@hi-ui/hiui 3.9.0-rc.2 → 3.9.0-rc.3

package/es/select/Select.js

@@ -422,30 +422,36 @@ var InternalSelect = function InternalSelect(props) {
     return shouldMatch || String(item[(0, _utils.transKeys)(fieldNames, 'id')] || '').includes(keyword) || String(item[(0, _utils.transKeys)(fieldNames, 'title')] || '').includes(keyword);
   }, [dataSource, searchable, keyword, filterOption]);
   var remoteSearch = (0, _react.useCallback)(function (keyword) {
-    var _dataSource = typeof dataSource === 'function' ? dataSource(keyword) : dataSource;
-
-    if (Array.isArray(_dataSource)) {
-      setDropdownItems(_dataSource);
-      return;
-    } // 处理promise函数
-
-
-    if (_dataSource.toString() === '[object Promise]') {
-      setLoading(true);
-
-      _dataSource.then(function (res) {
-        setLoading(false);
-        setDropdownItems(Array.isArray(res) ? res : []);
-      }, function () {
-        setLoading(false);
-        setDropdownItems([]);
-      });
+    if (typeof dataSource === 'function') {
+      var resultMayBePromise = dataSource(keyword);
+
+      if (resultMayBePromise !== undefined && resultMayBePromise !== null) {
+        if (resultMayBePromise.toString() === '[object Promise]') {
+          // 处理promise函数
+          setLoading(true);
+          resultMayBePromise.then(function (res) {
+            setLoading(false);
+
+            if (res !== undefined && res !== null) {
+              setDropdownItems(Array.isArray(res) ? res : []);
+            }
+          })["catch"](function () {
+            setLoading(false);
+            setDropdownItems([]);
+          });
+        } else {
+          setDropdownItems(Array.isArray(resultMayBePromise) ? resultMayBePromise : []);
+        }
+      }
 
       return;
-    } // 调用接口
+    } // 支持传入对象
 
 
-    HiRequestSearch(_dataSource, keyword);
+    if (dataSource) {
+      // 调用接口
+      HiRequestSearch(dataSource, keyword);
+    }
   }, [dataSource, keyword]);
   var HiRequestSearch = (0, _react.useCallback)(function (_dataSource, keyword) {
     var url = _dataSource.url,

package/es/select-tree/SelectTreeHook.js

@@ -85,7 +85,14 @@ var SelectTree = function SelectTree(_ref) {
       _ref$bordered = _ref.bordered,
       bordered = _ref$bordered === void 0 ? true : _ref$bordered,
       _ref$fieldNames = _ref.fieldNames,
-      fieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames;
+      fieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
+      filterOption = _ref.filterOption;
+  var isCustomFilter = typeof filterOption === 'function';
+
+  if (isCustomFilter) {
+    searchMode = '';
+  }
+
   (0, _util.setFieldNames)(fieldNames || {});
 
   var _useState = (0, _react.useState)(false),
@@ -308,13 +315,13 @@ var SelectTree = function SelectTree(_ref) {
   }, []); // 过滤方法
 
   var searchTreeNode = function searchTreeNode(val) {
+    var _keyword = val;
     var matchNodes = [];
 
     var _data = _lodash["default"].cloneDeep(flattenData);
 
     if (searchMode === 'highlight') {
       var filterArr = _data.map(function (node) {
-        var _keyword = val;
         _keyword = val.includes('[') ? _keyword.replace(/\[/gi, '\\[') : _keyword;
         _keyword = val.includes('(') ? _keyword.replace(/\(/gi, '\\(') : _keyword;
         _keyword = val.includes(')') ? _keyword.replace(/\)/gi, '\\)') : _keyword;
@@ -337,6 +344,18 @@ var SelectTree = function SelectTree(_ref) {
       });
       matchNodesSet = _lodash["default"].uniq(matchNodesSet);
       setExpandIds(matchNodesSet);
+    } else if (searchMode === '' && isCustomFilter) {
+      // filterOption 模式展开全部
+      var _matchNodesSet = [];
+
+      _data.forEach(function (mn) {
+        _matchNodesSet.push(mn[(0, _util.transKeys)(fieldNames, 'id')]);
+
+        _matchNodesSet = _matchNodesSet.concat(mn.ancestors || []);
+      });
+
+      _matchNodesSet = _lodash["default"].uniq(_matchNodesSet);
+      setExpandIds(_matchNodesSet);
     }
   };
   /**
@@ -543,7 +562,7 @@ var SelectTree = function SelectTree(_ref) {
 
   var debouncedFilterItems = _lodash["default"].debounce(changeEvents, 300);
 
-  var searchable = searchMode === 'filter' || searchMode === 'highlight'; // 按键操作
+  var searchable = searchMode === 'filter' || searchMode === 'highlight' || isCustomFilter; // 按键操作
 
   var handleKeyDown = (0, _react.useCallback)(function (evt) {
     // space
@@ -741,7 +760,8 @@ var SelectTree = function SelectTree(_ref) {
     onClick: selectedEvents,
     emptyContent: emptyContent,
     isRemoteLoadData: !!dataSource,
-    onCheck: checkedEvents
+    onCheck: checkedEvents,
+    filterOption: filterOption
   })))));
 };
 

package/es/select-tree/components/tree/TreeNode.js

@@ -67,7 +67,8 @@ var TreeNode = function TreeNode(_ref2) {
       isRemoteLoadData = _useContext.isRemoteLoadData,
       activeId = _useContext.activeId,
       searchMode = _useContext.searchMode,
-      searchValue = _useContext.searchValue;
+      searchValue = _useContext.searchValue,
+      filterOption = _useContext.filterOption;
 
   var treeNodeRef = (0, _react.useRef)(null);
   var renderIndent = (0, _react.useCallback)(function () {
@@ -131,7 +132,14 @@ var TreeNode = function TreeNode(_ref2) {
         isLeaf = node.isLeaf;
     var childrenNodes = (0, _util.getChildrenNodes)(node, flttenData);
     var expand = expandIds.includes(node[(0, _util.transKeys)(fieldNames, 'id')]);
-    var needFilter = searchMode === 'filter' ? !!(0, _util.matchAllDataFilterKey)(node, searchValue) : true;
+    var needFilter = true;
+
+    if (searchMode === 'filter') {
+      needFilter = !!(0, _util.matchAllDataFilterKey)(node, searchValue);
+    } else if (typeof filterOption === 'function') {
+      needFilter = filterOption(searchValue, node);
+    }
+
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, {
       key: index
     }, needFilter ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("li", {

package/es/select-tree/components/tree/index.js

@@ -39,6 +39,7 @@ var Tree = function Tree(_ref) {
       emptyContent = _ref.emptyContent,
       searchMode = _ref.searchMode,
       searchValue = _ref.searchValue,
+      filterOption = _ref.filterOption,
       fieldNames = _ref.fieldNames;
   return /*#__PURE__*/_react["default"].createElement(_context["default"].Provider, {
     value: {
@@ -57,7 +58,8 @@ var Tree = function Tree(_ref) {
       isRemoteLoadData: isRemoteLoadData,
       activeId: activeId,
       searchMode: searchMode,
-      searchValue: searchValue
+      searchValue: searchValue,
+      filterOption: filterOption
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(PREFIX)

package/es/table/AdvanceHeader/CustomFilter.js

@@ -47,9 +47,9 @@ var CustomFilter = function CustomFilter(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "-icon"),
     ref: popperAttachEle,
-    onClick: function onClick() {
+    onClick: filterDropdown ? function () {
       return setFilterDropdownVisible(true);
-    }
+    } : undefined
   }, filterIcon), /*#__PURE__*/_react["default"].createElement(_popper["default"] // 弹出层的显示隐藏
   , {
     show: filterDropdownVisible // 依附的元素

package/es/table/AdvanceHeader/select/index.js

@@ -39,6 +39,8 @@ var _utils = require("../../../select/utils");
 
 require("./style");
 
+var _util = require("../../util");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -106,7 +108,7 @@ var InternalSelect = function InternalSelect(props) {
       setCacheSelectItem = _useState8[1]; // value 有可能是0的情况
 
 
-  var _useState9 = (0, _react.useState)((0, _utils.resetSelectedItems)(value === undefined ? defaultValue : value, _lodash["default"].cloneDeep(data), (0, _utils.transKeys)(fieldNames, 'id'))),
+  var _useState9 = (0, _react.useState)((0, _utils.resetSelectedItems)(value === undefined ? defaultValue : value, (0, _util.cloneArray)(data), (0, _utils.transKeys)(fieldNames, 'id'))),
       _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
       selectedItems = _useState10[0],
       setSelectedItems = _useState10[1];
@@ -145,7 +147,7 @@ var InternalSelect = function InternalSelect(props) {
     resetFocusedIndex();
   }, []);
   (0, _react.useEffect)(function () {
-    historyData.current = _lodash["default"].cloneDeep(data);
+    historyData.current = (0, _util.cloneArray)(data);
   }, [data]);
   (0, _react.useEffect)(function () {
     if (dropdownItems && dropdownItems.length) {
@@ -174,7 +176,7 @@ var InternalSelect = function InternalSelect(props) {
     }
   }, [value, cacheSelectItem]);
   (0, _react.useEffect)(function () {
-    var _data = _lodash["default"].cloneDeep(data);
+    var _data = (0, _util.cloneArray)(data);
 
     var selectedItems = (0, _utils.resetSelectedItems)(value === undefined ? defaultValue : value, historyData.current, (0, _utils.transKeys)(fieldNames, 'id')); // setSelectedItems(selectedItems)
 
@@ -213,7 +215,7 @@ var InternalSelect = function InternalSelect(props) {
   var onClickOption = (0, _react.useCallback)(function (item, index) {
     if (!item || item[(0, _utils.transKeys)(fieldNames, 'disabled')]) return;
 
-    var _selectedItems = _lodash["default"].cloneDeep(selectedItems);
+    var _selectedItems = (0, _util.cloneArray)(selectedItems);
 
     if (type === 'multiple') {
       // 获取元素索引

package/es/table/BodyTable.js

@@ -73,7 +73,7 @@ var BodyTable = function BodyTable(_ref) {
       setDragRowKey = _useState4[1]; // **************** 获取colgroup
 
 
-  var _columns = _lodash["default"].cloneDeep(columns);
+  var _columns = (0, _util.cloneArray)(columns);
 
   var depthArray = [];
   (0, _util.setDepth)(_columns, 0, depthArray);

package/es/table/HeaderTable.js

@@ -19,8 +19,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactResizable = require("react-resizable");
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
 var _classnames = _interopRequireDefault(require("classnames"));
 
 var _context = _interopRequireDefault(require("./context"));
@@ -65,13 +63,13 @@ var HeaderTable = function HeaderTable(_ref) {
       sticky = _useContext.sticky,
       disabledData = _useContext.disabledData;
 
-  var _useState = (0, _react.useState)(_lodash["default"].cloneDeep(propsData)),
+  var _useState = (0, _react.useState)((0, _util.cloneArray)(propsData)),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
       data = _useState2[0],
       setDate = _useState2[1];
 
   (0, _react.useEffect)(function () {
-    setDate(_lodash["default"].cloneDeep(propsData));
+    setDate((0, _util.cloneArray)(propsData));
   }, [propsData]);
 
   var _useState3 = (0, _react.useState)(false),
@@ -117,7 +115,7 @@ var HeaderTable = function HeaderTable(_ref) {
     if (rowSelection) {
       var _rowSelection$selecte = rowSelection.selectedRowKeys,
           selectedRowKeys = _rowSelection$selecte === void 0 ? [] : _rowSelection$selecte;
-      var flattedData = (0, _util.flatTreeData)(_lodash["default"].cloneDeep(data));
+      var flattedData = (0, _util.flatTreeData)((0, _util.cloneArray)(data));
 
       var _isAllChecked = flattedData.filter(function (data) {
         return !disabledData.current.includes(data.key);
@@ -130,7 +128,7 @@ var HeaderTable = function HeaderTable(_ref) {
   }, [data, rowSelection]); // 处理列的深度
 
   (0, _react.useEffect)(function () {
-    var _columns = _lodash["default"].cloneDeep(columns);
+    var _columns = (0, _util.cloneArray)(columns);
 
     var depthArray = [];
     (0, _util.setDepth)(_columns, 0, depthArray);
@@ -226,7 +224,7 @@ var HeaderTable = function HeaderTable(_ref) {
           indeterminate: !isAllChecked && rowSelection.selectedRowKeys.length > 0,
           onChange: function onChange(e) {
             if (rowSelection.onChange) {
-              var targetItems = (0, _util.flatTreeData)(_lodash["default"].cloneDeep(data)).filter(function (data) {
+              var targetItems = (0, _util.flatTreeData)((0, _util.cloneArray)(data)).filter(function (data) {
                 return !disabledData.current.includes(data.key);
               });
               var selectedIds = isAllChecked ? [] : targetItems.map(function (item) {

package/es/table/Row.js

@@ -23,8 +23,6 @@ var _context = _interopRequireDefault(require("./context"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
 var _checkbox = _interopRequireDefault(require("../checkbox"));
 
 var _loading = _interopRequireDefault(require("../loading"));
@@ -92,7 +90,7 @@ var Row = function Row(_ref) {
       onDragStart = _useContext.onDragStart,
       dargInfo = _useContext.dargInfo;
 
-  var _columns = _lodash["default"].cloneDeep(columns);
+  var _columns = (0, _util.cloneArray)(columns);
 
   var depthArray = [];
   (0, _util.setDepth)(_columns, 0, depthArray);

package/es/table/Table.js

@@ -35,8 +35,6 @@ var _pagination2 = _interopRequireDefault(require("../pagination"));
 
 var _axios = _interopRequireDefault(require("axios"));
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
 var _context2 = _interopRequireDefault(require("../context"));
 
 var _loading = _interopRequireDefault(require("../loading"));
@@ -142,9 +140,9 @@ var Table = function Table(_ref) {
       var _dargInfo$current = dargInfo.current,
           rowData = _dargInfo$current.rowData,
           dropRowData = _dargInfo$current.dropRowData;
-      var restData = (0, _util.deleteRowByKey)(_lodash["default"].cloneDeep(data), dargInfo.current);
+      var restData = (0, _util.deleteRowByKey)((0, _util.cloneArray)(data), dargInfo.current);
 
-      var _data = (0, _util.setRowByKey)(_lodash["default"].cloneDeep(restData), dargInfo.current);
+      var _data = (0, _util.setRowByKey)((0, _util.cloneArray)(restData), dargInfo.current);
 
       dargInfo.current = {};
       onDropEnd && onDropEnd(rowData, dropRowData, _data);
@@ -272,7 +270,7 @@ var Table = function Table(_ref) {
   var firstRowRef = (0, _react.useRef)(null); // 处理拉平数据
 
   (0, _react.useEffect)(function () {
-    var _columns = _lodash["default"].cloneDeep(dataSource ? serverTableConfig.columns || [] : propsColumns);
+    var _columns = (0, _util.cloneArray)(dataSource ? serverTableConfig.columns || [] : propsColumns);
 
     var _flattedColumns = (0, _util.flatTreeData)(_columns);
 
@@ -302,7 +300,7 @@ var Table = function Table(_ref) {
       _columns[index] = currentItem;
     }); // 右侧
 
-    var rightCloumns = _lodash["default"].cloneDeep(_columns.slice(rightFixedIndex || _flattedColumns.length).reverse());
+    var rightCloumns = (0, _util.cloneArray)(_columns.slice(rightFixedIndex || _flattedColumns.length).reverse());
 
     if (rightFixedIndex) {
       rightCloumns.forEach(function (currentItem, index) {

package/es/table/util.js

@@ -6,12 +6,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getScrollBarSize = getScrollBarSize;
-exports.deleteRowByKey = exports.setRowByKey = exports.getMaskNums = exports.setColumnsDefaultWidth = exports.parseFixedcolumns = exports.getTotalOrEvgRowData = exports.checkNeedTotalOrEvg = exports.checkIsNumberStr = exports.getStyle = exports.getFixedDataByFixedColumn = exports.groupDataByDepth = exports.getLeafChildren = exports.setDepth = exports.flatTreeData = void 0;
+exports.cloneArray = exports.deleteRowByKey = exports.setRowByKey = exports.getMaskNums = exports.setColumnsDefaultWidth = exports.parseFixedcolumns = exports.getTotalOrEvgRowData = exports.checkNeedTotalOrEvg = exports.checkIsNumberStr = exports.getStyle = exports.getFixedDataByFixedColumn = exports.groupDataByDepth = exports.getLeafChildren = exports.setDepth = exports.flatTreeData = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _lodash = _interopRequireDefault(require("lodash"));
 
+var _treeUtils = require("@hi-ui/tree-utils");
+
 // 将树状数据拍平
 var flatTreeData = function flatTreeData() {
   var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -309,4 +311,10 @@ var deleteRowByKey = function deleteRowByKey(data, dragInfo) {
   return data;
 };
 
-exports.deleteRowByKey = deleteRowByKey;
+exports.deleteRowByKey = deleteRowByKey;
+
+var cloneArray = function cloneArray(arr) {
+  return Array.isArray(arr) ? (0, _treeUtils.cloneTree)(arr) : [];
+};
+
+exports.cloneArray = cloneArray;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/hiui",
-  "version": "3.9.0-rc.2",
+  "version": "3.9.0-rc.3",
   "description": "HIUI for React",
   "scripts": {
     "test": "node_modules/.bin/standard && node_modules/.bin/stylelint --config .stylelintrc 'components/**/*.scss'",
@@ -54,6 +54,7 @@
   },
   "dependencies": {
     "@hi-ui/core-css": "^2.0.1",
+    "@hi-ui/tree-utils": "^4.0.0-alpha.3",
     "@hi-ui/use-latest": "~4.0.0-alpha.2",
     "@hi-ui/use-uncontrolled-state": "~4.0.0-alpha.5",
     "async-validator": "^3.3.0",