@kdcloudjs/kdesign 1.5.2 → 1.5.5

package/lib/tree/tree.js

@@ -13,10 +13,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
+var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
 
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
 
+var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
+
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
@@ -31,6 +33,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+
 var _ConfigContext = _interopRequireDefault(require("../config-provider/ConfigContext"));
 
 var _utils = require("../_utils");
@@ -96,7 +100,9 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       innerEstimatedItemSize = TreeProps.estimatedItemSize,
       style = TreeProps.style,
       filterTreeNode = TreeProps.filterTreeNode,
-      filterValue = TreeProps.filterValue;
+      filterValue = TreeProps.filterValue,
+      expandOnClickNode = TreeProps.expandOnClickNode,
+      loadData = TreeProps.loadData;
   var treePrefixCls = getPrefixCls(prefixCls, 'tree', customPrefixcls); // 树样式前缀
 
   var treeNodePrefixCls = getPrefixCls(prefixCls, 'tree-node', customPrefixcls); // 树节点样式前缀
@@ -105,13 +111,11 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   var treeRootClassName = "".concat(treePrefixCls, "-root");
   var estimatedItemSize = innerEstimatedItemSize; // 节点高度
 
-  var flattenAllData = _react.default.useMemo(function () {
+  var _React$useMemo = _react.default.useMemo(function () {
     return (0, _treeUtils.flattenAll)(treeData, []);
-  }, [treeData]);
-
-  var maxLevel = _react.default.useMemo(function () {
-    return (0, _treeUtils.getMaxLevel)(flattenAllData);
-  }, [flattenAllData]);
+  }, [treeData]),
+      flattenAllData = _React$useMemo.flattenAllData,
+      maxLevel = _React$useMemo.maxLevel;
 
   var _useChecked = (0, _treeHooks.useChecked)(checkStrictly, checkedKeysProps, defaultCheckedKeys, flattenAllData, maxLevel, checkable),
       _useChecked2 = (0, _slicedToArray2.default)(_useChecked, 4),
@@ -164,7 +168,21 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       dragOverNodeKey = _React$useState10[0],
       setDragOverNodeKey = _React$useState10[1];
 
-  var _useExpand = (0, _treeHooks.useExpand)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, filterValue),
+  var _React$useState11 = _react.default.useState(new _set.default()),
+      _React$useState12 = (0, _slicedToArray2.default)(_React$useState11, 2),
+      loadedKeys = _React$useState12[0],
+      setLoadedKeys = _React$useState12[1];
+
+  var _React$useState13 = _react.default.useState(new _set.default()),
+      _React$useState14 = (0, _slicedToArray2.default)(_React$useState13, 2),
+      loadingKeys = _React$useState14[0],
+      setLoadingKeys = _React$useState14[1];
+
+  var isSearching = _react.default.useMemo(function () {
+    return typeof filterTreeNode === 'function' && filterValue;
+  }, [filterValue]);
+
+  var _useExpand = (0, _treeHooks.useExpand)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching),
       _useExpand2 = (0, _slicedToArray2.default)(_useExpand, 2),
       expandedKeys = _useExpand2[0],
       setExpandedKeys = _useExpand2[1];
@@ -174,8 +192,8 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   }, [flattenAllData, expandedKeys]);
 
   var filterData = _react.default.useMemo(function () {
-    return (0, _treeUtils.getFilterData)(spreadAttrData, filterTreeNode, filterValue);
-  }, [spreadAttrData, filterTreeNode, filterValue]);
+    return (0, _treeUtils.getFilterData)(spreadAttrData, filterTreeNode, isSearching);
+  }, [spreadAttrData, isSearching]);
 
   var _useViewportHeight = (0, _treeHooks.useViewportHeight)(height, listRef),
       _useViewportHeight2 = (0, _slicedToArray2.default)(_useViewportHeight, 1),
@@ -210,16 +228,55 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       listRef.current.style.transform = "translate3d(0,".concat(tempStartOffset, "px,0)");
     }
   }, [listRef, scrollRef, virtual, estimatedItemSize]);
+  var handleNodeLoad = (0, _react.useCallback)(function (loadedKeys, loadingKeys, data) {
+    var key = data.key;
+
+    if (!loadData || loadedKeys.has(key) || loadingKeys.has(key)) {
+      return;
+    }
+
+    setLoadingKeys(function (prevLoadingKeys) {
+      var _context;
 
-  var handleExpand = _react.default.useCallback(function (key, value, node) {
-    var newExpandedKeys = value ? (0, _treeUtils.addKeys)(expandedKeys, [key]) : (0, _treeUtils.delKey)(expandedKeys, [key]);
+      return new _set.default((0, _concat.default)(_context = []).call(_context, (0, _toConsumableArray2.default)(prevLoadingKeys), [key]));
+    });
+    loadData(data).then(function () {
+      setLoadedKeys(function (prevState) {
+        var _context2;
+
+        return new _set.default((0, _concat.default)(_context2 = []).call(_context2, (0, _toConsumableArray2.default)(prevState), [key]));
+      });
+      setLoadingKeys(function (prevState) {
+        var prevLoadingKeys = (0, _cloneDeep.default)(prevState);
+        prevLoadingKeys.delete(key);
+        return prevLoadingKeys;
+      });
+    }).catch(function (e) {
+      setLoadingKeys(function (prevState) {
+        var prevLoadingKeys = (0, _cloneDeep.default)(prevState);
+        prevLoadingKeys.delete(key);
+        return prevLoadingKeys;
+      });
+      setExpandedKeys(function (preExpandedKeys) {
+        return (0, _treeUtils.delKey)((0, _toConsumableArray2.default)(preExpandedKeys), [key]);
+      });
+      throw e;
+    });
+  }, [loadData, setExpandedKeys]);
+
+  var handleExpand = _react.default.useCallback(function (key, expanded, node) {
+    var newExpandedKeys = expanded ? (0, _treeUtils.addKeys)(expandedKeys, [key]) : (0, _treeUtils.delKey)(expandedKeys, [key]);
     onExpand && onExpand(newExpandedKeys, {
       node: node,
-      expanded: value
+      expanded: expanded
     });
     setScrollKey('');
     setIsInit(false);
-  }, [expandedKeys, onExpand]);
+
+    if (expanded && loadData) {
+      handleNodeLoad(loadedKeys, loadingKeys, node);
+    }
+  }, [expandedKeys, onExpand, loadData, handleNodeLoad, loadedKeys, loadingKeys]);
 
   var handleCheck = _react.default.useCallback(function (key, value, node, event, pos) {
     var newCheckedKeys = value ? (0, _treeUtils.addKeys)(checkedKeys, [key]) : (0, _treeUtils.delKey)(checkedKeys, [key]);
@@ -315,10 +372,10 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   }, [onDragEnd]);
 
   var handleDrop = _react.default.useCallback(function (event, node, dragNode, dragNodesKeys) {
-    var _context;
+    var _context3;
 
     var pos = (0, _treeUtils.getPos)(flattenAllData, dragNodesKeys);
-    var keys = (0, _concat.default)(_context = (0, _treeUtils.getAllChildKeys)(flattenAllData, pos)).call(_context, dragNodesKeys);
+    var keys = (0, _concat.default)(_context3 = (0, _treeUtils.getAllChildKeys)(flattenAllData, pos)).call(_context3, dragNodesKeys);
     onDrop && onDrop({
       event: event,
       node: node,
@@ -384,7 +441,6 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     className: treeRootClassName,
     ref: listRef
   }, visibleData && (0, _map.default)(visibleData).call(visibleData, function (item) {
-    // const props: any = {}
     var checked = (0, _treeUtils.getChecked)(checkedKeys, item.key);
     var indeterminate = (0, _treeUtils.getHalfChecked)(halfCheckedKeys, item.key);
     item.nodeKey = item.key;
@@ -399,8 +455,7 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     item.onSelect = handleSelect;
     item.checked = checked;
     item.selected = (0, _treeUtils.getSelected)(selectedKeys, item.key);
-    item.indeterminate = indeterminate; // item.showLine = showLine
-
+    item.indeterminate = indeterminate;
     item.disabled = getDisabled(disabled, item.disabled);
     item.showIcon = showIcon || false;
     item.checkable = getCheckable(checkable, item.checkable); // 哪个优先
@@ -415,6 +470,9 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     item.getDragNode = getDragNode;
     item.setDragNode = setDragNode;
     item.dragOver = dragOverNodeKey === item.key && dropPosition === 0;
+    item.expandOnClickNode = expandOnClickNode;
+    item.loading = loadingKeys.has(item.key) && !loadedKeys.has(item.key);
+    item.loadData = loadData;
     return /*#__PURE__*/_react.default.createElement(_treeNode.default, (0, _extends2.default)({}, item, {
       key: item.key,
       ref: treeNodeRef

package/lib/tree/treeHooks.d.ts

@@ -4,6 +4,6 @@ export declare const useViewportHeight: (height: number, listRef: React.RefObjec
 export declare const useVisibleDataMemo: (virtual: boolean, filterData: TreeNodeData[], viewportHeight: number, estimatedItemSize: number, start: number) => TreeNodeData[][];
 export declare const usePlantomHeightEffect: (plantomRef: React.RefObject<HTMLElement>, filterData: TreeNodeData[], estimatedItemSize: number) => void;
 export declare const useChecked: (checkStrictly: boolean, checkedKeysProps: string[], defaultCheckedKeys: string[], flattenAllData: any[], maxLevel: number, checkable: boolean) => readonly [string[], string[], React.Dispatch<React.SetStateAction<string[]>>, React.Dispatch<React.SetStateAction<string[]>>];
-export declare const useExpand: (flattenAllData: any[], expandedKeysProps: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, scrollKey: string, isInit: boolean, filterTreeNode: FunctionConstructor, filterValue: string) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];
+export declare const useExpand: (flattenAllData: any[], expandedKeysProps: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, scrollKey: string, isInit: boolean, filterTreeNode: FunctionConstructor, isSearching: boolean) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];
 export declare const useScrollToKey: (scrollKey: string, index: number, estimatedItemSize: number, scrollRef: any, viewportHeight: number, treeNodePrefixCls: string) => void;
 export declare const useSelect: (selectedKeysProps: string[], defaultSelectedKeys: string[]) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];

package/lib/tree/treeHooks.js

@@ -104,7 +104,7 @@ var useChecked = function useChecked(checkStrictly, checkedKeysProps, defaultChe
 
 exports.useChecked = useChecked;
 
-var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, filterValue) {
+var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching) {
   var expandScrollkeys = [];
 
   if (scrollKey) {
@@ -113,8 +113,8 @@ var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExp
   }
 
   var initialExpandedKeys = _react.default.useMemo(function () {
-    return (0, _treeUtils.getInitExpandedKeys)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, filterValue);
-  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, filterValue]);
+    return (0, _treeUtils.getInitExpandedKeys)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching);
+  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching]);
 
   var newExpandedKeys = _react.default.useMemo(function () {
     return (0, _treeUtils.getExpandedKeys)(expandedKeysProps, expandScrollkeys);
@@ -157,7 +157,6 @@ var useScrollToKey = function useScrollToKey(scrollKey, index, estimatedItemSize
     }
 
     if (treeRoot && treeNode) {
-      // const treeRootScrollTop = treeRoot.scrollTop
       var treeRootRect = treeRoot.getBoundingClientRect();
       var treeNodeRect = treeNode.getBoundingClientRect();
 

package/lib/tree/treeNode.d.ts

@@ -25,6 +25,7 @@ export interface TreeNodeProps {
     pos?: string;
     estimatedItemSize?: number;
     dragOver?: boolean;
+    isLeaf?: boolean;
     onCheck?: (key: string, value: boolean, node: React.ReactNode, event: React.MouseEvent<MouseEvent>, pos: string) => void;
     onSelect?: (event: React.MouseEvent<MouseEvent>, node: React.ReactNode, key: string) => void;
     onExpand?: (value: boolean, node: React.ReactNode) => void;

package/lib/tree/treeNode.js

@@ -35,6 +35,8 @@ var _checkbox = _interopRequireDefault(require("./../checkbox"));
 
 var _icon = _interopRequireDefault(require("../icon"));
 
+var _spin = _interopRequireDefault(require("../spin"));
+
 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; }
@@ -86,6 +88,8 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       indeterminate = TreeNodeProps.indeterminate,
       estimatedItemSize = TreeNodeProps.estimatedItemSize,
       dragOver = TreeNodeProps.dragOver,
+      expandOnClickNode = TreeNodeProps.expandOnClickNode,
+      loading = TreeNodeProps.loading,
       onExpand = TreeNodeProps.onExpand,
       onCheck = TreeNodeProps.onCheck,
       onDragStart = TreeNodeProps.onDragStart,
@@ -95,7 +99,7 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onDragEnd = TreeNodeProps.onDragEnd,
       onDrop = TreeNodeProps.onDrop,
       onSelect = TreeNodeProps.onSelect,
-      others = __rest(TreeNodeProps, ["nodeKey", "prefixCls", "selectable", "checkable", "className", "icon", "switcherIcon", "disabled", "draggable", "pos", "checked", "level", "getDragNode", "hasChildNode", "expand", "title", "showLine", "showIcon", "selected", "setDragNode", "style", "indeterminate", "estimatedItemSize", "dragOver", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect"]);
+      others = __rest(TreeNodeProps, ["nodeKey", "prefixCls", "selectable", "checkable", "className", "icon", "switcherIcon", "disabled", "draggable", "pos", "checked", "level", "getDragNode", "hasChildNode", "expand", "title", "showLine", "showIcon", "selected", "setDragNode", "style", "indeterminate", "estimatedItemSize", "dragOver", "expandOnClickNode", "loading", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect"]);
 
   var nodeData = _react.default.useMemo(function () {
     return (0, _extends2.default)({
@@ -113,7 +117,6 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       indeterminate: indeterminate,
       icon: icon,
       switcherIcon: switcherIcon,
-      // showLine,
       showIcon: showIcon,
       selected: selected
     }, others);
@@ -195,57 +198,46 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
 
     return indentArr;
-  }; // line的两种模式， 图标被替换和图标不被替换
+  };
+
+  var isLeaf = (0, _react.useCallback)(function () {
+    var isLeaf = TreeNodeProps.isLeaf,
+        loadData = TreeNodeProps.loadData,
+        hasChildNode = TreeNodeProps.hasChildNode;
+
+    if (isLeaf === false) {
+      return false;
+    }
 
+    return isLeaf || !loadData && !hasChildNode;
+  }, [TreeNodeProps]); // line的两种模式， 图标被替换和图标不被替换
 
   var renderExpandIcon = function renderExpandIcon() {
-    // todo 图标被替换则 line样式改变
-    // if(switcherIcon){
-    // }
-    if (hasChildNode) {
-      var _classNames2;
-
-      // todo    showLine模式 使用+ -符号图标
-      // if(!!showLine){
-      //   return (
-      //     <span
-      //     onClick={handleClick}
-      //     className={classNames(`${treeNodePrefixCls}-icon`)}
-      //   >
-      //     {expand ? <Icon type='search' /> : <Icon type='add' />}
-      //   </span>
-      //   )
-      // }
+    if (loading) {
+      return /*#__PURE__*/_react.default.createElement(_spin.default, {
+        type: "component"
+      });
+    }
+
+    var showExpandIcon = !isLeaf();
+
+    if (showExpandIcon) {
+      var _classNames3;
+
       if (Array.isArray(switcherIcon) && switcherIcon.length === 2) {
         return /*#__PURE__*/_react.default.createElement("span", {
-          className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-icon"))
+          className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-icon"), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-icon-hover"), !expandOnClickNode)),
+          onClick: expandOnClickNode ? undefined : handleExpandIconClick
         }, expandState ? renderIcon(switcherIcon[1]) : renderIcon(switcherIcon[0]));
       }
 
       return /*#__PURE__*/_react.default.createElement("span", {
-        className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-icon"), (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, "".concat(treeNodePrefixCls, "-animation-expand"), expandState), (0, _defineProperty2.default)(_classNames2, "".concat(treeNodePrefixCls, "-animation-collapse"), !expandState), _classNames2))
+        className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-icon"), (_classNames3 = {}, (0, _defineProperty2.default)(_classNames3, "".concat(treeNodePrefixCls, "-animation-expand"), expandState), (0, _defineProperty2.default)(_classNames3, "".concat(treeNodePrefixCls, "-animation-collapse"), !expandState), (0, _defineProperty2.default)(_classNames3, "".concat(treeNodePrefixCls, "-icon-hover"), !expandOnClickNode), _classNames3)),
+        onClick: expandOnClickNode ? undefined : handleExpandIconClick
       }, renderIcon(switcherIcon || /*#__PURE__*/_react.default.createElement(_icon.default, {
         type: "arrow-right-solid"
       })));
     } else {
-      // if(typeof showLine === 'object' && !showLine.showLeafIcon){
-      //   return (
-      //     <span
-      //       className={classNames(`${treeNodePrefixCls}-icon-hidden`)}
-      //     >
-      //       {/* todo  renderLeafLine() */}
-      //       {renderIcon(leafIcon)}
-      //     </span>
-      //   )
-      // }else if(typeof showLine === 'object' && showLine.showLeafIcon || showLine === true){
-      //   return (
-      //     <span
-      //       className={classNames(`${treeNodePrefixCls}-leaf-icon`)}
-      //     >
-      //       {renderIcon(leafIcon)}
-      //     </span>
-      //   )
-      // }
       // 叶子结点 隐藏展开按钮
       return /*#__PURE__*/_react.default.createElement("span", {
         className: "".concat(treeNodePrefixCls, "-icon-hidden")
@@ -260,11 +252,11 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   };
 
   var renderNode = function renderNode() {
-    var _classNames3;
+    var _classNames4, _classNames5;
 
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
       draggable: draggable && !disabled,
-      className: (0, _classnames.default)((_classNames3 = {}, (0, _defineProperty2.default)(_classNames3, "".concat(treeNodePrefixCls, "-draggabled"), true), (0, _defineProperty2.default)(_classNames3, "".concat(treeNodePrefixCls, "-root"), true), (0, _defineProperty2.default)(_classNames3, "".concat(treeNodePrefixCls, "-fb-children-pointerEvents"), forbiddenChildrenPointerEvents), (0, _defineProperty2.default)(_classNames3, "".concat(treeNodePrefixCls, "-drag-over"), dragOver), _classNames3)),
+      className: (0, _classnames.default)((_classNames4 = {}, (0, _defineProperty2.default)(_classNames4, "".concat(treeNodePrefixCls, "-draggabled"), true), (0, _defineProperty2.default)(_classNames4, "".concat(treeNodePrefixCls, "-root"), true), (0, _defineProperty2.default)(_classNames4, "".concat(treeNodePrefixCls, "-fb-children-pointerEvents"), forbiddenChildrenPointerEvents), (0, _defineProperty2.default)(_classNames4, "".concat(treeNodePrefixCls, "-drag-over"), dragOver), _classNames4)),
       onDragStart: handleDragStart,
       onDragEnd: handleDragEnd,
       onDragOver: handleDragOver,
@@ -273,7 +265,8 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onDrop: handleDrop,
       ref: dragRef
     }, indent(), renderExpandIcon(), showIcon && renderNodeIcon(), /*#__PURE__*/_react.default.createElement("div", {
-      className: "".concat(treeNodePrefixCls, "-title-wrap")
+      className: (0, _classnames.default)((_classNames5 = {}, (0, _defineProperty2.default)(_classNames5, "".concat(treeNodePrefixCls, "-title-wrap"), true), (0, _defineProperty2.default)(_classNames5, "".concat(treeNodePrefixCls, "-title-wrap-hover"), !expandOnClickNode && !disabled), (0, _defineProperty2.default)(_classNames5, "".concat(treeNodePrefixCls, "-title-wrap-selected"), selected && selectable && !disabled && !expandOnClickNode), _classNames5)),
+      onClick: expandOnClickNode ? undefined : handleClick
     }, checkable ? /*#__PURE__*/_react.default.createElement(_checkbox.default, {
       onChange: handleOnchange,
       checked: checked,
@@ -303,12 +296,17 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     };
   });
 
-  var handleClick = _react.default.useCallback(function (e) {
-    e.stopPropagation();
+  var handleExpandIconClick = (0, _react.useCallback)(function (e) {
+    e === null || e === void 0 ? void 0 : e.stopPropagation();
     setExpandState(!expandState);
     onExpand && onExpand(nodeKey, !expandState, nodeData);
+  }, [expandState, nodeData, nodeKey, onExpand, setExpandState]);
+
+  var handleClick = _react.default.useCallback(function (e) {
+    e.stopPropagation();
+    expandOnClickNode && handleExpandIconClick();
     handleSelect(e);
-  }, [setExpandState, expandState, onExpand, nodeKey, nodeData, handleSelect]);
+  }, [expandOnClickNode, handleExpandIconClick, handleSelect]);
 
   var handleDragStart = _react.default.useCallback(function (e) {
     if (!draggable) return;
@@ -364,11 +362,11 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   }, [onDrop, nodeData, nodeKey]);
 
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-item"), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-item-hover"), !disabled && selectable), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-selected"), selected && selectable && !disabled), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-disabled"), disabled), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-opened"), expandState), (0, _concat.default)(_context = "".concat(treeNodePrefixCls, "-item-")).call(_context, nodeKey), className),
+    className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-item"), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-item-hover"), !disabled && selectable && expandOnClickNode), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-selected"), selected && selectable && !disabled && expandOnClickNode), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-disabled"), disabled), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-opened"), expandState), (0, _concat.default)(_context = "".concat(treeNodePrefixCls, "-item-")).call(_context, nodeKey), className),
     style: (0, _extends2.default)({
       height: "".concat(estimatedItemSize, "px")
     }, style),
-    onClick: handleClick
+    onClick: expandOnClickNode ? handleClick : undefined
   }, renderNode());
 });
 

package/lib/tree/utils/treeUtils.d.ts

@@ -7,13 +7,16 @@ import { TreeNodeData } from '../tree';
  * @param level
  * @param pos
  */
-export declare const flattenAll: (treeData: any[], newTreeData?: TreeNodeData[], level?: number, pos?: string | undefined) => TreeNodeData[];
+export declare const flattenAll: (treeData: any[], newTreeData?: TreeNodeData[], level?: number, pos?: string | undefined) => {
+    flattenAllData: TreeNodeData[];
+    maxLevel: number;
+};
 export declare const getExpand: (expandedKeys: string[], key: string) => boolean;
 export declare const getChecked: (checkedKeys: string[], key: string) => boolean;
 export declare const getSelected: (selectedKeys: string[], key: string) => boolean;
 export declare const getHalfChecked: (halfCheckedKeys: string[], key: string) => boolean;
 export declare const getAllFilterKeys: (data: any[], filterTreeNode: FunctionConstructor) => any[];
-export declare const getFilterData: (data: any[], filterTreeNode: FunctionConstructor, filterValue: string) => any[];
+export declare const getFilterData: (data: any[], filterTreeNode: FunctionConstructor, isSearching: boolean) => any[];
 export declare const getMaxLevel: (data: any[]) => number;
 /**
  *计算node的属性后返回新的 treedata
@@ -43,6 +46,6 @@ export declare const getDataCheckededStateStrictly: (checkedKeys: string[]) => {
 };
 export declare const delKey: (prevKeys: string[], delKeys: string[]) => never[] & string[];
 export declare const getAllNodeKeys: (data: any[]) => string[];
-export declare const getInitExpandedKeys: (data: any[], expandedKeys: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, expandScrollkeys: string[] | undefined, filterTreeNode: FunctionConstructor, filterValue: string) => string[];
+export declare const getInitExpandedKeys: (data: any[], expandedKeys: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, expandScrollkeys: string[] | undefined, filterTreeNode: FunctionConstructor, isSearching: boolean) => string[];
 export declare const getExpandedKeys: (expandedKeys: string[], expandScrollkeys?: string[]) => string[];
 export declare const calcDropPosition: (event: React.MouseEvent, dropNode: HTMLElement) => 0 | 1 | -1;

package/lib/tree/utils/treeUtils.js

@@ -21,8 +21,6 @@ var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stabl
 
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
 
-var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
 var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
 
 var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/starts-with"));
@@ -58,29 +56,52 @@ var flattenAll = function flattenAll(treeData) {
   var newTreeData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   var pos = arguments.length > 3 ? arguments[3] : undefined;
-  treeData && treeData.forEach(function (item, index) {
-    var _context;
+  var maxLevel = 0;
 
-    var children = item.children,
-        title = item.title,
-        key = item.key,
-        others = __rest(item, ["children", "title", "key"]);
+  var fn = function fn(treeData) {
+    var newTreeData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+    var pos = arguments.length > 3 ? arguments[3] : undefined;
+    var parent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
+    treeData && treeData.forEach(function (item, index) {
+      var _context;
+
+      var children = item.children,
+          title = item.title,
+          key = item.key,
+          others = __rest(item, ["children", "title", "key"]);
+
+      item.parent = parent;
+
+      var _pos = pos ? (0, _concat.default)(_context = "".concat(pos, "-")).call(_context, index) : "".concat(index);
+
+      var hasChildNode = item.isLeaf ? false : children && children instanceof Array && children.length > 0;
+      var flattenNode = (0, _extends2.default)({
+        title: title,
+        key: key,
+        pos: _pos,
+        hasChildNode: hasChildNode,
+        level: level,
+        parent: parent
+      }, others);
+      newTreeData.push(flattenNode);
+      var _level = level;
+
+      if (maxLevel < level) {
+        maxLevel = level;
+      }
 
-    var _pos = pos ? (0, _concat.default)(_context = "".concat(pos, "-")).call(_context, index) : "".concat(index);
+      _level++;
+      hasChildNode && fn(children, newTreeData, _level, _pos, flattenNode);
+    });
+    return newTreeData;
+  };
 
-    var hasChildNode = children && children instanceof Array && children.length > 0;
-    newTreeData.push((0, _extends2.default)({
-      title: title,
-      key: key,
-      pos: _pos,
-      hasChildNode: hasChildNode,
-      level: level
-    }, others));
-    var _level = level;
-    _level++;
-    flattenAll(children, newTreeData, _level, _pos);
-  });
-  return newTreeData;
+  var flattenAllData = fn(treeData, newTreeData, level, pos);
+  return {
+    flattenAllData: flattenAllData,
+    maxLevel: maxLevel
+  };
 };
 
 exports.flattenAll = flattenAll;
@@ -130,29 +151,30 @@ var isAllParentExpand = function isAllParentExpand(data, pos) {
 };
 
 var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode) {
-  var filterData = (0, _filter.default)(data).call(data, function (item) {
-    return filterTreeNode === null || filterTreeNode === void 0 ? void 0 : filterTreeNode(item);
-  });
-  var filterKeys = getAllNodeKeys(filterData);
   var allFilterKeys = [];
-  (0, _map.default)(filterKeys).call(filterKeys, function (key) {
-    var _context2;
+  (0, _filter.default)(data).call(data, function (item) {
+    return filterTreeNode === null || filterTreeNode === void 0 ? void 0 : filterTreeNode(item);
+  }).forEach(function (item) {
+    var node = (0, _extends2.default)({}, item);
 
-    return allFilterKeys.push.apply(allFilterKeys, (0, _concat.default)(_context2 = (0, _toConsumableArray2.default)(getAllParentKeys(data, key))).call(_context2, [key]));
+    while (node) {
+      allFilterKeys.push(node.key);
+      node = node.parent;
+    }
   });
   return (0, _toConsumableArray2.default)(new _set.default(allFilterKeys));
 };
 
 exports.getAllFilterKeys = getAllFilterKeys;
 
-var getFilterData = function getFilterData(data, filterTreeNode, filterValue) {
+var getFilterData = function getFilterData(data, filterTreeNode, isSearching) {
   var filterData = data;
+  var allFilterKeys = null;
 
-  if (typeof filterTreeNode === 'function' && filterValue) {
+  if (isSearching) {
+    allFilterKeys = getAllFilterKeys(filterData, filterTreeNode);
     filterData = (0, _filter.default)(filterData).call(filterData, function (item) {
-      var _context3;
-
-      return (0, _includes.default)(_context3 = getAllFilterKeys(filterData, filterTreeNode)).call(_context3, item.key);
+      return (0, _includes.default)(allFilterKeys).call(allFilterKeys, item.key);
     });
   }
 
@@ -294,11 +316,11 @@ var getSpreadAttrData = function getSpreadAttrData(treeData, expandedKeys) {
 exports.getSpreadAttrData = getSpreadAttrData;
 
 var addKeys = function addKeys() {
-  var _context4;
+  var _context2;
 
   var prevKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var newKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  return (0, _from.default)(new _set.default((0, _concat.default)(_context4 = []).call(_context4, (0, _toConsumableArray2.default)(prevKeys), (0, _toConsumableArray2.default)(newKeys))));
+  return (0, _from.default)(new _set.default((0, _concat.default)(_context2 = []).call(_context2, (0, _toConsumableArray2.default)(prevKeys), (0, _toConsumableArray2.default)(newKeys))));
 };
 
 exports.addKeys = addKeys;
@@ -363,14 +385,14 @@ var getPos = function getPos(data, key) {
 exports.getPos = getPos;
 
 var getInitCheckedKeys = function getInitCheckedKeys(data, keys) {
-  var _context5;
+  var _context3;
 
   var checkedKeys = [];
   keys.forEach(function (item) {
     var pos = getPos(data, item);
     checkedKeys.push.apply(checkedKeys, (0, _toConsumableArray2.default)(getAllChildKeys(data, pos)));
   });
-  return (0, _from.default)(new _set.default((0, _concat.default)(_context5 = []).call(_context5, checkedKeys, (0, _toConsumableArray2.default)(keys))));
+  return (0, _from.default)(new _set.default((0, _concat.default)(_context3 = []).call(_context3, checkedKeys, (0, _toConsumableArray2.default)(keys))));
 };
 
 exports.getInitCheckedKeys = getInitCheckedKeys;
@@ -558,7 +580,7 @@ var getRootKeys = function getRootKeys(data) {
 var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent) {
   var expandScrollkeys = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : [];
   var filterTreeNode = arguments.length > 7 ? arguments[7] : undefined;
-  var filterValue = arguments.length > 8 ? arguments[8] : undefined;
+  var isSearching = arguments.length > 8 ? arguments[8] : undefined;
   var keys = (expandedKeys === null || expandedKeys === void 0 ? void 0 : (0, _concat.default)(expandedKeys).call(expandedKeys, expandScrollkeys)) || (defaultExpandedKeys === null || defaultExpandedKeys === void 0 ? void 0 : (0, _concat.default)(defaultExpandedKeys).call(defaultExpandedKeys, expandScrollkeys)) || [];
 
   if (defaultExpandAll) {
@@ -581,10 +603,10 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
     }
   }
 
-  if (typeof filterTreeNode === 'function' && filterValue) {
-    var _context6;
+  if (isSearching) {
+    var _context4;
 
-    keys = (0, _concat.default)(_context6 = []).call(_context6, (0, _toConsumableArray2.default)(keys), (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode)));
+    keys = (0, _concat.default)(_context4 = []).call(_context4, (0, _toConsumableArray2.default)(keys), (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode)));
   }
 
   return (0, _from.default)(new _set.default((0, _toConsumableArray2.default)(keys)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.5.2",
+  "version": "1.5.5",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [