@ibiz-template/model-helper 0.4.8-dev.0 → 0.4.9

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

@@ -1 +1 @@
-{"version":3,"file":"model-helper.d.ts","sourceRoot":"","sources":["../src/model-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,UAAU,EAGX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC;;;;;;;GAOG;AACH,qBAAa,WAAW;IAgCpB,SAAS,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC;IACpD,SAAS,CAAC,YAAY,EAAE,MAAM;IAC9B,SAAS,CAAC,UAAU,EAAE,OAAO;IAjC/B,SAAS,CAAC,GAAG,YAAmB;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,CAAM;IAExC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAEpD;;;;;;;OAOG;gBAES,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EAC1C,YAAY,EAAE,MAAM,EACpB,UAAU,GAAE,OAAc;IAKtC;;;;;;;OAOG;IACG,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK5C;;;;;;;;OAQG;IACG,aAAa,CACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,MAA0B,GAChC,OAAO,CAAC,IAAI,CAAC;IAYhB;;;;;;;;OAQG;cACa,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAkDlE;;;;;;;;;OASG;cACa,UAAU,CACxB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,IAAI,CAAC;IAQhB;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;IAWlE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAI7D;;;;;;;;;OASG;IACG,qBAAqB,CACzB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,EACxB,IAAI,CAAC,EAAE,OAAO,GACb,OAAO,CAAC,cAAc,CAAC;IAU1B;;;;;;;OAOG;IACH,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IA2BtD;;;;;;;;OAQG;IACG,eAAe,CACnB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,QAAQ,CAAC;IAOpB;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,OAAO,CAAC;IAKnB;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CACpB,OAAO,GAAE,OAAO,GAAG,MAA0B,GAC5C,SAAS;IAQZ;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,IAAI,GAAE,OAAO,GAAG,MAA0B,GAAG,MAAM;CASxE"}
+{"version":3,"file":"model-helper.d.ts","sourceRoot":"","sources":["../src/model-helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,UAAU,EAGX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIzC;;;;;;;GAOG;AACH,qBAAa,WAAW;IAgCpB,SAAS,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC;IACpD,SAAS,CAAC,YAAY,EAAE,MAAM;IAC9B,SAAS,CAAC,UAAU,EAAE,OAAO;IAjC/B,SAAS,CAAC,GAAG,YAAmB;IAEhC;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,CAAM;IAExC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAEpD;;;;;;;OAOG;gBAES,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EAC1C,YAAY,EAAE,MAAM,EACpB,UAAU,GAAE,OAAc;IAKtC;;;;;;;OAOG;IACG,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK5C;;;;;;;;OAQG;IACG,aAAa,CACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,MAA0B,GAChC,OAAO,CAAC,IAAI,CAAC;IAYhB;;;;;;;;OAQG;cACa,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAkDlE;;;;;;;;;OASG;cACa,UAAU,CACxB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,IAAI,CAAC;IAQhB;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;IAWlE;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAI7D;;;;;;;;;OASG;IACG,qBAAqB,CACzB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,EACxB,IAAI,CAAC,EAAE,OAAO,GACb,OAAO,CAAC,cAAc,CAAC;IAU1B;;;;;;;OAOG;IACH,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI;IAatD;;;;;;;;OAQG;IACG,eAAe,CACnB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,QAAQ,CAAC;IAOpB;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,OAAO,CAAC;IAKnB;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CACpB,OAAO,GAAE,OAAO,GAAG,MAA0B,GAC5C,SAAS;IAQZ;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,IAAI,GAAE,OAAO,GAAG,MAA0B,GAAG,MAAM;CASxE"}

package/out/model-helper.js

@@ -1,7 +1,7 @@
 import { DSLHelper } from '@ibiz/rt-model-api';
 import { ModelUtil } from './model-util';
 import { ModelLoader } from './model-loader';
-import { plural } from './utils';
+import { mergeAppMenu, plural } from './utils';
 /**
  * 模型加载工具类
  *
@@ -202,19 +202,7 @@ export class ModelHelper {
                 view.controls.forEach((ctrl) => {
                     if (ctrl.controlType === 'APPMENU') {
                         ctrl = ctrl;
-                        this.subAppRefs.forEach(subApp => {
-                            if (subApp &&
-                                subApp.appMenuModel &&
-                                subApp.appMenuModel.appMenuItems) {
-                                if (!ctrl.appMenuItems) {
-                                    ctrl.appMenuItems = [];
-                                }
-                                ctrl.appMenuItems = [
-                                    ...ctrl.appMenuItems,
-                                    ...subApp.appMenuModel.appMenuItems,
-                                ];
-                            }
-                        });
+                        mergeAppMenu(ctrl, this.subAppRefs);
                     }
                 });
             }

package/out/utils/index.d.ts

@@ -2,4 +2,5 @@ export { formatPath } from './format-path/format-path';
 export { mergeModel } from './merge-model/merge-model';
 export { plural, pluralLower } from './plural/plural';
 export { ServicePathDeep, ServicePathItem, ServicePathUtil, } from './service-path-util/service-path-util';
+export { mergeAppMenu } from './merge-model/merge-app-menu';
 //# sourceMappingURL=index.d.ts.map

package/out/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,uCAAuC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC"}

package/out/utils/index.js

@@ -2,3 +2,4 @@ export { formatPath } from './format-path/format-path';
 export { mergeModel } from './merge-model/merge-model';
 export { plural, pluralLower } from './plural/plural';
 export { ServicePathUtil, } from './service-path-util/service-path-util';
+export { mergeAppMenu } from './merge-model/merge-app-menu';

package/out/utils/merge-model/merge-app-menu.d.ts

@@ -0,0 +1,11 @@
+import { IAppMenuModel, ISubAppRef } from '@ibiz/model-core';
+/**
+ * 合并主应用首页菜单
+ * @author lxm
+ * @date 2023-12-07 02:26:57
+ * @export
+ * @param {IAppMenuModel} mainMenu
+ * @param {ISubAppRef[]} subAppRefs
+ */
+export declare function mergeAppMenu(mainMenu: IAppMenuModel, subAppRefs: ISubAppRef[]): void;
+//# sourceMappingURL=merge-app-menu.d.ts.map

package/out/utils/merge-model/merge-app-menu.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-app-menu.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-app-menu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,aAAa,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAyD3E;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,aAAa,EACvB,UAAU,EAAE,UAAU,EAAE,GACvB,IAAI,CAeN"}

package/out/utils/merge-model/merge-app-menu.js

@@ -0,0 +1,84 @@
+/**
+ * 递归合并主菜单项和子菜单项
+ * @author lxm
+ * @date 2023-12-07 03:16:13
+ * @param {IAppMenuItem} mainItem
+ * @param {IAppMenuItem} subItem
+ */
+function mergeMenuItem(mainItem, subItem) {
+    var _a, _b, _c;
+    // 主菜单项没有子菜单项直接合并替换
+    if (!((_a = mainItem.appMenuItems) === null || _a === void 0 ? void 0 : _a.length)) {
+        if ((_b = subItem.appMenuItems) === null || _b === void 0 ? void 0 : _b.length) {
+            // 子菜单有下级菜单的时候只是添加下级菜单
+            mainItem.appMenuItems = subItem.appMenuItems;
+        }
+        else {
+            // 子菜单项也没有下级菜单的时候覆盖
+            Object.assign(mainItem, subItem);
+        }
+    }
+    else {
+        const addItems = [];
+        (_c = subItem.appMenuItems) === null || _c === void 0 ? void 0 : _c.forEach(item => {
+            var _a;
+            const sameMenu = (_a = mainItem.appMenuItems) === null || _a === void 0 ? void 0 : _a.find(x => x.id === item.id);
+            if (sameMenu) {
+                mergeMenuItem(sameMenu, item);
+            }
+            else {
+                addItems.push(item);
+            }
+        });
+        mainItem.appMenuItems.push(...addItems);
+    }
+}
+/**
+ * 合并主菜单和子菜单
+ * @author lxm
+ * @date 2023-12-07 03:15:54
+ * @param {IAppMenuModel} main
+ * @param {IAppMenuModel} sub
+ */
+function mergeMenu(main, sub) {
+    var _a;
+    const addItems = [];
+    (_a = sub.appMenuItems) === null || _a === void 0 ? void 0 : _a.forEach(item => {
+        var _a;
+        const sameMenu = (_a = main.appMenuItems) === null || _a === void 0 ? void 0 : _a.find(x => x.id === item.id);
+        if (sameMenu) {
+            mergeMenuItem(sameMenu, item);
+        }
+        else {
+            addItems.push(item);
+        }
+    });
+    if (!main.appMenuItems) {
+        main.appMenuItems = [];
+    }
+    main.appMenuItems.push(...addItems);
+}
+/**
+ * 合并主应用首页菜单
+ * @author lxm
+ * @date 2023-12-07 02:26:57
+ * @export
+ * @param {IAppMenuModel} mainMenu
+ * @param {ISubAppRef[]} subAppRefs
+ */
+export function mergeAppMenu(mainMenu, subAppRefs) {
+    const subMenus = [];
+    subAppRefs.forEach(sub => {
+        var _a, _b;
+        if ((_b = (_a = sub.appMenuModel) === null || _a === void 0 ? void 0 : _a.appMenuItems) === null || _b === void 0 ? void 0 : _b.length) {
+            subMenus.push(sub.appMenuModel);
+        }
+    });
+    if (subMenus.length === 0) {
+        return;
+    }
+    // 依次合并主应用菜单和子应用菜单
+    subMenus.forEach(subMenu => {
+        mergeMenu(mainMenu, subMenu);
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/model-helper",
-  "version": "0.4.8-dev.0",
+  "version": "0.4.9",
   "description": "控制器包",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -35,7 +35,7 @@
     "ramda": "^0.29.1"
   },
   "devDependencies": {
-    "@ibiz-template/runtime": "^0.4.8-dev.0",
+    "@ibiz-template/runtime": "^0.4.9",
     "@types/pluralize": "^0.0.33",
     "@types/ramda": "^0.29.9"
   },
@@ -43,5 +43,5 @@
     "@ibiz-template/runtime": "^0.4.0",
     "ramda": "^0.29.0"
   },
-  "gitHead": "7ee2d66f0b84abba32b842f6b78fc77862cc3c55"
+  "gitHead": "aed61e1dc8d1cf0f56bbed55cfe70d6ea0f5cc58"
 }

package/src/model-helper.ts

@@ -11,7 +11,7 @@ import {
 import { DSLHelper } from '@ibiz/rt-model-api';
 import { ModelUtil } from './model-util';
 import { ModelLoader } from './model-loader';
-import { plural } from './utils';
+import { mergeAppMenu, plural } from './utils';
 
 /**
  * 模型加载工具类
@@ -246,21 +246,7 @@ export class ModelHelper {
         view.controls.forEach((ctrl: IAppMenu) => {
           if (ctrl.controlType === 'APPMENU') {
             ctrl = ctrl as IAppMenuModel;
-            this.subAppRefs.forEach(subApp => {
-              if (
-                subApp &&
-                subApp.appMenuModel &&
-                subApp.appMenuModel.appMenuItems
-              ) {
-                if (!ctrl.appMenuItems) {
-                  ctrl.appMenuItems = [];
-                }
-                ctrl.appMenuItems = [
-                  ...ctrl.appMenuItems,
-                  ...subApp.appMenuModel.appMenuItems,
-                ];
-              }
-            });
+            mergeAppMenu(ctrl, this.subAppRefs);
           }
         });
       }

package/src/utils/index.ts

@@ -6,3 +6,4 @@ export {
   ServicePathItem,
   ServicePathUtil,
 } from './service-path-util/service-path-util';
+export { mergeAppMenu } from './merge-model/merge-app-menu';

package/src/utils/merge-model/merge-app-menu.ts

@@ -0,0 +1,84 @@
+import { IAppMenuItem, IAppMenuModel, ISubAppRef } from '@ibiz/model-core';
+
+/**
+ * 递归合并主菜单项和子菜单项
+ * @author lxm
+ * @date 2023-12-07 03:16:13
+ * @param {IAppMenuItem} mainItem
+ * @param {IAppMenuItem} subItem
+ */
+function mergeMenuItem(mainItem: IAppMenuItem, subItem: IAppMenuItem): void {
+  // 主菜单项没有子菜单项直接合并替换
+  if (!mainItem.appMenuItems?.length) {
+    if (subItem.appMenuItems?.length) {
+      // 子菜单有下级菜单的时候只是添加下级菜单
+      mainItem.appMenuItems = subItem.appMenuItems;
+    } else {
+      // 子菜单项也没有下级菜单的时候覆盖
+      Object.assign(mainItem, subItem);
+    }
+  } else {
+    const addItems: IAppMenuItem[] = [];
+    subItem.appMenuItems?.forEach(item => {
+      const sameMenu = mainItem.appMenuItems?.find(x => x.id === item.id);
+      if (sameMenu) {
+        mergeMenuItem(sameMenu, item);
+      } else {
+        addItems.push(item);
+      }
+    });
+    mainItem.appMenuItems.push(...addItems);
+  }
+}
+
+/**
+ * 合并主菜单和子菜单
+ * @author lxm
+ * @date 2023-12-07 03:15:54
+ * @param {IAppMenuModel} main
+ * @param {IAppMenuModel} sub
+ */
+function mergeMenu(main: IAppMenuModel, sub: IAppMenuModel): void {
+  const addItems: IAppMenuItem[] = [];
+  sub.appMenuItems?.forEach(item => {
+    const sameMenu = main.appMenuItems?.find(x => x.id === item.id);
+    if (sameMenu) {
+      mergeMenuItem(sameMenu, item);
+    } else {
+      addItems.push(item);
+    }
+  });
+
+  if (!main.appMenuItems) {
+    main.appMenuItems = [];
+  }
+  main.appMenuItems.push(...addItems);
+}
+
+/**
+ * 合并主应用首页菜单
+ * @author lxm
+ * @date 2023-12-07 02:26:57
+ * @export
+ * @param {IAppMenuModel} mainMenu
+ * @param {ISubAppRef[]} subAppRefs
+ */
+export function mergeAppMenu(
+  mainMenu: IAppMenuModel,
+  subAppRefs: ISubAppRef[],
+): void {
+  const subMenus: IAppMenuModel[] = [];
+  subAppRefs.forEach(sub => {
+    if (sub.appMenuModel?.appMenuItems?.length) {
+      subMenus.push(sub.appMenuModel);
+    }
+  });
+  if (subMenus.length === 0) {
+    return;
+  }
+
+  // 依次合并主应用菜单和子应用菜单
+  subMenus.forEach(subMenu => {
+    mergeMenu(mainMenu, subMenu);
+  });
+}