@kdcloudjs/kdesign 1.5.1 → 1.5.4

package/lib/stepper/stepper.js

@@ -64,6 +64,7 @@ var InternalStepper = function InternalStepper(props, ref) {
       stepBtnClassName = inputNumberProps.stepBtnClassName,
       max = inputNumberProps.max,
       min = inputNumberProps.min,
+      disabled = inputNumberProps.disabled,
       propsValue = inputNumberProps.value,
       defaultValue = inputNumberProps.defaultValue;
   var inputPrefixCls = getPrefixCls(prefixCls, 'inputNumber', customPrefixcls);
@@ -105,10 +106,11 @@ var InternalStepper = function InternalStepper(props, ref) {
       return null;
     }
 
-    var decreaseClassName = getStepBtnClassNames('base', 'decrease', showPlusdisabled);
+    var decreaseClassName = getStepBtnClassNames('base', 'decrease', showPlusdisabled || disabled);
     return /*#__PURE__*/_react.default.createElement("span", {
       className: decreaseClassName,
       onMouseDown: function onMouseDown() {
+        if (disabled) return;
         handleStepMouseDown('minus');
       }
     }, /*#__PURE__*/_react.default.createElement(_icon.default, {
@@ -118,10 +120,11 @@ var InternalStepper = function InternalStepper(props, ref) {
   };
 
   var getStepSuffix = function getStepSuffix() {
-    var increaseClassName = getStepBtnClassNames('base', 'increase', showMinusdisabled);
+    var increaseClassName = getStepBtnClassNames('base', 'increase', showMinusdisabled || disabled);
     return type === 'embed' ? getEmbedStepView() : /*#__PURE__*/_react.default.createElement("span", {
       className: increaseClassName,
       onMouseDown: function onMouseDown() {
+        if (disabled) return;
         handleStepMouseDown('plus');
       }
     }, /*#__PURE__*/_react.default.createElement(_icon.default, {
@@ -218,13 +221,14 @@ var InternalStepper = function InternalStepper(props, ref) {
     var _classNames2, _classNames3;
 
     var embedStepClassName = getStepBtnClassNames('embed');
-    var plusClassName = (0, _classnames.default)("".concat(inputPrefixCls, "-embedStep-plus"), (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, stepBtnClassName, stepBtnClassName), (0, _defineProperty2.default)(_classNames2, "".concat(inputPrefixCls, "-embedStep-disabled"), showMinusdisabled), _classNames2));
-    var minusClassName = (0, _classnames.default)("".concat(inputPrefixCls, "-embedStep-minus"), (_classNames3 = {}, (0, _defineProperty2.default)(_classNames3, stepBtnClassName, stepBtnClassName), (0, _defineProperty2.default)(_classNames3, "".concat(inputPrefixCls, "-embedStep-disabled"), showPlusdisabled), _classNames3));
+    var plusClassName = (0, _classnames.default)("".concat(inputPrefixCls, "-embedStep-plus"), (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, stepBtnClassName, stepBtnClassName), (0, _defineProperty2.default)(_classNames2, "".concat(inputPrefixCls, "-embedStep-disabled"), showMinusdisabled || disabled), _classNames2));
+    var minusClassName = (0, _classnames.default)("".concat(inputPrefixCls, "-embedStep-minus"), (_classNames3 = {}, (0, _defineProperty2.default)(_classNames3, stepBtnClassName, stepBtnClassName), (0, _defineProperty2.default)(_classNames3, "".concat(inputPrefixCls, "-embedStep-disabled"), showPlusdisabled || disabled), _classNames3));
     return /*#__PURE__*/_react.default.createElement("span", {
       className: embedStepClassName
     }, /*#__PURE__*/_react.default.createElement("span", {
       className: plusClassName,
       onMouseDown: function onMouseDown() {
+        if (disabled) return;
         handleStepMouseDown('plus');
       }
     }, /*#__PURE__*/_react.default.createElement(_icon.default, {
@@ -233,6 +237,7 @@ var InternalStepper = function InternalStepper(props, ref) {
     })), /*#__PURE__*/_react.default.createElement("span", {
       className: minusClassName,
       onMouseDown: function onMouseDown() {
+        if (disabled) return;
         handleStepMouseDown('minus');
       }
     }, /*#__PURE__*/_react.default.createElement(_icon.default, {

package/lib/stepper/style/index.css

@@ -152,6 +152,7 @@
 }
 .kd-inputNumber-baseStep-disabled {
   cursor: not-allowed;
+  color: var(--kd-c-stepper-icon-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
 }
 .kd-inputNumber-baseStep-disabled .kd-inputNumber-icon {
   color: unset !important;
@@ -244,6 +245,7 @@
 }
 .kd-inputNumber-embedStep-disabled {
   cursor: not-allowed !important;
+  color: var(--kd-c-stepper-icon-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
 }
 .kd-inputNumber-embedStep-disabled .kd-inputNumber-icon {
   color: unset !important;

package/lib/stepper/style/index.less

@@ -53,6 +53,7 @@
 
     &-disabled {
       cursor: not-allowed;
+      color: @stepper-icon-color-disabled;
 
       .@{inputNumber-prefix-cls}-icon {
         color: unset !important;
@@ -104,6 +105,7 @@
 
     &-disabled {
       cursor: not-allowed !important;
+      color: @stepper-icon-color-disabled;
 
       .@{inputNumber-prefix-cls}-icon {
         color: unset !important;

package/lib/stepper/style/token.less

@@ -7,15 +7,14 @@
 @stepper-icon-color-hover: var(~'@{stepper-prefix}-icon-color-hover', @color-theme);
 @stepper-color-border-strong: var(~'@{stepper-prefix}-color-border-strong', @color-border-strong);
 @stepper-embed-icon-color-background: var(~'@{stepper-prefix}-embed-icon-color-background', transparent);
+@stepper-icon-color-disabled: var(~'@{stepper-prefix}-icon-color-disabled', @color-disabled);
 
 // font
 @stepper-input-font-size: var(~'@{stepper-prefix}-input-font-size', 12px);
 
-
 // motion
 @stepper-motion-duration: var(~'@{stepper-prefix}-motion-duration', @duration-promptly);
 
-
 // sizing
 @stepper-input-small-sizing-height: var(~'@{stepper-prefix}-input-small-sizing-height', 20px);
 @stepper-input-middle-sizing-height: var(~'@{stepper-prefix}-input-middle-sizing-height', 28px);

package/lib/style/icon/kdicon.css

@@ -99,6 +99,7 @@
 .kdicon-fixed-solid:before { content: "\e65f"; }
 .kdicon-fixed-window:before { content: "\e6d1"; }
 .kdicon-fixed:before { content: "\e6e3"; }
+.kdicon-fold:before { content: "\e71d"; }
 .kdicon-foldmenu:before { content: "\e70e"; }
 .kdicon-font-background-solid:before { content: "\e673"; }
 .kdicon-font-color-solid:before { content: "\e674"; }
@@ -209,7 +210,7 @@
 .kdicon-two-window:before { content: "\e6f6"; }
 .kdicon-underline-solid:before { content: "\e671"; }
 .kdicon-unfold-all:before { content: "\e6ad"; }
-.kdicon-unfold:before { content: "\e6bb"; }
+.kdicon-unfold:before { content: "\e71e"; }
 .kdicon-unfoldmenu:before { content: "\e70d"; }
 .kdicon-unlock-solid:before { content: "\e666"; }
 .kdicon-unlock:before { content: "\e69e"; }

package/lib/tabs/style/index.css

@@ -294,6 +294,7 @@
   min-width: 120px;
   height: 100%;
   font-size: 0;
+  border-top: 1px solid transparent;
 }
 .kd-tabs-navs-card.kd-tabs-navs-left::before,
 .kd-tabs-navs-card.kd-tabs-navs-right::before,

package/lib/tabs/style/index.less

@@ -156,6 +156,7 @@
       min-width: 120px;
       height: 100%;
       font-size: 0;
+      border-top: 1px solid transparent;
       &::before, &::after {
         position: absolute;
         content: '';

package/lib/tooltip/tooltip.js

@@ -41,7 +41,7 @@ var Tooltip = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   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), {
-    ref: ref
+    ref: children.ref || ref
   });
   var popperProps = (0, _extends2.default)((0, _extends2.default)({}, allProps), {
     prefixCls: prefixCls,

package/lib/tree/tree.js

@@ -105,13 +105,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 +162,11 @@ 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 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 +176,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),

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);

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"));
@@ -44,7 +42,7 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   return t;
 };
 
-var DRAG_OFFSET = 0.4;
+var DRAG_OFFSET = 0.3;
 /**
  * 打平所有数组，并添加pos位置信息，
  * 方便根据expandKeys等计算节点的expand，checkedKeys计算节点checked状态
@@ -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 = 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++;
+      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.1",
+  "version": "1.5.4",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [