@ibiz-template/model-helper 0.4.5 → 0.4.6-dev.0

package/out/model-helper.d.ts

@@ -1,4 +1,4 @@
-import { IAppDataEntity, IAppView, IApplication, IAppLan } from '@ibiz/model-core';
+import { IAppDataEntity, IAppView, IApplication, IAppLan, ISubAppRef } from '@ibiz/model-core';
 import { DSLHelper } from '@ibiz/rt-model-api';
 import { ModelUtil } from './model-util';
 /**
@@ -14,6 +14,15 @@ export declare class ModelHelper {
     protected defaultAppId: string;
     protected permission: boolean;
     protected dsl: DSLHelper;
+    /**
+     * 当前子应用清单
+     *
+     * @author chitanda
+     * @date 2023-12-06 15:12:30
+     * @protected
+     * @type {ISubAppRef[]}
+     */
+    protected subAppRefs: ISubAppRef[];
     /**
      * 模型获取工具类缓存
      *
@@ -32,6 +41,15 @@ export declare class ModelHelper {
      * @param {boolean} [permission=true] 是否启用权限
      */
     constructor(getModel: (url: string) => Promise<IModel>, defaultAppId: string, permission?: boolean);
+    /**
+     * 初始化应用内容
+     *
+     * @author chitanda
+     * @date 2023-12-06 17:12:51
+     * @param {string} [id]
+     * @return {*}  {Promise<boolean>}
+     */
+    initApp(id?: string): Promise<boolean>;
     /**
      * 初始化具体应用模型工具类
      *
@@ -52,6 +70,17 @@ export declare class ModelHelper {
      * @return {*}  {Promise<void>}
      */
     protected initToHub(appId?: string | IObject): Promise<void>;
+    /**
+     * 初始化子应用相关内容
+     *
+     * @author chitanda
+     * @date 2023-12-06 15:12:23
+     * @protected
+     * @param {IApplication} app
+     * @param {ISubAppRef} subApp
+     * @return {*}  {Promise<void>}
+     */
+    protected initSubApp(app: IApplication, subApp: ISubAppRef): Promise<void>;
     /**
      * 获取应用模型
      *
@@ -81,6 +110,15 @@ export declare class ModelHelper {
      * @return {*}  {Promise<IAppDataEntity>}
      */
     getAppDataEntityModel(name: string, appId?: string | IObject, isId?: boolean): Promise<IAppDataEntity>;
+    /**
+     * 计算应用视图需要合并的子应用模型
+     *
+     * @author chitanda
+     * @date 2023-12-06 16:12:25
+     * @protected
+     * @param {IAppView} view
+     */
+    protected calcAppViewSubAppModel(view: IAppView): void;
     /**
      * 根据应用视图 codeName 获取应用视图模型
      *

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,EACR,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;IAsBpB,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;IAvB/B,SAAS,CAAC,GAAG,YAAmB;IAEhC;;;;;;;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;IAGtC;;;;;;;;OAQG;IACG,aAAa,CACjB,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,MAA0B,GAChC,OAAO,CAAC,IAAI,CAAC;IAehB;;;;;;;;OAQG;cACa,SAAS,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA0ClE;;;;;;;OAOG;IACG,WAAW,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;IAMlE;;;;;;;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;;;;;;;;OAQG;IACG,eAAe,CACnB,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,GACvB,OAAO,CAAC,QAAQ,CAAC;IAKpB;;;;;;;;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;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"}

package/out/model-helper.js

@@ -24,6 +24,15 @@ export class ModelHelper {
         this.defaultAppId = defaultAppId;
         this.permission = permission;
         this.dsl = new DSLHelper();
+        /**
+         * 当前子应用清单
+         *
+         * @author chitanda
+         * @date 2023-12-06 15:12:30
+         * @protected
+         * @type {ISubAppRef[]}
+         */
+        this.subAppRefs = [];
         /**
          * 模型获取工具类缓存
          *
@@ -33,6 +42,19 @@ export class ModelHelper {
          * @type {Map<string, ModelUtil>}
          */
         this.cache = new Map();
+        ibiz.hub.registerModelLoaderProvider(new ModelLoader(this));
+    }
+    /**
+     * 初始化应用内容
+     *
+     * @author chitanda
+     * @date 2023-12-06 17:12:51
+     * @param {string} [id]
+     * @return {*}  {Promise<boolean>}
+     */
+    async initApp(id) {
+        await this.initToHub(id);
+        return true;
     }
     /**
      * 初始化具体应用模型工具类
@@ -44,12 +66,9 @@ export class ModelHelper {
      * @return {*}  {Promise<void>}
      */
     async initModelUtil(modelTag, appId = this.defaultAppId) {
-        ibiz.hub.registerModelLoaderProvider(new ModelLoader(this));
         const modelUtil = new ModelUtil(appId, modelTag, this.getModel, this.defaultAppId === appId, this.permission);
         await modelUtil.init();
         this.cache.set(appId, modelUtil);
-        await ibiz.hub.getAppAsync(ibiz.env.appId);
-        await this.initToHub(appId);
     }
     /**
      * 初始化模型至Hub中
@@ -61,7 +80,8 @@ export class ModelHelper {
      * @return {*}  {Promise<void>}
      */
     async initToHub(appId) {
-        const app = ibiz.hub.getApp(appId);
+        const id = this.calcAppId(appId);
+        const app = ibiz.hub.getApp(id);
         const modelUtil = this.getModelUtil(appId);
         const appSourceModel = await modelUtil.getAppModel();
         // 将引用的视图注册到 hub 清单中
@@ -95,6 +115,30 @@ export class ModelHelper {
                 ibiz.util.layoutPanel.register(`${item.viewType}_DEFAULT`, item.viewLayoutPanel);
             }
         });
+        // 子应用模型相关处理
+        {
+            const { subAppRefs = [] } = app.model;
+            subAppRefs.forEach(item => {
+                this.initSubApp(app, item);
+            });
+        }
+    }
+    /**
+     * 初始化子应用相关内容
+     *
+     * @author chitanda
+     * @date 2023-12-06 15:12:23
+     * @protected
+     * @param {IApplication} app
+     * @param {ISubAppRef} subApp
+     * @return {*}  {Promise<void>}
+     */
+    async initSubApp(app, subApp) {
+        this.subAppRefs.push(subApp);
+        const ids = subApp.appViewIds || [];
+        ids.forEach(id => {
+            ibiz.hub.setAppView(id, subApp.id);
+        });
     }
     /**
      * 获取应用模型
@@ -105,6 +149,11 @@ export class ModelHelper {
      * @return {*}  {Promise<IApplication>}
      */
     async getAppModel(appId) {
+        const id = this.calcAppId(appId);
+        if (!this.cache.has(id)) {
+            const data = ibiz.appData || {};
+            await this.initModelUtil(data.dynamodeltag, id);
+        }
         const model = await this.getModelUtil(appId).getAppModel();
         const app = this.dsl.application(model);
         return app;
@@ -139,6 +188,38 @@ export class ModelHelper {
         dsl.codeName2 = plural(dsl.codeName.toLowerCase());
         return dsl;
     }
+    /**
+     * 计算应用视图需要合并的子应用模型
+     *
+     * @author chitanda
+     * @date 2023-12-06 16:12:25
+     * @protected
+     * @param {IAppView} view
+     */
+    calcAppViewSubAppModel(view) {
+        if (view.viewType === 'APPINDEXVIEW') {
+            if (view.controls) {
+                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,
+                                ];
+                            }
+                        });
+                    }
+                });
+            }
+        }
+    }
     /**
      * 根据应用视图 codeName 获取应用视图模型
      *
@@ -150,7 +231,9 @@ export class ModelHelper {
      */
     async getAppViewModel(name, appId) {
         const model = await this.getModelUtil(appId).getAppViewModel(name);
-        return this.dsl.appView(model);
+        const dsl = this.dsl.appView(model);
+        this.calcAppViewSubAppModel(dsl);
+        return dsl;
     }
     /**
      * 获取应用多语言模型

package/out/model-loader.d.ts

@@ -13,6 +13,7 @@ import { ModelHelper } from './model-helper';
 export declare class ModelLoader implements ModelLoaderProvider {
     protected helper: ModelHelper;
     constructor(helper: ModelHelper);
+    initApp(id?: string): Promise<boolean>;
     getApp(id?: string): Promise<IApplication>;
     getAppView(appId: string, codeName: string): Promise<IAppView>;
     getAppDataEntity(appId: string, id: string): Promise<IAppDataEntity>;

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

@@ -1 +1 @@
-{"version":3,"file":"model-loader.d.ts","sourceRoot":"","sources":["../src/model-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,WAAY,YAAW,mBAAmB;IACzC,SAAS,CAAC,MAAM,EAAE,WAAW;gBAAnB,MAAM,EAAE,WAAW;IAEzC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAI1C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAI9D,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAIpE,0BAA0B,CACxB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC;IAI1B,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAGnD"}
+{"version":3,"file":"model-loader.d.ts","sourceRoot":"","sources":["../src/model-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,WAAY,YAAW,mBAAmB;IACzC,SAAS,CAAC,MAAM,EAAE,WAAW;gBAAnB,MAAM,EAAE,WAAW;IAEzC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAItC,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAI1C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAI9D,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAIpE,0BAA0B,CACxB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC;IAI1B,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAGnD"}

package/out/model-loader.js

@@ -11,6 +11,9 @@ export class ModelLoader {
     constructor(helper) {
         this.helper = helper;
     }
+    initApp(id) {
+        return this.helper.initApp(id);
+    }
     getApp(id) {
         return this.helper.getAppModel(id);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/model-helper",
-  "version": "0.4.5",
+  "version": "0.4.6-dev.0",
   "description": "控制器包",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -29,13 +29,13 @@
   "author": "chitanda",
   "license": "MIT",
   "dependencies": {
-    "@ibiz/model-core": "^0.0.24",
-    "@ibiz/rt-model-api": "^0.1.30",
+    "@ibiz/model-core": "^0.0.26",
+    "@ibiz/rt-model-api": "^0.1.32",
     "pluralize": "^8.0.0",
     "ramda": "^0.29.1"
   },
   "devDependencies": {
-    "@ibiz-template/runtime": "^0.4.5",
+    "@ibiz-template/runtime": "^0.4.6-dev.0",
     "@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": "28b2af793771fa7be9fac2e1c8396081f4002230"
+  "gitHead": "b7cde546c542456de87377e49677bdd21b04449d"
 }

package/src/model-helper.ts

@@ -4,6 +4,9 @@ import {
   IAppView,
   IApplication,
   IAppLan,
+  ISubAppRef,
+  IAppMenuModel,
+  IAppMenu,
 } from '@ibiz/model-core';
 import { DSLHelper } from '@ibiz/rt-model-api';
 import { ModelUtil } from './model-util';
@@ -21,6 +24,16 @@ import { plural } from './utils';
 export class ModelHelper {
   protected dsl = new DSLHelper();
 
+  /**
+   * 当前子应用清单
+   *
+   * @author chitanda
+   * @date 2023-12-06 15:12:30
+   * @protected
+   * @type {ISubAppRef[]}
+   */
+  protected subAppRefs: ISubAppRef[] = [];
+
   /**
    * 模型获取工具类缓存
    *
@@ -43,7 +56,22 @@ export class ModelHelper {
     protected getModel: (url: string) => Promise<IModel>,
     protected defaultAppId: string,
     protected permission: boolean = true,
-  ) {}
+  ) {
+    ibiz.hub.registerModelLoaderProvider(new ModelLoader(this));
+  }
+
+  /**
+   * 初始化应用内容
+   *
+   * @author chitanda
+   * @date 2023-12-06 17:12:51
+   * @param {string} [id]
+   * @return {*}  {Promise<boolean>}
+   */
+  async initApp(id?: string): Promise<boolean> {
+    await this.initToHub(id);
+    return true;
+  }
 
   /**
    * 初始化具体应用模型工具类
@@ -58,7 +86,6 @@ export class ModelHelper {
     modelTag: string,
     appId: string = this.defaultAppId,
   ): Promise<void> {
-    ibiz.hub.registerModelLoaderProvider(new ModelLoader(this));
     const modelUtil = new ModelUtil(
       appId,
       modelTag,
@@ -68,8 +95,6 @@ export class ModelHelper {
     );
     await modelUtil.init();
     this.cache.set(appId, modelUtil);
-    await ibiz.hub.getAppAsync(ibiz.env.appId);
-    await this.initToHub(appId);
   }
 
   /**
@@ -82,7 +107,8 @@ export class ModelHelper {
    * @return {*}  {Promise<void>}
    */
   protected async initToHub(appId?: string | IObject): Promise<void> {
-    const app = ibiz.hub.getApp(appId);
+    const id: string = this.calcAppId(appId);
+    const app = ibiz.hub.getApp(id);
     const modelUtil = this.getModelUtil(appId);
     const appSourceModel = await modelUtil.getAppModel();
     // 将引用的视图注册到 hub 清单中
@@ -121,6 +147,34 @@ export class ModelHelper {
         );
       }
     });
+    // 子应用模型相关处理
+    {
+      const { subAppRefs = [] } = app.model;
+      subAppRefs.forEach(item => {
+        this.initSubApp(app, item);
+      });
+    }
+  }
+
+  /**
+   * 初始化子应用相关内容
+   *
+   * @author chitanda
+   * @date 2023-12-06 15:12:23
+   * @protected
+   * @param {IApplication} app
+   * @param {ISubAppRef} subApp
+   * @return {*}  {Promise<void>}
+   */
+  protected async initSubApp(
+    app: IApplication,
+    subApp: ISubAppRef,
+  ): Promise<void> {
+    this.subAppRefs.push(subApp);
+    const ids = subApp.appViewIds || [];
+    ids.forEach(id => {
+      ibiz.hub.setAppView(id, subApp.id);
+    });
   }
 
   /**
@@ -132,6 +186,11 @@ export class ModelHelper {
    * @return {*}  {Promise<IApplication>}
    */
   async getAppModel(appId?: string | IObject): Promise<IApplication> {
+    const id: string = this.calcAppId(appId);
+    if (!this.cache.has(id)) {
+      const data = ibiz.appData || {};
+      await this.initModelUtil(data.dynamodeltag, id);
+    }
     const model = await this.getModelUtil(appId).getAppModel();
     const app = this.dsl.application(model) as IApplication;
     return app;
@@ -173,6 +232,41 @@ export class ModelHelper {
     return dsl;
   }
 
+  /**
+   * 计算应用视图需要合并的子应用模型
+   *
+   * @author chitanda
+   * @date 2023-12-06 16:12:25
+   * @protected
+   * @param {IAppView} view
+   */
+  protected calcAppViewSubAppModel(view: IAppView): void {
+    if (view.viewType === 'APPINDEXVIEW') {
+      if (view.controls) {
+        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,
+                ];
+              }
+            });
+          }
+        });
+      }
+    }
+  }
+
   /**
    * 根据应用视图 codeName 获取应用视图模型
    *
@@ -187,7 +281,9 @@ export class ModelHelper {
     appId?: string | IObject,
   ): Promise<IAppView> {
     const model = await this.getModelUtil(appId).getAppViewModel(name);
-    return this.dsl.appView(model) as IAppView;
+    const dsl = this.dsl.appView(model) as IAppView;
+    this.calcAppViewSubAppModel(dsl);
+    return dsl;
   }
 
   /**

package/src/model-loader.ts

@@ -14,6 +14,10 @@ import { ModelHelper } from './model-helper';
 export class ModelLoader implements ModelLoaderProvider {
   constructor(protected helper: ModelHelper) {}
 
+  initApp(id?: string): Promise<boolean> {
+    return this.helper.initApp(id);
+  }
+
   getApp(id?: string): Promise<IApplication> {
     return this.helper.getAppModel(id);
   }