zzz-pc-view 0.0.58 → 0.0.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zzz-pc-view",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "main": "src/index.umd.js",
   "module": "src/index.es.js",
   "types": "src/index.d.ts",

package/src/decorators/Loader/index.d.ts

@@ -44,7 +44,7 @@ export interface Param<T extends TypeWithPrototype = TypeWithPrototype> {
     api: ApiList<T>;
     query?: any;
     global?: boolean;
-    childrenKey?: KeyMatch<CombineInstanceType<T>, undefined | CombineInstanceType<T>[]>;
+    childrenKey?: KeyMatch<CombineInstanceType<T>, undefined | null | CombineInstanceType<T>[]>;
     onLoaded?: (list: CombineInstanceType<T>[]) => CombineInstanceType<T>[];
 }
 /**
@@ -61,7 +61,7 @@ declare class LoaderConfig<T extends TypeWithPrototype = TypeWithPrototype> impl
     api: ApiList<T>;
     query: any;
     global: boolean;
-    childrenKey?: KeyMatch<CombineInstanceType<T>, undefined | CombineInstanceType<T>[]>;
+    childrenKey?: KeyMatch<CombineInstanceType<T>, undefined | null | CombineInstanceType<T>[]>;
     onLoaded?: (list: CombineInstanceType<T>[]) => CombineInstanceType<T>[];
     /**
      * 构造函数

package/src/index.es.js

@@ -3080,15 +3080,19 @@ const setList = (config, list2) => {
   if (typeof onLoaded === "function") {
     list2 = onLoaded(list2);
   }
-  if (list2.length > 0 && !(list2[0] instanceof config.target)) {
+  const { target } = config;
+  if (list2.length > 0 && !(list2[0] instanceof target)) {
     const { childrenKey } = config;
     if (childrenKey) {
-      config.target.bindList(toFlat(list2, childrenKey));
+      const primaryKey = getByClass(target).propertyKey;
+      const map2 = toKeyValue(list2, primaryKey);
+      const treeList = target.bindList(toFlat(list2, childrenKey));
+      list2 = treeList.filter((node) => map2[node[primaryKey]]);
     } else {
-      list2 = config.target.bindList(list2);
+      list2 = target.bindList(list2);
     }
   }
-  config.target[storeKey].listRef.value = list2;
+  target[storeKey].listRef.value = list2;
   return list2;
 };
 const loadGlobal = async () => {