@ibiz-template/model-helper 0.7.12-alpha.0 → 0.7.12

package/dist/index.esm.js

@@ -15823,15 +15823,13 @@ import_pluralize.default.addPluralRule(/(matr|vert|ind)ix|ex$/, "$1ices");
 function plural(key) {
   return (0, import_pluralize.default)(key);
 }
-function pluralLower(key) {
-  return plural(key).toLowerCase();
-}
 
 // src/utils/service-path-util/service-path-util.ts
 var ServicePathUtil = class {
-  constructor(appDataEntities, allDERss) {
+  constructor(appDataEntities, allDERss, modelUtil) {
     this.appDataEntities = appDataEntities;
     this.allDERss = allDERss;
+    this.modelUtil = modelUtil;
     /**
      * 应用实体关系
      *
@@ -15883,8 +15881,8 @@ var ServicePathUtil = class {
    * @param {string} id
    * @return {*}  {string[]}
    */
-  calcRequestPaths(id) {
-    const paths = this.calcPaths(id);
+  async calcRequestPaths(id) {
+    const paths = await this.calcPaths(id);
     return paths.map((path) => {
       return path.map((item) => "".concat(item.plural, "/${").concat(item.lower, "}")).join("/");
     });
@@ -15898,7 +15896,7 @@ var ServicePathUtil = class {
    * @param {string} id
    * @return {*}  {ServicePathItem[][]} 返回顺序为 [祖父实体，爷爷实体，父实体，当前实体]
    */
-  calcPaths(id) {
+  async calcPaths(id) {
     const entityRef = this.appDataEntities.find((item) => item.id === id);
     if (!entityRef) {
       throw new Error("\u672A\u627E\u5230\u5B9E\u4F53 ".concat(id));
@@ -15911,7 +15909,7 @@ var ServicePathUtil = class {
     if (deRss) {
       const ids = [id];
       const arr = this.calcDeepPath(ids, deRss);
-      this.deepFillPath(codeName, [codeName], arr);
+      await this.deepFillPath(codeName, [codeName], arr);
       let paths = this.entityRsPathMap.get(codeName);
       if (paths) {
         paths = this.sortPath(paths);
@@ -15966,11 +15964,12 @@ var ServicePathUtil = class {
    * @param {string[]} pathNames
    * @param {ServicePathDeep[]} items
    */
-  deepFillPath(deCodeName, pathNames, items) {
-    items.forEach((item) => {
+  async deepFillPath(deCodeName, pathNames, items) {
+    for (let i = 0; i < items.length; i++) {
+      const item = items[i];
       const [rs, children] = item;
       if (children.length > 0) {
-        this.deepFillPath(
+        await this.deepFillPath(
           deCodeName,
           [...pathNames, rs.majorDECodeName],
           children
@@ -15980,23 +15979,27 @@ var ServicePathUtil = class {
         this.entityRsPathMap.set(deCodeName, []);
       }
       const arr = this.entityRsPathMap.get(deCodeName);
+      const serviceApiItems = await this.getServiceApiItems(pathNames);
+      const rsServiceApiItems = await this.getServiceApiItems([
+        rs.majorDECodeName
+      ]);
       arr.push(
         [
-          ...pathNames.map((pathName) => {
+          ...pathNames.map((pathName, index) => {
             return {
               codeName: pathName,
               lower: pathName.toLowerCase(),
-              plural: pluralLower(pathName)
+              plural: serviceApiItems[index].deApiCodeName2
             };
           }),
           {
             codeName: rs.majorDECodeName,
             lower: rs.majorDECodeName.toLowerCase(),
-            plural: pluralLower(rs.majorDECodeName)
+            plural: rsServiceApiItems[0].deApiCodeName2
           }
         ].reverse()
       );
-    });
+    }
   }
   /**
    * 排序资源路径顺序
@@ -16012,6 +16015,40 @@ var ServicePathUtil = class {
       return b.length - a.length;
     });
   }
+  /**
+   * 通过codeName数据获取相关接口标识数据
+   *
+   * @author tony001
+   * @date 2024-05-11 17:05:51
+   * @protected
+   * @param {string[]} codeNames
+   * @return {*}  {Promise<ServiceApiItem[]>}
+   */
+  async getServiceApiItems(codeNames) {
+    const serviceApiItems = [];
+    for (let i = 0; i < codeNames.length; i++) {
+      const appEntity = await this.modelUtil.getAppDataEntityModel(
+        codeNames[i],
+        false
+      );
+      const serviceApiItem = {
+        codeName: codeNames[i],
+        deApiCodeName: appEntity.dEAPICodeName,
+        deApiCodeName2: ""
+      };
+      if (appEntity.dEAPICodeName) {
+        if (!appEntity.deapicodeName2) {
+          serviceApiItem.deApiCodeName2 = plural(appEntity.dEAPICodeName);
+        }
+        const { engineVer } = await this.modelUtil.getAppModel();
+        if (!engineVer || engineVer < 240) {
+          serviceApiItem.deApiCodeName2 = appEntity.deapicodeName2.toLowerCase();
+        }
+      }
+      serviceApiItems.push(serviceApiItem);
+    }
+    return serviceApiItems;
+  }
 };
 
 // src/utils/merge-model/merge-app-menu.ts
@@ -16182,7 +16219,8 @@ var ModelUtil = class {
     });
     this.servicePathUtil = new ServicePathUtil(
       allDataEntities,
-      allAppDERSs
+      allAppDERSs,
+      this
     );
     if (this.appModel.getAllPSAppLans && this.appModel.getAllPSAppLans.length > 0) {
       ibiz.env.isEnableMultiLan = true;
@@ -16672,7 +16710,7 @@ var ModelHelper = class {
     const util = this.getModelUtil(appId);
     const model = await util.getAppDataEntityModel(name, isId, true);
     const dsl = this.dsl.appDataEntity(model);
-    const list = util.servicePathUtil.calcRequestPaths(dsl.id);
+    const list = await util.servicePathUtil.calcRequestPaths(dsl.id);
     dsl.requestPaths = list;
     dsl.codeName2 = plural(dsl.codeName.toLowerCase());
     if (dsl.deapicodeName) {