@kdcloudjs/kdesign 1.5.3 → 1.5.6

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"));
@@ -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 = item.isLeaf ? false : 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++;
+      hasChildNode && 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.3",
+  "version": "1.5.6",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [