ns-base-module 1.0.3 → 1.0.4

package/dist/FilterPopover/Filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Filter.d.ts","sourceRoot":"","sources":["Filter.tsx"],"names":[],"mappings":"AAEA,OAAO,KAMN,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAOrC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,2CAA2C,CAAC;AAOnD,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAE1B,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,QAAQ,EAAE,CAAC,YAAY,EAAE,iBAAiB,EAAE,KAAK,IAAI,CAAC;IACtD,cAAc,CAAC,EAAE,CACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,MAAM,KACjB,IAAI,CAAC;IACV,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAE1D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE/B,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAWD,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CAmXhC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Filter.d.ts","sourceRoot":"","sources":["Filter.tsx"],"names":[],"mappings":"AAEA,OAAO,KAMN,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAOrC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,2CAA2C,CAAC;AAOnD,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAE1B,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,QAAQ,EAAE,CAAC,YAAY,EAAE,iBAAiB,EAAE,KAAK,IAAI,CAAC;IACtD,cAAc,CAAC,EAAE,CACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,MAAM,KACjB,IAAI,CAAC;IACV,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAE1D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE/B,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAWD,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CAiYhC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/FilterPopover/Filter.js

@@ -61,30 +61,31 @@ var Filter = function Filter(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     checked = _useState2[0],
     setChecked = _useState2[1];
+  // const [searchValue, setSearchValue] = useState<string | undefined>();
+
   var _useState3 = useState(),
     _useState4 = _slicedToArray(_useState3, 2),
-    searchValue = _useState4[0],
-    setSearchValue = _useState4[1];
+    selectValue = _useState4[0],
+    setSelectValue = _useState4[1];
   var _useState5 = useState(),
     _useState6 = _slicedToArray(_useState5, 2),
-    selectValue = _useState6[0],
-    setSelectValue = _useState6[1];
-  var _useState7 = useState(1),
+    searchval = _useState6[0],
+    setSearchval = _useState6[1];
+  var searchValue = useRef("");
+  var page = useRef({
+    pageNum: 1,
+    pageSize: 20
+  });
+  // const [pageNum, setPageNum] = useState(1);
+  // const [pageSize, setPageSize] = useState(20);
+  var _useState7 = useState(20),
     _useState8 = _slicedToArray(_useState7, 2),
-    pageNum = _useState8[0],
-    setPageNum = _useState8[1];
-  var _useState9 = useState(20),
+    total = _useState8[0],
+    setTotal = _useState8[1];
+  var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    pageSize = _useState10[0],
-    setPageSize = _useState10[1];
-  var _useState11 = useState(20),
-    _useState12 = _slicedToArray(_useState11, 2),
-    total = _useState12[0],
-    setTotal = _useState12[1];
-  var _useState13 = useState([]),
-    _useState14 = _slicedToArray(_useState13, 2),
-    list = _useState14[0],
-    setList = _useState14[1];
+    list = _useState10[0],
+    setList = _useState10[1];
   var scrollableRef = useRef(null);
 
   // 获取列表
@@ -102,15 +103,15 @@ var Filter = function Filter(_ref) {
             return _context.abrupt("return");
           case 2:
             params = {
-              arguments: searchValue ? _objectSpread(_objectSpread({}, argument), {}, _defineProperty({}, dataIndex, {
-                value: searchValue,
+              arguments: searchValue.current ? _objectSpread(_objectSpread({}, argument), {}, _defineProperty({}, dataIndex, {
+                value: searchValue.current,
                 criteriaType: "Contains"
                 // criteriaType: 'In',
               })) : _objectSpread({}, argument),
               formTemplateCode: formTemplateCode,
               menuCode: menuCode,
-              pageNum: pageNum,
-              pageSize: pageSize,
+              pageNum: page.current.pageNum,
+              pageSize: page.current.pageSize,
               distinctField: [dataIndex]
             };
             _context.next = 5;
@@ -125,9 +126,9 @@ var Filter = function Filter(_ref) {
             datas.map(function (d) {
               if (dataIndex && d[dataIndex]) arr.push(d[dataIndex]);
             });
-            _datas = pageNum === 1 ? [].concat(arr) : [].concat(_toConsumableArray(list), arr);
+            _datas = page.current.pageNum === 1 ? [].concat(arr) : [].concat(_toConsumableArray(list), arr);
             setList(_datas);
-            if (checked.length === 0 && pageNum > 1) {
+            if (checked.length === 0 && page.current.pageNum > 1) {
               setChecked([]); // 全部没选中 分页一样没选择
             } else {
               setChecked([].concat(_toConsumableArray(checked), arr));
@@ -146,7 +147,8 @@ var Filter = function Filter(_ref) {
   var updateOpen = useRef(false);
   useEffect(function () {
     if (updateOpen.current === open) return;
-    updateOpen.current = open;
+    updateOpen.current = open; // 防止当前筛选被更新
+
     if (open) {
       if (dictItems && dictItems.length) {
         var _list = dictItems.map(function (h) {
@@ -158,12 +160,11 @@ var Filter = function Filter(_ref) {
         getDates();
       }
     }
-  }, [pageNum, searchValue, dictItems, JSON.stringify(argument), open]);
+  }, [dictItems, JSON.stringify(argument), open]);
   var loadMoreData = function loadMoreData() {
-    if (pageNum * pageSize >= total) return;
-    setPageNum(function (num) {
-      return num + 1;
-    });
+    if (page.current.pageNum * page.current.pageSize >= total) return;
+    page.current.pageNum = page.current.pageNum + 1;
+    getDates();
   };
 
   // useEffect(() => {
@@ -173,13 +174,18 @@ var Filter = function Filter(_ref) {
 
   var onChange = useCallback(function (checkedValue) {
     setChecked(checkedValue);
-  }, [checked, list, searchValue]);
+  }, [checked, list]);
   var onChangeAll = useCallback(function (e) {
     setChecked(e.target.checked ? _toConsumableArray(list) : []);
   }, [list]);
   var onSearch = useCallback(function (value) {
-    setPageNum(1);
-    setSearchValue(value);
+    if (dictItems && dictItems.length) {
+      setSearchval(value);
+      return;
+    }
+    page.current.pageNum = 1;
+    searchValue.current = value;
+    getDates();
   }, []);
   var allChecked = useMemo(function () {
     return checked.length == list.length;
@@ -205,15 +211,15 @@ var Filter = function Filter(_ref) {
       (_props$onFilterSearch = props.onFilterSearch) === null || _props$onFilterSearch === void 0 || _props$onFilterSearch.call(props, dataIndex, value, _criteriaType);
       (_props$onFilterSearch2 = props.onFilterSearchValue) === null || _props$onFilterSearch2 === void 0 || _props$onFilterSearch2.call(props, value); // 显示筛选图标用
     } else {
-      setSearchValue(value);
+      searchValue.current = value;
     }
   };
   var handleFilter = function handleFilter() {
-    var lastChecked = searchValue ? checked.filter(function (item) {
-      var _item$toString, _searchValue$toString;
-      return (item === null || item === void 0 || (_item$toString = item.toString()) === null || _item$toString === void 0 || (_item$toString = _item$toString.toLowerCase()) === null || _item$toString === void 0 ? void 0 : _item$toString.indexOf(searchValue === null || searchValue === void 0 || (_searchValue$toString = searchValue.toString()) === null || _searchValue$toString === void 0 ? void 0 : _searchValue$toString.toLowerCase())) !== -1;
+    var lastChecked = searchValue.current ? checked.filter(function (item) {
+      var _item$toString, _searchValue$current;
+      return (item === null || item === void 0 || (_item$toString = item.toString()) === null || _item$toString === void 0 || (_item$toString = _item$toString.toLowerCase()) === null || _item$toString === void 0 ? void 0 : _item$toString.indexOf((_searchValue$current = searchValue.current) === null || _searchValue$current === void 0 || (_searchValue$current = _searchValue$current.toString()) === null || _searchValue$current === void 0 ? void 0 : _searchValue$current.toLowerCase())) !== -1;
     }) : checked;
-    if (searchValue) setChecked(lastChecked);
+    if (searchValue.current) setChecked(lastChecked);
 
     // 多选 字典转value
     var multChecked = [];
@@ -233,7 +239,7 @@ var Filter = function Filter(_ref) {
     if (props.onFilterSearch) {
       // 改成查接口
       var _value = haDict ? multChecked : lastChecked;
-      if (allChecked && !searchValue) {
+      if (allChecked && !searchValue.current) {
         _value = [];
       }
       onFilterSearch(_value);
@@ -243,10 +249,10 @@ var Filter = function Filter(_ref) {
   };
   var searchList = useMemo(function () {
     return list.filter(function (item) {
-      var _item$toString2, _searchValue$toString2;
-      return !searchValue || (item === null || item === void 0 || (_item$toString2 = item.toString()) === null || _item$toString2 === void 0 || (_item$toString2 = _item$toString2.toLowerCase()) === null || _item$toString2 === void 0 ? void 0 : _item$toString2.indexOf(searchValue === null || searchValue === void 0 || (_searchValue$toString2 = searchValue.toString()) === null || _searchValue$toString2 === void 0 ? void 0 : _searchValue$toString2.toLowerCase())) !== -1;
+      var _item$toString2, _searchval$toString;
+      return !searchval || (item === null || item === void 0 || (_item$toString2 = item.toString()) === null || _item$toString2 === void 0 || (_item$toString2 = _item$toString2.toLowerCase()) === null || _item$toString2 === void 0 ? void 0 : _item$toString2.indexOf(searchval === null || searchval === void 0 || (_searchval$toString = searchval.toString()) === null || _searchval$toString === void 0 ? void 0 : _searchval$toString.toLowerCase())) !== -1;
     });
-  }, [list]);
+  }, [list, searchval]);
   var searchListCheckBox = function searchListCheckBox() {
     return searchList.map(function (item, index) {
       return /*#__PURE__*/React.createElement("div", {
@@ -346,7 +352,7 @@ var Filter = function Filter(_ref) {
   }, /*#__PURE__*/React.createElement(InfiniteScroll, {
     dataLength: list.length,
     next: loadMoreData,
-    hasMore: pageNum * pageSize < total,
+    hasMore: page.current.pageNum * page.current.pageSize < total,
     loader: /*#__PURE__*/React.createElement(Divider, {
       plain: true,
       style: {