فهرست منبع

chore: update nav & treeUtil type define

pointhalo 3 سال پیش
والد
کامیت
d7a29e4873
2فایلهای تغییر یافته به همراه2 افزوده شده و 9 حذف شده
  1. 1 8
      packages/semi-foundation/navigation/foundation.ts
  2. 1 1
      packages/semi-foundation/tree/treeUtil.ts

+ 1 - 8
packages/semi-foundation/navigation/foundation.ts

@@ -181,20 +181,13 @@ export default class NavigationFoundation<P = Record<string, any>, S = Record<st
         return [...willOpenKeys];
         return [...willOpenKeys];
     }
     }
 
 
-    getItemKey(item: string | number, keyPropName = 'itemKey') {
-        if (typeof item === 'object' && item) {
-            return item[keyPropName];
-        }
-        return item;
-    }
-
     getShouldOpenKeys(itemKeysMap: ItemKey2ParentKeysMap = {}, selectedKeys: string | number[]= []) {
     getShouldOpenKeys(itemKeysMap: ItemKey2ParentKeysMap = {}, selectedKeys: string | number[]= []) {
         const willOpenKeySet = new Set();
         const willOpenKeySet = new Set();
 
 
         if (Array.isArray(selectedKeys) && selectedKeys.length) {
         if (Array.isArray(selectedKeys) && selectedKeys.length) {
             selectedKeys.forEach(item => {
             selectedKeys.forEach(item => {
                 if (item) {
                 if (item) {
-                    const parentKeys = get(itemKeysMap, this.getItemKey(item));
+                    const parentKeys = get(itemKeysMap, item);
 
 
                     if (Array.isArray(parentKeys)) {
                     if (Array.isArray(parentKeys)) {
                         parentKeys.forEach(k => willOpenKeySet.add(k));
                         parentKeys.forEach(k => willOpenKeySet.add(k));

+ 1 - 1
packages/semi-foundation/tree/treeUtil.ts

@@ -314,7 +314,7 @@ export function calcCheckedKeys(values: any, keyEntities: KeyEntities) {
     let halfCheckedKeys = new Set([]);
     let halfCheckedKeys = new Set([]);
     let visited: any[] = [];
     let visited: any[] = [];
 
 
-    const levelMap:{[key:string]: string[]} = getSortedKeyList(keyList, keyEntities);
+    const levelMap:{[key: number]: string[]} = getSortedKeyList(keyList, keyEntities);
 
 
     const calcCurrLevel = (node: any) => {
     const calcCurrLevel = (node: any) => {
         const { key, parent, level } = node;
         const { key, parent, level } = node;