@kdcloudjs/kdesign 1.6.14 → 1.6.16

package/lib/tree/utils/treeUtils.js

@@ -5,7 +5,13 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getSpreadAttrData = exports.getSelected = exports.getPos = exports.getMaxLevel = exports.getInitExpandedKeys = exports.getInitCheckededState = exports.getInitCheckedKeys = exports.getHalfChecked = exports.getFilterData = exports.getExpandedKeys = exports.getExpand = exports.getDataCheckededStateStrictly = exports.getDataCheckededState = exports.getChecked = exports.getAllParentPos = exports.getAllParentKeys = exports.getAllNodeKeys = exports.getAllFilterKeys = exports.getAllChildKeys = 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;
+exports.getSpreadAttrData = exports.getSelected = exports.getPos = exports.getMaxLevel = exports.getInitExpandedKeys = exports.getInitCheckededState = exports.getInitCheckededKeys = exports.getInitCheckedKeys = exports.getHalfChecked = exports.getFilterData = exports.getExpandedKeys = exports.getExpand = exports.getDataCheckededStateStrictly = exports.getDataCheckededState = void 0;
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
 
@@ -17,16 +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 _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
+var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
 
-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 _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 _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/splice"));
 
 var __rest = void 0 && (void 0).__rest || function (s, e) {
@@ -57,6 +65,7 @@ var flattenAll = function flattenAll(treeData) {
   var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   var pos = arguments.length > 3 ? arguments[3] : undefined;
   var maxLevel = 0;
+  var keysData = {};
 
   var fn = function fn(treeData) {
     var newTreeData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
@@ -64,15 +73,13 @@ var flattenAll = function flattenAll(treeData) {
     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 _context, _context2;
 
       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;
@@ -81,9 +88,12 @@ var flattenAll = function flattenAll(treeData) {
         key: key,
         pos: _pos,
         hasChildNode: hasChildNode,
+        children: children,
         level: level,
-        parent: parent
+        parentKey: (parent === null || parent === void 0 ? void 0 : parent.key) || null,
+        pathParentKeys: parent ? (0, _concat.default)(_context2 = []).call(_context2, (0, _toConsumableArray2.default)((parent === null || parent === void 0 ? void 0 : parent.pathParentKeys) || []), [parent === null || parent === void 0 ? void 0 : parent.key]) : []
       }, others);
+      keysData[key] = flattenNode;
       newTreeData.push(flattenNode);
       var _level = level;
 
@@ -100,7 +110,8 @@ var flattenAll = function flattenAll(treeData) {
   var flattenAllData = fn(treeData, newTreeData, level, pos);
   return {
     flattenAllData: flattenAllData,
-    maxLevel: maxLevel
+    maxLevel: maxLevel,
+    keysData: keysData
   };
 };
 
@@ -136,43 +147,79 @@ var getHalfChecked = function getHalfChecked(halfCheckedKeys, key) {
 
 exports.getHalfChecked = getHalfChecked;
 
-var isAllParentExpand = function isAllParentExpand(data, pos) {
+var isAllParentExpand = function isAllParentExpand(_data, pos, posData) {
+  var _a;
+
   var expand = true;
 
   while (pos.lastIndexOf('-') > -1 && expand) {
     pos = pos.substring(0, pos.lastIndexOf('-'));
-    var parentNode = (0, _find.default)(data).call(data, function (item) {
-      return item.pos === pos;
-    });
-    expand = parentNode === null || parentNode === void 0 ? void 0 : parentNode.expand;
+
+    if (posData[pos]) {
+      expand = (_a = posData[pos]) === null || _a === void 0 ? void 0 : _a.expand;
+    }
   }
 
   return expand;
 };
 
-var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode) {
-  var allFilterKeys = [];
-  (0, _filter.default)(data).call(data, function (item) {
+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 = 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);
-      node = node.parent;
+      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;
 
 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 filterData = data;
   var allFilterKeys = null;
 
   if (isSearching) {
-    allFilterKeys = getAllFilterKeys(filterData, filterTreeNode);
+    allFilterKeys = getAllFilterKeys(filterData, filterTreeNode, keysData).allFilterKeys;
     filterData = (0, _filter.default)(filterData).call(filterData, function (item) {
       return (0, _includes.default)(allFilterKeys).call(allFilterKeys, item.key);
     });
@@ -181,7 +228,7 @@ var getFilterData = function getFilterData(data, filterTreeNode, isSearching) {
   var newData = [];
   filterData.forEach(function (item) {
     var pos = item.pos;
-    var parentExpand = isAllParentExpand(filterData, pos);
+    var parentExpand = isAllParentExpand(filterData, pos, posData);
 
     if (parentExpand) {
       newData.push(item);
@@ -192,16 +239,20 @@ var getFilterData = function getFilterData(data, filterTreeNode, isSearching) {
 
 exports.getFilterData = getFilterData;
 
-var hasParentChecked = function hasParentChecked(data, checkedKeys) {
+var hasParentChecked = function hasParentChecked(_data, checkedKeys) {
   var pos = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+  var posData = arguments.length > 3 ? arguments[3] : undefined;
+
+  var _a;
+
   var checked = false;
 
   while (pos.lastIndexOf('-') > -1 && !checked) {
     pos = pos.substring(0, pos.lastIndexOf('-'));
-    var parentNode = (0, _find.default)(data).call(data, function (item) {
-      return item.pos === pos;
-    });
-    checked = getChecked(checkedKeys, parentNode.key);
+
+    if (posData[pos]) {
+      checked = getChecked(checkedKeys, (_a = posData[pos]) === null || _a === void 0 ? void 0 : _a.key);
+    }
   }
 
   return checked;
@@ -282,7 +333,8 @@ var getMaxLevel = function getMaxLevel(data) {
 exports.getMaxLevel = getMaxLevel;
 
 var getSpreadAttrData = function getSpreadAttrData(treeData, expandedKeys) {
-  var newTreeData = [];
+  var spreadAttrData = [];
+  var posData = {};
   treeData.forEach(function (item) {
     var title = item.title,
         key = item.key,
@@ -297,7 +349,7 @@ var getSpreadAttrData = function getSpreadAttrData(treeData, expandedKeys) {
 
     var itemExpand = getExpand(expandedKeys, key);
     var expand = itemExpand || false;
-    newTreeData.push((0, _extends2.default)({
+    var dataItem = (0, _extends2.default)({
       title: title,
       key: key,
       level: level,
@@ -308,19 +360,24 @@ var getSpreadAttrData = function getSpreadAttrData(treeData, expandedKeys) {
       disabled: disabled,
       checkable: checkable,
       selectable: selectable
-    }, others));
+    }, others);
+    posData[pos] = dataItem;
+    spreadAttrData.push(dataItem);
   });
-  return newTreeData;
+  return {
+    spreadAttrData: spreadAttrData,
+    posData: posData
+  };
 };
 
 exports.getSpreadAttrData = getSpreadAttrData;
 
 var addKeys = function addKeys() {
-  var _context2;
+  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)(_context2 = []).call(_context2, (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;
@@ -385,14 +442,14 @@ var getPos = function getPos(data, key) {
 exports.getPos = getPos;
 
 var getInitCheckedKeys = function getInitCheckedKeys(data, keys) {
-  var _context3;
+  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)(_context3 = []).call(_context3, 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;
@@ -401,6 +458,9 @@ var getInitCheckededState = function getInitCheckededState(data) {
   var checkedKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var maxLevel = arguments.length > 2 ? arguments[2] : undefined;
   var init = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var posData = arguments.length > 4 ? arguments[4] : undefined;
+
+  var _keysData = arguments.length > 5 ? arguments[5] : undefined;
 
   var _checkedKeys = (0, _toConsumableArray2.default)(checkedKeys);
 
@@ -419,7 +479,7 @@ var getInitCheckededState = function getInitCheckededState(data) {
 
         var _hasHalfChildChecked = _hasChildCheckState === null || _hasChildCheckState === void 0 ? void 0 : _hasChildCheckState.halfChecked;
 
-        var _hasParentChecked = hasParentChecked(data, checkedKeys, item.pos);
+        var _hasParentChecked = hasParentChecked(data, checkedKeys, item.pos, posData);
 
         var checked = selfChecked || _hasParentChecked || _allChildChecked;
 
@@ -448,6 +508,139 @@ var getInitCheckededState = function getInitCheckededState(data) {
 
 exports.getInitCheckededState = getInitCheckededState;
 
+function getChildNodeKeys(node, keysNodeProps) {
+  var nodes = new _set.default();
+
+  var loop = function loop(children) {
+    (0, _map.default)(children).call(children, function (child) {
+      var key = child.key;
+      var item = keysNodeProps[key];
+
+      if (!item || item.disabled || item.checkable === false) {
+        return;
+      }
+
+      nodes.add(key);
+      loop(item.children || []);
+    });
+  };
+
+  if (node) {
+    loop(node.children || []);
+  }
+
+  return nodes;
+}
+
+var updateParent = function updateParent(key, keysNodeProps, allKeys, halfCheckedKeysSet) {
+  var pathParentKeys = (0, _toConsumableArray2.default)(keysNodeProps[key].pathParentKeys); // 逐级更新父节点的状态
+
+  pathParentKeys.reverse().forEach(function (itemKey) {
+    var parent = keysNodeProps[itemKey];
+
+    if (parent && !parent.disabled && parent.checkable !== false) {
+      var total = 0;
+      var number = 0;
+      parent.children.some(function (_ref) {
+        var key = _ref.key;
+        var item = keysNodeProps[key]; // 不符合可选条件
+
+        if (!item || item.disabled || item.checkable === false) {
+          return false;
+        }
+
+        total++;
+
+        if (allKeys.has(key)) {
+          number++;
+        } else if (halfCheckedKeysSet.has(key)) {
+          // 只要有一个半选，就不用再算了 ，父节点是半选
+          number += 0.5;
+          return true;
+        }
+      });
+
+      if (!number || number === total) {
+        halfCheckedKeysSet.delete(itemKey);
+      } else {
+        halfCheckedKeysSet.add(itemKey);
+      }
+
+      if (number && number === total) {
+        allKeys.add(itemKey);
+      } else {
+        allKeys.delete(itemKey);
+      }
+    }
+  });
+};
+
+var getInitCheckededKeys = function getInitCheckededKeys() {
+  var _context6;
+
+  var checkedKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var keysNodeProps = arguments.length > 1 ? arguments[1] : undefined;
+  var checkedKeysSet = new _set.default(checkedKeys || []);
+  var halfCheckedKeysSet = new _set.default();
+  var childCheckedKeysSet = new _set.default();
+  checkedKeys.forEach(function (key) {
+    if (!childCheckedKeysSet.has(key)) {
+      var childKeys = getChildNodeKeys(keysNodeProps[key], keysNodeProps);
+      childKeys.forEach(function (v) {
+        childCheckedKeysSet.add(v);
+      });
+    }
+
+    if (keysNodeProps[key] && !keysNodeProps[key].pathParentKeys.some(function (_key) {
+      return checkedKeysSet.has(_key);
+    })) {
+      updateParent(key, keysNodeProps, checkedKeysSet, halfCheckedKeysSet);
+    }
+  });
+  return {
+    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)
+  };
+};
+
+exports.getInitCheckededKeys = getInitCheckededKeys;
+
+function getAllCheckedKeys(key, checked, checkedKeys, keysNodeProps, halfCheckedKeys) {
+  if (!keysNodeProps[key]) {
+    return {
+      checkedKeys: checkedKeys,
+      halfCheckedKeys: halfCheckedKeys
+    };
+  }
+
+  var checkedKeysSet = new _set.default(checkedKeys);
+  var halfCheckedKeysSet = new _set.default(halfCheckedKeys);
+  var childKeys = getChildNodeKeys(keysNodeProps[key], keysNodeProps);
+  var allKeys = checkedKeysSet;
+
+  if (checked) {
+    // 选中节点，找到所有符合条件的子节点的key
+    allKeys.add(key);
+    halfCheckedKeysSet.delete(key);
+    childKeys.forEach(function (v) {
+      allKeys.add(v);
+    });
+  } else {
+    halfCheckedKeysSet.delete(key); // 移除所有符合条件的子节点的key
+
+    allKeys.delete(key);
+    childKeys.forEach(function (v) {
+      allKeys.delete(v);
+    });
+  }
+
+  updateParent(key, keysNodeProps, checkedKeysSet, halfCheckedKeysSet);
+  return {
+    checkedKeys: (0, _toConsumableArray2.default)(allKeys),
+    halfCheckedKeys: (0, _toConsumableArray2.default)(halfCheckedKeysSet)
+  };
+}
+
 var getDataCheckededState = function getDataCheckededState(data, checkedKeys, halfCheckedKeys, maxLevel) {
   var init = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   var pos = arguments.length > 5 ? arguments[5] : undefined;
@@ -581,6 +774,8 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
   var expandScrollkeys = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : [];
   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) {
@@ -604,9 +799,9 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
   }
 
   if (isSearching) {
-    var _context4;
+    var _context7;
 
-    keys = (0, _concat.default)(_context4 = []).call(_context4, (0, _toConsumableArray2.default)(keys), (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode)));
+    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.14",
+  "version": "1.6.16",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [