@ibiz-template/model-helper 0.7.41-alpha.33 → 0.7.41-alpha.34

package/dist/index.esm.js

@@ -19191,11 +19191,15 @@ var MergeSubModelHelper = class {
     if (forms.length === 0)
       return;
     forms.forEach((dstForm) => {
-      const ids = dstForm.id.split(".");
+      var _a, _b;
+      const appDataEntityId = (_b = (_a = dstForm.appDataEntityId) == null ? void 0 : _a.split(
+        "."
+      )) == null ? void 0 : _b[1];
+      const { codeName } = dstForm;
       const dataRelationTags = getFormdataRelationTags(dstForm);
       for (let i = 0; i < subAppRefs.length; i++) {
         const srcForm = ibiz.hub.getSubAppControl(
-          ids[1] + ids[2],
+          appDataEntityId + codeName,
           subAppRefs[i].appId
         );
         if (srcForm) {
@@ -19205,7 +19209,7 @@ var MergeSubModelHelper = class {
           for (let j = 0; j < dataRelationTags.length; j++) {
             const dataRelationTag = dataRelationTags[j];
             const dataRelationForm = ibiz.hub.getSubAppControl(
-              ids[1] + dataRelationTag,
+              appDataEntityId + dataRelationTag,
               subAppRefs[i].appId
             );
             if (dataRelationForm) {
@@ -19238,6 +19242,34 @@ var MergeSubModelHelper = class {
       }
     }
   }
+  /**
+   * @description 合并子应用AC自填模式界面行为组
+   * @param {(IAppDEACMode[] | undefined)} acModes
+   * @param {ISubAppRef[]} subAppRefs
+   * @returns {*}  {void}
+   * @memberof MergeSubModelHelper
+   */
+  mergeSubAppDEACModesActionGroup(acModes, subAppRefs) {
+    if (!acModes || !acModes.length || !subAppRefs || !subAppRefs.length)
+      return;
+    for (let index = 0; index < acModes.length; index++) {
+      const { deuiactionGroup } = acModes[index];
+      if (deuiactionGroup) {
+        for (let j = 0; j < subAppRefs.length; j++) {
+          const srcAppDEUIActionGroup = ibiz.hub.getSubAppDEUIActionGroups(
+            deuiactionGroup.uniqueTag,
+            subAppRefs[j].appId
+          );
+          if (srcAppDEUIActionGroup) {
+            mergeAppDEUIActionGroup(
+              deuiactionGroup,
+              srcAppDEUIActionGroup
+            );
+          }
+        }
+      }
+    }
+  }
 };
 
 // src/model/PSSYSAPP.ts
@@ -20035,6 +20067,18 @@ var ModelHelper = class {
   getAppStyle(appId) {
     return this.getModelUtil(appId).getAppStyle();
   }
+  /**
+   * @description 计算应用实体需要合并的子应用模型
+   * @protected
+   * @param {IAppDataEntity} appDataEntity
+   * @memberof ModelHelper
+   */
+  calcAppDataEntitySubAppModel(appDataEntity) {
+    this.merge.mergeSubAppDEACModesActionGroup(
+      appDataEntity.appDEACModes,
+      this.subAppRefs
+    );
+  }
   /**
    * 根据应用实体 codeName 获取应用实体模型
    *
@@ -20049,6 +20093,7 @@ var ModelHelper = class {
     const util = this.getModelUtil(appId);
     const model = await util.getAppDataEntityModel(name, isId, true);
     const dsl = this.dsl.appDataEntity(model);
+    this.calcAppDataEntitySubAppModel(dsl);
     const list = await util.servicePathUtil.calcRequestPaths(dsl.id);
     dsl.requestPaths = list;
     dsl.codeName2 = plural(dsl.codeName.toLowerCase());