@ibiz-template/model-helper 0.7.41-alpha.27 → 0.7.41-alpha.28

package/out/utils/merge-model/merge-de-drcontrol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-de-drcontrol.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-de-drcontrol.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CA4E3E"}
+{"version":3,"file":"merge-de-drcontrol.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-de-drcontrol.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAsH3E"}

package/out/utils/merge-model/merge-de-drcontrol.js

@@ -1,3 +1,5 @@
+/* eslint-disable prefer-destructuring */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /**
  * 合并DrCtrl控件
  *
@@ -12,7 +14,7 @@ export function mergeDEDrControl(dstDRCtrl, srcDRCtrl) {
     if (!srcDRCtrl) {
         return;
     }
-    // 合并分组（相同name替换，没有则附加）
+    // 合并分组（相同id替换，如果分组项定义用户标记（格式如：dynamic_overlay:BEFORE/AFTER:目标分组id）,则需要找到目标分组，则根据位置在目标项前后附加,没有则附加）
     if (srcDRCtrl.dedrbarGroups) {
         srcDRCtrl.dedrbarGroups.forEach((item1) => {
             var _a;
@@ -24,12 +26,30 @@ export function mergeDEDrControl(dstDRCtrl, srcDRCtrl) {
             if (result) {
                 dstDRCtrl.dedrbarGroups[index] = item1;
             }
+            else if (item1.userTag && item1.userTag.startsWith('dynamic_overlay')) {
+                const [dynaTag, targetPosition, targetTag] = item1.userTag.split(':');
+                const targetIndex = dstDRCtrl.dedrbarGroups.findIndex((item3) => item3.id === targetTag);
+                if (targetIndex !== -1) {
+                    if (targetPosition === 'BEFORE') {
+                        dstDRCtrl.dedrbarGroups.splice(targetIndex, 0, item1);
+                    }
+                    else if (targetPosition === 'AFTER') {
+                        dstDRCtrl.dedrbarGroups.splice(targetIndex + 1, 0, item1);
+                    }
+                    else {
+                        dstDRCtrl.dedrbarGroups.push(item1);
+                    }
+                }
+                else {
+                    dstDRCtrl.dedrbarGroups.push(item1);
+                }
+            }
             else {
                 dstDRCtrl.dedrbarGroups.push(item1);
             }
         });
     }
-    // 合并分组项（相同id替换，没有则附加）
+    // 合并分组项（相同id替换，如果项成员项定义成员标记（格式如：dynamic_overlay:BEFORE/AFTER:目标项id）,则需要找到目标项，则根据位置在目标项前后附加，没有则附加）
     if (srcDRCtrl.dedrctrlItems) {
         srcDRCtrl.dedrctrlItems.forEach((item1) => {
             let index = 0;
@@ -40,12 +60,30 @@ export function mergeDEDrControl(dstDRCtrl, srcDRCtrl) {
             if (result) {
                 dstDRCtrl.dedrctrlItems[index] = item1;
             }
+            else if (item1.itemTag && item1.itemTag.startsWith('dynamic_overlay')) {
+                const [dynaTag, targetPosition, targetTag] = item1.itemTag.split(':');
+                const targetIndex = dstDRCtrl.dedrctrlItems.findIndex((item3) => item3.id === targetTag);
+                if (targetIndex !== -1) {
+                    if (targetPosition === 'BEFORE') {
+                        dstDRCtrl.dedrctrlItems.splice(targetIndex, 0, item1);
+                    }
+                    else if (targetPosition === 'AFTER') {
+                        dstDRCtrl.dedrctrlItems.splice(targetIndex + 1, 0, item1);
+                    }
+                    else {
+                        dstDRCtrl.dedrctrlItems.push(item1);
+                    }
+                }
+                else {
+                    dstDRCtrl.dedrctrlItems.push(item1);
+                }
+            }
             else {
                 dstDRCtrl.dedrctrlItems.push(item1);
             }
         });
     }
-    // 合并分组项（相同id替换，如果tab成员项定义成员标记（格式如：BEFORE/AFTER:目标项id）,则需要找到目标项，则根据位置在目标项前后附加），没有则附加到尾部
+    // 合并分组项（相同id替换，如果tab成员项定义成员标记（格式如：BEFORE/AFTER:目标项id或者dynamic_overlay:BEFORE/AFTER:目标项id）,则需要找到目标项，则根据位置在目标项前后附加），没有则附加到尾部
     if (srcDRCtrl.dedrtabPages) {
         srcDRCtrl.dedrtabPages.forEach((item1) => {
             let index = 0;
@@ -57,7 +95,15 @@ export function mergeDEDrControl(dstDRCtrl, srcDRCtrl) {
                 dstDRCtrl.dedrtabPages[index] = item1;
             }
             else if (item1.itemTag) {
-                const [targetPosition, targetTag] = item1.itemTag.split(':');
+                // 兼容BEFORE/AFTER:目标项id或者dynamic_overlay:BEFORE/AFTER:目标项id2种格式
+                const splitTags = item1.itemTag.split(':');
+                let targetPosition = '';
+                let targetTag = '';
+                // 只处理符合预期格式的情况
+                if (splitTags.length === 2 || splitTags.length === 3) {
+                    targetPosition = splitTags[splitTags.length === 2 ? 0 : 1];
+                    targetTag = splitTags[splitTags.length === 2 ? 1 : 2];
+                }
                 if (!targetTag || !targetPosition) {
                     dstDRCtrl.dedrtabPages.push(item1);
                 }

package/out/utils/merge-model/merge-de-form.d.ts

@@ -41,5 +41,20 @@ export declare function recursiveIterate(parent: IData, callback: (item: any, _p
  * @returns {*}  {void}
  */
 export declare function mergeAppDEForm(dst: IDEForm | undefined, src: IDEForm | undefined): void;
+/**
+ * 获取存在基于数据关系部件构建的分页部件的数据关系标识
+ * @param form 表单模型
+ * @returns 数据关系标识集合
+ */
+export declare function getFormdataRelationTags(form: IDEForm | undefined): string[];
+/**
+ * @description 合并存在数据关系标识的表单分页部件，子应用表单codename和主应用表单表单分页部件数据关系标识相同
+ * @export
+ * @param {string} dataRelationTag 数据关系标识
+ * @param {(IDEForm | undefined)} dst 主应用表单模型
+ * @param {(IDEForm | undefined)} src 子应用表单模型
+ * @returns {*}  {void}
+ */
+export declare function mergeFormDRTabpanel(dataRelationTag: string, dst: IDEForm | undefined, src: IDEForm | undefined): void;
 export {};
 //# sourceMappingURL=merge-de-form.d.ts.map

package/out/utils/merge-model/merge-de-form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-de-form.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-de-form.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAU3C,aAAa;AACb,QAAA,MAAM,WAAW;IACf,cAAc;;CAEf,CAAC;AAiCF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,KAAK,EACb,QAAQ,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,KAAK,OAAO,GAAG,IAAI,EACrD,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,WAAW,CAAC,GACjC,IAAI,CAaN;AA2ID;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,OAAO,GAAG,SAAS,EACxB,GAAG,EAAE,OAAO,GAAG,SAAS,GACvB,IAAI,CAKN"}
+{"version":3,"file":"merge-de-form.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-de-form.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAU3C,aAAa;AACb,QAAA,MAAM,WAAW;IACf,cAAc;;CAEf,CAAC;AAiCF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,KAAK,EACb,QAAQ,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,KAAK,OAAO,GAAG,IAAI,EACrD,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,WAAW,CAAC,GACjC,IAAI,CAaN;AA2ID;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,OAAO,GAAG,SAAS,EACxB,GAAG,EAAE,OAAO,GAAG,SAAS,GACvB,IAAI,CAKN;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,EAAE,CAe3E;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CACjC,eAAe,EAAE,MAAM,EACvB,GAAG,EAAE,OAAO,GAAG,SAAS,EACxB,GAAG,EAAE,OAAO,GAAG,SAAS,GACvB,IAAI,CAwCN"}

package/out/utils/merge-model/merge-de-form.js

@@ -217,3 +217,59 @@ export function mergeAppDEForm(dst, src) {
         return;
     mergeSubAppFormItems(dst, subAppMergeItems);
 }
+/**
+ * 获取存在基于数据关系部件构建的分页部件的数据关系标识
+ * @param form 表单模型
+ * @returns 数据关系标识集合
+ */
+export function getFormdataRelationTags(form) {
+    const dataRelationTags = [];
+    if (!form)
+        return dataRelationTags;
+    recursiveIterate(form, (item) => {
+        if (item.detailType === 'TABPANEL' && item.dataRelationTag) {
+            dataRelationTags.push(item.dataRelationTag);
+        }
+    }, {
+        childrenFields: CHILDRENFIELDS,
+    });
+    return dataRelationTags;
+}
+/**
+ * @description 合并存在数据关系标识的表单分页部件，子应用表单codename和主应用表单表单分页部件数据关系标识相同
+ * @export
+ * @param {string} dataRelationTag 数据关系标识
+ * @param {(IDEForm | undefined)} dst 主应用表单模型
+ * @param {(IDEForm | undefined)} src 子应用表单模型
+ * @returns {*}  {void}
+ */
+export function mergeFormDRTabpanel(dataRelationTag, dst, src) {
+    if (!dataRelationTag || !dst || !src)
+        return;
+    // 基于数据标识获取子应用表单分页部件
+    let srcTabpanel;
+    recursiveIterate(src, (item) => {
+        if (item.detailType === 'TABPANEL' &&
+            item.dataRelationTag === dataRelationTag) {
+            srcTabpanel = item;
+            return true;
+        }
+    }, {
+        childrenFields: CHILDRENFIELDS,
+    });
+    // 将子应用表单分页部件合并到主应用表单分页部件中
+    if (srcTabpanel) {
+        recursiveIterate(dst, (item) => {
+            if (item.detailType === 'TABPANEL' &&
+                item.dataRelationTag === dataRelationTag) {
+                const detailName = getFormDetailMatchField(item, CHILDRENFIELDS);
+                if (detailName && item[detailName] && srcTabpanel[detailName]) {
+                    item[detailName].push(...srcTabpanel[detailName]);
+                    return true;
+                }
+            }
+        }, {
+            childrenFields: CHILDRENFIELDS,
+        });
+    }
+}

package/out/utils/merge-model/merge-model-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-model-helper.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-model-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EACR,QAAQ,EASR,cAAc,EAEd,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAQ/C;;;;;;;GAOG;AACH,qBAAa,mBAAmB;IAC9B;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,YAAmB;IAEhC;;;;;;;OAOG;IACH,gBAAgB,CACd,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAcP;;;;;;;;OAQG;IACH,uBAAuB,CACrB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAuBP;;;;;;;;OAQG;IACH,iBAAiB,CACf,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAiBP;;;;;;;;OAQG;IACH,6BAA6B,CAC3B,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAwBP;;;;;;OAMG;IACH,0CAA0C,CACxC,eAAe,EAAE,cAAc,EAAE,EACjC,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAwCP;;;;;;;;OAQG;IACH,qCAAqC,CACnC,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAyEP,mBAAmB,CACjB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAwBP;;;;;;;;OAQG;IACH,0BAA0B,CACxB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAuCP;;;;;;;;OAQG;IACH,gCAAgC,CAC9B,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAqCP;;;;;;OAMG;IACH,eAAe,CACb,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;CAmBR"}
+{"version":3,"file":"merge-model-helper.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-model-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EACR,QAAQ,EASR,cAAc,EAEd,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAY/C;;;;;;;GAOG;AACH,qBAAa,mBAAmB;IAC9B;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,YAAmB;IAEhC;;;;;;;OAOG;IACH,gBAAgB,CACd,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAcP;;;;;;;;OAQG;IACH,uBAAuB,CACrB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAuBP;;;;;;;;OAQG;IACH,iBAAiB,CACf,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAiBP;;;;;;;;OAQG;IACH,6BAA6B,CAC3B,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAwBP;;;;;;OAMG;IACH,0CAA0C,CACxC,eAAe,EAAE,cAAc,EAAE,EACjC,IAAI,EAAE,QAAQ,EACd,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAwCP;;;;;;;;OAQG;IACH,qCAAqC,CACnC,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAyEP,mBAAmB,CACjB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAwBP;;;;;;;;OAQG;IACH,0BAA0B,CACxB,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAuCP;;;;;;;;OAQG;IACH,gCAAgC,CAC9B,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAqCP;;;;;;OAMG;IACH,eAAe,CACb,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;CAuCR"}

package/out/utils/merge-model/merge-model-helper.js

@@ -5,7 +5,7 @@ import { mergeAppMenu } from './merge-app-menu';
 import { mergeDEDrControl } from './merge-de-drcontrol';
 import { mergeAppDEUIActionGroup } from './merge-app-uiaction-group';
 import { mergeTreeView } from './merge-treeview';
-import { mergeAppDEForm } from './merge-de-form';
+import { getFormdataRelationTags, mergeAppDEForm, mergeFormDRTabpanel, } from './merge-de-form';
 /**
  * 子应用模型合并对象
  *
@@ -331,11 +331,24 @@ export class MergeSubModelHelper {
             return;
         forms.forEach(dstForm => {
             const ids = dstForm.id.split('.');
+            // 查找源表单存在基于数据关系部件构建的分页部件的数据关系标识
+            const dataRelationTags = getFormdataRelationTags(dstForm);
             for (let i = 0; i < subAppRefs.length; i++) {
                 const srcForm = ibiz.hub.getSubAppControl(ids[1] + ids[2], subAppRefs[i].appId);
+                // 常规表单合并
                 if (srcForm) {
                     mergeAppDEForm(dstForm, srcForm);
                 }
+                // 表单分页部件合并（数据关系部件）
+                if (dataRelationTags && dataRelationTags.length > 0) {
+                    for (let j = 0; j < dataRelationTags.length; j++) {
+                        const dataRelationTag = dataRelationTags[j];
+                        const dataRelationForm = ibiz.hub.getSubAppControl(ids[1] + dataRelationTag, subAppRefs[i].appId);
+                        if (dataRelationForm) {
+                            mergeFormDRTabpanel(dataRelationTag, dstForm, dataRelationForm);
+                        }
+                    }
+                }
             }
         });
     }

package/out/utils/merge-model/merge-treeview.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-treeview.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-treeview.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAiCjE"}
+{"version":3,"file":"merge-treeview.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-treeview.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAiB,MAAM,kBAAkB,CAAC;AAE1D;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAyDjE"}

package/out/utils/merge-model/merge-treeview.js

@@ -17,10 +17,10 @@ export function mergeTreeView(dst, source) {
         }
         source.detreeNodes.forEach(sourceNode => {
             var _a;
-            const isExist = dst.detreeNodes.find(dstNode => {
+            const item = dst.detreeNodes.find(dstNode => {
                 return dstNode.id === sourceNode.id;
             });
-            if (!isExist) {
+            if (!item) {
                 (_a = dst.detreeNodes) === null || _a === void 0 ? void 0 : _a.push(sourceNode);
             }
         });
@@ -32,13 +32,149 @@ export function mergeTreeView(dst, source) {
         }
         source.detreeNodeRSs.forEach(sourceNodeRs => {
             var _a;
-            const isExist = dst.detreeNodeRSs.find(dstNodeRs => {
+            // 若配置了用户标记（dynamic_overlay:before|after|replace|delete|start|end:noderesid），则需根据用户标记进行合并，否则原始数据没有则直接附加末尾
+            if (sourceNodeRs.userTag &&
+                sourceNodeRs.userTag.startsWith('dynamic_overlay') &&
+                sourceNodeRs.userTag.split(':').length === 3) {
+                mergeSubAppTreeNodeResToDst(dst, sourceNodeRs);
+            }
+            else {
+                const itemIndex = dst.detreeNodeRSs.findIndex(dstNodeRs => {
+                    return (dstNodeRs.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId &&
+                        dstNodeRs.childDETreeNodeId === sourceNodeRs.childDETreeNodeId);
+                });
+                // 若存在end标记，则需要添加到第一个end标记节点关系前面，保证end标记节点关系始终添加到最后
+                const endIndex = dst.detreeNodeRSs.findIndex(dstNodeRs => {
+                    var _a;
+                    if (dstNodeRs.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId) {
+                        const tags = (_a = sourceNodeRs.userTag) === null || _a === void 0 ? void 0 : _a.split(':');
+                        if (!tags || tags.length !== 3 || tags[1] !== 'end')
+                            return false;
+                        return true;
+                    }
+                    return false;
+                });
+                if (itemIndex === -1) {
+                    if (endIndex === -1) {
+                        (_a = dst.detreeNodeRSs) === null || _a === void 0 ? void 0 : _a.push(sourceNodeRs);
+                    }
+                    else {
+                        dst.detreeNodeRSs.splice(endIndex, 0, sourceNodeRs);
+                    }
+                }
+            }
+        });
+    }
+}
+/**
+ * 合并指定子应用树节点关系到主应用树指定位置
+ * @param dst 原始树
+ * @param sourceNode 子应用树节点关系
+ */
+function mergeSubAppTreeNodeResToDst(dst, sourceNodeRs) {
+    var _a;
+    // dynamic_overlay:before|after|replace|delete|start|end:nodeid 定义附加位置
+    const [dynamicOverlay, targetPosition, targetTag] = sourceNodeRs.userTag.split(':');
+    if (!dynamicOverlay || !targetPosition || !targetTag)
+        return;
+    switch (targetPosition) {
+        case 'before':
+            // 在目标节点之前,dynamic_overlay:before:childnodeid,这儿最后一节拼接的是子节点标识
+            const beforeIndex = dst.detreeNodeRSs.findIndex(dstNode => {
+                return (dstNode.childDETreeNodeId === targetTag &&
+                    dstNode.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId);
+            });
+            if (beforeIndex !== -1) {
+                dst.detreeNodeRSs.splice(beforeIndex, 0, sourceNodeRs);
+            }
+            break;
+        case 'after':
+            // 在目标节点之后,格式如：dynamic_overlay:after:childnodeid,最后一节拼接的是子节点标识
+            const afterIndex = dst.detreeNodeRSs.findIndex(dstNode => {
+                return (dstNode.childDETreeNodeId === targetTag &&
+                    dstNode.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId);
+            });
+            if (afterIndex !== -1) {
+                dst.detreeNodeRSs.splice(afterIndex + 1, 0, sourceNodeRs);
+            }
+            break;
+        case 'replace':
+            // 替换目标节点,格式如：dynamic_overlay:replace:childnodeid,最后一节拼接的是子节点标识
+            const replaceIndex = dst.detreeNodeRSs.findIndex(dstNode => {
+                return (dstNode.childDETreeNodeId === targetTag &&
+                    dstNode.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId);
+            });
+            if (replaceIndex !== -1) {
+                dst.detreeNodeRSs.splice(replaceIndex, 1, sourceNodeRs);
+            }
+            break;
+        case 'delete':
+            // 删除目标节点,格式如：dynamic_overlay:delete:childnodeid,最后一节拼接的是子节点标识
+            const deleteIndex = dst.detreeNodeRSs.findIndex(dstNode => {
+                return (dstNode.childDETreeNodeId === targetTag &&
+                    dstNode.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId);
+            });
+            if (deleteIndex !== -1) {
+                dst.detreeNodeRSs.splice(deleteIndex, 1);
+            }
+            break;
+        case 'start':
+            // 在目标节点内部开始，格式如：dynamic_overlay:start:随机字符,最后一节拼接的是随机字符，读的是当前节点关系的父节点标识
+            const startIndex = dst.detreeNodeRSs.findIndex(dstNode => {
+                return dstNode.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId;
+            });
+            if (startIndex !== -1) {
+                dst.detreeNodeRSs.splice(startIndex, 0, sourceNodeRs);
+            }
+            break;
+        case 'end':
+            // 在目标节点内部结束，格式如：dynamic_overlay:end:随机字符,最后一节拼接的是随机字符，读的是当前节点关系的父节点标识
+            const endIndex = getLastIndex(dst.detreeNodeRSs, dstNode => {
+                return dstNode.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId;
+            });
+            if (endIndex !== -1) {
+                dst.detreeNodeRSs.splice(endIndex + 1, 0, sourceNodeRs);
+            }
+            break;
+        default:
+            // 未识别位置，若源树不存在该关系，则直接附加到最后
+            const defaultIndex = dst.detreeNodeRSs.findIndex(dstNodeRs => {
                 return (dstNodeRs.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId &&
                     dstNodeRs.childDETreeNodeId === sourceNodeRs.childDETreeNodeId);
             });
-            if (!isExist) {
-                (_a = dst.detreeNodeRSs) === null || _a === void 0 ? void 0 : _a.push(sourceNodeRs);
+            // 若存在end标记，则需要添加到第一个end标记节点关系前面，保证end标记节点关系始终添加到最后
+            const defaultEndIndex = dst.detreeNodeRSs.findIndex(dstNodeRs => {
+                var _a;
+                if (dstNodeRs.parentDETreeNodeId === sourceNodeRs.parentDETreeNodeId) {
+                    const tags = (_a = sourceNodeRs.userTag) === null || _a === void 0 ? void 0 : _a.split(':');
+                    if (!tags || tags.length !== 3 || tags[1] !== 'end')
+                        return false;
+                    return true;
+                }
+                return false;
+            });
+            if (defaultIndex === -1) {
+                if (defaultEndIndex === -1) {
+                    (_a = dst.detreeNodeRSs) === null || _a === void 0 ? void 0 : _a.push(sourceNodeRs);
+                }
+                else {
+                    dst.detreeNodeRSs.splice(defaultEndIndex, 0, sourceNodeRs);
+                }
             }
-        });
+            break;
+    }
+}
+/**
+ * 获取指定数组中满足条件的最后一个元素
+ * @param arr 指定数组
+ * @param predicate 过滤条件
+ * @returns 找到则返回指定元素下标，反之返回-1
+ */
+function getLastIndex(arr, predicate) {
+    for (let i = arr.length - 1; i >= 0; i--) {
+        if (predicate(arr[i])) {
+            return i;
+        }
     }
+    return -1;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/model-helper",
-  "version": "0.7.41-alpha.27",
+  "version": "0.7.41-alpha.28",
   "description": "模型辅助库",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -30,20 +30,19 @@
   "author": "iBiz",
   "license": "MIT",
   "dependencies": {
-    "@ibiz-template/core": "^0.7.41-alpha.26",
-    "@ibiz/model-core": "^0.1.81",
-    "@ibiz/rt-model-api": "0.2.79",
+    "@ibiz-template/core": "^0.7.41-alpha.28",
+    "@ibiz/model-core": "^0.1.82",
+    "@ibiz/rt-model-api": "0.2.80",
     "pluralize": "^8.0.0",
     "ramda": "^0.29.1"
   },
   "devDependencies": {
-    "@ibiz-template/runtime": "^0.7.41-alpha.27",
+    "@ibiz-template/runtime": "^0.7.41-alpha.28",
     "@types/pluralize": "^0.0.33",
     "@types/ramda": "^0.29.10"
   },
   "peerDependencies": {
     "@ibiz-template/runtime": "^0.6.0",
     "ramda": "^0.29.0"
-  },
-  "gitHead": "e1cf592ba49a4a3e93a5398aabb5c8a97073b698"
+  }
 }