@bit-sun/business-component 1.1.15 → 1.1.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/SearchSelect/index.tsx

@@ -76,6 +76,7 @@ const SearchSelect = (props: any) => {
   const [filterRows, setFilterRows] = useState([]); // 存放拼接后的一维数组的变量
   const [checkedAll, setCheckedAll] = useState(false)
   const [indeterminate, setIndeterminate] = useState(false)
+  const [tableFormParams, setTableFormParams] = useState({});
 
   // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
   const getData = (params={}, type=1) => {
@@ -209,7 +210,7 @@ const SearchSelect = (props: any) => {
       ctx?.form?.setFieldSource(sourceName, source)
       setItems(source)
     }
-    setIsModalVisible(false);
+    handleCancel();
   };
 
   const formaData = (value) => {
@@ -223,6 +224,8 @@ const SearchSelect = (props: any) => {
   };
 
   const handleCancel = () => {
+    form.resetFields();
+    setTableFormParams({});
     setIsModalVisible(false);
   };
 
@@ -238,17 +241,18 @@ const SearchSelect = (props: any) => {
 
   const onSearchTable = () => {
     const params = form.getFieldsValue();
+    setTableFormParams(params);
     getData({ ...params, pageSize: tableInitPageSize }, 2)
   }
 
   const onResetTable = () => {
     form.resetFields();
+    setTableFormParams({});
     handleTableChange({ pageSize: tableInitPageSize, currentPage: 1 })
   }
 
   const handleTableChange = (pagination) => {
-    const params = form.getFieldsValue();
-    getData({ ...params, pageSize: pagination.pageSize, currentPage: pagination.current }, 2)
+    getData({ ...tableFormParams, pageSize: pagination.pageSize, currentPage: pagination.current }, 2)
   }
 
   const onChangeCheckAll = (e) => {