@kdcloudjs/kdesign 1.6.29 → 1.6.31

package/lib/_utils/usePopper.js

@@ -558,18 +558,18 @@ function usePopper(locatorElement, popperElement, props) {
   (0, _react.useEffect)(function () {
     if (exist && visible) {
       var mouseleaveTimer;
+      var triggerNode = getTriggerElement(locatorRef.current);
 
       var handleHidePopper = function handleHidePopper(e) {
-        var triggerNode = getTriggerElement(locatorRef.current);
         var triggerRect = triggerNode.getBoundingClientRect();
         var popperRect = popperRef.current.getBoundingClientRect();
-        var left = /left/.test(nextPlacement) ? popperRect.right : triggerRect.left;
-        var right = /right/.test(nextPlacement) ? popperRect.left : triggerRect.right;
-        var top = /top/.test(nextPlacement) ? popperRect.bottom : triggerRect.top;
-        var bottom = /bottom/.test(nextPlacement) ? popperRect.top : triggerRect.bottom;
+        var left = triggerRect.left;
+        var right = triggerRect.right;
+        var top = triggerRect.top;
+        var bottom = triggerRect.bottom;
         var X = e.clientX,
             Y = e.clientY;
-        var inTriggerRect = X > left - 2 && X < right + 2 && Y > top - 2 && Y < bottom + 2;
+        var inTriggerRect = X > left + 2 && X < right - 2 && Y > top + 2 && Y < bottom - 2;
         var inPopperRect = X > popperRect.left && X < popperRect.right && Y > popperRect.top && Y < popperRect.bottom;
         var ableArea = matchTrigger('contextMenu') ? inPopperRect : inTriggerRect || inPopperRect;
 
@@ -577,7 +577,12 @@ function usePopper(locatorElement, popperElement, props) {
           mouseleaveTimer && clearTimeout(mouseleaveTimer);
           matchTrigger('focus') && triggerNode.focus();
         } else {
-          matchTrigger('hover') ? mouseleaveTimer = window.setTimeout(hidePopper, mouseLeaveDelay * 1000) : hidePopper();
+          if (matchTrigger('hover')) {
+            mouseleaveTimer && clearTimeout(mouseleaveTimer);
+            mouseleaveTimer = window.setTimeout(hidePopper, mouseLeaveDelay * 3000);
+          } else {
+            hidePopper();
+          }
         }
       };
 
@@ -592,6 +597,9 @@ function usePopper(locatorElement, popperElement, props) {
       };
 
       if (matchTrigger('hover')) {
+        triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode.removeEventListener('mouseleave', debounceHidePopper);
+        popperNode === null || popperNode === void 0 ? void 0 : popperNode.removeEventListener('mouseleave', debounceHidePopper);
+        triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode.addEventListener('mouseleave', debounceHidePopper);
         popperNode === null || popperNode === void 0 ? void 0 : popperNode.addEventListener('mouseleave', debounceHidePopper);
       }
 
@@ -599,6 +607,7 @@ function usePopper(locatorElement, popperElement, props) {
         return document.addEventListener(mapEvent[action], debounceHidePopper);
       }) : document.addEventListener(mapEvent[trigger], debounceHidePopper);
       return function () {
+        triggerNode === null || triggerNode === void 0 ? void 0 : triggerNode.removeEventListener('mouseleave', debounceHidePopper);
         popperNode === null || popperNode === void 0 ? void 0 : popperNode.removeEventListener('mouseleave', debounceHidePopper);
         Array.isArray(trigger) ? trigger.forEach(function (action) {
           return document.removeEventListener(mapEvent[action], debounceHidePopper);

package/lib/cascader/style/index.css

@@ -224,7 +224,7 @@
   visibility: hidden;
 }
 .kd-cascader-menus .kd-cascader-menu {
-  display: inline-table;
+  display: inline-block;
   height: var(--kd-c-cascader-sizing-height, 192px);
   min-width: var(--kd-c-cascader-menu-sizing-min-width, 116px);
   margin: 0;

package/lib/cascader/style/index.less

@@ -128,7 +128,7 @@
   }
 
   .@{cascader-menu-prefix-cls} {
-    display: inline-table;
+    display: inline-block;
     height: @cascader-height;
     min-width: @cascader-menu-min-width;
     margin: 0;

package/lib/date-picker/hooks/use-picker-input.js

@@ -106,10 +106,6 @@ function usePickerInput(_ref) {
         }, 0);
       } else if (open) {
         triggerOpen(false);
-
-        if (valueChangedRef.current) {
-          onSubmit();
-        }
       }
 
       setFocused(false);

package/lib/date-picker/style/index.css

@@ -557,6 +557,8 @@
   padding: 3px 0;
   cursor: pointer;
   overflow: hidden;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
 }
 .kd-date-picker-panel .kd-date-picker-warpper .kd-date-picker-calendar .kd-date-picker-calendar-line .kd-date-picker-calendar-item:not(.kd-date-picker-calendar-item-disabled):hover .kd-date-picker-calendar-text {
   background: #f5f5f5;
@@ -794,8 +796,7 @@
           flex: 1 0 auto;
   width: 56px;
   margin: 0;
-  padding: 0 0 206px 0;
-  padding-top: 10px;
+  padding: 10px 0 214px 0;
   text-align: left;
   -webkit-transition: background 0.3s;
   transition: background 0.3s;

package/lib/date-picker/style/index.less

@@ -408,6 +408,7 @@
           padding: 3px 0;
           cursor: pointer;
           overflow: hidden;
+          box-sizing: border-box;
         }
 
         & .@{datePicker-prefix-cls}-calendar-item:not(.@{datePicker-prefix-cls}-calendar-item-disabled):hover {
@@ -676,8 +677,7 @@
         flex: 1 0 auto;
         width: 56px;
         margin: 0;
-        padding: 0 0 206px 0;
-        padding-top: 10px;
+        padding: 10px 0 214px 0;
         text-align: left;
         transition: background 0.3s;
         overflow: hidden;

package/lib/form/style/index.css

@@ -120,6 +120,10 @@
   display: -ms-flexbox;
   display: flex;
 }
+.kd-form-horizontal .kd-form-field-label {
+  -ms-flex-negative: 0;
+      flex-shrink: 0;
+}
 .kd-form-inline .kd-form-field {
   display: -webkit-inline-box;
   display: -ms-inline-flexbox;

package/lib/form/style/index.less

@@ -17,6 +17,12 @@
     }
   }
 
+  &-horizontal {
+    .@{field-label-cls} {
+      flex-shrink: 0;
+    }
+  }
+
   &-inline {
     .@{field-prefix-cls} {
       display: inline-flex;

package/lib/grid/col.js

@@ -25,6 +25,8 @@ var _utils = require("../_utils");
 
 var _configProvider = require("../config-provider");
 
+var _testBrowserType = require("../_utils/testBrowserType");
+
 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; }
@@ -52,8 +54,10 @@ var Col = function Col(props) {
       winWidth = _getCompProps.winWidth,
       children = _getCompProps.children,
       className = _getCompProps.className,
-      customPrefixcls = _getCompProps.prefixCls; // className前缀
+      customPrefixcls = _getCompProps.prefixCls; // 浏览器名称
+
 
+  var isSogou = (0, _testBrowserType.testBrowserType)(/^sogou/i, 0); // className前缀
 
   var prefixCls = getPrefixCls(pkgPrefixCls, 'col', customPrefixcls);
   var columns = 24;
@@ -120,7 +124,9 @@ var Col = function Col(props) {
     marginLeft: base.offset && base.offset / columns * 100 + '%'
   }, style);
   return /*#__PURE__*/React.createElement("div", {
-    className: (0, _classnames.default)(prefixCls, className),
+    className: (0, _classnames.default)(prefixCls, className, {
+      'sogou-col': isSogou
+    }),
     style: styleString
   }, children);
 };

package/lib/grid/row.js

@@ -29,6 +29,8 @@ var _configProvider = require("../config-provider");
 
 var _throttle = _interopRequireDefault(require("lodash/throttle"));
 
+var _testBrowserType = require("../_utils/testBrowserType");
+
 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; }
@@ -65,8 +67,10 @@ var Row = function Row(props) {
       gutter = _getCompProps.gutter,
       align = _getCompProps.align,
       justify = _getCompProps.justify,
-      customPrefixcls = _getCompProps.prefixCls; // className前缀
+      customPrefixcls = _getCompProps.prefixCls; // 浏览器名称
+
 
+  var isSogou = (0, _testBrowserType.testBrowserType)(/^sogou/i, 0); // className前缀
 
   var prefixCls = getPrefixCls(pkgPrefixCls, 'row', customPrefixcls);
 
@@ -123,6 +127,8 @@ var Row = function Row(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: (0, _classnames.default)(prefixCls, className, {
       nowrap: !wrap
+    }, {
+      'sogou-row': isSogou
     }),
     style: styleString
   }, (0, _map.default)(_context = React.Children).call(_context, children, function (child) {

package/lib/grid/style/index.css

@@ -119,9 +119,15 @@
   -ms-flex-wrap: nowrap;
       flex-wrap: nowrap;
 }
+.kd-row.sogou-row {
+  margin-bottom: calc(-1 * var(--rgap));
+}
 .kd-col {
   position: relative;
   -webkit-box-sizing: border-box;
           box-sizing: border-box;
   padding: 0 calc(var(--cgap) / 2);
 }
+.kd-col.sogou-col {
+  margin-bottom: var(--rgap);
+}

package/lib/grid/style/index.less

@@ -13,10 +13,18 @@
   &.nowrap {
     flex-wrap: nowrap;
   }
+
+  &.sogou-row {
+    margin-bottom: calc(-1 * var(--rgap));
+  }
 }
 
 .@{col-prefix-cls} {
   position: relative;
   box-sizing: border-box;
   padding: 0 calc(var(--cgap) / 2);
+
+  &.sogou-col {
+    margin-bottom: var(--rgap);
+  }
 }

package/lib/input/ClearableLabeledInput.d.ts

@@ -13,6 +13,7 @@ interface ClearableInputProps {
     style?: CSSProperties;
     disabled?: boolean;
     focused?: boolean;
+    count?: boolean;
     borderType?: BorderType;
     size?: InputSiteType;
     suffix?: React.ReactNode;

package/lib/input/ClearableLabeledInput.js

@@ -56,7 +56,8 @@ var ClearableInput = function ClearableInput(props) {
       addonAfter = props.addonAfter,
       focused = props.focused,
       numberMark = props.numberMark,
-      inputCount = props.inputCount;
+      inputCount = props.inputCount,
+      count = props.count;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -105,7 +106,7 @@ var ClearableInput = function ClearableInput(props) {
   var renderInputWithFixNode = function renderInputWithFixNode(originElement) {
     var _context, _classNames2;
 
-    if (!hasPrefixSuffix(props)) {
+    if (!hasPrefixSuffix(props) && !count) {
       return originElement;
     }
 
@@ -127,7 +128,7 @@ var ClearableInput = function ClearableInput(props) {
   var renderInputWithLabel = function renderInputWithLabel(originElement) {
     var _classNames4, _context2, _classNames5;
 
-    if (!addonBefore && !addonAfter) {
+    if (!addonBefore && !addonAfter && !count) {
       return originElement;
     }
 

package/lib/input/input.js

@@ -183,7 +183,11 @@ var InternalInput = function InternalInput(props, ref) {
 
     if (count && showNumberMark && !disabled) {
       return /*#__PURE__*/_react.default.createElement("div", {
-        className: (0, _classnames.default)("".concat(inputPrefixCls, "-input-mark-inner"))
+        className: (0, _classnames.default)("".concat(inputPrefixCls, "-input-mark-inner")),
+        onMouseDown: function onMouseDown(e) {
+          e.stopPropagation();
+          e.preventDefault();
+        }
       }, enteredLength, maxLength !== undefined ? "/".concat(maxLength) : null);
     }
 
@@ -222,6 +226,7 @@ var InternalInput = function InternalInput(props, ref) {
     prefixCls: inputPrefixCls,
     element: renderInput(),
     focused: focused,
+    count: count,
     inputCount: renderCount()
   }));
 };

package/lib/input-number/inputNumber.js

@@ -192,29 +192,42 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
         _numerical$split2$ = _numerical$split2[1],
         decimalValue = _numerical$split2$ === void 0 ? '' : _numerical$split2$;
 
+    var sign = '';
+
+    if ((0, _includes.default)(integerValue).call(integerValue, '-')) {
+      integerValue = integerValue.replace('-', '');
+      sign = '-';
+    }
+
     var integerValueLength = integerValue.length;
     var decimalValueLength = decimalValue.length;
 
     if (typeof decimalLength === 'number' && typeof digitLength === 'number') {
-      if (integerValueLength > digitLength - decimalLength) {
-        resultNumerical = integerValue.substr(0, digitLength - decimalLength);
-      } else if (decimalValueLength > decimalLength) {
+      if (decimalValueLength <= decimalLength && integerValueLength <= digitLength - decimalLength) {
+        resultNumerical = numerical;
+      } else if (integerValueLength > digitLength - decimalLength) {
         var _context;
 
-        resultNumerical = (0, _concat.default)(_context = "".concat(integerValue, ".")).call(_context, decimalValue.substr(0, decimalLength));
+        resultNumerical = (0, _concat.default)(_context = "".concat(sign)).call(_context, integerValue.substr(0, digitLength - decimalLength));
+      } else if (decimalValueLength > decimalLength) {
+        var _context2, _context3;
+
+        resultNumerical = (0, _concat.default)(_context2 = (0, _concat.default)(_context3 = "".concat(sign)).call(_context3, integerValue, ".")).call(_context2, decimalValue.substr(0, decimalLength));
       }
     } else if (typeof decimalLength !== 'number' && typeof digitLength === 'number') {
       if (integerValueLength >= digitLength) {
-        resultNumerical = integerValue.substr(0, digitLength);
+        var _context4;
+
+        resultNumerical = (0, _concat.default)(_context4 = "".concat(sign)).call(_context4, integerValue.substr(0, digitLength));
       } else {
-        var _context2;
+        var _context5, _context6, _context7;
 
-        resultNumerical = decimalValueLength ? (0, _concat.default)(_context2 = "".concat(integerValue, ".")).call(_context2, decimalValue.substr(0, digitLength - integerValueLength)) : integerValue;
+        resultNumerical = decimalValueLength ? (0, _concat.default)(_context5 = (0, _concat.default)(_context6 = "".concat(sign)).call(_context6, integerValue, ".")).call(_context5, decimalValue.substr(0, digitLength - integerValueLength)) : (0, _concat.default)(_context7 = "".concat(sign)).call(_context7, integerValue);
       }
     } else if (typeof decimalLength === 'number' && typeof digitLength !== 'number') {
-      var _context3;
+      var _context8, _context9, _context10;
 
-      resultNumerical = decimalValueLength ? (0, _concat.default)(_context3 = "".concat(integerValue, ".")).call(_context3, decimalValue.substr(0, decimalLength)) : integerValue;
+      resultNumerical = decimalValueLength ? (0, _concat.default)(_context8 = (0, _concat.default)(_context9 = "".concat(sign)).call(_context9, integerValue, ".")).call(_context8, decimalValue.substr(0, decimalLength)) : (0, _concat.default)(_context10 = "".concat(sign)).call(_context10, integerValue);
     } else {
       resultNumerical = numerical;
     }
@@ -251,7 +264,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
   };
 
   var handleKeyDown = function handleKeyDown(event) {
-    var _context4;
+    var _context11;
 
     if (!stepOption || props.disabled || props.readOnly) {
       return;
@@ -259,7 +272,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
 
     var keyCode = event.keyCode;
 
-    if ((0, _includes.default)(_context4 = [38, 40]).call(_context4, keyCode)) {
+    if ((0, _includes.default)(_context11 = [38, 40]).call(_context11, keyCode)) {
       event.preventDefault();
       handleStepChang(keyCode === 38 ? 'plus' : 'minus');
     }

package/lib/select/select.js

@@ -440,31 +440,41 @@ var InternalSelect = function InternalSelect(props, ref) {
     var _multipleRef$current3 = multipleRef.current,
         selectedVal = _multipleRef$current3.selectedVal,
         selectMulOpts = _multipleRef$current3.selectMulOpts;
+    var newSelectedVal = (0, _toConsumableArray2.default)(selectedVal);
+    var newSelectMulOpts = (0, _toConsumableArray2.default)(selectMulOpts);
+
+    if ((filledOptions === null || filledOptions === void 0 ? void 0 : filledOptions.length) !== newSelectedVal.length) {
+      (0, _map.default)(filledOptions).call(filledOptions, function (child) {
+        var _ref = child.props || child,
+            value = _ref.value;
+
+        if (!(0, _includes.default)(newSelectedVal).call(newSelectedVal, value)) {
+          newSelectedVal.push(value);
+          newSelectMulOpts.push({
+            value: value,
+            label: getOptionLabel(child)
+          });
+        }
+      });
 
-    if (!('value' in selectProps)) {
-      if ((filledOptions === null || filledOptions === void 0 ? void 0 : filledOptions.length) !== selectedVal.length) {
-        (0, _map.default)(filledOptions).call(filledOptions, function (child) {
-          var _ref = child.props || child,
-              value = _ref.value;
-
-          if (!(0, _includes.default)(selectedVal).call(selectedVal, value)) {
-            selectedVal.push(value);
-            selectMulOpts.push({
-              value: value,
-              label: getOptionLabel(child)
-            });
-          }
-        });
-        setMulOptions((0, _toConsumableArray2.default)(selectMulOpts));
+      if (typeof value === 'undefined') {
+        multipleRef.current.selectedVal = newSelectedVal;
+        multipleRef.current.selectMulOpts = newSelectMulOpts;
+        setMulOptions((0, _toConsumableArray2.default)(newSelectMulOpts));
         setSearchValue('');
-      } else {
-        multipleRef.current.selectedVal = selectedVal = [];
-        multipleRef.current.selectMulOpts = selectMulOpts = [];
+      }
+    } else {
+      newSelectedVal = [];
+      newSelectMulOpts = [];
+
+      if (typeof value === 'undefined') {
+        multipleRef.current.selectedVal = [];
+        multipleRef.current.selectMulOpts = [];
         setMulOptions([]);
       }
     }
 
-    onChange && onChange(labelInValue ? selectMulOpts : selectedVal, selectMulOpts);
+    onChange && onChange(labelInValue ? newSelectMulOpts : newSelectedVal, newSelectMulOpts);
   }; // 输入框变化搜索内容
 
 

package/lib/select/style/index.css

@@ -298,6 +298,8 @@
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  right: 28px;
+  left: 0;
 }
 .kd-select-borderless {
   border: none;

package/lib/select/style/index.less

@@ -67,6 +67,8 @@
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
+    right: 28px;
+    left: 0;
   }
 
   &-borderless {

package/lib/tree/tree.js

@@ -278,6 +278,11 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
 
   var handleExpand = _react.default.useCallback(function (key, expanded, node) {
     var newExpandedKeys = expanded ? (0, _treeUtils.addKeys)(expandedKeys, [key]) : (0, _treeUtils.delKey)(expandedKeys, [key]);
+
+    if (expandedKeysProps === undefined) {
+      setExpandedKeys(newExpandedKeys);
+    }
+
     onExpand && onExpand(newExpandedKeys, {
       node: node,
       expanded: expanded
@@ -458,8 +463,6 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     if (scrollToKey) {
       setSelectedKeys([scrollToKey]);
       setScrollKey(scrollToKey);
-    } else {
-      setSelectedKeys([]);
     }
   }, [scrollToKey]);
   (0, _react.useEffect)(function () {
@@ -493,7 +496,7 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     item.onDrop = handleDrop;
     item.onSelect = handleSelect;
     item.checked = checked;
-    item.selected = (0, _treeUtils.getSelected)(selectedKeys, item.key);
+    item.selected = (0, _treeUtils.getSelected)(Array.isArray(selectedKeys) && selectedKeys[0] ? [selectedKeys[0]] : selectedKeys, item.key);
     item.indeterminate = indeterminate;
     item.disabled = getDisabled(disabled, item.disabled);
     item.showIcon = showIcon || false;

package/lib/tree/treeHooks.js

@@ -113,12 +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, 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);
-  }, [expandedKeysProps]);
+    return (0, _treeUtils.getInitExpandedKeys)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData, searchExpandedKeys, isInit);
+  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, searchExpandedKeys, isInit]);
 
   var _React$useState7 = _react.default.useState(initialExpandedKeys),
       _React$useState8 = (0, _slicedToArray2.default)(_React$useState7, 2),
@@ -126,9 +122,8 @@ var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExp
       setExpandedKeys = _React$useState8[1];
 
   _react.default.useEffect(function () {
-    var keys = isInit || isSearching ? initialExpandedKeys : newExpandedKeys;
-    setExpandedKeys(keys);
-  }, [newExpandedKeys, initialExpandedKeys, isSearching, isInit]);
+    setExpandedKeys(initialExpandedKeys);
+  }, [flattenAllData, expandedKeysProps, searchExpandedKeys, defaultExpandAll, defaultExpandedKeys, defaultExpandRoot, defaultExpandParent]);
 
   return [expandedKeys, setExpandedKeys];
 };

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

@@ -60,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, keysData: KeysDataType, searchExpandedKeys: 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, keysData: KeysDataType, searchExpandedKeys: string[], isInit: 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

@@ -776,25 +776,28 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
   var isSearching = arguments.length > 8 ? arguments[8] : undefined;
   var keysData = arguments.length > 9 ? arguments[9] : undefined;
   var searchExpandedKeys = arguments.length > 10 ? arguments[10] : undefined;
+  var isInit = arguments.length > 11 ? arguments[11] : 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) {
-    keys = getAllNodeKeys(data);
-  } else {
-    if (defaultExpandRoot) {
-      var rootKey = getRootKeys(data);
+  if (isInit) {
+    if (defaultExpandAll) {
+      keys = getAllNodeKeys(data);
+    } else {
+      if (defaultExpandRoot) {
+        var rootKey = getRootKeys(data);
 
-      if (rootKey) {
-        keys = (0, _concat.default)(keys).call(keys, rootKey);
+        if (rootKey) {
+          keys = (0, _concat.default)(keys).call(keys, rootKey);
+        }
       }
-    }
 
-    if (defaultExpandParent) {
-      var parentKeys = [];
-      keys.forEach(function (key) {
-        parentKeys.push.apply(parentKeys, (0, _toConsumableArray2.default)(getAllParentKeys(data, key)));
-      });
-      keys = (0, _concat.default)(keys).call(keys, parentKeys);
+      if (defaultExpandParent) {
+        var parentKeys = [];
+        keys.forEach(function (key) {
+          parentKeys.push.apply(parentKeys, (0, _toConsumableArray2.default)(getAllParentKeys(data, key)));
+        });
+        keys = (0, _concat.default)(keys).call(keys, parentKeys);
+      }
     }
   }
 

package/package.json

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