@ibiz-template/model-helper 0.7.38-alpha.45 → 0.7.38-alpha.57

package/dist/index.esm.js

@@ -17064,6 +17064,42 @@ function mergeDEDrControl(dstDRCtrl, srcDRCtrl) {
       }
     });
   }
+  if (srcDRCtrl.dedrtabPages) {
+    srcDRCtrl.dedrtabPages.forEach((item1) => {
+      let index = 0;
+      const result = dstDRCtrl.dedrtabPages.find(
+        (item2, index2) => {
+          index = index2;
+          return item1.id === item2.id;
+        }
+      );
+      if (result) {
+        dstDRCtrl.dedrtabPages[index] = item1;
+      } else if (item1.itemTag) {
+        const [targetPosition, targetTag] = item1.itemTag.split(":");
+        if (!targetTag || !targetPosition) {
+          dstDRCtrl.dedrtabPages.push(item1);
+        } else {
+          const targetIndex = dstDRCtrl.dedrtabPages.findIndex(
+            (item3) => item3.id === targetTag
+          );
+          if (targetIndex !== -1) {
+            if (targetPosition === "BEFORE") {
+              dstDRCtrl.dedrtabPages.splice(targetIndex, 0, item1);
+            } else if (targetPosition === "AFTER") {
+              dstDRCtrl.dedrtabPages.splice(targetIndex + 1, 0, item1);
+            } else {
+              dstDRCtrl.dedrtabPages.push(item1);
+            }
+          } else {
+            dstDRCtrl.dedrtabPages.push(item1);
+          }
+        }
+      } else {
+        dstDRCtrl.dedrtabPages.push(item1);
+      }
+    });
+  }
 }
 
 // src/utils/merge-model/merge-app-uiaction-group.ts
@@ -17920,12 +17956,16 @@ var ModelHelper = class {
       const name = view.path.split("/").pop().replace(".json", "");
       ibiz.hub.defaultAppIndexViewName = name;
       if (!ibiz.env.AppTitle) {
-        const views = appSourceModel.cache.getPSAppViews;
-        const indexView = views.find(
-          (viewItem) => viewItem.dynaModelFilePath === view.path
-        );
-        if (indexView) {
-          ibiz.env.AppTitle = indexView.title;
+        if (appSourceModel.caption) {
+          ibiz.env.AppTitle = appSourceModel.caption;
+        } else {
+          const views = appSourceModel.cache.getPSAppViews;
+          const indexView = views.find(
+            (viewItem) => viewItem.dynaModelFilePath === view.path
+          );
+          if (indexView) {
+            ibiz.env.AppTitle = indexView.caption;
+          }
         }
       }
     }
@@ -18081,12 +18121,16 @@ var ModelHelper = class {
         const name = view.path.split("/").pop().replace(".json", "");
         ibiz.hub.defaultAppIndexViewName = name;
         if (!ibiz.env.AppTitle) {
-          const views = model.cache.getPSAppViews;
-          const indexView = views.find(
-            (viewItem) => viewItem.dynaModelFilePath === view.path
-          );
-          if (indexView) {
-            ibiz.env.AppTitle = indexView.title;
+          if (model.caption) {
+            ibiz.env.AppTitle = model.caption;
+          } else {
+            const views = model.cache.getPSAppViews;
+            const indexView = views.find(
+              (viewItem) => viewItem.dynaModelFilePath === view.path
+            );
+            if (indexView) {
+              ibiz.env.AppTitle = indexView.caption;
+            }
           }
         }
       }