@bit-sun/business-component 1.1.16 → 1.1.17

package/dist/index.esm.js

@@ -2562,30 +2562,24 @@ var SearchSelect = function SearchSelect(props) {
 
   var _useState23 = useState([]),
       _useState24 = _slicedToArray(_useState23, 2),
-      selectedRows = _useState24[0],
-      setSelectedRows = _useState24[1];
+      doubleArr = _useState24[0],
+      setDoubleArr = _useState24[1]; // 存放双数组的数组
 
-  var _useState25 = useState([]),
-      _useState26 = _slicedToArray(_useState25, 2),
-      doubleArr = _useState26[0],
-      setDoubleArr = _useState26[1]; // 存放双数组的数组
 
+  var _useState25 = useState(false),
+      _useState26 = _slicedToArray(_useState25, 2),
+      checkedAll = _useState26[0],
+      setCheckedAll = _useState26[1];
 
-  var _useState27 = useState([]),
+  var _useState27 = useState(false),
       _useState28 = _slicedToArray(_useState27, 2),
-      filterRows = _useState28[0],
-      setFilterRows = _useState28[1]; // 存放拼接后的一维数组的变量
+      indeterminate = _useState28[0],
+      setIndeterminate = _useState28[1];
 
-
-  var _useState29 = useState(false),
+  var _useState29 = useState({}),
       _useState30 = _slicedToArray(_useState29, 2),
-      checkedAll = _useState30[0],
-      setCheckedAll = _useState30[1];
-
-  var _useState31 = useState(false),
-      _useState32 = _slicedToArray(_useState31, 2),
-      indeterminate = _useState32[0],
-      setIndeterminate = _useState32[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
+      tableFormParams = _useState30[0],
+      setTableFormParams = _useState30[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
 
 
   var getData = function getData() {
@@ -2708,16 +2702,6 @@ var SearchSelect = function SearchSelect(props) {
         setSelectedRowKeys(labelInValue ? value.map(function (i) {
           return i.key;
         }) : value);
-        setSelectedRows(labelInValue ? value.map(function (i) {
-          return {
-            value: i.key,
-            text: i.label
-          };
-        }) : value.map(function (i) {
-          return {
-            value: i
-          };
-        }));
         setPopValue(labelInValue ? value.map(function (i) {
           return {
             value: i.key,
@@ -2729,15 +2713,13 @@ var SearchSelect = function SearchSelect(props) {
           };
         }));
         setIndeterminate(!!value.length && value.length < itemsTotal);
-        setCheckedAll(value.length === itemsTotal);
+        setCheckedAll(value.length === itemsTotal); // 需清空数据
+
+        if (!value.length) {
+          setDoubleArr([]);
+        }
       } else {
         setSelectedRowKeys(labelInValue ? [value.key] : [value]);
-        setSelectedRows(labelInValue ? [{
-          value: value.key,
-          text: value.label
-        }] : [{
-          value: value
-        }]);
         setPopValue(labelInValue ? [{
           value: value.key,
           text: value.label
@@ -2760,7 +2742,7 @@ var SearchSelect = function SearchSelect(props) {
       setItems(source);
     }
 
-    setIsModalVisible(false);
+    handleCancel();
   };
 
   var formaData = function formaData(value) {
@@ -2783,6 +2765,8 @@ var SearchSelect = function SearchSelect(props) {
   };
 
   var handleCancel = function handleCancel() {
+    form.resetFields();
+    setTableFormParams({});
     setIsModalVisible(false);
   };
 
@@ -2798,6 +2782,7 @@ var SearchSelect = function SearchSelect(props) {
 
   var onSearchTable = function onSearchTable() {
     var params = form.getFieldsValue();
+    setTableFormParams(params);
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
       pageSize: tableInitPageSize
     }), 2);
@@ -2805,6 +2790,7 @@ var SearchSelect = function SearchSelect(props) {
 
   var onResetTable = function onResetTable() {
     form.resetFields();
+    setTableFormParams({});
     handleTableChange({
       pageSize: tableInitPageSize,
       currentPage: 1
@@ -2812,8 +2798,7 @@ var SearchSelect = function SearchSelect(props) {
   };
 
   var handleTableChange = function handleTableChange(pagination) {
-    var params = form.getFieldsValue();
-    getData(_objectSpread2(_objectSpread2({}, params), {}, {
+    getData(_objectSpread2(_objectSpread2({}, tableFormParams), {}, {
       pageSize: pagination.pageSize,
       currentPage: pagination.current
     }), 2);
@@ -2827,13 +2812,12 @@ var SearchSelect = function SearchSelect(props) {
         setSelectedRowKeys(currentItemsData.map(function (i) {
           return i.value;
         }));
-        setSelectedRows(currentItemsData);
         setPopValue(currentItemsData);
       }
     } else {
       setSelectedRowKeys([]);
-      setSelectedRows([]);
       setPopValue([]);
+      setDoubleArr([]);
     }
 
     setIndeterminate(false);
@@ -2883,7 +2867,8 @@ var SearchSelect = function SearchSelect(props) {
 
   var onChangeSelectedKeys = function onChangeSelectedKeys(selectKeys, selectRows) {
     var nowPage = tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.current;
-    var filterRows = [];
+    var filterRows = []; // 存放拼接后的一维数组的变量
+
     var sksResult = [];
 
     if (selectMode) {
@@ -2895,7 +2880,6 @@ var SearchSelect = function SearchSelect(props) {
 
       filterRows = mapRows(doubleArr); // console.log(filterRows)
 
-      setFilterRows(filterRows);
       sksResult = filterRows.map(function (i) {
         return i.value;
       });
@@ -2908,7 +2892,6 @@ var SearchSelect = function SearchSelect(props) {
     }
 
     setSelectedRowKeys(sksResult);
-    setSelectedRows(filterRows);
     setPopValue(filterRows);
     setIndeterminate(!!filterRows.length && filterRows.length < (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
     setCheckedAll(filterRows.length === (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));

package/dist/index.js

@@ -2573,30 +2573,24 @@ var SearchSelect = function SearchSelect(props) {
 
   var _useState23 = React.useState([]),
       _useState24 = _slicedToArray(_useState23, 2),
-      selectedRows = _useState24[0],
-      setSelectedRows = _useState24[1];
+      doubleArr = _useState24[0],
+      setDoubleArr = _useState24[1]; // 存放双数组的数组
 
-  var _useState25 = React.useState([]),
-      _useState26 = _slicedToArray(_useState25, 2),
-      doubleArr = _useState26[0],
-      setDoubleArr = _useState26[1]; // 存放双数组的数组
 
+  var _useState25 = React.useState(false),
+      _useState26 = _slicedToArray(_useState25, 2),
+      checkedAll = _useState26[0],
+      setCheckedAll = _useState26[1];
 
-  var _useState27 = React.useState([]),
+  var _useState27 = React.useState(false),
       _useState28 = _slicedToArray(_useState27, 2),
-      filterRows = _useState28[0],
-      setFilterRows = _useState28[1]; // 存放拼接后的一维数组的变量
+      indeterminate = _useState28[0],
+      setIndeterminate = _useState28[1];
 
-
-  var _useState29 = React.useState(false),
+  var _useState29 = React.useState({}),
       _useState30 = _slicedToArray(_useState29, 2),
-      checkedAll = _useState30[0],
-      setCheckedAll = _useState30[1];
-
-  var _useState31 = React.useState(false),
-      _useState32 = _slicedToArray(_useState31, 2),
-      indeterminate = _useState32[0],
-      setIndeterminate = _useState32[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
+      tableFormParams = _useState30[0],
+      setTableFormParams = _useState30[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
 
 
   var getData = function getData() {
@@ -2719,16 +2713,6 @@ var SearchSelect = function SearchSelect(props) {
         setSelectedRowKeys(labelInValue ? value.map(function (i) {
           return i.key;
         }) : value);
-        setSelectedRows(labelInValue ? value.map(function (i) {
-          return {
-            value: i.key,
-            text: i.label
-          };
-        }) : value.map(function (i) {
-          return {
-            value: i
-          };
-        }));
         setPopValue(labelInValue ? value.map(function (i) {
           return {
             value: i.key,
@@ -2740,15 +2724,13 @@ var SearchSelect = function SearchSelect(props) {
           };
         }));
         setIndeterminate(!!value.length && value.length < itemsTotal);
-        setCheckedAll(value.length === itemsTotal);
+        setCheckedAll(value.length === itemsTotal); // 需清空数据
+
+        if (!value.length) {
+          setDoubleArr([]);
+        }
       } else {
         setSelectedRowKeys(labelInValue ? [value.key] : [value]);
-        setSelectedRows(labelInValue ? [{
-          value: value.key,
-          text: value.label
-        }] : [{
-          value: value
-        }]);
         setPopValue(labelInValue ? [{
           value: value.key,
           text: value.label
@@ -2771,7 +2753,7 @@ var SearchSelect = function SearchSelect(props) {
       setItems(source);
     }
 
-    setIsModalVisible(false);
+    handleCancel();
   };
 
   var formaData = function formaData(value) {
@@ -2794,6 +2776,8 @@ var SearchSelect = function SearchSelect(props) {
   };
 
   var handleCancel = function handleCancel() {
+    form.resetFields();
+    setTableFormParams({});
     setIsModalVisible(false);
   };
 
@@ -2809,6 +2793,7 @@ var SearchSelect = function SearchSelect(props) {
 
   var onSearchTable = function onSearchTable() {
     var params = form.getFieldsValue();
+    setTableFormParams(params);
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
       pageSize: tableInitPageSize
     }), 2);
@@ -2816,6 +2801,7 @@ var SearchSelect = function SearchSelect(props) {
 
   var onResetTable = function onResetTable() {
     form.resetFields();
+    setTableFormParams({});
     handleTableChange({
       pageSize: tableInitPageSize,
       currentPage: 1
@@ -2823,8 +2809,7 @@ var SearchSelect = function SearchSelect(props) {
   };
 
   var handleTableChange = function handleTableChange(pagination) {
-    var params = form.getFieldsValue();
-    getData(_objectSpread2(_objectSpread2({}, params), {}, {
+    getData(_objectSpread2(_objectSpread2({}, tableFormParams), {}, {
       pageSize: pagination.pageSize,
       currentPage: pagination.current
     }), 2);
@@ -2838,13 +2823,12 @@ var SearchSelect = function SearchSelect(props) {
         setSelectedRowKeys(currentItemsData.map(function (i) {
           return i.value;
         }));
-        setSelectedRows(currentItemsData);
         setPopValue(currentItemsData);
       }
     } else {
       setSelectedRowKeys([]);
-      setSelectedRows([]);
       setPopValue([]);
+      setDoubleArr([]);
     }
 
     setIndeterminate(false);
@@ -2894,7 +2878,8 @@ var SearchSelect = function SearchSelect(props) {
 
   var onChangeSelectedKeys = function onChangeSelectedKeys(selectKeys, selectRows) {
     var nowPage = tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.current;
-    var filterRows = [];
+    var filterRows = []; // 存放拼接后的一维数组的变量
+
     var sksResult = [];
 
     if (selectMode) {
@@ -2906,7 +2891,6 @@ var SearchSelect = function SearchSelect(props) {
 
       filterRows = mapRows(doubleArr); // console.log(filterRows)
 
-      setFilterRows(filterRows);
       sksResult = filterRows.map(function (i) {
         return i.value;
       });
@@ -2919,7 +2903,6 @@ var SearchSelect = function SearchSelect(props) {
     }
 
     setSelectedRowKeys(sksResult);
-    setSelectedRows(filterRows);
     setPopValue(filterRows);
     setIndeterminate(!!filterRows.length && filterRows.length < (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
     setCheckedAll(filterRows.length === (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));

package/package.json

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

package/src/components/SearchSelect/index.tsx

@@ -71,9 +71,7 @@ const SearchSelect = (props: any) => {
   const [tableData, setTableData] = useState([]);
   const [tablePagination, setTablePagination] = useState({ showQuickJumper: true, total: 0, current: 1, pageSize: tableInitPageSize })
   const [selectedRowKeys, setSelectedRowKeys] = useState([]);
-  const [selectedRows, setSelectedRows] = useState([]);
   const [doubleArr, setDoubleArr] = useState([]); // 存放双数组的数组
-  const [filterRows, setFilterRows] = useState([]); // 存放拼接后的一维数组的变量
   const [checkedAll, setCheckedAll] = useState(false)
   const [indeterminate, setIndeterminate] = useState(false)
   const [tableFormParams, setTableFormParams] = useState({});
@@ -190,13 +188,15 @@ const SearchSelect = (props: any) => {
     if(value) {
       if(selectMode) {
         setSelectedRowKeys(labelInValue ? value.map(i => i.key) : value)
-        setSelectedRows(labelInValue ? value.map(i => ({ value: i.key, text: i.label })) : value.map(i => ({ value: i })))
         setPopValue(labelInValue ? value.map(i => ({ value: i.key, text: i.label })) : value.map(i => ({ value: i })));
         setIndeterminate(!!value.length && value.length < itemsTotal);
         setCheckedAll(value.length === itemsTotal);
+        // 需清空数据
+        if(!value.length) {
+          setDoubleArr([])
+        }
       } else {
         setSelectedRowKeys(labelInValue ? [value.key] : [value])
-        setSelectedRows(labelInValue ? [{ value: value.key, text: value.label }] : [{ value: value }])
         setPopValue(labelInValue ? [{ value: value.key, text: value.label }] : [{ value: value }]);
       }
     }
@@ -261,15 +261,14 @@ const SearchSelect = (props: any) => {
       if(items.length === itemsTotal) {
         const currentItemsData = JSON.parse(JSON.stringify(items))
         setSelectedRowKeys(currentItemsData.map(i => i.value))
-        setSelectedRows(currentItemsData)
         setPopValue(currentItemsData);
       } else {
         // TODO 请求接口获取所有数据
       }
     } else {
       setSelectedRowKeys([])
-      setSelectedRows([])
       setPopValue([]);
+      setDoubleArr([])
     }
     setIndeterminate(false);
     setCheckedAll(e.target.checked);
@@ -316,7 +315,7 @@ const SearchSelect = (props: any) => {
   const onChangeSelectedKeys=(selectKeys,selectRows) => {
     const nowPage = tablePagination?.current;
 
-    let filterRows = [];
+    let filterRows = []; // 存放拼接后的一维数组的变量
     let sksResult = [];
 
     if(selectMode) {
@@ -328,7 +327,6 @@ const SearchSelect = (props: any) => {
       // 这块扁平化成为一位数组
       filterRows = mapRows(doubleArr);
       // console.log(filterRows)
-      setFilterRows(filterRows)
 
       sksResult = filterRows.map((i) => i.value)
     } else {
@@ -338,7 +336,6 @@ const SearchSelect = (props: any) => {
     }
 
     setSelectedRowKeys(sksResult)
-    setSelectedRows(filterRows)
     setPopValue(filterRows);
     setIndeterminate(!!filterRows.length && filterRows.length < tablePagination?.total);
     setCheckedAll(filterRows.length === tablePagination?.total);