@ibiz-template/model-helper 0.7.41-alpha.2 → 0.7.41-alpha.21

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

@@ -1 +1 @@
-{"version":3,"file":"model-helper.d.ts","sourceRoot":"","sources":["../src/model-helper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model-helper.d.ts","sourceRoot":"","sources":["../src/model-helper.ts"],"names":[],"mappings":"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"}

package/out/model-helper.js

@@ -168,8 +168,18 @@ export class ModelHelper {
             for (let i = 0; i < subAppRefs.length; i++) {
                 const subApp = subAppRefs[i];
                 const sourceSubApp = getAllPSSubAppRefs[i];
-                // eslint-disable-next-line no-await-in-loop
-                await this.initSubApp(app, subApp, sourceSubApp);
+                // 控制插件应用访问权限、通过应用样式参数SUBAPPACCESSKEY定义权限标识
+                if (subApp.accessKey) {
+                    const mianApp = await ibiz.hub.getApp(ibiz.env.appId);
+                    await mianApp.authority.init();
+                    const permitted = mianApp.authority.calcByResCode(subApp.accessKey);
+                    if (permitted) {
+                        await this.initSubApp(app, subApp, sourceSubApp);
+                    }
+                }
+                else {
+                    await this.initSubApp(app, subApp, sourceSubApp);
+                }
             }
         }
     }
@@ -389,6 +399,8 @@ export class ModelHelper {
         this.merge.mergeSubAppGridCloumnActionGroup(view, controls, this.subAppRefs);
         // 合并树视图部件
         this.merge.mergeSubAppTreeView(view, controls, this.subAppRefs);
+        // 合并子应用表单部件
+        this.merge.mergeSubAppForm(view, controls, this.subAppRefs);
     }
     /**
      * 根据应用视图 codeName 获取应用视图模型

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

@@ -0,0 +1,45 @@
+import { IDEForm } from '@ibiz/model-core';
+/** 默认配置参数 */
+declare const IterateOpts: {
+    /** 子集合属性数组 */
+    childrenFields: string[];
+};
+/**
+ * @description 递归遍历子元素，递归遍历子元素 用法：传入数组和回调函数 无返回值
+ * @example
+ * ```
+ * const parent = {
+ *       name: 'parent',
+ *       children: [
+ *           {
+ *               name: 'child1',
+ *               children: [{ name: 'grandchild1' }, { name: 'grandchild2' }],
+ *           },
+ *           { name: 'child2', children: [{ name: 'grandchild3' }] },
+ *       ],
+ *    };
+ *
+ * const result: string[] = [];
+ *
+ * recursiveIterate(parent, item => {
+ *     result.push(item.name);
+ * });
+ *
+ * result // => ['child1', 'grandchild1', 'grandchild2', 'child2', 'grandchild3']
+ * ```
+ * @export
+ * @param {IData} parent 父元素
+ * @param {(item: any) => boolean} callback 每一个子元素的回调
+ * @param {Partial<typeof IterateOpts>} [opts]
+ */
+export declare function recursiveIterate(parent: IData, callback: (item: any, _parent: any) => boolean | void, opts?: Partial<typeof IterateOpts>): void;
+/**
+ * @description 合并子应用表单
+ * @export
+ * @param {(IDEForm | undefined)} dst 主应用表单模型
+ * @param {(IDEForm | undefined)} src 子应用表单模型
+ * @returns {*}  {void}
+ */
+export declare function mergeAppDEForm(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

@@ -0,0 +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"}

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

@@ -0,0 +1,219 @@
+import { mergeDeepRight } from 'ramda';
+// 表单子属性集合(常量)
+const CHILDRENFIELDS = [
+    'deformPages',
+    'deformTabPages',
+    'deformDetails',
+];
+/** 默认配置参数 */
+const IterateOpts = {
+    /** 子集合属性数组 */
+    childrenFields: ['children'],
+};
+/**
+ * @description 获取表单成员匹配属性标识
+ * @param {IModel} model 指定模型数据
+ * @param {string[]} fields 属性集合
+ * @returns {*}  {(string | undefined)}
+ */
+function getFormDetailMatchField(model, fields) {
+    var _a;
+    for (const field of fields) {
+        if ((_a = model[field]) === null || _a === void 0 ? void 0 : _a.length) {
+            return field;
+        }
+    }
+}
+/**
+ * @description 获取子属性集合
+ * @param {IData} parent
+ * @param {string[]} fields 子集合可能的属性名称
+ * @returns {*}  {(IData[] | undefined)}
+ */
+function getChildField(parent, fields) {
+    var _a;
+    for (const field of fields) {
+        if ((_a = parent[field]) === null || _a === void 0 ? void 0 : _a.length) {
+            return parent[field];
+        }
+    }
+}
+/**
+ * @description 递归遍历子元素，递归遍历子元素 用法：传入数组和回调函数 无返回值
+ * @example
+ * ```
+ * const parent = {
+ *       name: 'parent',
+ *       children: [
+ *           {
+ *               name: 'child1',
+ *               children: [{ name: 'grandchild1' }, { name: 'grandchild2' }],
+ *           },
+ *           { name: 'child2', children: [{ name: 'grandchild3' }] },
+ *       ],
+ *    };
+ *
+ * const result: string[] = [];
+ *
+ * recursiveIterate(parent, item => {
+ *     result.push(item.name);
+ * });
+ *
+ * result // => ['child1', 'grandchild1', 'grandchild2', 'child2', 'grandchild3']
+ * ```
+ * @export
+ * @param {IData} parent 父元素
+ * @param {(item: any) => boolean} callback 每一个子元素的回调
+ * @param {Partial<typeof IterateOpts>} [opts]
+ */
+export function recursiveIterate(parent, callback, opts) {
+    const { childrenFields } = mergeDeepRight(IterateOpts, opts || {});
+    const children = getChildField(parent, childrenFields);
+    if (children === null || children === void 0 ? void 0 : children.length) {
+        for (const child of children) {
+            // 递归自身的子成员
+            const isBreak = callback(child, parent);
+            // 如果回调返回true则不循环子数据
+            if (!isBreak) {
+                recursiveIterate(child, callback, opts);
+            }
+        }
+    }
+}
+/**
+ * @description  计算子应用表单合并项（仅合并类型为用户标记为dynamic_overlay:before|after|inside|replace:formitemname）
+ * @param {IDEForm} src 子应用表单模型
+ * @returns {*}  {Map<string, IData>} key值为关联主表单项标识；value为{position:before|after|inside|replace,model:IModel}对象
+ */
+function computeSubAppFormItems(src) {
+    const subAppMergeItemsMap = new Map();
+    recursiveIterate(src, (item, parent) => {
+        // 用户标记为dynamic_overlay：开始的才识别为需覆盖到主应用表单
+        if (item.userTag &&
+            item.userTag.startsWith('dynamic_overlay:') &&
+            item.userTag.split(':').length === 3) {
+            // before|after|inside|replace + ':formitemname' 定义附加位置
+            const tags = item.userTag.split(':');
+            if (tags[1] && tags[2]) {
+                if (!subAppMergeItemsMap.get(tags[2])) {
+                    subAppMergeItemsMap.set(tags[2], []);
+                }
+                const tempItem = {
+                    position: tags[1],
+                    model: item,
+                    // 定义当前项是否已经被合并
+                    merge: false,
+                };
+                const targetMergeArray = subAppMergeItemsMap.get(tags[2]);
+                targetMergeArray.push(tempItem);
+            }
+            // 退出当前子的循环,父已经合并，无需管子的合并
+            return true;
+        }
+    }, {
+        childrenFields: CHILDRENFIELDS,
+    });
+    return subAppMergeItemsMap;
+}
+/**
+ * @description 合并指定表单成员到主表表单指定位置
+ * @param {IModel} item 当前表单成员
+ * @param {IModel} parent 当前表单成员父成员
+ * @param {IData} mergeItem 子应用表单合并项
+ * @returns {*}  {void}
+ */
+function mergeSubAppFormItemToDst(item, parent, mergeItem) {
+    const { position, model } = mergeItem;
+    const formMatchField = getFormDetailMatchField(parent, CHILDRENFIELDS);
+    if (!formMatchField)
+        return;
+    const curIndex = parent[formMatchField].findIndex((parentItem) => {
+        return parentItem.codeName === item.codeName;
+    });
+    switch (position) {
+        // 附加至目标之前(before)
+        case 'before':
+            if (curIndex !== -1) {
+                parent[formMatchField].splice(curIndex, 0, model);
+            }
+            else {
+                parent[formMatchField].push(model);
+            }
+            break;
+        // 附加至目标内部(inside)
+        case 'inside':
+            const itemMatchField = getFormDetailMatchField(item, CHILDRENFIELDS);
+            if (itemMatchField) {
+                item[itemMatchField].push(model);
+            }
+            break;
+        // 替换目标(replace)
+        case 'replace':
+            if (curIndex !== -1) {
+                parent[formMatchField].splice(curIndex, 1, model);
+            }
+            break;
+        // 附加至目标之后(after)
+        case 'after':
+            if (curIndex !== -1) {
+                parent[formMatchField].splice(curIndex + 1, 0, model);
+            }
+            break;
+        // 附加至目标之后(默认)
+        default:
+            if (curIndex !== -1) {
+                parent[formMatchField].splice(curIndex + 1, 0, model);
+            }
+            break;
+    }
+    // 标记当前项已被合并
+    mergeItem.merge = true;
+}
+/**
+ * @description 合并子应用表单表单项
+ * @param {IDEForm} dst 目标表单模型
+ * @param {Map<string, IData>} subAppMergeItems 子应用需合并项数据
+ * @returns {*}  {void}
+ */
+function mergeSubAppFormItems(dst, subAppMergeItems) {
+    if (!dst || !subAppMergeItems)
+        return;
+    if (subAppMergeItems.size === 0)
+        return;
+    recursiveIterate(dst, (item, parent) => {
+        // 通过关联主表单项标识进行合并
+        const mergeItems = subAppMergeItems.get(item.codeName);
+        if (mergeItems && mergeItems.length > 0) {
+            mergeItems.forEach((mergeItem) => {
+                // 判断当前项是否已经被合并，若已经被合并则不再处理
+                if (!mergeItem.merge) {
+                    mergeSubAppFormItemToDst(item, parent, mergeItem);
+                }
+            });
+        }
+    }, {
+        childrenFields: CHILDRENFIELDS,
+    });
+    // 矫正合并后主表单模型数据
+    if (dst.deformPages && dst.deformPages.length > 1) {
+        dst.noTabHeader = false;
+    }
+    else {
+        dst.noTabHeader = true;
+    }
+}
+/**
+ * @description 合并子应用表单
+ * @export
+ * @param {(IDEForm | undefined)} dst 主应用表单模型
+ * @param {(IDEForm | undefined)} src 子应用表单模型
+ * @returns {*}  {void}
+ */
+export function mergeAppDEForm(dst, src) {
+    if (!dst || !src)
+        return;
+    const subAppMergeItems = computeSubAppFormItems(src);
+    if (subAppMergeItems.size === 0)
+        return;
+    mergeSubAppFormItems(dst, subAppMergeItems);
+}

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

@@ -1,4 +1,4 @@
-import { IAppView, IControl, ISubAppRef } from '@ibiz/model-core';
+import { IAppView, IControl, IDEToolbarItem, ISubAppRef } from '@ibiz/model-core';
 import { DSLHelper } from '@ibiz/rt-model-api';
 /**
  * 子应用模型合并对象
@@ -56,6 +56,14 @@ export declare class MergeSubModelHelper {
      * @param {ISubAppRef[]} subAppRefs
      */
     mergeSubAppToolbarActionGroup(view: IAppView, controls: IControl[] | undefined, subAppRefs: ISubAppRef[]): void;
+    /**
+     * @description 递归合并工具项界面行为组
+     * @param {IDEToolbarItem[]} dstToolBarItems
+     * @param {IAppView} view
+     * @param {ISubAppRef[]} subAppRefs
+     * @memberof MergeSubModelHelper
+     */
+    recursiveMergeSubAppToolbarItemActionGroup(dstToolBarItems: IDEToolbarItem[], view: IAppView, subAppRefs: ISubAppRef[]): void;
     /**
      * 合并树上下文菜单
      *
@@ -87,5 +95,13 @@ export declare class MergeSubModelHelper {
      * @param {ISubAppRef[]} subAppRefs
      */
     mergeSubAppGridCloumnActionGroup(view: IAppView, controls: IControl[] | undefined, subAppRefs: ISubAppRef[]): void;
+    /**
+     * @description 合并子应用表单(实体代码标识和表单代码标识一致)
+     * @param {IAppView} view
+     * @param {(IControl[] | undefined)} controls
+     * @param {ISubAppRef[]} subAppRefs
+     * @memberof MergeSubModelHelper
+     */
+    mergeSubAppForm(view: IAppView, controls: IControl[] | undefined, subAppRefs: ISubAppRef[]): void;
 }
 //# sourceMappingURL=merge-model-helper.d.ts.map

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,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAO/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;IAiDP;;;;;;;;OAQG;IACH,qCAAqC,CACnC,IAAI,EAAE,QAAQ,EACd,QAAQ,EAAE,QAAQ,EAAE,GAAG,SAAS,EAChC,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI;IAuEP,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;CAoCR"}
+{"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"}

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

@@ -5,6 +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';
 /**
  * 子应用模型合并对象
  *
@@ -113,27 +114,7 @@ export class MergeSubModelHelper {
         });
         if (dstToolBar && dstToolBar.detoolbarItems) {
             const dstToolBarItems = dstToolBar.detoolbarItems;
-            if (dstToolBarItems && dstToolBarItems.length > 0) {
-                for (let i = 0; i < dstToolBarItems.length; i++) {
-                    const dstToolBarItem = dstToolBarItems[i];
-                    if (dstToolBarItem &&
-                        dstToolBarItem.uiactionGroup) {
-                        const dstUIActionGroup = dstToolBarItem
-                            .uiactionGroup;
-                        if (dstUIActionGroup) {
-                            for (let j = 0; j < subAppRefs.length; j++) {
-                                if (subAppRefs[j].appId === view.appId) {
-                                    continue;
-                                }
-                                const srcAppDEUIActionGroup = ibiz.hub.getSubAppDEUIActionGroups(dstUIActionGroup.uniqueTag, subAppRefs[j].appId);
-                                if (srcAppDEUIActionGroup) {
-                                    mergeAppDEUIActionGroup(dstToolBarItems[i].uiactionGroup, srcAppDEUIActionGroup);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
+            this.recursiveMergeSubAppToolbarItemActionGroup(dstToolBarItems, view, subAppRefs);
         }
         controls.forEach(control => {
             if (control && control.controls) {
@@ -141,6 +122,40 @@ export class MergeSubModelHelper {
             }
         });
     }
+    /**
+     * @description 递归合并工具项界面行为组
+     * @param {IDEToolbarItem[]} dstToolBarItems
+     * @param {IAppView} view
+     * @param {ISubAppRef[]} subAppRefs
+     * @memberof MergeSubModelHelper
+     */
+    recursiveMergeSubAppToolbarItemActionGroup(dstToolBarItems, view, subAppRefs) {
+        if (dstToolBarItems && dstToolBarItems.length > 0) {
+            for (let i = 0; i < dstToolBarItems.length; i++) {
+                const dstToolBarItem = dstToolBarItems[i];
+                if (dstToolBarItem &&
+                    dstToolBarItem.uiactionGroup) {
+                    const dstUIActionGroup = dstToolBarItem
+                        .uiactionGroup;
+                    if (dstUIActionGroup) {
+                        for (let j = 0; j < subAppRefs.length; j++) {
+                            if (subAppRefs[j].appId === view.appId) {
+                                continue;
+                            }
+                            const srcAppDEUIActionGroup = ibiz.hub.getSubAppDEUIActionGroups(dstUIActionGroup.uniqueTag, subAppRefs[j].appId);
+                            if (srcAppDEUIActionGroup) {
+                                mergeAppDEUIActionGroup(dstToolBarItems[i].uiactionGroup, srcAppDEUIActionGroup);
+                            }
+                        }
+                    }
+                }
+                if (dstToolBarItem.detoolbarItems) {
+                    this.recursiveMergeSubAppToolbarItemActionGroup(dstToolBarItem
+                        .detoolbarItems, view, subAppRefs);
+                }
+            }
+        }
+    }
     /**
      * 合并树上下文菜单
      *
@@ -179,13 +194,15 @@ export class MergeSubModelHelper {
                                             if (srcAppDEUIActionGroup) {
                                                 mergeAppDEUIActionGroup(dstContextMenuItems[i]
                                                     .uiactionGroup, srcAppDEUIActionGroup);
-                                                const targetDeTreeNode = (_b = dstTree.detreeNodes) === null || _b === void 0 ? void 0 : _b.find(treeNode => {
+                                                const targetDeTreeNodes = (_b = dstTree.detreeNodes) === null || _b === void 0 ? void 0 : _b.filter(treeNode => {
                                                     return (treeNode.decontextMenu &&
                                                         treeNode.decontextMenu.modelId ===
                                                             dstContextMenu.modelId);
                                                 });
-                                                if (targetDeTreeNode) {
-                                                    targetDeTreeNode.decontextMenu = dstContextMenu;
+                                                if (targetDeTreeNodes && targetDeTreeNodes.length > 0) {
+                                                    targetDeTreeNodes.forEach(targetDeTreeNode => {
+                                                        targetDeTreeNode.decontextMenu = dstContextMenu;
+                                                    });
                                                 }
                                             }
                                         }
@@ -297,4 +314,29 @@ export class MergeSubModelHelper {
             });
         }
     }
+    /**
+     * @description 合并子应用表单(实体代码标识和表单代码标识一致)
+     * @param {IAppView} view
+     * @param {(IControl[] | undefined)} controls
+     * @param {ISubAppRef[]} subAppRefs
+     * @memberof MergeSubModelHelper
+     */
+    mergeSubAppForm(view, controls, subAppRefs) {
+        if (!controls)
+            return;
+        const forms = controls.filter(item => {
+            return item.controlType === 'FORM';
+        });
+        if (forms.length === 0)
+            return;
+        forms.forEach(dstForm => {
+            const ids = dstForm.id.split('.');
+            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);
+                }
+            }
+        });
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/model-helper",
-  "version": "0.7.41-alpha.2",
+  "version": "0.7.41-alpha.21",
   "description": "模型辅助库",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -30,14 +30,14 @@
   "author": "iBiz",
   "license": "MIT",
   "dependencies": {
-    "@ibiz-template/core": "^0.7.41-alpha.2",
-    "@ibiz/model-core": "^0.1.76",
-    "@ibiz/rt-model-api": "0.2.73",
+    "@ibiz-template/core": "^0.7.41-alpha.18",
+    "@ibiz/model-core": "^0.1.81",
+    "@ibiz/rt-model-api": "0.2.79",
     "pluralize": "^8.0.0",
     "ramda": "^0.29.1"
   },
   "devDependencies": {
-    "@ibiz-template/runtime": "^0.7.41-alpha.2",
+    "@ibiz-template/runtime": "^0.7.41-alpha.21",
     "@types/pluralize": "^0.0.33",
     "@types/ramda": "^0.29.10"
   },
@@ -45,5 +45,5 @@
     "@ibiz-template/runtime": "^0.6.0",
     "ramda": "^0.29.0"
   },
-  "gitHead": "339bfa274a8edb1ba4c53cb08920fdc86f048d36"
+  "gitHead": "70e316e5d3c511884cd2b577b5b2483b5ff6c97c"
 }