@kdcloudjs/kdesign 1.6.15 → 1.6.16

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

@@ -16,7 +16,8 @@ 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, keysData: KeysDataType) => 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;
 /**
@@ -59,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) => 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;

package/lib/tree/utils/treeUtils.js

@@ -5,7 +5,9 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.flattenAll = exports.delKey = exports.calcDropPosition = exports.addKeys = void 0;
+exports.delKey = exports.calcDropPosition = exports.addKeys = void 0;
+exports.findfilterChildrenKeys = findfilterChildrenKeys;
+exports.flattenAll = void 0;
 exports.getAllCheckedKeys = getAllCheckedKeys;
 exports.getChecked = exports.getAllParentPos = exports.getAllParentKeys = exports.getAllNodeKeys = exports.getAllFilterKeys = exports.getAllChildKeys = void 0;
 exports.getChildNodeKeys = getChildNodeKeys;
@@ -21,18 +23,18 @@ var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
 
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 
-var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-
 var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
 
+var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+
+var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
+
 var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/starts-with"));
 
 var _from = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/from"));
 
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 
-var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
 var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/splice"));
 
 var __rest = void 0 && (void 0).__rest || function (s, e) {
@@ -161,19 +163,51 @@ var isAllParentExpand = function isAllParentExpand(_data, pos, posData) {
   return expand;
 };
 
+function findfilterChildrenKeys(node, allFilterKeys) {
+  var nodes = new _set.default();
+
+  var loop = function loop(children) {
+    (0, _map.default)(children).call(children, function (child) {
+      var key = child.key;
+      var item = child;
+      allFilterKeys.add(key);
+      loop(item.children || []);
+    });
+  };
+
+  if (node) {
+    loop(node.children || []);
+  }
+
+  return nodes;
+}
+
 var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, keysData) {
-  var allFilterKeys = [];
-  (0, _filter.default)(data).call(data, function (item) {
+  var allFilterKeys = new _set.default();
+  var filterExpandKeys = new _set.default();
+  var filterKeys = (0, _filter.default)(data).call(data, function (item) {
     return filterTreeNode === null || filterTreeNode === void 0 ? void 0 : filterTreeNode(item);
-  }).forEach(function (item) {
+  });
+  filterKeys.forEach(function (item) {
+    findfilterChildrenKeys(item, allFilterKeys);
+  });
+  filterKeys.forEach(function (item) {
     var node = (0, _extends2.default)({}, item);
 
     while (node) {
-      allFilterKeys.push(node.key);
+      var _context3;
+
+      allFilterKeys.add(node.key);
+      !(0, _includes.default)(_context3 = (0, _map.default)(filterKeys).call(filterKeys, function (i) {
+        return i.key;
+      })).call(_context3, node.key) && filterExpandKeys.add(node.key);
       node = (keysData === null || keysData === void 0 ? void 0 : keysData[node === null || node === void 0 ? void 0 : node.parentKey]) || null;
     }
   });
-  return (0, _toConsumableArray2.default)(new _set.default(allFilterKeys));
+  return {
+    allFilterKeys: (0, _toConsumableArray2.default)(allFilterKeys),
+    filterExpandKeys: (0, _toConsumableArray2.default)(filterExpandKeys)
+  };
 };
 
 exports.getAllFilterKeys = getAllFilterKeys;
@@ -185,7 +219,7 @@ var getFilterData = function getFilterData(data, filterTreeNode, isSearching) {
   var allFilterKeys = null;
 
   if (isSearching) {
-    allFilterKeys = getAllFilterKeys(filterData, filterTreeNode, keysData);
+    allFilterKeys = getAllFilterKeys(filterData, filterTreeNode, keysData).allFilterKeys;
     filterData = (0, _filter.default)(filterData).call(filterData, function (item) {
       return (0, _includes.default)(allFilterKeys).call(allFilterKeys, item.key);
     });
@@ -339,11 +373,11 @@ var getSpreadAttrData = function getSpreadAttrData(treeData, expandedKeys) {
 exports.getSpreadAttrData = getSpreadAttrData;
 
 var addKeys = function addKeys() {
-  var _context3;
+  var _context4;
 
   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)(_context3 = []).call(_context3, (0, _toConsumableArray2.default)(prevKeys), (0, _toConsumableArray2.default)(newKeys))));
+  return (0, _from.default)(new _set.default((0, _concat.default)(_context4 = []).call(_context4, (0, _toConsumableArray2.default)(prevKeys), (0, _toConsumableArray2.default)(newKeys))));
 };
 
 exports.addKeys = addKeys;
@@ -408,14 +442,14 @@ var getPos = function getPos(data, key) {
 exports.getPos = getPos;
 
 var getInitCheckedKeys = function getInitCheckedKeys(data, keys) {
-  var _context4;
+  var _context5;
 
   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)(_context4 = []).call(_context4, checkedKeys, (0, _toConsumableArray2.default)(keys))));
+  return (0, _from.default)(new _set.default((0, _concat.default)(_context5 = []).call(_context5, checkedKeys, (0, _toConsumableArray2.default)(keys))));
 };
 
 exports.getInitCheckedKeys = getInitCheckedKeys;
@@ -542,7 +576,7 @@ var updateParent = function updateParent(key, keysNodeProps, allKeys, halfChecke
 };
 
 var getInitCheckededKeys = function getInitCheckededKeys() {
-  var _context5;
+  var _context6;
 
   var checkedKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var keysNodeProps = arguments.length > 1 ? arguments[1] : undefined;
@@ -564,7 +598,7 @@ var getInitCheckededKeys = function getInitCheckededKeys() {
     }
   });
   return {
-    checkedKeys: (0, _toConsumableArray2.default)(new _set.default((0, _concat.default)(_context5 = []).call(_context5, (0, _toConsumableArray2.default)(checkedKeysSet), (0, _toConsumableArray2.default)(childCheckedKeysSet)))),
+    checkedKeys: (0, _toConsumableArray2.default)(new _set.default((0, _concat.default)(_context6 = []).call(_context6, (0, _toConsumableArray2.default)(checkedKeysSet), (0, _toConsumableArray2.default)(childCheckedKeysSet)))),
     halfCheckedKeys: (0, _toConsumableArray2.default)(halfCheckedKeysSet)
   };
 };
@@ -741,6 +775,7 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
   var filterTreeNode = arguments.length > 7 ? arguments[7] : undefined;
   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 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) {
@@ -764,9 +799,9 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
   }
 
   if (isSearching) {
-    var _context6;
+    var _context7;
 
-    keys = (0, _concat.default)(_context6 = []).call(_context6, (0, _toConsumableArray2.default)(keys), (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode, keysData)));
+    keys = (0, _concat.default)(_context7 = []).call(_context7, (0, _toConsumableArray2.default)(searchExpandedKeys), (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode, keysData).filterExpandKeys));
   }
 
   return (0, _from.default)(new _set.default((0, _toConsumableArray2.default)(keys)));

package/package.json

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