@kdcloudjs/kdesign 1.7.45 → 1.7.46

package/lib/tree/treeHooks.js

@@ -75,15 +75,15 @@ var useChecked = function useChecked(checkStrictly, checkedKeysProps, defaultChe
   return [checkedKeys, halfCheckedKeys, setCheckedKeys, setHalfCheckedKeys];
 };
 exports.useChecked = useChecked;
-var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchStatus, filterValue) {
+var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchStatus, filterValue, expandOnFilterNode) {
   var expandScrollkeys = [];
   if (scrollKey) {
     var pos = (0, _treeUtils.getPos)(flattenAllData, scrollKey);
     expandScrollkeys = (0, _treeUtils.getAllParentKeys)(flattenAllData, pos);
   }
   var initialExpandedKeys = _react.default.useMemo(function () {
-    return (0, _treeUtils.getInitExpandedKeys)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData, isInit, searchStatus);
-  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, isInit, searchStatus, filterValue]);
+    return (0, _treeUtils.getInitExpandedKeys)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData, isInit, searchStatus, expandOnFilterNode);
+  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, isInit, searchStatus, filterValue, expandOnFilterNode]);
   var _React$useState7 = _react.default.useState(initialExpandedKeys),
     _React$useState8 = (0, _slicedToArray2.default)(_React$useState7, 2),
     expandedKeys = _React$useState8[0],

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

@@ -17,8 +17,8 @@ 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 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 getAllFilterKeys: (data: any[], filterTreeNode: FunctionConstructor, keysData: KeysDataType, expandOnFilterNode: boolean) => any;
+export declare const getFilterData: (data: any[], filterTreeNode: FunctionConstructor, isSearching: boolean, posData: {} | undefined, keysData: {} | undefined, expandOnFilterNode: boolean) => any[];
 export declare const getMaxLevel: (data: any[]) => number;
 /**
  *计算node的属性后返回新的 treedata
@@ -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, isInit: boolean, searchStatus: SearchStatus) => 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, isInit: boolean, searchStatus: SearchStatus, expandOnFilterNode: 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

@@ -136,7 +136,7 @@ function findfilterChildrenKeys(node, allFilterKeys) {
   }
   return nodes;
 }
-var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, keysData) {
+var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, keysData, expandOnFilterNode) {
   var allFilterKeys = new _set.default();
   var filterExpandKeys = new _set.default();
   var filterKeys = (0, _filter.default)(data).call(data, function (item) {
@@ -146,10 +146,15 @@ var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, keysData)
     findfilterChildrenKeys(item, allFilterKeys);
   });
   filterKeys.forEach(function (item) {
+    var firstIteration = true;
     var node = (0, _extends2.default)({}, item);
     while (node) {
       allFilterKeys.add(node.key);
-      filterExpandKeys.add(node.key);
+      // expandOnFilterNode为true时，不将filterKeys中的节点添加到filterExpandKeys中
+      if (!expandOnFilterNode || !firstIteration) {
+        filterExpandKeys.add(node.key);
+      }
+      firstIteration = false;
       node = (keysData === null || keysData === void 0 ? void 0 : keysData[node === null || node === void 0 ? void 0 : node.parentKey]) || null;
     }
   });
@@ -162,10 +167,11 @@ exports.getAllFilterKeys = getAllFilterKeys;
 var getFilterData = function getFilterData(data, filterTreeNode, isSearching) {
   var posData = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var keysData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+  var expandOnFilterNode = arguments.length > 5 ? arguments[5] : undefined;
   var filterData = data;
   var allFilterKeys = null;
   if (isSearching) {
-    allFilterKeys = getAllFilterKeys(filterData, filterTreeNode, keysData).allFilterKeys;
+    allFilterKeys = getAllFilterKeys(filterData, filterTreeNode, keysData, expandOnFilterNode).allFilterKeys;
     filterData = (0, _filter.default)(filterData).call(filterData, function (item) {
       return (0, _includes.default)(allFilterKeys).call(allFilterKeys, item.key);
     });
@@ -494,6 +500,7 @@ function getAllCheckedKeys(key, checked, checkedKeys, keysNodeProps, halfChecked
     halfCheckedKeysSet.delete(key);
     childKeys.forEach(function (v) {
       allKeys.add(v);
+      halfCheckedKeysSet.delete(v);
     });
   } else {
     halfCheckedKeysSet.delete(key);
@@ -619,6 +626,7 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
   var keysData = arguments.length > 9 ? arguments[9] : undefined;
   var isInit = arguments.length > 10 ? arguments[10] : undefined;
   var searchStatus = arguments.length > 11 ? arguments[11] : undefined;
+  var expandOnFilterNode = arguments.length > 12 ? arguments[12] : 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 (isInit) {
     if (defaultExpandAll) {
@@ -640,7 +648,7 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
     }
   }
   if (isSearching && searchStatus === 'SEARCH_START') {
-    keys = (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode, keysData).filterExpandKeys);
+    keys = (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode, keysData, expandOnFilterNode).filterExpandKeys);
   }
   return keys;
 };

package/package.json

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