bhd-components 0.7.21 → 0.7.22

package/esm/customerService/teacherList.js

@@ -11,8 +11,35 @@ var TeacherList = function(props) {
     var _useState = _sliced_to_array(useState(""), 2), keyWordProblem = _useState[0], setKeyWordProblem = _useState[1]; //搜索内容
     var _useState1 = _sliced_to_array(useState(1), 2), showLoadingState = _useState1[0], setShowLoadingState = _useState1[1]; //1，初始状态，2、无数据 ，3、不显示图片
     var _useState2 = _sliced_to_array(useState([]), 2), totalData = _useState2[0], setTotalData = _useState2[1]; //总数据
-    var _useState3 = _sliced_to_array(useState([]), 2), teacher_list = _useState3[0], setTeacher_list = _useState3[1]; //老师列表,有头像
+    // const [teacher_list, setTeacher_list] = useState([]); //老师列表,有头像
+    var teacher_list = useRef([]); //老师列表,有头像
     var timer = useRef(null); //文本框输入时
+    var page = useRef(1);
+    var loading = useRef(true);
+    var sliderRef = useRef(null);
+    useEffect(function() {
+        var handleScroll = function(e) {
+            // 处理滚轮事件的逻辑
+            var container = document.getElementById("teacher_list");
+            var scrollTop = container.scrollTop;
+            var clientHeight = container.clientHeight;
+            var scrollHeight = container.scrollHeight;
+            if (scrollTop + clientHeight + 60 >= scrollHeight && loading.current) {
+                loading.current = false;
+                // console.log('加载下一页');
+                page.current = page.current + 1;
+                getList(keyWordProblem);
+            }
+        };
+        // 添加滚轮事件监听器
+        sliderRef.current.addEventListener("wheel", handleScroll);
+        // 清除滚轮事件监听器
+        return function() {
+            sliderRef.current.removeEventListener("wheel", handleScroll);
+        };
+    }, [
+        keyWordProblem
+    ]);
     useEffect(function() {
         getList("");
         return function() {
@@ -20,17 +47,32 @@ var TeacherList = function(props) {
         };
     }, []);
     var getList = function(val) {
+        if (page.current == 1) {
+            setTotalData([]);
+        }
         http.get("".concat(urllocation, "/chat-service/public/v1.0/teachers"), {
             params: {
-                name: val
+                name: val,
+                page: page.current,
+                maxPageSize: 20
             }
         }).then(function(res) {
             console.log(res);
-            var data = res.data;
-            if (data.total > 0) {
+            if (res.data.total > 0) {
+                loading.current = true;
                 setShowLoadingState(3);
-                setTotalData(res.data.teachers);
+                var data = new Map();
+                setTotalData(function(totalData) {
+                    return totalData.concat(res.data.teachers).filter(function(a) {
+                        return !data.has(a.uid) && data.set(a.uid, 1);
+                    });
+                });
                 getUserName(res.data.teachers);
+            } else {
+                loading.current = false;
+                if (page.current == 1) {
+                    setShowLoadingState(2);
+                }
             }
         });
     };
@@ -39,7 +81,7 @@ var TeacherList = function(props) {
             var list = dataList;
             var ids = [];
             list = list.map(function(item) {
-                if (!item.headImg && teacher_list.filter(function(v) {
+                if (!item.headImg && teacher_list.current.filter(function(v) {
                     return v.uid == item.uid;
                 }).length <= 0) {
                     ids.push(item.uid);
@@ -58,16 +100,27 @@ var TeacherList = function(props) {
                                 if (name.length > 0) {
                                     return _object_spread({}, item, name[0]);
                                 } else {
-                                    return item;
+                                    var nameList1 = teacher_list.current;
+                                    var name1 = nameList1.filter(function(v) {
+                                        return v.uid == item.uid;
+                                    });
+                                    if (name1.length > 0) {
+                                        return _object_spread({}, item, name1[0]);
+                                    } else {
+                                        return item;
+                                    }
                                 }
                             });
-                            setTeacher_list(list);
+                            var data = new Map();
+                            teacher_list.current = teacher_list.current.concat(list).filter(function(a) {
+                                return !data.has(a.uid) && data.set(a.uid, 1);
+                            });
                             return list;
                         });
                     }
                 });
             } else {
-                var nameList = teacher_list;
+                var nameList = teacher_list.current;
                 setTotalData(function(list1) {
                     var list = list1;
                     list = list.map(function(item) {
@@ -80,7 +133,6 @@ var TeacherList = function(props) {
                             return item;
                         }
                     });
-                    setTeacher_list(list);
                     return list;
                 });
             }
@@ -131,13 +183,9 @@ var TeacherList = function(props) {
                                 setKeyWordProblem(val);
                                 clearTimeout(timer.current);
                                 timer.current = setTimeout(function() {
-                                    if (val != "") {
-                                        setTotalData([]);
-                                        getList(val);
-                                    } else {
-                                        setShowLoadingState(1);
-                                        setTotalData([]);
-                                    }
+                                    page.current = 1;
+                                    setTotalData([]);
+                                    getList(val);
                                 }, 1000);
                             }
                         }),
@@ -154,7 +202,7 @@ var TeacherList = function(props) {
                 }),
                 /*#__PURE__*/ _jsxs("div", {
                     className: styles.main_list,
-                    id: "history_list",
+                    id: "teacher_list",
                     children: [
                         showLoadingState == 1 && /*#__PURE__*/ _jsxs("div", {
                             className: styles.no_data,
@@ -174,12 +222,13 @@ var TeacherList = function(props) {
                                     src: "/new_yun/images/aiService/no_data.png"
                                 }),
                                 /*#__PURE__*/ _jsx("p", {
-                                    children: "暂无记录"
+                                    children: "未搜索到老师"
                                 })
                             ]
                         }),
                         /*#__PURE__*/ _jsx("div", {
                             className: styles.list_item,
+                            ref: sliderRef,
                             children: totalData.map(function(item) {
                                 var span = item.name.replaceAll(new RegExp(keyWordProblem, "ig"), function(i) {
                                     return "<span class=".concat(styles.sign, ">").concat(i, "</span>");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bhd-components",
-  "version": "0.7.21",
+  "version": "0.7.22",
   "description": "组件功能描述",
   "files": [
     "esm",