@kdcloudjs/kdesign 1.4.1 → 1.5.2

package/lib/tree/tree.js

@@ -13,12 +13,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
+
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
 
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
@@ -90,7 +94,9 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     return '';
   } : _TreeProps$setTreeNod2,
       innerEstimatedItemSize = TreeProps.estimatedItemSize,
-      style = TreeProps.style;
+      style = TreeProps.style,
+      filterTreeNode = TreeProps.filterTreeNode,
+      filterValue = TreeProps.filterValue;
   var treePrefixCls = getPrefixCls(prefixCls, 'tree', customPrefixcls); // 树样式前缀
 
   var treeNodePrefixCls = getPrefixCls(prefixCls, 'tree-node', customPrefixcls); // 树节点样式前缀
@@ -141,22 +147,35 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
 
   var dragNodeRef = _react.default.useRef(null);
 
+  var delayedDragEnterRef = _react.default.useRef(null);
+
   var _React$useState5 = _react.default.useState(true),
       _React$useState6 = (0, _slicedToArray2.default)(_React$useState5, 2),
       isInit = _React$useState6[0],
       setIsInit = _React$useState6[1];
 
-  var _useExpand = (0, _treeHooks.useExpand)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit),
-      _useExpand2 = (0, _slicedToArray2.default)(_useExpand, 1),
-      expandedKeys = _useExpand2[0];
+  var _React$useState7 = _react.default.useState(null),
+      _React$useState8 = (0, _slicedToArray2.default)(_React$useState7, 2),
+      dropPosition = _React$useState8[0],
+      setDropPosition = _React$useState8[1];
+
+  var _React$useState9 = _react.default.useState(null),
+      _React$useState10 = (0, _slicedToArray2.default)(_React$useState9, 2),
+      dragOverNodeKey = _React$useState10[0],
+      setDragOverNodeKey = _React$useState10[1];
+
+  var _useExpand = (0, _treeHooks.useExpand)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, filterValue),
+      _useExpand2 = (0, _slicedToArray2.default)(_useExpand, 2),
+      expandedKeys = _useExpand2[0],
+      setExpandedKeys = _useExpand2[1];
 
   var spreadAttrData = _react.default.useMemo(function () {
     return (0, _treeUtils.getSpreadAttrData)(flattenAllData, expandedKeys);
   }, [flattenAllData, expandedKeys]);
 
   var filterData = _react.default.useMemo(function () {
-    return (0, _treeUtils.getFilterData)(spreadAttrData);
-  }, [spreadAttrData]);
+    return (0, _treeUtils.getFilterData)(spreadAttrData, filterTreeNode, filterValue);
+  }, [spreadAttrData, filterTreeNode, filterValue]);
 
   var _useViewportHeight = (0, _treeHooks.useViewportHeight)(height, listRef),
       _useViewportHeight2 = (0, _slicedToArray2.default)(_useViewportHeight, 1),
@@ -220,7 +239,15 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     });
   }, [onDragStart]);
 
-  var handleDragOver = _react.default.useCallback(function (event, node) {
+  var handleDragOver = _react.default.useCallback(function (event, node, dropTarget) {
+    var dropPos = (0, _treeUtils.calcDropPosition)(event, dropTarget);
+    setDropPosition(dropPos);
+    var dragNode = getDragNode();
+
+    if (dragNode.key === node.key) {
+      setDropPosition(null);
+    }
+
     onDragOver && onDragOver({
       event: event,
       node: node
@@ -234,14 +261,53 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     });
   }, [onDragLeave]);
 
-  var handleDragEnter = _react.default.useCallback(function (event, node) {
+  var handleDragEnter = _react.default.useCallback(function (event, node, dropTarget) {
+    var key = node.key,
+        pos = node.pos;
+    var dragNode = getDragNode();
+
+    if (!dragNode) {
+      return;
+    }
+
+    if (!delayedDragEnterRef.current) {
+      delayedDragEnterRef.current = {};
+    }
+
+    (0, _keys.default)(delayedDragEnterRef.current).forEach(function (key) {
+      clearTimeout(delayedDragEnterRef.current[key]);
+    });
+
+    if ((dragNode === null || dragNode === void 0 ? void 0 : dragNode.key) !== key) {
+      var dragPos = (0, _treeUtils.calcDropPosition)(event, dropTarget);
+      setDragOverNodeKey(key);
+      setDropPosition(dragPos);
+      delayedDragEnterRef.current[pos] = setTimeout(function () {
+        var newExpandedKeys = (0, _toConsumableArray2.default)(expandedKeys);
+
+        if (!node.expand) {
+          newExpandedKeys = (0, _treeUtils.addKeys)(expandedKeys, [key]);
+        }
+
+        if (!('expandedKeys' in TreeProps)) {
+          setExpandedKeys(newExpandedKeys);
+        }
+
+        onExpand === null || onExpand === void 0 ? void 0 : onExpand(newExpandedKeys, {
+          node: node,
+          expanded: true
+        });
+      }, 800);
+    }
+
     onDragEnter && onDragEnter({
       event: event,
       node: node
     });
-  }, [onDragEnter]);
+  }, [TreeProps, expandedKeys, onDragEnter, onExpand, setExpandedKeys]);
 
   var handleDragEnd = _react.default.useCallback(function (event, node) {
+    setDragOverNodeKey('');
     onDragEnd && onDragEnd({
       event: event,
       node: node
@@ -257,9 +323,10 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       event: event,
       node: node,
       dragNode: dragNode,
-      keys: keys
+      dragNodesKeys: keys,
+      dropPosition: dropPosition
     });
-  }, [onDrop, flattenAllData]);
+  }, [flattenAllData, onDrop, dropPosition]);
 
   var handleSelect = _react.default.useCallback(function (event, node, key) {
     var checked = (0, _treeUtils.getChecked)(checkedKeys, key);
@@ -347,6 +414,7 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     item.style = setTreeNodeStyle((0, _extends2.default)({}, item));
     item.getDragNode = getDragNode;
     item.setDragNode = setDragNode;
+    item.dragOver = dragOverNodeKey === item.key && dropPosition === 0;
     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) => 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, filterValue: string) => 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) {
+var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, filterValue) {
   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);
-  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey]);
+    return (0, _treeUtils.getInitExpandedKeys)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, filterValue);
+  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, filterValue]);
 
   var newExpandedKeys = _react.default.useMemo(function () {
     return (0, _treeUtils.getExpandedKeys)(expandedKeysProps, expandScrollkeys);

package/lib/tree/treeNode.d.ts

@@ -24,6 +24,7 @@ export interface TreeNodeProps {
     checked?: boolean;
     pos?: string;
     estimatedItemSize?: number;
+    dragOver?: 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

@@ -85,6 +85,7 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       style = TreeNodeProps.style,
       indeterminate = TreeNodeProps.indeterminate,
       estimatedItemSize = TreeNodeProps.estimatedItemSize,
+      dragOver = TreeNodeProps.dragOver,
       onExpand = TreeNodeProps.onExpand,
       onCheck = TreeNodeProps.onCheck,
       onDragStart = TreeNodeProps.onDragStart,
@@ -94,7 +95,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", "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", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect"]);
 
   var nodeData = _react.default.useMemo(function () {
     return (0, _extends2.default)({
@@ -263,7 +264,7 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
 
     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), _classNames3)),
+      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)),
       onDragStart: handleDragStart,
       onDragEnd: handleDragEnd,
       onDragOver: handleDragOver,
@@ -271,7 +272,9 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onDragEnter: handleDragEnter,
       onDrop: handleDrop,
       ref: dragRef
-    }, indent(), renderExpandIcon(), showIcon && renderNodeIcon(), checkable ? /*#__PURE__*/_react.default.createElement(_checkbox.default, {
+    }, indent(), renderExpandIcon(), showIcon && renderNodeIcon(), /*#__PURE__*/_react.default.createElement("div", {
+      className: "".concat(treeNodePrefixCls, "-title-wrap")
+    }, checkable ? /*#__PURE__*/_react.default.createElement(_checkbox.default, {
       onChange: handleOnchange,
       checked: checked,
       indeterminate: !disabled && indeterminate,
@@ -280,9 +283,9 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-title"), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-title-disabled"), disabled))
     }, title)) : /*#__PURE__*/_react.default.createElement("span", {
       className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-title"), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-title-disabled"), disabled))
-    }, title), showDragLine && /*#__PURE__*/_react.default.createElement("span", {
+    }, title), showDragLine && !dragOver && /*#__PURE__*/_react.default.createElement("span", {
       className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-drag-line"))
-    })));
+    }))));
   };
 
   var handleOnchange = _react.default.useCallback(function (e) {
@@ -311,12 +314,12 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     if (!draggable) return;
     setDragNode(nodeData);
     onDragStart && onDragStart(e, props);
-  }, [onDragStart, nodeData, props, draggable]);
+  }, [draggable, setDragNode, nodeData, onDragStart, props]);
 
   var handleDragOver = _react.default.useCallback(function (e) {
     if (!draggable) return;
     e.preventDefault();
-    onDragOver && onDragOver(e, nodeData);
+    onDragOver && onDragOver(e, nodeData, dragRef.current);
   }, [onDragOver, nodeData, draggable]);
 
   var handleDragLeave = _react.default.useCallback(function (e) {
@@ -336,7 +339,7 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     setForbiddenChildrenPointerEvents(true);
     if (!((_a = dragRef.current) === null || _a === void 0 ? void 0 : _a.isEqualNode(e.target))) return;
     setShowDragLine(true);
-    onDragEnter && onDragEnter(e, nodeData);
+    onDragEnter && onDragEnter(e, nodeData, dragRef.current);
   }, [onDragEnter, nodeData, draggable]);
 
   var handleDragEnd = _react.default.useCallback(function (e) {

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

@@ -12,7 +12,8 @@ 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 getFilterData: (data: any[]) => any[];
+export declare const getAllFilterKeys: (data: any[], filterTreeNode: FunctionConstructor) => any[];
+export declare const getFilterData: (data: any[], filterTreeNode: FunctionConstructor, filterValue: string) => any[];
 export declare const getMaxLevel: (data: any[]) => number;
 /**
  *计算node的属性后返回新的 treedata
@@ -42,5 +43,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[]) => 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 getExpandedKeys: (expandedKeys: string[], expandScrollkeys?: string[]) => string[];
+export declare const calcDropPosition: (event: React.MouseEvent, dropNode: HTMLElement) => 0 | 1 | -1;

package/lib/tree/utils/treeUtils.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getSpreadAttrData = exports.getSelected = exports.getPos = exports.getMaxLevel = exports.getInitExpandedKeys = exports.getInitCheckededState = exports.getInitCheckedKeys = exports.getHalfChecked = exports.getFilterData = exports.getExpandedKeys = exports.getExpand = exports.getDataCheckededStateStrictly = exports.getDataCheckededState = exports.getChecked = exports.getAllParentPos = exports.getAllParentKeys = exports.getAllNodeKeys = exports.getAllChildKeys = exports.flattenAll = exports.delKey = exports.addKeys = void 0;
+exports.getSpreadAttrData = exports.getSelected = exports.getPos = exports.getMaxLevel = exports.getInitExpandedKeys = exports.getInitCheckededState = exports.getInitCheckedKeys = exports.getHalfChecked = exports.getFilterData = exports.getExpandedKeys = exports.getExpand = exports.getDataCheckededStateStrictly = exports.getDataCheckededState = exports.getChecked = exports.getAllParentPos = exports.getAllParentKeys = exports.getAllNodeKeys = exports.getAllFilterKeys = exports.getAllChildKeys = exports.flattenAll = exports.delKey = exports.calcDropPosition = exports.addKeys = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
 
@@ -19,14 +19,16 @@ var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-s
 
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 
-var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/starts-with"));
-
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
 
-var _from = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/from"));
+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"));
+
+var _from = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/from"));
+
 var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/splice"));
 
 var __rest = void 0 && (void 0).__rest || function (s, e) {
@@ -41,6 +43,8 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   }
   return t;
 };
+
+var DRAG_OFFSET = 0.3;
 /**
  * 打平所有数组，并添加pos位置信息，
  * 方便根据expandKeys等计算节点的expand，checkedKeys计算节点checked状态
@@ -50,7 +54,6 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
  * @param pos
  */
 
-
 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;
@@ -126,11 +129,37 @@ var isAllParentExpand = function isAllParentExpand(data, pos) {
   return expand;
 };
 
-var getFilterData = function getFilterData(data) {
+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;
+
+    return allFilterKeys.push.apply(allFilterKeys, (0, _concat.default)(_context2 = (0, _toConsumableArray2.default)(getAllParentKeys(data, key))).call(_context2, [key]));
+  });
+  return (0, _toConsumableArray2.default)(new _set.default(allFilterKeys));
+};
+
+exports.getAllFilterKeys = getAllFilterKeys;
+
+var getFilterData = function getFilterData(data, filterTreeNode, filterValue) {
+  var filterData = data;
+
+  if (typeof filterTreeNode === 'function' && filterValue) {
+    filterData = (0, _filter.default)(filterData).call(filterData, function (item) {
+      var _context3;
+
+      return (0, _includes.default)(_context3 = getAllFilterKeys(filterData, filterTreeNode)).call(_context3, item.key);
+    });
+  }
+
   var newData = [];
-  data.forEach(function (item) {
+  filterData.forEach(function (item) {
     var pos = item.pos;
-    var parentExpand = isAllParentExpand(data, pos);
+    var parentExpand = isAllParentExpand(filterData, pos);
 
     if (parentExpand) {
       newData.push(item);
@@ -265,11 +294,11 @@ var getSpreadAttrData = function getSpreadAttrData(treeData, expandedKeys) {
 exports.getSpreadAttrData = getSpreadAttrData;
 
 var addKeys = function addKeys() {
-  var _context2;
+  var _context4;
 
   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)(_context2 = []).call(_context2, (0, _toConsumableArray2.default)(prevKeys), (0, _toConsumableArray2.default)(newKeys))));
+  return (0, _from.default)(new _set.default((0, _concat.default)(_context4 = []).call(_context4, (0, _toConsumableArray2.default)(prevKeys), (0, _toConsumableArray2.default)(newKeys))));
 };
 
 exports.addKeys = addKeys;
@@ -334,14 +363,14 @@ var getPos = function getPos(data, key) {
 exports.getPos = getPos;
 
 var getInitCheckedKeys = function getInitCheckedKeys(data, keys) {
-  var _context3;
+  var _context5;
 
   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)(_context3 = []).call(_context3, checkedKeys, (0, _toConsumableArray2.default)(keys))));
+  return (0, _from.default)(new _set.default((0, _concat.default)(_context5 = []).call(_context5, checkedKeys, (0, _toConsumableArray2.default)(keys))));
 };
 
 exports.getInitCheckedKeys = getInitCheckedKeys;
@@ -528,6 +557,8 @@ 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 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) {
@@ -550,6 +581,12 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
     }
   }
 
+  if (typeof filterTreeNode === 'function' && filterValue) {
+    var _context6;
+
+    keys = (0, _concat.default)(_context6 = []).call(_context6, (0, _toConsumableArray2.default)(keys), (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode)));
+  }
+
   return (0, _from.default)(new _set.default((0, _toConsumableArray2.default)(keys)));
 };
 
@@ -561,4 +598,25 @@ var getExpandedKeys = function getExpandedKeys(expandedKeys) {
   return (0, _from.default)(new _set.default((0, _toConsumableArray2.default)(keys)));
 };
 
-exports.getExpandedKeys = getExpandedKeys;
+exports.getExpandedKeys = getExpandedKeys;
+
+var calcDropPosition = function calcDropPosition(event, dropNode) {
+  var clientY = event.clientY;
+
+  var _dropNode$getBounding = dropNode.getBoundingClientRect(),
+      top = _dropNode$getBounding.top,
+      bottom = _dropNode$getBounding.bottom,
+      height = _dropNode$getBounding.height;
+
+  if (clientY <= top + height * DRAG_OFFSET) {
+    return -1;
+  }
+
+  if (clientY >= bottom - height * DRAG_OFFSET) {
+    return 1;
+  }
+
+  return 0;
+};
+
+exports.calcDropPosition = calcDropPosition;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.4.1",
+  "version": "1.5.2",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [
@@ -76,7 +76,7 @@
     "@babel/runtime": "^7.10.4",
     "@babel/runtime-corejs3": "^7.11.2",
     "@babel/standalone": "^7.14.3",
-    "@kdcloudjs/table": "^1.1.1",
+    "@kdcloudjs/table": "^1.1.2",
     "@popperjs/core": "^2.5.4",
     "async-validator": "^3.5.1",
     "axios": "^0.21.1",