@ibiz-template/model-helper 0.7.41-alpha.60 → 0.7.41-alpha.62

package/dist/index.esm.js

@@ -17912,7 +17912,10 @@ var Environment = {
   aMapKey: "",
   runContainer: "DYNAENGINE",
   mobWeChatAppId: "",
-  isPortalApp: false
+  isPortalApp: false,
+  mobLoadingCaption: "\u79FB\u52A8\u7AEF\u5E94\u7528",
+  mobLoadingDescription: "\u79FB\u52A8\u7AEF\u5E94\u7528\u63CF\u8FF0",
+  mobLoadingBackground: "rgba(0, 100, 250, 1)"
 };
 
 // ../core/out/error/runtime-error/runtime-error.js
@@ -18410,6 +18413,35 @@ function mergeDEDrControl(dstDRCtrl, srcDRCtrl) {
     });
   }
 }
+function mergeDETabExpPanel(dstTabExpPanel, srcTabExpPanel) {
+  if (!srcTabExpPanel || !dstTabExpPanel) {
+    return;
+  }
+  if (!dstTabExpPanel.tabExpPageIds) {
+    dstTabExpPanel.tabExpPageIds = [];
+  }
+  if (!dstTabExpPanel.appViewRefs) {
+    dstTabExpPanel.appViewRefs = [];
+  }
+  if (!dstTabExpPanel.controls) {
+    dstTabExpPanel.controls = [];
+  }
+  if (srcTabExpPanel.tabExpPageIds) {
+    srcTabExpPanel.tabExpPageIds.forEach((id1) => {
+      dstTabExpPanel.tabExpPageIds.push(id1);
+    });
+  }
+  if (srcTabExpPanel.appViewRefs) {
+    srcTabExpPanel.appViewRefs.forEach((item1) => {
+      dstTabExpPanel.appViewRefs.push(item1);
+    });
+  }
+  if (srcTabExpPanel.controls) {
+    srcTabExpPanel.controls.forEach((item1) => {
+      dstTabExpPanel.controls.push(item1);
+    });
+  }
+}
 
 // src/utils/merge-model/merge-app-uiaction-group.ts
 function parseDynamicOverlay(tag) {
@@ -18933,16 +18965,31 @@ var MergeSubModelHelper = class {
    */
   mergeSubAppDRCtrl(view, controls, subAppRefs) {
     const dstDRCtrl = controls == null ? void 0 : controls.find((item) => {
-      return item.controlType === "DRBAR" || item.controlType === "DRTAB";
+      return item.controlType === "DRBAR" || item.controlType === "DRTAB" || item.controlType === "TABEXPPANEL";
     });
     if (dstDRCtrl) {
-      for (let i = 0; i < subAppRefs.length; i++) {
-        const srcDRCtrl = ibiz.hub.getSubAppDrControl(
-          "".concat(dstDRCtrl.appDataEntityId.split(".")[1], "_").concat(dstDRCtrl.modelType, "_").concat(dstDRCtrl.dataRelationTag).toLowerCase(),
-          subAppRefs[i].appId
-        );
-        if (srcDRCtrl) {
-          mergeDEDrControl(dstDRCtrl, srcDRCtrl);
+      if (dstDRCtrl.controlType === "TABEXPPANEL") {
+        for (let i = 0; i < subAppRefs.length; i++) {
+          const srcDRCtrl = ibiz.hub.getSubAppTabExpPanel(
+            dstDRCtrl.uniqueTag,
+            subAppRefs[i].appId
+          );
+          if (srcDRCtrl) {
+            mergeDETabExpPanel(
+              dstDRCtrl,
+              srcDRCtrl
+            );
+          }
+        }
+      } else {
+        for (let i = 0; i < subAppRefs.length; i++) {
+          const srcDRCtrl = ibiz.hub.getSubAppDrControl(
+            "".concat(dstDRCtrl.appDataEntityId.split(".")[1], "_").concat(dstDRCtrl.modelType, "_").concat(dstDRCtrl.dataRelationTag).toLowerCase(),
+            subAppRefs[i].appId
+          );
+          if (srcDRCtrl) {
+            mergeDEDrControl(dstDRCtrl, srcDRCtrl);
+          }
         }
       }
     }
@@ -19985,7 +20032,11 @@ var ModelHelper = class {
     const drCtrls = this.dsl.controls(sourceSubApp.getAllPSDEDRControls || []);
     drCtrlIds.forEach((id, index) => {
       const drCtrl = drCtrls[index];
-      ibiz.hub.registerSubAppDrControls(subApp.id || ibiz.env.appId, drCtrl);
+      if (drCtrl.controlType === "TABEXPPANEL") {
+        ibiz.hub.registerSubAppTabExpPanel(subApp.id || ibiz.env.appId, drCtrl);
+      } else {
+        ibiz.hub.registerSubAppDrControls(subApp.id || ibiz.env.appId, drCtrl);
+      }
     });
     const appDEUIActionGroupIds = subApp.appDEUIActionGroupIds || [];
     const appDEUIActionGroups = sourceSubApp.getAllPSAppDEUIActionGroups || [];