ns-base-module 1.0.11 → 1.0.12

package/dist/Entry/EntryCriteria.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { EntryType } from './data.d';
-export declare const initialValueEunm: (type: EntryType) => "Equals" | "Contains" | "In" | "BeforeThan" | "Between";
+export declare const initialValueEunm: (type: EntryType) => "In" | "Equals" | "Contains" | "BeforeThan" | "Between";
 export declare const entryCriteriaHidden: (type: EntryType, criteriaTypeItems?: {
     label: string;
     value: string;

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,CA2ahC,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,CAobhC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/FilterPopover/Filter.js

@@ -71,7 +71,8 @@ var Filter = function Filter(props) {
   var searchValue = useRef("");
   var page = useRef({
     pageNum: 1,
-    pageSize: 20
+    pageSize: 20,
+    total: 20
   });
   // const [pageNum, setPageNum] = useState(1);
   // const [pageSize, setPageSize] = useState(20);
@@ -88,7 +89,7 @@ var Filter = function Filter(props) {
   // 获取列表
   var getDates = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _res$data;
+      var _res$data, _res$data2;
       var _list, params, res, datas, arr, _datas;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -142,7 +143,8 @@ var Filter = function Filter(props) {
               }
             }
             setTotal(res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.total);
-          case 15:
+            page.current.total = res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.total;
+          case 16:
           case "end":
             return _context.stop();
         }
@@ -158,15 +160,20 @@ var Filter = function Filter(props) {
     updateOpen.current = open; // 防止当前筛选被更新
 
     if (open) {
-      page.current.pageNum = 1;
-      searchValue.current = "";
-      setSearchval("");
-      setList([]);
-      getDates();
+      // 半选状态 - 不刷新列表
+      if (!(checked.length > 0 && checked.length < list.length)) {
+        page.current.pageNum = 1;
+        page.current.total = 20;
+        searchValue.current = "";
+        setSearchval("");
+        setList([]);
+        setChecked([]);
+        getDates();
+      }
     }
   }, [dictItems, JSON.stringify(argument), open]);
   var loadMoreData = function loadMoreData() {
-    if (page.current.pageNum * page.current.pageSize >= total) return;
+    if (page.current.pageNum * page.current.pageSize >= page.current.total) return;
     page.current.pageNum = page.current.pageNum + 1;
     getDates();
   };