@douyinfe/semi-foundation 2.24.1-alpha.0 → 2.24.2

package/lib/es/cascader/util.js

@@ -1,23 +1,7 @@
-import _max from "lodash/max";
-import _isEmpty from "lodash/isEmpty";
-import _uniq from "lodash/uniq";
 import _isEqual from "lodash/isEqual";
 import _isUndefined from "lodash/isUndefined";
 import _isNull from "lodash/isNull";
-
-var __rest = this && this.__rest || function (s, e) {
-  var t = {};
-
-  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
-
-  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
-  }
-  return t;
-};
-
 import { strings } from './constants';
-import { getSortedKeyList } from '../tree/treeUtil';
 
 function getPosition(level, index) {
   return "".concat(level, "-").concat(index);
@@ -44,14 +28,8 @@ function traverseDataNodes(treeNodes, callback) {
 
     if (node) {
       const key = parent ? getPosition(parent.key, ind) : "".concat(ind);
-
-      const {
-        children
-      } = node,
-            resetInfo = __rest(node, ["children"]);
-
       item = {
-        data: Object.assign({}, resetInfo),
+        data: Object.assign({}, node),
         ind,
         key,
         level: parent ? parent.level + 1 : 0,
@@ -82,19 +60,12 @@ export function convertDataToEntities(dataNodes) {
     } = data;
     const entity = Object.assign({}, data);
     keyEntities[key] = entity; // Fill children
-    // entity.parent = keyEntities[parentKey];
-    // if (entity.parent) {
-    //     entity.parent.children = entity.parent.children || [];
-    //     entity.parent.children.push(entity);
-    // }
 
-    const entityParent = keyEntities[parentKey];
+    entity.parent = keyEntities[parentKey];
 
-    if (entityParent) {
-      // entityParent.children = entityParent.children || [];
-      // entityParent.children.push(entity);
-      entityParent.childrenKeys = entityParent.childrenKeys || [];
-      entityParent.childrenKeys.push(key);
+    if (entity.parent) {
+      entity.parent.children = entity.parent.children || [];
+      entity.parent.children.push(entity);
     }
   });
   return keyEntities;
@@ -116,304 +87,4 @@ export function calcMergeType(autoMergeValue, leafOnly) {
   }
 
   return mergeType;
-}
-export function findChildKeys(keys, options) {
-  let omitKeys = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-  const res = [];
-  keys && keys.forEach(key => {
-    const opts = options[key]; // opts &&
-    //     opts.children &&
-    //     opts.children.forEach((child: any) => {
-    //         if (!omitKeys.length || !omitKeys.includes(child.key)) {
-    //             res.push(child.key);
-    //         }
-    //     });
-
-    opts && opts.childrenKeys && opts.childrenKeys.forEach(child => {
-      if (!omitKeys.length || !omitKeys.includes(child.key)) {
-        res.push(child.key);
-      }
-    });
-  });
-  return res;
-}
-export function findSiblingKeys(selectedKeys, options) {
-  let self = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  const par = []; // selectedKeys.forEach(item => {
-  //     if (options[item] && options[item].parent) {
-  //         par.push(options[item].parent.key);
-  //     }
-  // });
-
-  selectedKeys.forEach(item => {
-    if (options[item] && options[item].parentKey) {
-      par.push(options[item].parentKey);
-    }
-  });
-  const res = findChildKeys(_uniq(par), options, self ? [] : selectedKeys);
-  return res;
-}
-export function findAncestorKeys(selectedKeys, options) {
-  let self = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  const res = []; // Recursively find the parent element
-  // const findPar = (item: any) => {
-  //     if (item.parent) {
-  //         res.push(item.parent.key);
-  //         findPar(item.parent);
-  //     }
-  // };
-
-  const findPar = item => {
-    if (item.parentKey) {
-      res.push(item.parentKey);
-      findPar(options[item.parentKey]);
-    }
-  };
-
-  selectedKeys.forEach(item => {
-    options[item] && findPar(options[item]);
-
-    if (self) {
-      res.push(item);
-    }
-  });
-  return res;
-}
-export function calcCheckedKeysForUnchecked(key, keyEntities, checkedKeys, halfCheckedKeys) {
-  const descendantKeys = findDescendantKeys([key], keyEntities, true);
-  const nodeItem = keyEntities[key];
-  descendantKeys.forEach(descendantKey => {
-    if (checkedKeys.has(descendantKey)) {
-      checkedKeys.delete(descendantKey);
-    }
-
-    if (halfCheckedKeys.has(descendantKey)) {
-      halfCheckedKeys.delete(descendantKey);
-    }
-  });
-
-  const calcCurrLevel = node => {
-    // const par = node.parent;
-    const par = keyEntities[node.parentKey]; // no parent
-
-    if (!par) {
-      return;
-    } // Has a parent node, and the parent node is not checked or halfChecked
-
-
-    if (!checkedKeys.has(par.key) && !halfCheckedKeys.has(par.key)) {
-      return;
-    } // Has a parent node, and the parent node is checked or halfChecked
-    // eslint-disable-next-line @typescript-eslint/no-shadow
-
-
-    const {
-      key
-    } = node;
-    const siblingKeys = findSiblingKeys([key], keyEntities); // eslint-disable-next-line @typescript-eslint/no-shadow
-
-    const anyChecked = siblingKeys.some(key => checkedKeys.has(key) || halfCheckedKeys.has(key));
-    const ancestorKeys = findAncestorKeys([key], keyEntities, false); // If there is checked or halfChecked in the sibling node, you need to change the parent node to halfChecked
-
-    if (anyChecked) {
-      ancestorKeys.forEach(itemKey => {
-        if (checkedKeys.has(itemKey)) {
-          checkedKeys.delete(itemKey);
-          halfCheckedKeys.add(itemKey);
-        }
-      }); // If there is no checked or halfChecked in the sibling node, you need to change the parent node to unchecked
-    } else {
-      if (checkedKeys.has(par.key)) {
-        checkedKeys.delete(par.key);
-      }
-
-      if (halfCheckedKeys.has(par.key)) {
-        halfCheckedKeys.delete(par.key);
-      }
-
-      calcCurrLevel(par);
-    }
-  };
-
-  calcCurrLevel(nodeItem);
-  return {
-    checkedKeys,
-    halfCheckedKeys
-  };
-}
-export function calcCheckedKeysForChecked(key, keyEntities, checkedKeys, halfCheckedKeys) {
-  const descendantKeys = findDescendantKeys([key], keyEntities, true);
-  const nodeItem = keyEntities[key];
-  checkedKeys = new Set([...checkedKeys, key]);
-
-  const calcCurrLevel = node => {
-    // if (!node.parent) {
-    //     return;
-    // }
-    const par = keyEntities[node.parentKey];
-
-    if (!par) {
-      return;
-    } // eslint-disable-next-line @typescript-eslint/no-shadow
-
-
-    const {
-      key
-    } = node;
-    const siblingKeys = findSiblingKeys([key], keyEntities); // eslint-disable-next-line @typescript-eslint/no-shadow
-
-    const allChecked = siblingKeys.every(key => checkedKeys.has(key));
-
-    if (!allChecked) {
-      const ancestorKeys = findAncestorKeys([key], keyEntities, false);
-      halfCheckedKeys = new Set([...halfCheckedKeys, ...ancestorKeys]);
-    } else {
-      // const par = node.parent;
-      checkedKeys.add(par.key);
-      calcCurrLevel(par);
-    }
-  };
-
-  calcCurrLevel(nodeItem);
-  return {
-    checkedKeys: new Set([...checkedKeys, ...descendantKeys]),
-    halfCheckedKeys
-  };
-}
-export function calcCheckedKeys(values, keyEntities) {
-  const keyList = Array.isArray(values) ? values : [values];
-  const descendantKeys = findDescendantKeys(keyList, keyEntities, true);
-  /**
-   * Recursively find the parent element. Because the incoming nodes are all checked,
-   * their descendants must be checked. That is to say, if the descendant nodes have
-   *  disabled+unchecked nodes, their ancestor nodes will definitely not be checked
-   */
-
-  const checkedKeys = new Set([...descendantKeys]);
-  let halfCheckedKeys = new Set([]);
-  let visited = [];
-  const levelMap = getSortedKeyList(keyList, keyEntities);
-
-  const calcCurrLevel = node => {
-    // const { key, parent, level } = node;
-    const {
-      key,
-      parentKey,
-      level
-    } = node;
-    const parent = keyEntities[parentKey]; // If the node does not have a parent node, or the node has been processed just now, no processing is done
-
-    if (!parent || visited.includes(key)) {
-      return;
-    }
-
-    const siblingKeys = findSiblingKeys([key], keyEntities); // visited for caching to avoid double counting
-
-    visited = [...visited, ...siblingKeys];
-    const allChecked = siblingKeys.every(siblingKey => checkedKeys.has(siblingKey));
-
-    if (!allChecked) {
-      const ancestorKeys = findAncestorKeys([key], keyEntities, false);
-      halfCheckedKeys = new Set([...halfCheckedKeys, ...ancestorKeys]);
-    } else {
-      checkedKeys.add(parent.key); // IMPORTANT! parent level may not exist in original level map; if add to the end directly may destroy the hierarchical order
-
-      if (level - 1 in levelMap && level) {
-        levelMap[level - 1].push(parent.key);
-      } else {
-        levelMap[level - 1] = [parent.key];
-      }
-    }
-  }; // Loop keyList from deepest Level to topLevel, bottom up
-
-
-  while (!_isEmpty(levelMap)) {
-    const maxLevel = _max(Object.keys(levelMap).map(key => Number(key)));
-
-    levelMap[maxLevel].forEach(key => calcCurrLevel(keyEntities[key]));
-    delete levelMap[maxLevel];
-  }
-
-  return {
-    checkedKeys,
-    halfCheckedKeys
-  };
-}
-export function findDescendantKeys(selectedKeys, options) {
-  let self = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  const res = [];
-
-  const findChild = item => {
-    if (!item) {
-      return;
-    } // const { children } = item;
-    // const hasChildren = isValid(children);
-    // if (hasChildren) {
-    //     children.forEach((child: any) => {
-    //         res.push(child.key);
-    //         findChild(options[child.key]);
-    //     });
-    // }
-
-
-    const {
-      childrenKeys
-    } = item;
-    const hasChildren = isValid(childrenKeys);
-
-    if (hasChildren) {
-      childrenKeys.forEach(childKey => {
-        res.push(childKey);
-        findChild(options[childKey]);
-      });
-    }
-  };
-
-  selectedKeys.forEach(item => {
-    if (self) {
-      res.push(item);
-    }
-
-    findChild(options[item]);
-  });
-  return res;
-}
-export function normalizeKeyList(keyList, keyEntities) {
-  let leafOnly = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  const res = [];
-  const keyListSet = new Set(keyList);
-
-  if (!leafOnly) {
-    keyList.forEach(key => {
-      if (!keyEntities[key]) {
-        return;
-      }
-
-      const {
-        parentKey
-      } = keyEntities[key];
-
-      if (parentKey && keyListSet.has(parentKey)) {
-        return;
-      }
-
-      res.push(key);
-    });
-  } else {
-    keyList.forEach(key => {
-      // if (keyEntities[key] && !isValid(keyEntities[key].children)) {
-      if (keyEntities[key] && !isValid(keyEntities[key].childrenKeys)) {
-        res.push(key);
-      }
-    });
-  }
-
-  return res;
-}
-export function calcDisabledKeys(keyEntities) {
-  const disabledKeys = Object.keys(keyEntities).filter(key => keyEntities[key].data.disabled);
-  const {
-    checkedKeys
-  } = calcCheckedKeys(disabledKeys, keyEntities);
-  return checkedKeys;
 }

package/lib/es/tree/treeUtil.d.ts

@@ -38,7 +38,6 @@ export declare function findChildKeys(keys: string[], options: any, omitKeys?: a
 export declare function findLeafKeys(keys: string[], options: any): any[];
 export declare function findSiblingKeys(selectedKeys: string[], options: any, self?: boolean): any[];
 export declare function findAncestorKeys(selectedKeys: string[], options: any, self?: boolean): any[];
-export declare function getSortedKeyList(keyList: any[], keyEntities: KeyEntities): {};
 export declare function calcCheckedKeys(values: any, keyEntities: KeyEntities): {
     checkedKeys: Set<string>;
     halfCheckedKeys: Set<any>;

package/lib/es/tree/treeUtil.js

@@ -294,7 +294,8 @@ export function findAncestorKeys(selectedKeys, options) {
   });
   return res;
 }
-export function getSortedKeyList(keyList, keyEntities) {
+
+function getSortedKeyList(keyList, keyEntities) {
   const levelMap = {};
   keyList.forEach(key => {
     if (!keyEntities[key]) {
@@ -313,6 +314,7 @@ export function getSortedKeyList(keyList, keyEntities) {
   });
   return levelMap;
 }
+
 export function calcCheckedKeys(values, keyEntities) {
   const keyList = Array.isArray(values) ? values : [values];
   const descendantKeys = findDescendantKeys(keyList, keyEntities, true);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.24.1-alpha.0",
+    "version": "2.24.2",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
@@ -23,7 +23,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "199105285d4ce2c2572968aeaf31e0a16c4b47f5",
+    "gitHead": "41831fb74dbc194221e9be7034dbcf93e4a35aa5",
     "devDependencies": {
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",

package/tree/treeUtil.ts

@@ -286,7 +286,7 @@ export function findAncestorKeys(selectedKeys: string[], options: any, self = tr
     return res;
 }
 
-export function getSortedKeyList(keyList: any[], keyEntities: KeyEntities) {
+function getSortedKeyList(keyList: any[], keyEntities: KeyEntities) {
     const levelMap = {};
     keyList.forEach(key => {
         if (!keyEntities[key]) {