@hzab/group-user-selector 0.0.3 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/group-user-selector",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "",
   "main": "src",
   "scripts": {

package/src/components/SearchRenter/index.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useState, forwardRef } from "react";
-import { Input,message,  Pagination,  } from "antd";
+import { Input, message, Pagination, } from "antd";
 
 import "./index.less";
 
@@ -27,15 +27,13 @@ function SearchRenter(props, ref) {
     setLoading && setLoading(true);
     searchModel &&
       searchModel.getList({ ...data }).then((res) => {
-        console.log(res, 2222222);
-
         setSearchList(res?.list || res || []);
-        setTotal(res?.pagination?.total||res?.total || 0);
+        setTotal(res?.pagination?.total || res?.total || 0);
       }).catch((err) => {
         message.error(err._message || "未知错误");
       })
         .finally(() => {
-          setLoading &&  setLoading(false);
+          setLoading && setLoading(false);
         });
   }
 
@@ -54,12 +52,22 @@ function SearchRenter(props, ref) {
   }
 
   const onSearch = (value) => {
-
     setSearch(value);
-    if (!value) return;
+    if (!value) {
+      setPageData({
+        pageSize: 10,
+        pageNum: 1
+      })
+      return
+    };
+    const data = {
+      pageSize: pageData?.pageSize || 10,
+      pageNum: 1
+    }
+    setPageData(data)
     handleSearch({
       [searchQueryKey]: value,
-      ...pageData
+      ...data
     })
   };
 
@@ -80,7 +88,7 @@ function SearchRenter(props, ref) {
           </div> : null}
         </div>
       ) : null}
-      </>
+    </>
   );
 }
 

package/src/index.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useState, useImperativeHandle, forwardRef } from "react";
+import { useEffect, useState, useImperativeHandle, forwardRef, useReducer, useRef } from "react";
 import { Input, Breadcrumb, Checkbox, message, Spin, Pagination, ConfigProvider } from "antd";
 import zhCN from 'antd/es/locale/zh_CN';
 import { CloseCircleFilled, SearchOutlined } from "@ant-design/icons";
@@ -35,7 +35,9 @@ function GroupSelection(props, ref) {
   const [selectedList, setSelectedList] = useState([...value]);
   const [queryValue, setQueryValue] = useState(undefined);
   const [total, setTotal] = useState(0);
-    const [pageData, setPageData] = useState(hasPagination ? {
+
+
+    const pageData = useRef(hasPagination ? {
       pageSize: 10,
       pageNum: 1
     } : {});
@@ -54,7 +56,7 @@ function GroupSelection(props, ref) {
   const getTreeData = (value?: string | number) => {
     setLoading(true);
     model &&
-      model.getList({ [queryKey]: value || queryValue, ...pageData }).then((res) => {
+      model.getList({ [queryKey]: value || queryValue, ...pageData.current }).then((res) => {
         setSelectList(res?.list || res || []);
         setTotal(res?.pagination?.total||res?.total || 0);
       })
@@ -74,12 +76,11 @@ function GroupSelection(props, ref) {
 
   const handleChangePage = (pageNum, pageSize) => {
     const pages = {
-      pageNum: pageSize !== pageData?.pageSize ? 1 : pageNum,
+      pageNum: pageSize !== pageData.current?.pageSize ? 1 : pageNum,
       pageSize
     }
-    setPageData({
-      ...pages
-    })
+    pageData.current = pages
+
     getTreeData()
   }
 
@@ -179,7 +180,7 @@ function GroupSelection(props, ref) {
             })}
           </div>
           {hasPagination ? <div>
-            <Pagination current={pageData?.pageNum} total={total} pageSize={pageData?.pageSize} onChange={handleChangePage} size="small" />
+            <Pagination current={pageData.current?.pageNum} total={total} pageSize={pageData.current?.pageSize} onChange={handleChangePage} size="small" />
           </div> : null}
         </div>
         <div className="group-selection-detail">