ns-base-module 1.0.3 → 1.0.5

package/dist/ChooseModal/index.d.ts

@@ -0,0 +1,21 @@
+import React from "react";
+export interface ChooseModalProps {
+    menuCode?: string;
+    formTemplateCode?: string;
+    children?: React.ReactElement;
+    params?: Record<string, any>;
+    width?: string;
+    modalType?: "center" | "left" | "right";
+    modalNode?: () => React.ReactElement | string;
+    footer?: React.ReactElement;
+    callbackShow?: (flag: boolean) => void;
+    hanldeOk?: () => void;
+    showFooter?: boolean;
+    destroyOnClose?: boolean;
+    title?: string;
+    modalProps?: Record<string, any> | null;
+    onSelectSubmit?: () => void;
+}
+declare const _default: React.ForwardRefExoticComponent<ChooseModalProps & React.RefAttributes<unknown>>;
+export default _default;
+//# sourceMappingURL=index.d.ts.map

package/dist/ChooseModal/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAoD,MAAM,OAAO,CAAC;AAWzE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAC;IACxC,SAAS,CAAC,EAAE,MAAM,KAAK,CAAC,YAAY,GAAG,MAAM,CAAC;IAC9C,MAAM,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC;IAC5B,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IAExC,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;;AAqJD,wBAAiC"}

package/dist/ChooseModal/index.js

@@ -0,0 +1,164 @@
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+/*
+ * @Date: 2023-05-08 13:49:30
+ * @description:
+ * @author chenchangfu
+ * Copyright (c) 2019, AUTHOR. All rights reserved.
+ * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ */
+import { Button, Drawer, Modal, Space } from "antd";
+import React, { forwardRef, useImperativeHandle, useState } from "react";
+// import Icon from '@/components/Icon';
+// import type { ListProps } from '@/components/v2/Order/List';
+// import { initLang } from '@/utils/language';
+// import List from '@/components/v2/Order/List';
+// import type { ListConfigType } from '@/utils/type.d';
+// import { queryConfig } from '@/services/global';
+import { initLang } from "../utils/language";
+import { handlePercentage } from "../utils/utils";
+import FontIcon from "../Icon";
+var Index = function Index(_ref, ref) {
+  var _params$config, _params$config2;
+  var children = _ref.children,
+    menuCode = _ref.menuCode,
+    formTemplateCode = _ref.formTemplateCode,
+    onSelectSubmit = _ref.onSelectSubmit,
+    params = _ref.params,
+    width = _ref.width,
+    _ref$modalType = _ref.modalType,
+    modalType = _ref$modalType === void 0 ? "center" : _ref$modalType,
+    modalNode = _ref.modalNode,
+    _ref$footer = _ref.footer,
+    footer = _ref$footer === void 0 ? null : _ref$footer,
+    callbackShow = _ref.callbackShow,
+    hanldeOk = _ref.hanldeOk,
+    _ref$showFooter = _ref.showFooter,
+    showFooter = _ref$showFooter === void 0 ? false : _ref$showFooter,
+    _ref$destroyOnClose = _ref.destroyOnClose,
+    destroyOnClose = _ref$destroyOnClose === void 0 ? true : _ref$destroyOnClose,
+    title = _ref.title,
+    _ref$modalProps = _ref.modalProps,
+    modalProps = _ref$modalProps === void 0 ? null : _ref$modalProps;
+  // console.log(params);
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    config = _useState4[0],
+    setConfig = _useState4[1];
+
+  // useEffect(() => {
+  //   if (visible && menuCode && formTemplateCode) {
+  //     queryConfig({ menuCode, formTemplateCode }).then((res) => {
+  //       if (res?.code == 200) {
+  //         setConfig(res?.data || {});
+  //       }
+  //     });
+  //   }
+  // }, [visible, menuCode, formTemplateCode]);
+
+  var onCancel = function onCancel() {
+    setVisible(false);
+    callbackShow === null || callbackShow === void 0 || callbackShow(false);
+  };
+  var _onShow = function onShow() {
+    setVisible(true);
+    callbackShow === null || callbackShow === void 0 || callbackShow(true);
+  };
+
+  // const onSubmit = (value: any) => {
+  //   onSelectSubmit?.(
+  //     Array.isArray(value)
+  //       ? value?.map(({ id, ...rest }: any, index: number) => ({
+  //           ...rest,
+  //           _id: id,
+  //           id: Date.now().toString() + index.toString(), // 后端id有可能不是唯一值问题
+  //         }))
+  //       : value,
+  //   );
+  //   onCancel();
+  // };
+
+  // const ModalChild = () => {
+  //   // console.log('paramsparams', params);
+  //   return (
+  //     config &&
+  //     menuCode &&
+  //     formTemplateCode && (
+  //       <List
+  //         config={JSON.stringify(config)}
+  //         menuCode={menuCode}
+  //         formTemplateCode={formTemplateCode}
+  //         onSelectSubmit={onSubmit}
+  //         // defaultOpenSearchModal={visible}
+  //         params={{ variablePara: params }}
+  //       />
+  //     )
+  //   );
+  // };
+
+  useImperativeHandle(ref, function () {
+    return {
+      onShow: function onShow() {
+        _onShow();
+      },
+      onHide: function onHide() {
+        onCancel();
+      }
+    };
+  });
+  var footerDom = function footerDom() {
+    return /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
+      type: "primary",
+      onClick: function onClick() {
+        hanldeOk === null || hanldeOk === void 0 || hanldeOk();
+        onCancel();
+      }
+    }, initLang({
+      id: "button.ok",
+      defaultValue: "确定"
+    })), /*#__PURE__*/React.createElement(Button, {
+      onClick: onCancel
+    }, initLang({
+      id: "button.cancel",
+      defaultValue: "取消"
+    })));
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, modalNode ? /*#__PURE__*/React.createElement("span", {
+    onClick: _onShow
+  }, modalNode()) :
+  /*#__PURE__*/
+  // <children.type {...children.props} onClick={onShow} />
+  React.createElement(FontIcon, {
+    type: "icon-24gl-lookup",
+    style: {
+      fontSize: "14px"
+    },
+    onClick: _onShow
+  }), (modalType == "center" || !modalType) && /*#__PURE__*/React.createElement(Modal, _extends({
+    title: title || (params === null || params === void 0 || (_params$config = params.config) === null || _params$config === void 0 ? void 0 : _params$config.name),
+    wrapClassName: "choose-modal-wrapper",
+    visible: visible,
+    footer: showFooter ? footerDom() : footer,
+    onCancel: onCancel,
+    destroyOnClose: destroyOnClose,
+    centered: true,
+    width: width ? handlePercentage(width) : "80%",
+    maskClosable: false
+  }, modalProps), children && /*#__PURE__*/React.createElement(children.type, children.props)), (modalType == "right" || modalType == "left") && /*#__PURE__*/React.createElement(Drawer, _extends({
+    title: title || (params === null || params === void 0 || (_params$config2 = params.config) === null || _params$config2 === void 0 ? void 0 : _params$config2.name),
+    width: handlePercentage(width),
+    open: visible,
+    footer: showFooter ? footerDom() : footer,
+    onClose: onCancel
+  }, modalProps), children && /*#__PURE__*/React.createElement(children.type, children.props)));
+};
+export default /*#__PURE__*/forwardRef(Index);

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

package/dist/FilterPopover/Filter.js

@@ -27,7 +27,7 @@ import InfiniteScroll from "react-infinite-scroll-component";
 import Checkbox from "../Entry/components/Checkbox";
 import Input from "../Entry/components/Input";
 import CopyCol from "../CopyCol";
-import { get } from "lodash";
+import { cloneDeep, get } from "lodash";
 import "../../style/components/FilterPopover.scss";
 import { initLang } from "../utils/language";
 // import request from "../utils/request";
@@ -61,79 +61,84 @@ 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);
 
   // 获取列表
   var getDates = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _res$data;
-      var params, res, datas, arr, _datas;
+      var _list, params, res, datas, arr, _datas;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!(!menuCode && !formTemplateCode)) {
-              _context.next = 2;
+              _context.next = 4;
               break;
             }
+            // 编辑表格2 前端过滤
+            _list = cloneDeep(props.list);
+            setList(_list);
             return _context.abrupt("return");
-          case 2:
+          case 4:
             params = {
-              arguments: searchValue ? _objectSpread(_objectSpread({}, argument), {}, _defineProperty({}, dataIndex, {
-                value: searchValue,
-                criteriaType: "Contains"
+              arguments: searchValue.current ? _objectSpread(_objectSpread({}, argument), {}, _defineProperty({}, dataIndex, {
+                value: searchValue.current,
+                criteriaType: "Contains",
+                necessary: true
                 // 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;
+            _context.next = 7;
             return request === null || request === void 0 ? void 0 : request("/querier/menu", {
               method: "POST",
               data: params
             });
-          case 5:
+          case 7:
             res = _context.sent;
             datas = get(res, "data.rows", []) || [];
             arr = [];
             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));
             }
             setTotal(res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.total);
-          case 13:
+          case 15:
           case "end":
             return _context.stop();
         }
@@ -146,7 +151,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 +164,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,14 +178,20 @@ 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);
-  }, []);
+  var onSearch = function onSearch(value) {
+    page.current.pageNum = 1;
+    searchValue.current = value; // 过滤用 前端过滤时
+
+    if (dictItems && dictItems.length || !(menuCode && formTemplateCode)) {
+      setSearchval(value); // 搜索用
+      return;
+    }
+    getDates();
+  };
   var allChecked = useMemo(function () {
     return checked.length == list.length;
   }, [checked, list]);
@@ -205,15 +216,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,8 +244,11 @@ var Filter = function Filter(_ref) {
     if (props.onFilterSearch) {
       // 改成查接口
       var _value = haDict ? multChecked : lastChecked;
-      if (allChecked && !searchValue) {
-        _value = [];
+      if (allChecked && !searchValue.current) {
+        if (menuCode && formTemplateCode) {
+          // 查接口清空，编辑表格2是前端查询
+          _value = [];
+        }
       }
       onFilterSearch(_value);
     } else {
@@ -243,10 +257,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 +360,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: {

package/dist/FilterPopover/FilterClearIcon.d.ts

@@ -1,8 +1,8 @@
 import React from "react";
-export interface Iprops {
-    filterSearch?: any[];
-    clearFilter: () => void;
+export interface IFilterPopoverProps {
+    filterSearch?: Record<string, any>[];
+    clearFilter: (flag?: boolean) => void;
 }
-declare const Index: React.FC<Iprops>;
+declare const Index: React.FC<IFilterPopoverProps>;
 export default Index;
 //# sourceMappingURL=FilterClearIcon.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"FilterClearIcon.d.ts","sourceRoot":"","sources":["FilterClearIcon.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,MAAM,WAAW,MAAM;IACrB,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IACrB,WAAW,EAAE,MAAM,IAAI,CAAC;CACzB;AAED,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAwB3B,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"FilterClearIcon.d.ts","sourceRoot":"","sources":["FilterClearIcon.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,MAAM,WAAW,mBAAmB;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;IACrC,WAAW,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CACvC;AAED,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAwBxC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/dist/FilterPopover/FilterClearIcon.js

@@ -23,7 +23,7 @@ var Index = function Index(props) {
 
   var handleClearFilter = function handleClearFilter() {
     var _props$clearFilter;
-    (_props$clearFilter = props.clearFilter) === null || _props$clearFilter === void 0 || _props$clearFilter.call(props);
+    (_props$clearFilter = props.clearFilter) === null || _props$clearFilter === void 0 || _props$clearFilter.call(props, true);
   };
   var hasFilter = props !== null && props !== void 0 && props.filterSearch ? (_Object$values = Object.values(props === null || props === void 0 ? void 0 : props.filterSearch)) === null || _Object$values === void 0 ? void 0 : _Object$values.some(function (d) {
     return !!d.value;

package/dist/IconTools/index.d.ts

@@ -0,0 +1,13 @@
+import React from "react";
+import { IFilterPopoverProps } from "../FilterPopover/FilterClearIcon";
+import { SubtotalsModalProps } from "../SubtotalsModal/index";
+declare type IconToolsType = {
+    onReload?: () => void;
+    changeSize?: (size: string) => void;
+    showSwitchBtn?: boolean;
+    handleChangeTableHeader?: () => void;
+    updateColumns: (tree: Record<string, any>[]) => void;
+} & IFilterPopoverProps & SubtotalsModalProps;
+declare const Index: (props: IconToolsType) => React.JSX.Element;
+export default Index;
+//# sourceMappingURL=index.d.ts.map

package/dist/IconTools/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":"AASA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAwB,EACtB,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAI9D,aAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAEpC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,MAAM,IAAI,CAAC;IAErC,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC;CACtD,GAAG,mBAAmB,GACrB,mBAAmB,CAAC;AAEtB,QAAA,MAAM,KAAK,UAAW,aAAa,sBAuHlC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/dist/IconTools/index.js

@@ -0,0 +1,125 @@
+import { ColumnHeightOutlined, PicLeftOutlined, RedoOutlined, SwapOutlined } from "@ant-design/icons";
+import { Dropdown, Tooltip } from "antd";
+import { initLang } from "../utils/language";
+import React, { useMemo } from "react";
+import FilterClearIcon from "../FilterPopover/FilterClearIcon";
+import SubtotalsModal from "../SubtotalsModal";
+import TableHeaderConfigPopover from "../TableHeaderConfigPopover";
+import { adapterColumns } from "./utils";
+var Index = function Index(props) {
+  var filterSearch = props.filterSearch,
+    clearFilter = props.clearFilter,
+    menuCode = props.menuCode,
+    formTemplateCode = props.formTemplateCode,
+    columns = props.columns,
+    onOk = props.onOk,
+    commonRequest = props.commonRequest,
+    onReload = props.onReload,
+    changeSize = props.changeSize,
+    _props$showSwitchBtn = props.showSwitchBtn,
+    showSwitchBtn = _props$showSwitchBtn === void 0 ? false : _props$showSwitchBtn,
+    handleChangeTableHeader = props.handleChangeTableHeader,
+    updateColumns = props.updateColumns;
+  var onClickMenu = function onClickMenu(key) {
+    changeSize === null || changeSize === void 0 || changeSize(key);
+    window.sessionStorage.setItem("LIST_SIZE", key);
+  };
+
+  //
+  var changeColumns = function changeColumns(tree) {
+    var _adapterColumns = adapterColumns([{
+        is_default: "Y",
+        define: JSON.stringify(tree)
+      }], columns),
+      JsonPares = _adapterColumns.JsonPares;
+    updateColumns(JsonPares);
+  };
+  var sizeMenuRender = useMemo(function () {
+    return [{
+      key: "default",
+      label: /*#__PURE__*/React.createElement("span", {
+        onClick: function onClick() {
+          return onClickMenu("default");
+        }
+      }, initLang({
+        id: "list.size.default",
+        defaultValue: "默认"
+      }))
+    }, {
+      key: "middle",
+      label: /*#__PURE__*/React.createElement("span", {
+        onClick: function onClick() {
+          return onClickMenu("middle");
+        }
+      }, initLang({
+        id: "list.size.middle",
+        defaultValue: "中等"
+      }))
+    }, {
+      key: "small",
+      label: /*#__PURE__*/React.createElement("span", {
+        onClick: function onClick() {
+          return onClickMenu("small");
+        }
+      }, initLang({
+        id: "list.size.small",
+        defaultValue: "紧凑"
+      }))
+    }];
+  }, []);
+  return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("span", {
+    style: {
+      marginLeft: 8
+    }
+  }, /*#__PURE__*/React.createElement(FilterClearIcon, {
+    filterSearch: filterSearch,
+    clearFilter: clearFilter
+  })), /*#__PURE__*/React.createElement(SubtotalsModal, {
+    menuCode: menuCode,
+    formTemplateCode: formTemplateCode,
+    onOk: onOk,
+    columns: columns === null || columns === void 0 ? void 0 : columns.map(function (c) {
+      return {
+        entryType: c.entryType,
+        dataType: c.dataType,
+        value: c.code || c.dataIndex,
+        label: c.label || c.title,
+        entryAttr: c.entryAttr
+      };
+    }),
+    commonRequest: commonRequest
+  }, /*#__PURE__*/React.createElement(PicLeftOutlined, {
+    className: "icon-button-wrapper"
+  })), /*#__PURE__*/React.createElement(Tooltip, {
+    placement: "top",
+    title: initLang({
+      id: "list.refresh"
+    })
+  }, /*#__PURE__*/React.createElement(RedoOutlined, {
+    className: "icon-button-wrapper",
+    onClick: function onClick() {
+      return onReload === null || onReload === void 0 ? void 0 : onReload(undefined);
+    }
+  })), /*#__PURE__*/React.createElement(Dropdown, {
+    menu: {
+      items: sizeMenuRender
+    },
+    placement: "bottomLeft"
+  }, /*#__PURE__*/React.createElement(ColumnHeightOutlined, {
+    className: "icon-button-wrapper"
+  })), showSwitchBtn && /*#__PURE__*/React.createElement(Tooltip, {
+    placement: "top",
+    title: initLang({
+      id: "list.horizontalDisplay"
+    })
+  }, /*#__PURE__*/React.createElement(SwapOutlined, {
+    className: "icon-button-wrapper",
+    onClick: handleChangeTableHeader
+  })), /*#__PURE__*/React.createElement(TableHeaderConfigPopover, {
+    menuCode: menuCode,
+    formTemplateCode: formTemplateCode,
+    columns: columns,
+    updateColumns: changeColumns
+  }));
+};
+export default Index;

package/dist/IconTools/utils.d.ts

@@ -0,0 +1,15 @@
+export declare const initColumns: (arr: any, parent: any) => any;
+/**
+ * customColumns 模板数据
+ * columns 新接口数据
+ *
+ * 匹配旧数据 是否有字段增删，返回新表头
+ * */
+export declare function adapterColumns(customColumns: Record<string, any>[] | undefined, columns: Record<string, any>[] | undefined | any): {
+    JsonPares: any;
+    item: Record<string, any>;
+} | {
+    JsonPares: null;
+    item: null;
+};
+//# sourceMappingURL=utils.d.ts.map

package/dist/IconTools/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,QAAS,GAAG,UAAU,GAAG,QAuBhD,CAAC;AA2BF;;;;;KAKK;AACL,wBAAgB,cAAc,CAC5B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,SAAS,EAChD,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,SAAS,GAAG,GAAG;;;;;;EA+HjD"}