@kdcloudjs/kdesign 1.6.14 → 1.6.16

package/es/select/select.js

@@ -73,7 +73,7 @@ var InternalSelect = function InternalSelect(props, ref) {
 
   var realChildren = Array.isArray(options) ? options : toArray(children); // options配置项和默认children
 
-  var innerRef = React.useRef();
+  var innerRef = useRef();
   var selectRef = ref || innerRef;
   var searchRef = useRef(null); // 搜索框ref
 
@@ -84,7 +84,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     selectMulOpts: []
   }); // 多选ref已选中项
 
-  var measureRef = React.useRef(null);
+  var measureRef = useRef(null);
 
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -127,7 +127,7 @@ var InternalSelect = function InternalSelect(props, ref) {
   var multipleFooterCls = classNames(_defineProperty({}, "".concat(selectPrefixCls, "-multiple-footer"), true)); // 多选，单选公共样式
 
   var commCls = classNames((_classNames6 = {}, _defineProperty(_classNames6, "".concat(selectPrefixCls, "-bordered"), borderType === 'bordered'), _defineProperty(_classNames6, "".concat(selectPrefixCls, "-underline"), borderType === 'underline'), _defineProperty(_classNames6, "".concat(selectPrefixCls, "-borderless"), borderType === 'none'), _defineProperty(_classNames6, _concatInstanceProperty(_context = "".concat(selectPrefixCls, "-size-")).call(_context, size), size), _defineProperty(_classNames6, "".concat(selectPrefixCls, "-wrapper"), true), _classNames6));
-  React.useEffect(function () {
+  useEffect(function () {
     setOptionShow(!!props.visible);
   }, [props.visible]); // realchildren更新时数据处理---待解决
 
@@ -218,9 +218,9 @@ var InternalSelect = function InternalSelect(props, ref) {
   var handleClick = function handleClick() {
     if (disabled) return;
 
-    if (!optionShow) {
+    if (optionShow) {
       var onDropdownVisibleChange = selectProps.onDropdownVisibleChange;
-      onDropdownVisibleChange && onDropdownVisibleChange(!optionShow);
+      onDropdownVisibleChange && onDropdownVisibleChange(true);
     }
   };
 
@@ -464,9 +464,8 @@ var InternalSelect = function InternalSelect(props, ref) {
   }; // 多选模式下清除某一项
 
 
-  var handleRemove = function handleRemove(e) {
+  var handleRemove = function handleRemove(e, tag) {
     if (disabled) return;
-    var tag = e.currentTarget.parentNode.getAttribute('data-tag');
     var _multipleRef$current4 = multipleRef.current,
         selectedVal = _multipleRef$current4.selectedVal,
         selectMulOpts = _multipleRef$current4.selectMulOpts;
@@ -670,7 +669,9 @@ var InternalSelect = function InternalSelect(props, ref) {
         size: size,
         closable: true,
         disabled: disabled,
-        onClose: handleRemove,
+        onClose: function onClose(e) {
+          return handleRemove(e, value);
+        },
         "data-tag": value
       }, label));
     }), maxTagCount && mulOptions.length > maxTagCount ? maxTagPlaceholder ? handleMaxTagHolder() : /*#__PURE__*/React.createElement("span", {
@@ -739,8 +740,10 @@ var InternalSelect = function InternalSelect(props, ref) {
   };
 
   var handleVisibleChange = function handleVisibleChange(visible) {
-    props.visible === undefined && setOptionShow(visible);
-    onVisibleChange && onVisibleChange(visible);
+    if (visible !== optionShow) {
+      props.visible === undefined && setOptionShow(visible);
+      onVisibleChange && onVisibleChange(visible);
+    }
   };
 
   var popperProps = _extends(_extends({}, selectProps), {
@@ -749,7 +752,8 @@ var InternalSelect = function InternalSelect(props, ref) {
     popperStyle: catchStyle(),
     defaultVisible: optionShow,
     visible: optionShow,
-    onVisibleChange: handleVisibleChange
+    onVisibleChange: handleVisibleChange,
+    clickToClose: !isShowSearch
   });
 
   return usePopper(renderSelect(), renderContent(), popperProps);

package/es/style/core/motion/other.less

@@ -123,4 +123,13 @@
     transform: translateY(-15px) scale(0.8);
     opacity: 0;
   }
+}
+
+@keyframes kdModalEffect {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
 }

package/es/style/icon/kdicon.css

@@ -1,6 +1,6 @@
 @font-face {
   font-family: "kdicon";
-  src: url("kdicon.woff?t=1654677347390") format("woff");
+  src: url("kdicon.woff?t=1668600442688") format("woff")
 }
 .kdicon {
   font-family: 'kdicon' !important;
@@ -24,8 +24,10 @@
 .kdicon-analysis:before { content: "\e6ce"; }
 .kdicon-arrow-down-solid:before { content: "\e656"; }
 .kdicon-arrow-down:before { content: "\e627"; }
+.kdicon-arrow-left-circle-solid:before { content: "\e720"; }
 .kdicon-arrow-left-solid:before { content: "\e657"; }
 .kdicon-arrow-left:before { content: "\e63f"; }
+.kdicon-arrow-right-circle-solid:before { content: "\e71f"; }
 .kdicon-arrow-right-solid:before { content: "\e655"; }
 .kdicon-arrow-right:before { content: "\e62c"; }
 .kdicon-arrow-up-solid:before { content: "\e654"; }

package/es/style/index.css

@@ -383,6 +383,22 @@
     opacity: 0;
   }
 }
+@-webkit-keyframes kdModalEffect {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+@keyframes kdModalEffect {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
 .top-active {
   -webkit-animation-name: kdZoomBottomIn;
           animation-name: kdZoomBottomIn;

package/es/table/feature/useFooterDataSource.d.ts

@@ -0,0 +1,3 @@
+import { TablePipeline } from '../interface';
+declare function useFooterDataSource(pipeline: TablePipeline, footerDataSource: any[] | undefined): void;
+export default useFooterDataSource;

package/es/table/feature/useFooterDataSource.js

@@ -0,0 +1,11 @@
+import { features } from '@kdcloudjs/table';
+
+function useFooterDataSource(pipeline, footerDataSource) {
+  if (footerDataSource) {
+    pipeline.use(features.footerDataSource({
+      dataSource: footerDataSource
+    }));
+  }
+}
+
+export default useFooterDataSource;

package/es/table/interface.d.ts

@@ -14,6 +14,7 @@ export declare type TableApi = {
     getColumns: () => any[];
     getDataSource: () => any[];
     getFooterDataSource: () => any[];
+    clearRangeSelection: () => void;
 };
 export declare type TableInstance = {
     api: TableApi;
@@ -44,6 +45,7 @@ export interface TableRowSelection {
     column?: Partial<ArtColumnStaticPart>;
     onChange?: (selectedRowKeys: string[], actionRowkey?: string, actionRowskeys?: string[], action?: string) => void;
     isDisabled?(row: any, rowIndex: number): boolean;
+    highlightRowWhenSelected?: boolean;
 }
 export declare type TableRowDetail = RowDetailFeatureOptions;
 export declare type TableFilter = FilterFeatureOptions;

package/es/table/table.js

@@ -20,6 +20,7 @@ import useContextMenu from './feature/contextMenu';
 import useRangeSelection from './feature/useRangeSelection';
 import useＭergeCellHover from './feature/mergeCellHover';
 import devWarning from '../_utils/devwarning';
+import useFooterDataSource from './feature/useFooterDataSource';
 var Table = /*#__PURE__*/forwardRef(function (props, ref) {
   var columns = props.columns,
       dataSource = props.dataSource,
@@ -69,22 +70,21 @@ var Table = /*#__PURE__*/forwardRef(function (props, ref) {
     dataSource: dataSource
   });
   var pipelineRef = useRef(pipeline);
-  pipelineRef.current = pipeline;
-
-  if (footerDataSource) {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    pipeline.footerDataSource(footerDataSource);
-  }
+  pipelineRef.current = pipeline; // if (footerDataSource) {
+  //   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  //   // @ts-ignore
+  //   pipeline.footerDataSource(footerDataSource)
+  // }
 
   useImperativeHandle(ref, function () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
 
     return {
       api: {
         getColumns: (_a = pipelineRef.current.getColumns) === null || _a === void 0 ? void 0 : _a.bind(pipelineRef.current),
         getDataSource: (_b = pipelineRef.current.getDataSource) === null || _b === void 0 ? void 0 : _b.bind(pipelineRef.current),
-        getFooterDataSource: (_c = pipelineRef.current.getFooterDataSource) === null || _c === void 0 ? void 0 : _c.bind(pipelineRef.current)
+        getFooterDataSource: (_c = pipelineRef.current.getFooterDataSource) === null || _c === void 0 ? void 0 : _c.bind(pipelineRef.current),
+        clearRangeSelection: (_d = pipelineRef.current.clearRangeSelection) === null || _d === void 0 ? void 0 : _d.bind(pipelineRef.current)
       }
     };
   });
@@ -105,6 +105,7 @@ var Table = /*#__PURE__*/forwardRef(function (props, ref) {
   useContextMenu(pipeline, contextMenu);
   useRangeSelection(pipeline, rangeSelection);
   useＭergeCellHover(pipeline);
+  useFooterDataSource(pipeline, footerDataSource);
   /* -------------------------------------------------------------------------- */
 
   /* after useTablePipeline, merge pipeline.getProps result                     */

package/es/tooltip/tooltip.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { PopperProps } from '../_utils/usePopper';
 export declare type RenderFunction = () => React.ReactNode;
 export interface TooltipProps extends PopperProps {

package/es/tooltip/tooltip.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime-corejs3/helpers/extends";
-import * as React from 'react';
+import React, { useRef } from 'react';
 import { getCompProps } from '../_utils';
 import { ConfigContext } from '../config-provider';
 import usePopper from '../_utils/usePopper';
@@ -11,6 +11,7 @@ var Tooltip = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
 
   var allProps = getCompProps('ToolTip', userDefaultProps, props);
+  var status = useRef();
   var tip = allProps.tip,
       children = allProps.children,
       customPrefixcls = allProps.prefixCls; // className前缀
@@ -20,8 +21,15 @@ var Tooltip = /*#__PURE__*/React.forwardRef(function (props, ref) {
     ref: children.ref || ref
   });
 
+  var onVisibleChange = function onVisibleChange(v) {
+    if (status.current === v) return;
+    status.current = v;
+    props.onVisibleChange && props.onVisibleChange(v);
+  };
+
   var popperProps = _extends(_extends({}, allProps), {
-    prefixCls: prefixCls
+    prefixCls: prefixCls,
+    onVisibleChange: onVisibleChange
   });
 
   var tipPopper = typeof tip === 'function' ? tip() : tip;

package/es/tree/tree.d.ts

@@ -57,5 +57,13 @@ export declare type TreeNodeData = {
     showIcon?: boolean;
     selectable?: boolean;
 };
+export declare type KeysDataType = {
+    [key: string]: TreeNodeData & {
+        pathParentKeys: string[];
+    };
+};
+export declare type PosDataType = {
+    [key: string]: TreeNodeData;
+};
 declare const Tree: React.ForwardRefExoticComponent<TreeProps & React.RefAttributes<unknown>>;
 export default Tree;

package/es/tree/tree.js

@@ -12,7 +12,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import ConfigContext from '../config-provider/ConfigContext';
 import { getCompProps } from '../_utils';
 import TreeNode from './treeNode';
-import { getChecked, getHalfChecked, addKeys, flattenAll, delKey, getFilterData, getSpreadAttrData, getDataCheckededState, getDataCheckededStateStrictly, getAllChildKeys, getPos, getSelected, calcDropPosition } from './utils/treeUtils';
+import { getChecked, getHalfChecked, addKeys, flattenAll, delKey, getFilterData, getSpreadAttrData, getAllCheckedKeys, getDataCheckededStateStrictly, getAllChildKeys, getPos, getSelected, calcDropPosition } from './utils/treeUtils';
 import { useChecked, useExpand, usePlantomHeightEffect, useViewportHeight, useVisibleDataMemo, useScrollToKey, useSelect } from './treeHooks';
 import isBoolean from 'lodash/isBoolean';
 var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
@@ -79,14 +79,8 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return flattenAll(treeData, []);
   }, [treeData]),
       flattenAllData = _React$useMemo.flattenAllData,
-      maxLevel = _React$useMemo.maxLevel;
-
-  var _useChecked = useChecked(checkStrictly, checkedKeysProps, defaultCheckedKeys, flattenAllData, maxLevel, checkable),
-      _useChecked2 = _slicedToArray(_useChecked, 4),
-      checkedKeys = _useChecked2[0],
-      halfCheckedKeys = _useChecked2[1],
-      setCheckedKeys = _useChecked2[2],
-      setHalfCheckedKeys = _useChecked2[3];
+      maxLevel = _React$useMemo.maxLevel,
+      keysData = _React$useMemo.keysData;
 
   var _React$useState = React.useState(scrollToKey),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -136,21 +130,39 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
       loadingKeys = _React$useState14[0],
       setLoadingKeys = _React$useState14[1];
 
+  var _React$useState15 = React.useState([]),
+      _React$useState16 = _slicedToArray(_React$useState15, 2),
+      searchExpandedKeys = _React$useState16[0],
+      setSearchExpandedKeys = _React$useState16[1];
+
   var isSearching = React.useMemo(function () {
     return typeof filterTreeNode === 'function' && filterValue;
   }, [filterValue]);
+  useEffect(function () {
+    setSearchExpandedKeys([]);
+  }, [filterValue]);
 
-  var _useExpand = useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching),
+  var _useExpand = useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchExpandedKeys),
       _useExpand2 = _slicedToArray(_useExpand, 2),
       expandedKeys = _useExpand2[0],
       setExpandedKeys = _useExpand2[1];
 
-  var spreadAttrData = React.useMemo(function () {
+  var _React$useMemo2 = React.useMemo(function () {
     return getSpreadAttrData(flattenAllData, expandedKeys);
-  }, [flattenAllData, expandedKeys]);
+  }, [flattenAllData, expandedKeys]),
+      spreadAttrData = _React$useMemo2.spreadAttrData,
+      posData = _React$useMemo2.posData;
+
+  var _useChecked = useChecked(checkStrictly, checkedKeysProps, defaultCheckedKeys, flattenAllData, maxLevel, checkable, keysData),
+      _useChecked2 = _slicedToArray(_useChecked, 4),
+      checkedKeys = _useChecked2[0],
+      halfCheckedKeys = _useChecked2[1],
+      setCheckedKeys = _useChecked2[2],
+      setHalfCheckedKeys = _useChecked2[3];
+
   var filterData = React.useMemo(function () {
-    return getFilterData(spreadAttrData, filterTreeNode, isSearching);
-  }, [spreadAttrData, isSearching]);
+    return getFilterData(spreadAttrData, filterTreeNode, isSearching, posData, keysData);
+  }, [spreadAttrData, isSearching, posData, keysData]);
 
   var _useViewportHeight = useViewportHeight(height, listRef),
       _useViewportHeight2 = _slicedToArray(_useViewportHeight, 1),
@@ -225,6 +237,12 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
       node: node,
       expanded: expanded
     });
+
+    if (isSearching) {
+      var newSearchExpandedKeys = expanded ? addKeys(searchExpandedKeys, [key]) : delKey(searchExpandedKeys, [key]);
+      setSearchExpandedKeys(newSearchExpandedKeys);
+    }
+
     setScrollKey('');
     setIsInit(false);
 
@@ -232,9 +250,17 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
       handleNodeLoad(loadedKeys, loadingKeys, node);
     }
   }, [expandedKeys, onExpand, loadData, handleNodeLoad, loadedKeys, loadingKeys]);
-  var handleCheck = React.useCallback(function (key, value, node, event, pos) {
+  var handleCheck = React.useCallback(function (key, value, node, event, _pos) {
     var newCheckedKeys = value ? addKeys(checkedKeys, [key]) : delKey(checkedKeys, [key]);
-    var checkState = checkStrictly ? getDataCheckededStateStrictly(newCheckedKeys) : getDataCheckededState(spreadAttrData, newCheckedKeys, halfCheckedKeys, maxLevel, false, pos, value);
+    var checkState = checkStrictly ? getDataCheckededStateStrictly(newCheckedKeys) : getAllCheckedKeys(key, value, checkedKeys, keysData, halfCheckedKeys);
+
+    if (!('checkedKeys' in TreeProps)) {
+      setCheckedKeys(checkState.checkedKeys);
+      setHalfCheckedKeys(checkState.halfCheckedKeys);
+    } else {
+      setHalfCheckedKeys(checkState.halfCheckedKeys);
+    }
+
     onCheck && onCheck(checkState.checkedKeys, {
       event: event,
       node: node,
@@ -389,7 +415,10 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
   }, [scrollToKey]);
   useEffect(function () {
     setHalfCheckedKeys(halfCheckedKeys);
-  }, [halfCheckedKeys]);
+  }, [halfCheckedKeys, setHalfCheckedKeys]);
+  useEffect(function () {
+    setCheckedKeys(checkedKeys);
+  }, [checkedKeys, setCheckedKeys]);
   return /*#__PURE__*/React.createElement("div", {
     className: treeNodeClassName,
     style: style,

package/es/tree/treeHooks.d.ts

@@ -1,9 +1,9 @@
-import { TreeNodeData } from './tree';
+import { TreeNodeData, KeysDataType } from './tree';
 import React from 'react';
 export declare const useViewportHeight: (height: number, listRef: React.RefObject<HTMLElement>) => number[];
 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, isSearching: boolean) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];
+export declare const useChecked: (checkStrictly: boolean, checkedKeysProps: string[], defaultCheckedKeys: string[], _flattenAllData: any[], _maxLevel: number, checkable: boolean, keysData: KeysDataType) => 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, isSearching: boolean, keysData: KeysDataType, searchExpandedKeys: 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/es/tree/treeHooks.js

@@ -2,7 +2,7 @@ import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import React, { useEffect, useState } from 'react';
-import { getInitCheckededState, getDataCheckededStateStrictly, getInitExpandedKeys, getPos, getAllParentKeys, getExpandedKeys } from './utils/treeUtils';
+import { getInitCheckededKeys, getDataCheckededStateStrictly, getInitExpandedKeys, getPos, getAllParentKeys, getExpandedKeys } from './utils/treeUtils';
 export var useViewportHeight = function useViewportHeight(height, listRef) {
   var _React$useState = React.useState(0),
       _React$useState2 = _slicedToArray(_React$useState, 2),
@@ -35,14 +35,14 @@ export var usePlantomHeightEffect = function usePlantomHeightEffect(plantomRef,
     }
   }, [plantomRef, filterData, estimatedItemSize]);
 };
-export var useChecked = function useChecked(checkStrictly, checkedKeysProps, defaultCheckedKeys, flattenAllData, maxLevel, checkable) {
+export var useChecked = function useChecked(checkStrictly, checkedKeysProps, defaultCheckedKeys, _flattenAllData, _maxLevel, checkable, keysData) {
   var initialCheckedState = React.useMemo(function () {
     if (!checkable) return {
       checkedKeys: [],
       halfCheckedKeys: []
     };
-    return checkStrictly ? getDataCheckededStateStrictly(checkedKeysProps || defaultCheckedKeys) : getInitCheckededState(flattenAllData, checkedKeysProps || defaultCheckedKeys, maxLevel, true);
-  }, [flattenAllData, checkedKeysProps, defaultCheckedKeys, checkStrictly, maxLevel, checkable]);
+    return checkStrictly ? getDataCheckededStateStrictly(checkedKeysProps || defaultCheckedKeys) : getInitCheckededKeys(checkedKeysProps || defaultCheckedKeys, keysData);
+  }, [checkable, checkStrictly, checkedKeysProps, defaultCheckedKeys, keysData]);
 
   var _React$useState3 = React.useState(initialCheckedState.checkedKeys),
       _React$useState4 = _slicedToArray(_React$useState3, 2),
@@ -64,7 +64,7 @@ export var useChecked = function useChecked(checkStrictly, checkedKeysProps, def
   }, [nextHalfCheckedKeys]);
   return [checkedKeys, halfCheckedKeys, setCheckedKeys, setHalfCheckedKeys];
 };
-export var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching) {
+export var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchExpandedKeys) {
   var expandScrollkeys = [];
 
   if (scrollKey) {
@@ -73,8 +73,8 @@ export var useExpand = function useExpand(flattenAllData, expandedKeysProps, def
   }
 
   var initialExpandedKeys = React.useMemo(function () {
-    return getInitExpandedKeys(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching);
-  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching]);
+    return getInitExpandedKeys(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData, searchExpandedKeys);
+  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, searchExpandedKeys]);
   var newExpandedKeys = React.useMemo(function () {
     return getExpandedKeys(expandedKeysProps, expandScrollkeys);
   }, [expandedKeysProps]);
@@ -85,9 +85,9 @@ export var useExpand = function useExpand(flattenAllData, expandedKeysProps, def
       setExpandedKeys = _React$useState8[1];
 
   React.useEffect(function () {
-    var keys = isInit ? initialExpandedKeys : newExpandedKeys;
+    var keys = isInit || isSearching ? initialExpandedKeys : newExpandedKeys;
     setExpandedKeys(keys);
-  }, [newExpandedKeys, initialExpandedKeys]);
+  }, [newExpandedKeys, initialExpandedKeys, isSearching, isInit]);
   return [expandedKeys, setExpandedKeys];
 };
 export var useScrollToKey = function useScrollToKey(scrollKey, index, estimatedItemSize, scrollRef, viewportHeight, treeNodePrefixCls) {

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

@@ -1,4 +1,4 @@
-import { TreeNodeData } from '../tree';
+import { TreeNodeData, KeysDataType } from '../tree';
 /**
  * 打平所有数组，并添加pos位置信息，
  * 方便根据expandKeys等计算节点的expand，checkedKeys计算节点checked状态
@@ -10,13 +10,15 @@ import { TreeNodeData } from '../tree';
 export declare const flattenAll: (treeData: any[], newTreeData?: TreeNodeData[], level?: number, pos?: string | undefined) => {
     flattenAllData: TreeNodeData[];
     maxLevel: number;
+    keysData: KeysDataType;
 };
 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, isSearching: boolean) => any[];
+export declare function findfilterChildrenKeys(node: any, allFilterKeys: Set<any>): Set<string>;
+export declare const getAllFilterKeys: (data: any[], filterTreeNode: FunctionConstructor, keysData: KeysDataType) => any;
+export declare const getFilterData: (data: any[], filterTreeNode: FunctionConstructor, isSearching: boolean, posData?: {}, keysData?: {}) => any[];
 export declare const getMaxLevel: (data: any[]) => number;
 /**
  *计算node的属性后返回新的 treedata
@@ -25,14 +27,26 @@ export declare const getMaxLevel: (data: any[]) => number;
  * @param expandedKeys
  * @param defaultExpandAll
  */
-export declare const getSpreadAttrData: (treeData: any[], expandedKeys: string[]) => any[];
+export declare const getSpreadAttrData: (treeData: any[], expandedKeys: string[]) => {
+    spreadAttrData: any[];
+    posData: any;
+};
 export declare const addKeys: (prevKeys?: string[], newKeys?: string[]) => string[];
 export declare const getAllParentKeys: (data: any[], pos?: string) => string[];
 export declare const getAllParentPos: (data: any[], pos?: string) => string[];
 export declare const getAllChildKeys: (data: any[], pos?: string) => string[];
 export declare const getPos: (data: any[], key: string) => any;
 export declare const getInitCheckedKeys: (data: any[], keys: string[]) => any[];
-export declare const getInitCheckededState: (data: any[], checkedKeys: string[] | undefined, maxLevel: number, init?: boolean) => {
+export declare const getInitCheckededState: (data: any[], checkedKeys: string[] | undefined, maxLevel: number, init: boolean | undefined, posData: any, _keysData: KeysDataType) => {
+    checkedKeys: string[];
+    halfCheckedKeys: string[];
+};
+export declare function getChildNodeKeys(node: TreeNodeData, keysNodeProps: KeysDataType): Set<string>;
+export declare const getInitCheckededKeys: (checkedKeys: string[] | undefined, keysNodeProps: KeysDataType) => {
+    checkedKeys: string[];
+    halfCheckedKeys: string[];
+};
+export declare function getAllCheckedKeys(key: string, checked: boolean, checkedKeys: string[], keysNodeProps: KeysDataType, halfCheckedKeys: string[]): {
     checkedKeys: string[];
     halfCheckedKeys: string[];
 };
@@ -46,6 +60,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, isSearching: boolean) => string[];
+export declare const getInitExpandedKeys: (data: any[], expandedKeys: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, expandScrollkeys: string[] | undefined, filterTreeNode: FunctionConstructor, isSearching: boolean, keysData: KeysDataType, searchExpandedKeys: string[]) => string[];
 export declare const getExpandedKeys: (expandedKeys: string[], expandScrollkeys?: string[]) => string[];
 export declare const calcDropPosition: (event: React.MouseEvent, dropNode: HTMLElement) => 0 | 1 | -1;