@ibiz-template/model-helper 0.7.41-alpha.5 → 0.7.41-alpha.52

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

@@ -5,7 +5,8 @@ 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';
+import { mergeAppCodeList } from './merge-app-codelist';
 /**
  * 子应用模型合并对象
  *
@@ -34,6 +35,11 @@ export class MergeSubModelHelper {
      * @param {ISubAppRef[]} subAppRefs
      */
     mergeAppMainMenu(view, controls, subAppRefs) {
+        // config.common.mergeAppMenu参数值为disable，不处理该应用的菜单合并
+        if (ibiz.config.common.mergeAppMenu &&
+            ibiz.config.common.mergeAppMenu === 'disable') {
+            return;
+        }
         const dstAppMenu = controls === null || controls === void 0 ? void 0 : controls.find(item => {
             return item.controlType === 'APPMENU' && item.name === 'appmenu';
         });
@@ -41,6 +47,23 @@ export class MergeSubModelHelper {
             for (let i = 0; i < subAppRefs.length; i++) {
                 const srcAppMenu = subAppRefs[i].appMenuModel;
                 if (srcAppMenu) {
+                    const { userTag } = srcAppMenu;
+                    if (userTag) {
+                        const [userKey, userValue] = userTag.split(':');
+                        // mergemenutag: 目标菜单代码名称,目标菜单代码名称建议识别正则缺省配置以匹配更多目标
+                        if (userKey === 'mergemenutag') {
+                            try {
+                                const userValueReg = new RegExp(userValue);
+                                if (!userValueReg.test(dstAppMenu.codeName)) {
+                                    continue;
+                                }
+                            }
+                            catch (error) {
+                                ibiz.log.warn(`[菜单合并]：无效的正则表达式${userValue},忽略处理`);
+                                continue;
+                            }
+                        }
+                    }
                     mergeAppMenu(dstAppMenu, srcAppMenu);
                 }
             }
@@ -56,6 +79,11 @@ export class MergeSubModelHelper {
      * @return {*}  {void}
      */
     mergeSubAppExtendedMenu(view, controls, subAppRefs) {
+        // config.common.mergeAppMenu参数值为disable，不处理该应用的菜单合并
+        if (ibiz.config.common.mergeAppMenu &&
+            ibiz.config.common.mergeAppMenu === 'disable') {
+            return;
+        }
         if (view.viewType !== 'APPINDEXVIEW' || !controls)
             return;
         const dstAppMenus = controls.filter(item => {
@@ -114,27 +142,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) {
@@ -142,6 +150,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);
+                }
+            }
+        }
+    }
     /**
      * 合并树上下文菜单
      *
@@ -180,13 +222,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;
+                                                    });
                                                 }
                                             }
                                         }
@@ -314,13 +358,65 @@ export class MergeSubModelHelper {
         if (forms.length === 0)
             return;
         forms.forEach(dstForm => {
-            const ids = dstForm.id.split('.');
+            var _a, _b;
+            const appDataEntityId = (_b = (_a = dstForm.appDataEntityId) === null || _a === void 0 ? void 0 : _a.split('.')) === null || _b === void 0 ? 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], subAppRefs[i].appId);
+                const srcForm = ibiz.hub.getSubAppControl(appDataEntityId + codeName, 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(appDataEntityId + dataRelationTag, subAppRefs[i].appId);
+                        if (dataRelationForm) {
+                            mergeFormDRTabpanel(dataRelationTag, dstForm, dataRelationForm);
+                        }
+                    }
+                }
             }
         });
     }
+    /**
+     * @description 合并子应用代码表(子应用代码表标识和主应用代码表标识一致，包含模块、代码表代码名称2部分内容保持一致)
+     * @param codelist
+     * @param subAppRefs
+     */
+    mergeSubAppCodeList(codelist, subAppRefs) {
+        if (!codelist || !subAppRefs || subAppRefs.length === 0)
+            return;
+        for (let i = 0; i < subAppRefs.length; i++) {
+            const subCodeList = ibiz.hub.getSubAppCodeList(codelist.codeListTag, subAppRefs[i].appId);
+            if (subCodeList) {
+                mergeAppCodeList(codelist, subCodeList);
+            }
+        }
+    }
+    /**
+     * @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);
+                    }
+                }
+            }
+        }
+    }
 }

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.5",
+  "version": "0.7.41-alpha.52",
   "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.77",
-    "@ibiz/rt-model-api": "0.2.74",
+    "@ibiz-template/core": "^0.7.41-alpha.52",
+    "@ibiz/model-core": "^0.1.84",
+    "@ibiz/rt-model-api": "0.2.82",
     "pluralize": "^8.0.0",
     "ramda": "^0.29.1"
   },
   "devDependencies": {
-    "@ibiz-template/runtime": "^0.7.41-alpha.5",
+    "@ibiz-template/runtime": "^0.7.41-alpha.52",
     "@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": "95d8b20bb9c6d513b424e78ed634599b26966801"
+  "gitHead": "c74c5ef7d621be7c892a0da41feab360af205b7c"
 }