acud 1.2.17 → 1.2.18

package/lib/table/hooks/useFilter/FilterDropdown.js

@@ -1,135 +1,98 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var React = _interopRequireWildcard(require("react"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
-
 var _OutlinedFunnel = _interopRequireDefault(require("acud-icon/lib/icons/OutlinedFunnel"));
-
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
-
 var _button = _interopRequireDefault(require("../../../button"));
-
 var _tree = _interopRequireDefault(require("../../../tree"));
-
 var _checkbox = _interopRequireDefault(require("../../../checkbox"));
-
 var _dropdown = _interopRequireDefault(require("../../../dropdown"));
-
 var _empty = _interopRequireDefault(require("../../../empty"));
-
 var _FilterWrapper = _interopRequireDefault(require("./FilterWrapper"));
-
 var _FilterSearch = _interopRequireDefault(require("./FilterSearch"));
-
 var _ = require(".");
-
 var _useSyncState3 = _interopRequireDefault(require("../../../_util/hooks/useSyncState"));
-
 var _context = require("../../../config-provider/context");
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 var defaultFilterFun = function defaultFilterFun(searchValue, filterItem) {
   var _a;
-
   return ((_a = filterItem.text) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase().indexOf(searchValue.trim().toLowerCase())) > -1;
 };
-
 function searchValueMatched(searchValue, text) {
   if (typeof text === 'string' || typeof text === 'number') {
     return text === null || text === void 0 ? void 0 : text.toString().toLowerCase().includes(searchValue.trim().toLowerCase());
   }
-
   return false;
 }
-
 var formatContent = function formatContent(content, searchValue, prefixCls) {
   var lowerContent = content.toLowerCase();
   var lowerSearch = searchValue.toLowerCase().trim();
   var searchStartIndex = lowerContent.indexOf(lowerSearch);
-  var len = lowerSearch.length; // 存在搜索值不在content的情况，比如key与children不一致时
-
+  var len = lowerSearch.length;
+  // 存在搜索值不在content的情况，比如key与children不一致时
   if (searchStartIndex === -1) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, content);
   }
-
   return /*#__PURE__*/React.createElement(React.Fragment, null, content.slice(0, searchStartIndex), /*#__PURE__*/React.createElement("span", {
     className: "".concat(prefixCls, "-dropdown-search-highlight")
   }, content.slice(searchStartIndex, searchStartIndex + len)), content.slice(searchStartIndex + len));
 };
-
 function FilterDropdown(props) {
   var _a;
-
   var tablePrefixCls = props.tablePrefixCls,
-      prefixCls = props.prefixCls,
-      column = props.column,
-      dropdownPrefixCls = props.dropdownPrefixCls,
-      columnKey = props.columnKey,
-      filterMultiple = props.filterMultiple,
-      _props$filterMode = props.filterMode,
-      filterMode = _props$filterMode === void 0 ? 'menu' : _props$filterMode,
-      _props$filterSearch = props.filterSearch,
-      filterSearch = _props$filterSearch === void 0 ? false : _props$filterSearch,
-      filterState = props.filterState,
-      triggerFilter = props.triggerFilter,
-      locale = props.locale,
-      children = props.children,
-      getPopupContainer = props.getPopupContainer;
+    prefixCls = props.prefixCls,
+    column = props.column,
+    dropdownPrefixCls = props.dropdownPrefixCls,
+    columnKey = props.columnKey,
+    filterMultiple = props.filterMultiple,
+    _props$filterMode = props.filterMode,
+    filterMode = _props$filterMode === void 0 ? 'menu' : _props$filterMode,
+    _props$filterSearch = props.filterSearch,
+    filterSearch = _props$filterSearch === void 0 ? false : _props$filterSearch,
+    filterState = props.filterState,
+    triggerFilter = props.triggerFilter,
+    locale = props.locale,
+    children = props.children,
+    getPopupContainer = props.getPopupContainer;
   var filterDropdownVisible = column.filterDropdownVisible,
-      onFilterDropdownVisibleChange = column.onFilterDropdownVisibleChange;
-
+    onFilterDropdownVisibleChange = column.onFilterDropdownVisibleChange;
   var _React$useState = React.useState(false),
-      _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
-      visible = _React$useState2[0],
-      setVisible = _React$useState2[1];
-
+    _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
+    visible = _React$useState2[0],
+    setVisible = _React$useState2[1];
   var filtered = !!(filterState && (((_a = filterState.filteredKeys) === null || _a === void 0 ? void 0 : _a.length) || filterState.forceFiltered));
-
   var triggerVisible = function triggerVisible(newVisible) {
     setVisible(newVisible);
     onFilterDropdownVisibleChange === null || onFilterDropdownVisibleChange === void 0 ? void 0 : onFilterDropdownVisibleChange(newVisible);
   };
-
-  var mergedVisible = typeof filterDropdownVisible === 'boolean' ? filterDropdownVisible : visible; // ===================== Select Keys =====================
-
-  var propFilteredKeys = filterState === null || filterState === void 0 ? void 0 : filterState.filteredKeys; // preKeys = propFilteredKeys;
-
+  var mergedVisible = typeof filterDropdownVisible === 'boolean' ? filterDropdownVisible : visible;
+  // ===================== Select Keys =====================
+  var propFilteredKeys = filterState === null || filterState === void 0 ? void 0 : filterState.filteredKeys;
+  // preKeys = propFilteredKeys;
   var _useSyncState = (0, _useSyncState3["default"])(propFilteredKeys || []),
-      _useSyncState2 = (0, _slicedToArray2["default"])(_useSyncState, 2),
-      getFilteredKeysSync = _useSyncState2[0],
-      setFilteredKeysSync = _useSyncState2[1]; // eslint-disable-next-line react-hooks/exhaustive-deps
-
-
+    _useSyncState2 = (0, _slicedToArray2["default"])(_useSyncState, 2),
+    getFilteredKeysSync = _useSyncState2[0],
+    setFilteredKeysSync = _useSyncState2[1];
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   var onSelectKeys = React.useCallback(function (_ref) {
     var selectedKeys = _ref.selectedKeys;
     setFilteredKeysSync(selectedKeys);
   }, []);
-
   var onCheck = function onCheck(keys, _ref2) {
     var node = _ref2.node,
-        checked = _ref2.checked;
-
+      checked = _ref2.checked;
     if (!filterMultiple) {
       onSelectKeys({
         selectedKeys: checked && node.key ? [node.key] : []
@@ -140,7 +103,6 @@ function FilterDropdown(props) {
       });
     }
   };
-
   var menuChange = function menuChange(e, value) {
     var keys = new Set(getFilteredKeysSync());
     var checked = e.target.checked;
@@ -149,28 +111,24 @@ function FilterDropdown(props) {
       selectedKeys: (0, _toConsumableArray2["default"])(keys)
     });
   };
-
   React.useEffect(function () {
     if (!visible) {
       return;
     }
-
     onSelectKeys({
       selectedKeys: propFilteredKeys || []
     });
-  }, [propFilteredKeys, visible]); // search in tree mode column filter
-
+  }, [propFilteredKeys, visible]);
+  // search in tree mode column filter
   var _React$useState3 = React.useState(''),
-      _React$useState4 = (0, _slicedToArray2["default"])(_React$useState3, 2),
-      searchValue = _React$useState4[0],
-      setSearchValue = _React$useState4[1];
-
+    _React$useState4 = (0, _slicedToArray2["default"])(_React$useState3, 2),
+    searchValue = _React$useState4[0],
+    setSearchValue = _React$useState4[1];
   var onSearch = function onSearch(e) {
     var value = e.target.value;
     setSearchValue(value);
-  }; // clear search value after close filter dropdown
-
-
+  };
+  // clear search value after close filter dropdown
   React.useEffect(function () {
     if (!visible) {
       setSearchValue('');
@@ -180,18 +138,15 @@ function FilterDropdown(props) {
     if (searchValue === '' || searchValue === undefined) {
       return column.filters;
     }
-
     if (filterMode === 'tree') {
       var loopTree = function loopTree(arr) {
         var filteredArrTemp = [];
         arr.forEach(function (filterItem) {
           var _a;
-
           if (defaultFilterFun(searchValue, filterItem)) {
             filteredArrTemp.push(filterItem);
           } else if (((_a = filterItem === null || filterItem === void 0 ? void 0 : filterItem.children) === null || _a === void 0 ? void 0 : _a.length) > 0) {
             var tempArr = loopTree(filterItem.children);
-
             if (tempArr.length > 0) {
               filterItem.children = tempArr;
               filteredArrTemp.push(filterItem);
@@ -200,79 +155,66 @@ function FilterDropdown(props) {
         });
         return filteredArrTemp;
       };
-
       return loopTree((0, _cloneDeep["default"])(column.filters));
     }
-
     return column.filters.filter(function (filterItem) {
       return defaultFilterFun(searchValue, filterItem);
     });
-  }, [filterMode, column.filters, searchValue]); // ======================= Submit ========================
-
+  }, [filterMode, column.filters, searchValue]);
+  // ======================= Submit ========================
   var internalTriggerFilter = function internalTriggerFilter(keys) {
     var mergedKeys = keys && keys.length ? keys : null;
-
     if (mergedKeys === null && (!filterState || !filterState.filteredKeys)) {
       return null;
     }
-
     if ((0, _isEqual["default"])(mergedKeys, filterState === null || filterState === void 0 ? void 0 : filterState.filteredKeys)) {
       return null;
     }
-
     triggerFilter({
       column: column,
       key: columnKey,
       filteredKeys: mergedKeys
     });
   };
-
   var onConfirm = function onConfirm() {
     triggerVisible(false);
     internalTriggerFilter(getFilteredKeysSync());
   };
-
   var onReset = function onReset() {
     setSearchValue('');
-    setFilteredKeysSync([]); // internalTriggerFilter([]);
+    setFilteredKeysSync([]);
+    // internalTriggerFilter([]);
     // triggerVisible(false);
   };
 
   var doFilter = function doFilter() {
     var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
-      closeDropdown: true
-    },
-        closeDropdown = _ref3.closeDropdown;
-
+        closeDropdown: true
+      },
+      closeDropdown = _ref3.closeDropdown;
     if (closeDropdown) {
       triggerVisible(false);
     }
-
     internalTriggerFilter(getFilteredKeysSync());
   };
-
   var onVisibleChange = function onVisibleChange(newVisible) {
     if (newVisible && propFilteredKeys !== undefined) {
       // Sync filteredKeys on appear in controlled mode (propFilteredKeys !== undefiend)
       setFilteredKeysSync(propFilteredKeys || []);
-    } // Default will filter when closed
-
-
+    }
+    // Default will filter when closed
     if (!newVisible && !column.filterDropdown) {
       // onConfirm();
       onReset();
     }
-
     triggerVisible(newVisible);
-  }; // ======================== Style ========================
-
-
+  };
+  // ======================== Style ========================
   var onCheckAll = function onCheckAll(e) {
     var selectedKeys = getFilteredKeysSync() || [];
     var allFilterKeys = (0, _.flattenKeys)(filteredArr).map(function (key) {
       return String(key);
     });
-
     if (e.target.checked) {
       setFilteredKeysSync((0, _toConsumableArray2["default"])(new Set([].concat((0, _toConsumableArray2["default"])(selectedKeys), (0, _toConsumableArray2["default"])(allFilterKeys)))));
     } else {
@@ -281,17 +223,14 @@ function FilterDropdown(props) {
       }));
     }
   };
-
   var onClearAll = function onClearAll() {
     setFilteredKeysSync([]);
     onConfirm();
   };
-
   var onSingleCheck = function onSingleCheck(value) {
     setFilteredKeysSync([value]);
     onConfirm();
   };
-
   var getTreeChildrenData = function getTreeChildrenData(_ref4) {
     var filters = _ref4.filters;
     return (filters || []).map(function (filter, index) {
@@ -300,17 +239,14 @@ function FilterDropdown(props) {
         title: filter.text,
         key: filter.value !== undefined ? key : index
       };
-
       if (filter.children) {
         item.children = getTreeChildrenData({
           filters: filter.children
         });
       }
-
       return item;
     });
   };
-
   var getTreeData = function getTreeData(_ref5) {
     var filters = _ref5.filters;
     var treeDataArr = [];
@@ -325,9 +261,7 @@ function FilterDropdown(props) {
     treeDataArr.push(treeData);
     return treeDataArr;
   };
-
   var dropdownContent;
-
   if (typeof column.filterDropdown === 'function') {
     dropdownContent = column.filterDropdown({
       prefixCls: "".concat(dropdownPrefixCls, "-custom"),
@@ -346,7 +280,6 @@ function FilterDropdown(props) {
     dropdownContent = column.filterDropdown;
   } else {
     var selectedKeys = getFilteredKeysSync() || [];
-
     var getFilterComponent = function getFilterComponent() {
       if (filteredArr.length === 0) {
         return /*#__PURE__*/React.createElement(_empty["default"], {
@@ -355,7 +288,6 @@ function FilterDropdown(props) {
           hasImage: false
         });
       }
-
       if (filterMode === 'tree') {
         return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
           className: "".concat(tablePrefixCls, "-filter-dropdown-tree")
@@ -380,7 +312,6 @@ function FilterDropdown(props) {
           } : undefined
         })));
       }
-
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
         className: "".concat(dropdownPrefixCls, "-menu")
       }, filterMultiple && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
@@ -397,7 +328,8 @@ function FilterDropdown(props) {
         onChange: onCheckAll
       }, "\u5168\u9009")), filteredArr.map(function (filter, index) {
         return /*#__PURE__*/React.createElement("div", {
-          key: index // eslint-disable-next-line max-len
+          key: index
+          // eslint-disable-next-line max-len
           ,
           className: "".concat(dropdownPrefixCls, "-menu-item ").concat(dropdownPrefixCls, "-menu-item-multiple")
         }, /*#__PURE__*/React.createElement(_checkbox["default"], {
@@ -420,7 +352,6 @@ function FilterDropdown(props) {
         }, /*#__PURE__*/React.createElement("span", null, searchValue ? formatContent(filter.text, searchValue, prefixCls) : filter.text));
       }))));
     };
-
     dropdownContent = /*#__PURE__*/React.createElement(React.Fragment, null, filterMode === 'menu' && /*#__PURE__*/React.createElement(_FilterSearch["default"], {
       filterSearch: filterSearch,
       value: searchValue,
@@ -440,12 +371,10 @@ function FilterDropdown(props) {
       onClick: onConfirm
     }, locale.filterConfirm)));
   }
-
   var menu = /*#__PURE__*/React.createElement(_FilterWrapper["default"], {
     className: "".concat(prefixCls, "-dropdown-box")
   }, dropdownContent);
   var filterIcon;
-
   if (typeof column.filterIcon === 'function') {
     filterIcon = column.filterIcon(filtered);
   } else if (column.filterIcon) {
@@ -453,10 +382,8 @@ function FilterDropdown(props) {
   } else {
     filterIcon = /*#__PURE__*/React.createElement(_OutlinedFunnel["default"], null);
   }
-
   var _React$useContext = React.useContext(_context.ConfigContext),
-      direction = _React$useContext.direction;
-
+    direction = _React$useContext.direction;
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-column")
   }, /*#__PURE__*/React.createElement("span", {
@@ -478,6 +405,5 @@ function FilterDropdown(props) {
     className: (0, _classnames["default"])("".concat(prefixCls, "-trigger"), (0, _defineProperty2["default"])({}, "".concat(prefixCls, "-trigger-active"), filtered))
   }, filterIcon)));
 }
-
 var _default = FilterDropdown;
 exports["default"] = _default;

package/lib/table/hooks/useFilter/FilterSearch.d.ts

@@ -7,5 +7,5 @@ interface FilterSearchProps<RecordType> {
     tablePrefixCls: string;
     locale: TableLocale;
 }
-declare function FilterSearch<RecordType>(props: FilterSearchProps<RecordType>): JSX.Element;
+declare function FilterSearch<RecordType>(props: FilterSearchProps<RecordType>): React.JSX.Element;
 export default FilterSearch;

package/lib/table/hooks/useFilter/FilterSearch.js

@@ -1,44 +1,35 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var React = _interopRequireWildcard(require("react"));
-
 var _input = _interopRequireDefault(require("../../../input"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function FilterSearch(props) {
   var value = props.value,
-      onChange = props.onChange,
-      filterSearch = props.filterSearch,
-      tablePrefixCls = props.tablePrefixCls,
-      locale = props.locale;
-
+    onChange = props.onChange,
+    filterSearch = props.filterSearch,
+    tablePrefixCls = props.tablePrefixCls,
+    locale = props.locale;
   if (!filterSearch) {
     return null;
   }
-
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(tablePrefixCls, "-filter-dropdown-search")
   }, /*#__PURE__*/React.createElement(_input["default"], {
     placeholder: locale.filterSearchPlaceholder,
     onChange: onChange,
-    value: value // for skip min-width of input
+    value: value
+    // for skip min-width of input
     // htmlSize={1}
     ,
     className: "".concat(tablePrefixCls, "-filter-dropdown-search-input")
   }));
 }
-
 var _default = FilterSearch;
 exports["default"] = _default;

package/lib/table/hooks/useFilter/FilterWrapper.d.ts

@@ -3,5 +3,5 @@ export interface FilterDropdownMenuWrapperProps {
     children?: React.ReactNode;
     className?: string;
 }
-declare const FilterDropdownMenuWrapper: (props: FilterDropdownMenuWrapperProps) => JSX.Element;
+declare const FilterDropdownMenuWrapper: (props: FilterDropdownMenuWrapperProps) => React.JSX.Element;
 export default FilterDropdownMenuWrapper;

package/lib/table/hooks/useFilter/FilterWrapper.js

@@ -1,18 +1,13 @@
 "use strict";
 
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var React = _interopRequireWildcard(require("react"));
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 var FilterDropdownMenuWrapper = function FilterDropdownMenuWrapper(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: props.className,
@@ -21,6 +16,5 @@ var FilterDropdownMenuWrapper = function FilterDropdownMenuWrapper(props) {
     }
   }, props.children);
 };
-
 var _default = FilterDropdownMenuWrapper;
 exports["default"] = _default;