@kdcloudjs/kdesign 1.6.14 → 1.6.16

package/lib/select/select.js

@@ -111,8 +111,7 @@ var InternalSelect = function InternalSelect(props, ref) {
 
   var realChildren = Array.isArray(options) ? options : (0, _reactChildren.toArray)(children); // options配置项和默认children
 
-  var innerRef = _react.default.useRef();
-
+  var innerRef = (0, _react.useRef)();
   var selectRef = ref || innerRef;
   var searchRef = (0, _react.useRef)(null); // 搜索框ref
 
@@ -123,7 +122,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     selectMulOpts: []
   }); // 多选ref已选中项
 
-  var measureRef = _react.default.useRef(null);
+  var measureRef = (0, _react.useRef)(null);
 
   var _useState = (0, _react.useState)([]),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -166,12 +165,10 @@ var InternalSelect = function InternalSelect(props, ref) {
   var multipleFooterCls = (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(selectPrefixCls, "-multiple-footer"), true)); // 多选，单选公共样式
 
   var commCls = (0, _classnames.default)((_classNames6 = {}, (0, _defineProperty2.default)(_classNames6, "".concat(selectPrefixCls, "-bordered"), borderType === 'bordered'), (0, _defineProperty2.default)(_classNames6, "".concat(selectPrefixCls, "-underline"), borderType === 'underline'), (0, _defineProperty2.default)(_classNames6, "".concat(selectPrefixCls, "-borderless"), borderType === 'none'), (0, _defineProperty2.default)(_classNames6, (0, _concat.default)(_context = "".concat(selectPrefixCls, "-size-")).call(_context, size), size), (0, _defineProperty2.default)(_classNames6, "".concat(selectPrefixCls, "-wrapper"), true), _classNames6));
-
-  _react.default.useEffect(function () {
+  (0, _react.useEffect)(function () {
     setOptionShow(!!props.visible);
   }, [props.visible]); // realchildren更新时数据处理---待解决
 
-
   (0, _react.useEffect)(function () {
     if (isMultiple) {
       multipleRef.current.selectedVal = initValue || [];
@@ -257,9 +254,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);
     }
   };
 
@@ -496,9 +493,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;
@@ -698,7 +694,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.default.createElement("span", {
@@ -767,8 +765,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 = (0, _extends2.default)((0, _extends2.default)({}, selectProps), {
@@ -777,7 +777,8 @@ var InternalSelect = function InternalSelect(props, ref) {
     popperStyle: catchStyle(),
     defaultVisible: optionShow,
     visible: optionShow,
-    onVisibleChange: handleVisibleChange
+    onVisibleChange: handleVisibleChange,
+    clickToClose: !isShowSearch
   });
   return (0, _usePopper.default)(renderSelect(), renderContent(), popperProps);
 };

package/lib/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/lib/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/lib/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/lib/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/lib/table/feature/useFooterDataSource.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _table = require("@kdcloudjs/table");
+
+function useFooterDataSource(pipeline, footerDataSource) {
+  if (footerDataSource) {
+    pipeline.use(_table.features.footerDataSource({
+      dataSource: footerDataSource
+    }));
+  }
+}
+
+var _default = useFooterDataSource;
+exports.default = _default;

package/lib/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/lib/table/table.js

@@ -57,6 +57,8 @@ var _mergeCellHover = _interopRequireDefault(require("./feature/mergeCellHover")
 
 var _devwarning = _interopRequireDefault(require("../_utils/devwarning"));
 
+var _useFooterDataSource = _interopRequireDefault(require("./feature/useFooterDataSource"));
+
 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; }
@@ -110,22 +112,21 @@ var Table = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     dataSource: dataSource
   });
   var pipelineRef = (0, _react.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)
+  // }
 
   (0, _react.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)
       }
     };
   });
@@ -146,6 +147,7 @@ var Table = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   (0, _contextMenu.default)(pipeline, contextMenu);
   (0, _useRangeSelection.default)(pipeline, rangeSelection);
   (0, _mergeCellHover.default)(pipeline);
+  (0, _useFooterDataSource.default)(pipeline, footerDataSource);
   /* -------------------------------------------------------------------------- */
 
   /* after useTablePipeline, merge pipeline.getProps result                     */

package/lib/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/lib/tooltip/tooltip.js

@@ -15,7 +15,7 @@ exports.default = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 
-var React = _interopRequireWildcard(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _utils = require("../_utils");
 
@@ -27,28 +27,39 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "functi
 
 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; }
 
-var Tooltip = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var _React$useContext = React.useContext(_configProvider.ConfigContext),
+var Tooltip = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+  var _React$useContext = _react.default.useContext(_configProvider.ConfigContext),
       getPrefixCls = _React$useContext.getPrefixCls,
       pkgPrefixCls = _React$useContext.prefixCls,
       userDefaultProps = _React$useContext.compDefaultProps; // 属性需要合并一遍用户定义的默认属性
 
 
   var allProps = (0, _utils.getCompProps)('ToolTip', userDefaultProps, props);
+  var status = (0, _react.useRef)();
   var tip = allProps.tip,
       children = allProps.children,
       customPrefixcls = allProps.prefixCls; // className前缀
 
   var prefixCls = getPrefixCls(pkgPrefixCls, 'tooltip', customPrefixcls);
-  var tiplocator = /*#__PURE__*/React.cloneElement(React.Children.count(children) === 1 && children.type ? children : /*#__PURE__*/React.createElement("span", null, children), {
+
+  var tiplocator = /*#__PURE__*/_react.default.cloneElement(_react.default.Children.count(children) === 1 && children.type ? children : /*#__PURE__*/_react.default.createElement("span", null, children), {
     ref: children.ref || ref
   });
+
+  var onVisibleChange = function onVisibleChange(v) {
+    if (status.current === v) return;
+    status.current = v;
+    props.onVisibleChange && props.onVisibleChange(v);
+  };
+
   var popperProps = (0, _extends2.default)((0, _extends2.default)({}, allProps), {
-    prefixCls: prefixCls
+    prefixCls: prefixCls,
+    onVisibleChange: onVisibleChange
   });
   var tipPopper = typeof tip === 'function' ? tip() : tip;
   return (0, _usePopper.default)(tiplocator, tipPopper, popperProps);
 });
+
 Tooltip.displayName = 'Tooltip';
 var _default = Tooltip;
 exports.default = _default;

package/lib/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/lib/tree/tree.js

@@ -115,14 +115,8 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     return (0, _treeUtils.flattenAll)(treeData, []);
   }, [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),
-      checkedKeys = _useChecked2[0],
-      halfCheckedKeys = _useChecked2[1],
-      setCheckedKeys = _useChecked2[2],
-      setHalfCheckedKeys = _useChecked2[3];
+      maxLevel = _React$useMemo.maxLevel,
+      keysData = _React$useMemo.keysData;
 
   var _React$useState = _react.default.useState(scrollToKey),
       _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
@@ -178,22 +172,40 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       loadingKeys = _React$useState14[0],
       setLoadingKeys = _React$useState14[1];
 
+  var _React$useState15 = _react.default.useState([]),
+      _React$useState16 = (0, _slicedToArray2.default)(_React$useState15, 2),
+      searchExpandedKeys = _React$useState16[0],
+      setSearchExpandedKeys = _React$useState16[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),
+  (0, _react.useEffect)(function () {
+    setSearchExpandedKeys([]);
+  }, [filterValue]);
+
+  var _useExpand = (0, _treeHooks.useExpand)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchExpandedKeys),
       _useExpand2 = (0, _slicedToArray2.default)(_useExpand, 2),
       expandedKeys = _useExpand2[0],
       setExpandedKeys = _useExpand2[1];
 
-  var spreadAttrData = _react.default.useMemo(function () {
+  var _React$useMemo2 = _react.default.useMemo(function () {
     return (0, _treeUtils.getSpreadAttrData)(flattenAllData, expandedKeys);
-  }, [flattenAllData, expandedKeys]);
+  }, [flattenAllData, expandedKeys]),
+      spreadAttrData = _React$useMemo2.spreadAttrData,
+      posData = _React$useMemo2.posData;
+
+  var _useChecked = (0, _treeHooks.useChecked)(checkStrictly, checkedKeysProps, defaultCheckedKeys, flattenAllData, maxLevel, checkable, keysData),
+      _useChecked2 = (0, _slicedToArray2.default)(_useChecked, 4),
+      checkedKeys = _useChecked2[0],
+      halfCheckedKeys = _useChecked2[1],
+      setCheckedKeys = _useChecked2[2],
+      setHalfCheckedKeys = _useChecked2[3];
 
   var filterData = _react.default.useMemo(function () {
-    return (0, _treeUtils.getFilterData)(spreadAttrData, filterTreeNode, isSearching);
-  }, [spreadAttrData, isSearching]);
+    return (0, _treeUtils.getFilterData)(spreadAttrData, filterTreeNode, isSearching, posData, keysData);
+  }, [spreadAttrData, isSearching, posData, keysData]);
 
   var _useViewportHeight = (0, _treeHooks.useViewportHeight)(height, listRef),
       _useViewportHeight2 = (0, _slicedToArray2.default)(_useViewportHeight, 1),
@@ -270,6 +282,12 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       node: node,
       expanded: expanded
     });
+
+    if (isSearching) {
+      var newSearchExpandedKeys = expanded ? (0, _treeUtils.addKeys)(searchExpandedKeys, [key]) : (0, _treeUtils.delKey)(searchExpandedKeys, [key]);
+      setSearchExpandedKeys(newSearchExpandedKeys);
+    }
+
     setScrollKey('');
     setIsInit(false);
 
@@ -278,9 +296,17 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     }
   }, [expandedKeys, onExpand, loadData, handleNodeLoad, loadedKeys, loadingKeys]);
 
-  var handleCheck = _react.default.useCallback(function (key, value, node, event, pos) {
+  var handleCheck = _react.default.useCallback(function (key, value, node, event, _pos) {
     var newCheckedKeys = value ? (0, _treeUtils.addKeys)(checkedKeys, [key]) : (0, _treeUtils.delKey)(checkedKeys, [key]);
-    var checkState = checkStrictly ? (0, _treeUtils.getDataCheckededStateStrictly)(newCheckedKeys) : (0, _treeUtils.getDataCheckededState)(spreadAttrData, newCheckedKeys, halfCheckedKeys, maxLevel, false, pos, value);
+    var checkState = checkStrictly ? (0, _treeUtils.getDataCheckededStateStrictly)(newCheckedKeys) : (0, _treeUtils.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,
@@ -440,7 +466,10 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   }, [scrollToKey]);
   (0, _react.useEffect)(function () {
     setHalfCheckedKeys(halfCheckedKeys);
-  }, [halfCheckedKeys]);
+  }, [halfCheckedKeys, setHalfCheckedKeys]);
+  (0, _react.useEffect)(function () {
+    setCheckedKeys(checkedKeys);
+  }, [checkedKeys, setCheckedKeys]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: treeNodeClassName,
     style: style,

package/lib/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/lib/tree/treeHooks.js

@@ -72,14 +72,14 @@ var usePlantomHeightEffect = function usePlantomHeightEffect(plantomRef, filterD
 
 exports.usePlantomHeightEffect = usePlantomHeightEffect;
 
-var useChecked = function useChecked(checkStrictly, checkedKeysProps, defaultCheckedKeys, flattenAllData, maxLevel, checkable) {
+var useChecked = function useChecked(checkStrictly, checkedKeysProps, defaultCheckedKeys, _flattenAllData, _maxLevel, checkable, keysData) {
   var initialCheckedState = _react.default.useMemo(function () {
     if (!checkable) return {
       checkedKeys: [],
       halfCheckedKeys: []
     };
-    return checkStrictly ? (0, _treeUtils.getDataCheckededStateStrictly)(checkedKeysProps || defaultCheckedKeys) : (0, _treeUtils.getInitCheckededState)(flattenAllData, checkedKeysProps || defaultCheckedKeys, maxLevel, true);
-  }, [flattenAllData, checkedKeysProps, defaultCheckedKeys, checkStrictly, maxLevel, checkable]);
+    return checkStrictly ? (0, _treeUtils.getDataCheckededStateStrictly)(checkedKeysProps || defaultCheckedKeys) : (0, _treeUtils.getInitCheckededKeys)(checkedKeysProps || defaultCheckedKeys, keysData);
+  }, [checkable, checkStrictly, checkedKeysProps, defaultCheckedKeys, keysData]);
 
   var _React$useState3 = _react.default.useState(initialCheckedState.checkedKeys),
       _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
@@ -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, isSearching) {
+var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchExpandedKeys) {
   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, isSearching);
-  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching]);
+    return (0, _treeUtils.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.default.useMemo(function () {
     return (0, _treeUtils.getExpandedKeys)(expandedKeysProps, expandScrollkeys);
@@ -126,9 +126,9 @@ var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExp
       setExpandedKeys = _React$useState8[1];
 
   _react.default.useEffect(function () {
-    var keys = isInit ? initialExpandedKeys : newExpandedKeys;
+    var keys = isInit || isSearching ? initialExpandedKeys : newExpandedKeys;
     setExpandedKeys(keys);
-  }, [newExpandedKeys, initialExpandedKeys]);
+  }, [newExpandedKeys, initialExpandedKeys, isSearching, isInit]);
 
   return [expandedKeys, setExpandedKeys];
 };

package/lib/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;