@ibiz-template/model-helper 0.7.15 → 0.7.16-alpha.0

package/dist/index.esm.js

@@ -15870,6 +15870,15 @@ var ServicePathUtil = class {
      * @type {Map<string, ServicePathItem[][]>}
      */
     this.entityRsPathMap = /* @__PURE__ */ new Map();
+    /**
+     * 实体资源加载状态关系
+     *
+     * @author tony001
+     * @date 2024-05-20 16:05:41
+     * @protected
+     * @type {Map<string, boolean>}
+     */
+    this.entityRsLoadMap = /* @__PURE__ */ new Map();
   }
   /**
    * 根据应用主实体过滤从关系集合
@@ -15924,7 +15933,10 @@ var ServicePathUtil = class {
       throw new Error("\u672A\u627E\u5230\u5B9E\u4F53 ".concat(id));
     }
     const { codeName } = entityRef;
-    if (this.entityRsPathMap.has(codeName)) {
+    if (!this.entityRsLoadMap.has(codeName)) {
+      this.entityRsLoadMap.set(codeName, false);
+    }
+    if (this.entityRsPathMap.has(codeName) && this.entityRsLoadMap.get(codeName)) {
       return this.entityRsPathMap.get(codeName);
     }
     const deRss = this.filterDERSs(id);
@@ -15936,9 +15948,11 @@ var ServicePathUtil = class {
       if (paths) {
         paths = this.sortPath(paths);
         this.entityRsPathMap.set(codeName, paths);
+        this.entityRsLoadMap.set(codeName, true);
         return paths;
       }
     }
+    this.entityRsLoadMap.set(codeName, true);
     return [];
   }
   /**
@@ -16005,22 +16019,30 @@ var ServicePathUtil = class {
       const rsServiceApiItems = await this.getServiceApiItems([
         rs.majorDECodeName
       ]);
-      arr.push(
-        [
-          ...pathNames.map((pathName, index) => {
-            return {
-              codeName: pathName,
-              lower: pathName.toLowerCase(),
-              plural: serviceApiItems[index].deApiCodeName2
-            };
-          }),
-          {
-            codeName: rs.majorDECodeName,
-            lower: rs.majorDECodeName.toLowerCase(),
-            plural: rsServiceApiItems[0].deApiCodeName2
-          }
-        ].reverse()
-      );
+      const tempArr = [
+        ...pathNames.map((pathName, index) => {
+          return {
+            codeName: pathName,
+            lower: pathName.toLowerCase(),
+            plural: serviceApiItems[index].deApiCodeName2
+          };
+        }),
+        {
+          codeName: rs.majorDECodeName,
+          lower: rs.majorDECodeName.toLowerCase(),
+          plural: rsServiceApiItems[0].deApiCodeName2
+        }
+      ].reverse();
+      const targetIndex = arr.findIndex((ele) => {
+        return ele.map((val) => {
+          return val.codeName;
+        }).join("/") === tempArr.map((temp) => {
+          return temp.codeName;
+        }).join("/");
+      });
+      if (targetIndex === -1) {
+        arr.push(tempArr);
+      }
     }
   }
   /**