@hi-ui/check-tree-select 4.0.0-beta.5 → 4.0.0-beta.50

package/lib/cjs/CheckTreeSelect.js

@@ -35,7 +35,7 @@ var treeUtils = require('@hi-ui/tree-utils');
 
 var typeAssertion = require('@hi-ui/type-assertion');
 
-var uniqBy = require('./node_modules/lodash/uniqBy.js');
+var arrayUtils = require('@hi-ui/array-utils');
 
 var highlighter = require('@hi-ui/highlighter');
 
@@ -45,8 +45,12 @@ var icons = require('@hi-ui/icons');
 
 var localeContext = require('@hi-ui/locale-context');
 
+var funcUtils = require('@hi-ui/func-utils');
+
 var useSearchMode = require('@hi-ui/use-search-mode');
 
+var useCheck = require('./hooks/use-check.js');
+
 function _interopDefaultLegacy(e) {
   return e && _typeof(e) === 'object' && 'default' in e ? e : {
     'default': e
@@ -73,9 +77,13 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       dataSource = _a.dataSource,
       _a$disabled = _a.disabled,
       disabled = _a$disabled === void 0 ? false : _a$disabled,
+      visible = _a.visible,
+      onOpen = _a.onOpen,
+      onClose = _a.onClose,
       _a$fieldNames = _a.fieldNames,
       fieldNames = _a$fieldNames === void 0 ? DEFAULT_FIELD_NAMES : _a$fieldNames,
-      checkedMode = _a.checkedMode,
+      _a$checkedMode = _a.checkedMode,
+      checkedMode = _a$checkedMode === void 0 ? 'ALL' : _a$checkedMode,
       _a$defaultExpandAll = _a.defaultExpandAll,
       defaultExpandAll = _a$defaultExpandAll === void 0 ? false : _a$defaultExpandAll,
       expandedIdsProp = _a.expandedIds,
@@ -91,20 +99,28 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       onLoadChildren = _a.onLoadChildren,
       titleRender = _a.render,
       filterOption = _a.filterOption,
+      onSearchProp = _a.onSearch,
       clearable = _a.clearable,
       invalid = _a.invalid,
       displayRender = _a.displayRender,
       placeholderProp = _a.placeholder,
       appearance = _a.appearance,
-      rest = tslib.__rest(_a, ["prefixCls", "role", "className", "data", "dataSource", "disabled", "fieldNames", "checkedMode", "defaultExpandAll", "expandedIds", "defaultExpandedIds", "onExpand", "defaultValue", "value", "onChange", "searchable", "searchMode", "onLoadChildren", "render", "filterOption", "clearable", "invalid", "displayRender", "placeholder", "appearance"]);
+      virtual = _a.virtual,
+      itemHeight = _a.itemHeight,
+      height = _a.height,
+      rest = tslib.__rest(_a, ["prefixCls", "role", "className", "data", "dataSource", "disabled", "visible", "onOpen", "onClose", "fieldNames", "checkedMode", "defaultExpandAll", "expandedIds", "defaultExpandedIds", "onExpand", "defaultValue", "value", "onChange", "searchable", "searchMode", "onLoadChildren", "render", "filterOption", "onSearch", "clearable", "invalid", "displayRender", "placeholder", "appearance", "virtual", "itemHeight", "height"]);
 
   var i18n = localeContext.useLocaleContext();
   var placeholder = typeAssertion.isUndef(placeholderProp) ? i18n.get('checkTreeSelect.placeholder') : placeholderProp;
 
-  var _useToggle = useToggle.useToggle(),
-      menuVisible = _useToggle[0],
-      menuVisibleAction = _useToggle[1]; // const [viewSelected, setViewSelected] = useState(false)
-
+  var _useUncontrolledToggl = useToggle.useUncontrolledToggle({
+    visible: visible,
+    disabled: disabled,
+    onOpen: onOpen,
+    onClose: onClose
+  }),
+      menuVisible = _useUncontrolledToggl[0],
+      menuVisibleAction = _useUncontrolledToggl[1];
   /**
    * 转换对象
    */
@@ -114,11 +130,22 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     return node[fieldNames[key] || key];
   }, [fieldNames]);
   var flattedData = React.useMemo(function () {
-    return treeUtils.flattenTree(data, function (node) {
-      node.id = getKeyFields(node.raw, 'id'); // @ts-ignore
-
-      node.title = getKeyFields(node.raw, 'title');
-      return node;
+    return treeUtils.baseFlattenTree({
+      tree: data,
+      childrenFieldName: function childrenFieldName(node) {
+        return getKeyFields(node, 'children');
+      },
+      transform: function transform(node) {
+        var _a, _b;
+
+        var flattedNode = node;
+        var raw = node.raw;
+        flattedNode.id = getKeyFields(raw, 'id');
+        flattedNode.title = getKeyFields(raw, 'title');
+        flattedNode.disabled = (_a = getKeyFields(raw, 'disabled')) !== null && _a !== void 0 ? _a : false;
+        flattedNode.isLeaf = (_b = getKeyFields(raw, 'isLeaf')) !== null && _b !== void 0 ? _b : false;
+        return flattedNode;
+      }
     });
   }, [data, getKeyFields]); // TODO: 抽离展开hook
   // TODO: onLoadChildren 和 defaultExpandAll 共存时
@@ -136,34 +163,27 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       expandedIds = _useUncontrolledState[0],
       tryChangeExpandedIds = _useUncontrolledState[1];
 
-  var _useUncontrolledState2 = useUncontrolledState.useUncontrolledState(defaultValue, valueProp, onChange),
-      value = _useUncontrolledState2[0],
-      tryChangeValue = _useUncontrolledState2[1]; // 搜索时临时选中缓存数据
-
-
-  var _useState = React.useState([]),
-      selectedItems = _useState[0],
-      setSelectedItems = _useState[1];
-
-  var onSelect = React.useCallback(function (checkedIds, option) {
-    tryChangeValue(checkedIds, option); // 存取异步选中数据
-
-    setSelectedItems(function (prev) {
-      var next = [].concat(prev);
-      var targetNode = option.targetNode,
-          checked = option.checked;
-
-      if (checked) {
-        next.push(targetNode);
-      } else {
-        next.filter(function (item) {
-          return item.id !== targetNode.id;
-        });
-      }
-
-      return next;
-    });
-  }, [tryChangeValue]); // ************************** 异步搜索 ************************* //
+  var _useCheck = useCheck.useCheck(checkedMode, disabled, flattedData, defaultValue, valueProp, onChange),
+      value = _useCheck[0],
+      tryChangeValue = _useCheck[1],
+      onNodeCheck = _useCheck[2],
+      checkedNodes = _useCheck[3],
+      parsedCheckedIds = _useCheck[4];
+
+  var onCheck = React.useCallback(function (checkedIds, option) {
+    var targetNode = option.targetNode,
+        checked = option.checked;
+    onNodeCheck(targetNode, checked);
+  }, [onNodeCheck]);
+  var onValueChange = React.useCallback(function (values, targetItem, shouldChecked) {
+    // 清空
+    if (values.length === 0) {
+      tryChangeValue([], null, shouldChecked, []);
+    } else {
+      // 操作单个
+      onNodeCheck(targetItem[0], shouldChecked);
+    }
+  }, [tryChangeValue, onNodeCheck]); // ************************** 异步搜索 ************************* //
   // const { loading, hasError, loadRemoteData } = useDataSource({ dataSource, validate: isArray })
 
   var _b = useSearchMode.useAsyncSearch({
@@ -209,7 +229,7 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
 
 
     var highlight = !!searchValue && (searchMode === 'highlight' || searchMode === 'filter');
-    var ret = highlight ? /*#__PURE__*/React__default['default'].createElement(highlighter.Highlighter, {
+    var ret = highlight ? /*#__PURE__*/React__default["default"].createElement(highlighter.Highlighter, {
       keyword: searchValue
     }, node.title) : true;
     return ret;
@@ -229,9 +249,9 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   }; // 下拉菜单不能合并（因为树形数据，不知道是第几级）
 
   var mergedData = React.useMemo(function () {
-    var nextData = selectedItems.concat(flattedData);
-    return uniqBy['default'](nextData, 'id');
-  }, [selectedItems, flattedData]);
+    var nextData = checkedNodes.concat(flattedData);
+    return arrayUtils.uniqBy(nextData, 'id');
+  }, [checkedNodes, flattedData]);
   var cls = classname.cx(prefixCls, className); // 过滤掉未选中的数据
   // const tagList = useMemo(() => {
   //   // @ts-ignore
@@ -240,7 +260,7 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   //   return flattedData.filter((item) => ids.includes(item.id))
   // }, [value, flattedData])
 
-  return /*#__PURE__*/React__default['default'].createElement(picker.Picker, Object.assign({
+  return /*#__PURE__*/React__default["default"].createElement(picker.Picker, Object.assign({
     ref: ref,
     className: cls
   }, rest, {
@@ -255,9 +275,9 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     // onChange={tryChangeValue}
     // data={mergedData}
     searchable: searchable,
-    onSearch: onSearch,
+    onSearch: funcUtils.callAllFuncs(onSearchProp, onSearch),
     loading: loading,
-    trigger: /*#__PURE__*/React__default['default'].createElement(tagInput.TagInputMock // ref={targetElementRef}
+    trigger: /*#__PURE__*/React__default["default"].createElement(tagInput.TagInputMock // ref={targetElementRef}
     // onClick={openMenu}
     // disabled={disabled}
     , {
@@ -268,26 +288,33 @@ var CheckTreeSelect = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       placeholder: placeholder,
       // @ts-ignore
       displayRender: displayRender,
-      suffix: menuVisible ? /*#__PURE__*/React__default['default'].createElement(icons.UpOutlined, null) : /*#__PURE__*/React__default['default'].createElement(icons.DownOutlined, null),
+      suffix: menuVisible ? /*#__PURE__*/React__default["default"].createElement(icons.UpOutlined, null) : /*#__PURE__*/React__default["default"].createElement(icons.DownOutlined, null),
       focused: menuVisible,
       appearance: appearance,
       value: value,
-      onChange: tryChangeValue,
+      onChange: onValueChange,
       data: mergedData,
       // @ts-ignore
       invalid: invalid
     })
-  }), typeAssertion.isArrayNonEmpty(treeProps.data) ? /*#__PURE__*/React__default['default'].createElement(tree.Tree, Object.assign({
+  }), typeAssertion.isArrayNonEmpty(treeProps.data) ?
+  /*#__PURE__*/
+  // 只做渲染，不做逻辑处理（比如搜索过滤后，check操作的是对过滤后的data操作，这是不符合预期的）
+  React__default["default"].createElement(tree.Tree, Object.assign({
     className: prefixCls + "__tree",
     selectable: false,
     checkable: true,
     checkOnSelect: true,
-    checkedMode: checkedMode,
-    checkedIds: value,
-    onCheck: onSelect,
+    checkedMode: checkedMode === 'SEPARATE' ? 'SEPARATE' : 'ALL',
+    checkedIds: parsedCheckedIds,
+    onCheck: onCheck,
     // TODO: 支持 fieldNames
-    // 禁用时被选中的样式处理
-    onLoadChildren: onLoadChildren
+    // @ts-ignore
+    onLoadChildren: onLoadChildren,
+    fieldNames: fieldNames,
+    virtual: virtual,
+    itemHeight: itemHeight,
+    height: height
   }, treeProps)) : null);
 });
 
@@ -349,4 +376,3 @@ var getSemiCheckedIdsWithSet = function getSemiCheckedIdsWithSet(flattedData, is
 
 exports.CheckTreeSelect = CheckTreeSelect;
 exports.getSemiCheckedIdsWithSet = getSemiCheckedIdsWithSet;
-//# sourceMappingURL=CheckTreeSelect.js.map

package/lib/cjs/hooks/use-check.js

@@ -0,0 +1,92 @@
+/** @LICENSE
+ * @hi-ui/check-tree-select
+ * https://github.com/XiaoMi/hiui/tree/master/packages/ui/check-tree-select#readme
+ *
+ * Copyright (c) HIUI <mi-hiui@xiaomi.com>.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+
+var React = require('react');
+
+var useUncontrolledState = require('@hi-ui/use-uncontrolled-state');
+
+var useCheck$1 = require('@hi-ui/use-check');
+
+var index = require('../utils/index.js');
+/**
+ * 用于 tree 组件复选的 hook
+ */
+
+
+var useCheck = function useCheck(checkedMode, disabled, flattedData, defaultCheckedIds, checkedIdsProp, onCheck) {
+  // 搜索时临时选中缓存数据
+  var _useState = React.useState([]),
+      checkedNodes = _useState[0],
+      setCheckedNodes = _useState[1];
+
+  var _useUncontrolledState = useUncontrolledState.useUncontrolledState(defaultCheckedIds, checkedIdsProp, function (checkedIds, checkedNode, checked, semiCheckedIds) {
+    var nextCheckedNodes = flattedData.filter(function (item) {
+      return checkedIds.includes(item.id);
+    });
+    setCheckedNodes(nextCheckedNodes);
+    onCheck === null || onCheck === void 0 ? void 0 : onCheck(checkedIds, {
+      checkedNodes: nextCheckedNodes.map(function (item) {
+        return item.raw;
+      }),
+      targetNode: checkedNode,
+      semiCheckedIds: semiCheckedIds,
+      checked: checked
+    });
+  }),
+      checkedIds = _useUncontrolledState[0],
+      trySetCheckedIds = _useUncontrolledState[1]; // 入口数据处理
+
+
+  var parsedCheckedIds = React.useMemo(function () {
+    return index.parseCheckDataDirty(checkedMode, checkedIds, flattedData, allowCheck);
+  }, [checkedMode, checkedIds, flattedData]);
+  var cascaded = checkedMode !== 'SEPARATE';
+
+  var _useCascadeCheck = useCheck$1.useCascadeCheck({
+    cascaded: cascaded,
+    disabled: disabled,
+    flattedData: flattedData,
+    checkedIds: parsedCheckedIds,
+    onCheck: function onCheck(checkedIds, checkedNode, checked, semiCheckedIds) {
+      // 出口数据处理
+      var processedIds = index.processCheckedIds(checkedMode, checkedIds, flattedData, allowCheck);
+      trySetCheckedIds(processedIds, checkedNode, checked, semiCheckedIds);
+    },
+    allowCheck: allowCheck
+  }),
+      onNodeCheck = _useCascadeCheck[0];
+
+  var proxyOnNodeCheck = React.useCallback(function (target, shouldChecked) {
+    // 保证 target 来源于原数据自身，而不是tree内部
+    var targetNode = flattedData.find(function (item) {
+      return item.id === target.id;
+    });
+
+    if (targetNode) {
+      onNodeCheck(targetNode, shouldChecked);
+    }
+  }, [onNodeCheck, flattedData]);
+  return [checkedIds, trySetCheckedIds, proxyOnNodeCheck, checkedNodes, parsedCheckedIds];
+};
+
+var allowCheck = function allowCheck(targetItem) {
+  if (targetItem.disabled) {
+    return false;
+  }
+
+  return true;
+};
+
+exports.useCheck = useCheck;

package/lib/cjs/index.js

@@ -20,4 +20,3 @@ var CheckTreeSelect = require('./CheckTreeSelect.js');
 exports.CheckTreeSelect = CheckTreeSelect.CheckTreeSelect;
 exports["default"] = CheckTreeSelect.CheckTreeSelect;
 exports.getSemiCheckedIdsWithSet = CheckTreeSelect.getSemiCheckedIdsWithSet;
-//# sourceMappingURL=index.js.map

package/lib/cjs/styles/index.scss.js

@@ -12,11 +12,10 @@
 Object.defineProperty(exports, '__esModule', {
   value: true
 });
-var css_248z = "@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n@use 'sass:map';\n";
+var css_248z = "";
 
-var __styleInject__ = require('style-inject/dist/style-inject.es.js')["default"];
+var __styleInject__ = require('inject-head-style')["default"];
 
 __styleInject__(css_248z);
 
 exports["default"] = css_248z;
-//# sourceMappingURL=index.scss.js.map

package/lib/cjs/utils/index.js

@@ -0,0 +1,162 @@
+/** @LICENSE
+ * @hi-ui/check-tree-select
+ * https://github.com/XiaoMi/hiui/tree/master/packages/ui/check-tree-select#readme
+ *
+ * Copyright (c) HIUI <mi-hiui@xiaomi.com>.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+'use strict';
+
+Object.defineProperty(exports, '__esModule', {
+  value: true
+});
+
+var treeUtils = require('@hi-ui/tree-utils');
+
+var typeAssertion = require('@hi-ui/type-assertion');
+/**
+ * 处理选中的回显数据
+ *
+ * @param checkedIds 当前所有被选中的节点 ID 集合
+ * @param nodeEntries 所有数据的Map 集合
+ * @param type 数据回显方式
+ */
+
+
+var processCheckedIds = function processCheckedIds(type, checkedIds, flattenData, allowCheck) {
+  var keySet = new Set(checkedIds);
+
+  switch (type) {
+    case 'CHILD':
+      return checkedIds.filter(function (id) {
+        var node = treeUtils.fFindNodeById(flattenData, id);
+
+        if (node) {
+          var children = node.children;
+
+          if (typeAssertion.isArrayNonEmpty(children)) {
+            if (children.filter(allowCheck).every(function (node) {
+              return keySet.has(node.id);
+            })) {
+              return false;
+            }
+          }
+        } // 没有孩子节点，保留
+
+
+        return true;
+      });
+
+    case 'PARENT':
+      return checkedIds.filter(function (id) {
+        var node = treeUtils.fFindNodeById(flattenData, id);
+
+        if (node) {
+          // 向上递归遍历是否被勾选
+          var ancestors = treeUtils.getNodeAncestors(node);
+
+          if (ancestors.some(function (parent) {
+            return keySet.has(parent.id);
+          })) {
+            return false;
+          }
+        }
+
+        return true;
+      });
+  }
+
+  return checkedIds;
+};
+/**
+ * 根据传入的 checkedIds 解析全选/半选数据
+ */
+
+
+var parseCheckDataDirty = function parseCheckDataDirty(type, checkedIds, flattenData, allowCheck) {
+  switch (type) {
+    case 'CHILD':
+    case 'PARENT':
+      return dirtyCheck(checkedIds, flattenData, allowCheck);
+  }
+
+  return checkedIds;
+};
+
+function dirtyCheck(checkedIds, flattenData, allowCheck) {
+  var nodeEntities = flattenData.reduce(function (prev, cur) {
+    prev[cur.id] = cur;
+    return prev;
+  }, {});
+  var checkedIdsSet = new Set(checkedIds.filter(function (id) {
+    return !!nodeEntities[id];
+  }));
+  var depthEntities = new Map();
+  var maxDepth = 0; // Convert entities by depth for calculation
+
+  Object.keys(nodeEntities).forEach(function (id) {
+    var entity = nodeEntities[id];
+    var depth = entity.depth;
+    var depthSet = depthEntities.get(depth);
+
+    if (!depthSet) {
+      depthSet = new Set();
+      depthEntities.set(depth, depthSet);
+    }
+
+    depthSet.add(entity);
+    maxDepth = Math.max(maxDepth, depth);
+  });
+  return fillCheck(checkedIdsSet, depthEntities, nodeEntities, maxDepth, allowCheck);
+}
+/**
+ *  对 checkedIds 级联遗漏选项 id 填充
+ *
+ *  1. 把所有嵌套孩子节点 allowCheck 的都标记为 checked
+ *  2. 祖先节点从下至上维护 checked 状态
+ */
+
+
+function fillCheck(checkedIds, depthEntities, nodeEntities, maxDepth, allowCheck) {
+  var checkedIdsSet = new Set(checkedIds);
+  checkedIdsSet.forEach(function (id) {
+    var checkedNode = nodeEntities[id];
+    var nestedChildren = treeUtils.findNestedChildren(checkedNode, allowCheck);
+    nestedChildren.forEach(function (child) {
+      checkedIdsSet.add(child.id);
+    });
+  }); // 缓存中间结果，优化查询
+
+  var visitedIds = new Map();
+
+  for (var depth = maxDepth - 1; depth >= 0; --depth) {
+    var entities = depthEntities.get(depth);
+    entities === null || entities === void 0 ? void 0 : entities.forEach(function (entity) {
+      var id = entity.id,
+          children = entity.children;
+      if (visitedIds.has(id)) return;
+
+      if (typeAssertion.isArrayNonEmpty(children)) {
+        var shouldChecked = !children.some(function (child) {
+          if (visitedIds.has(child.id)) {
+            return !visitedIds.get(child.id);
+          }
+
+          return !checkedIdsSet.has(child.id);
+        });
+        visitedIds.set(id, shouldChecked);
+
+        if (shouldChecked && allowCheck(entity)) {
+          checkedIdsSet.add(id);
+        }
+      }
+    });
+  }
+
+  return Array.from(checkedIdsSet);
+}
+
+exports.parseCheckDataDirty = parseCheckDataDirty;
+exports.processCheckedIds = processCheckedIds;