@kdcloudjs/kdesign 1.6.29 → 1.6.30

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);
+  }, [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.30",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [