@ibiz-template/model-helper 0.5.3-beta.4 → 0.5.3-beta.6

package/out/model-helper.d.ts

@@ -80,7 +80,7 @@ export declare class ModelHelper {
      * @param {ISubAppRef} subApp
      * @return {*}  {Promise<void>}
      */
-    protected initSubApp(app: IApplication, subApp: ISubAppRef): Promise<void>;
+    protected initSubApp(app: IApplication, subApp: ISubAppRef, sourceSubApp: IModel): Promise<void>;
     /**
      * 获取应用模型
      *

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,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;IACtE,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,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EAC5D,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;IAoDlE;;;;;;;;;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;;;;;;;;;OASG;IACG,gBAAgB,CACpB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,OAAO,EAChB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,QAAQ,CAAC;IASpB;;;;;;;;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,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;IACtE,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,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EAC5D,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;IAsDlE;;;;;;;;;OASG;cACa,UAAU,CACxB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;IAUhB;;;;;;;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;;;;;;;;;OASG;IACG,gBAAgB,CACpB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,OAAO,EAChB,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,QAAQ,CAAC;IAUpB;;;;;;;;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

@@ -88,7 +88,7 @@ export class ModelHelper {
         if (appSourceModel.getAllPSAppViews && appId === ibiz.env.appId) {
             const appViews = appSourceModel.getAllPSAppViews;
             appViews.forEach(appView => {
-                ibiz.hub.setAppView(appView.id, appSourceModel.id);
+                ibiz.hub.setAppView(appView.id, appSourceModel.id, appView.priority);
             });
         }
         if (appSourceModel.getDefaultPSAppIndexView) {
@@ -118,10 +118,12 @@ export class ModelHelper {
         // 子应用模型相关处理
         {
             const { subAppRefs = [] } = app.model;
+            const { getAllPSSubAppRefs = [] } = appSourceModel;
             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);
+                await this.initSubApp(app, subApp, sourceSubApp);
             }
         }
     }
@@ -135,11 +137,13 @@ export class ModelHelper {
      * @param {ISubAppRef} subApp
      * @return {*}  {Promise<void>}
      */
-    async initSubApp(app, subApp) {
+    async initSubApp(app, subApp, sourceSubApp) {
         this.subAppRefs.push(subApp);
         const ids = subApp.appViewIds || [];
-        ids.forEach(id => {
-            ibiz.hub.setAppView(id, subApp.id);
+        const views = sourceSubApp.getAllPSAppViews || [];
+        ids.forEach((id, index) => {
+            const view = views[index];
+            ibiz.hub.setAppView(id, subApp.id, view.priority);
         });
     }
     /**
@@ -236,7 +240,7 @@ export class ModelHelper {
      * @return {*}  {Promise<IAppView>}
      */
     async loadAppViewModel(viewId, params, appId) {
-        const model = await this.getModelUtil(appId).getAppViewModel(viewId, params);
+        const model = await this.getModelUtil(appId).getAppViewModel(viewId, params, true);
         const dsl = this.dsl.appView(model);
         return dsl;
     }

package/out/model-util.d.ts

@@ -98,12 +98,13 @@ export declare class ModelUtil {
      * 根据应用视图 id 获取应用视图模型,如果给了 params 则每次都会重新加载模型
      *
      * @author chitanda
-     * @date 2024-01-08 11:01:39
+     * @date 2024-01-15 12:01:36
      * @param {string} tag
      * @param {IParams} [params]
+     * @param {boolean} [isDynamic]
      * @return {*}  {Promise<IModel>}
      */
-    getAppViewModel(tag: string, params?: IParams): Promise<IModel>;
+    getAppViewModel(tag: string, params?: IParams, isDynamic?: boolean): Promise<IModel>;
     /**
      * 加载应用多语言模型
      *
@@ -126,12 +127,13 @@ export declare class ModelUtil {
      * 加载模型，如果给了 params 则不会缓存模型
      *
      * @author chitanda
-     * @date 2024-01-08 11:01:41
+     * @date 2024-01-15 12:01:57
      * @param {string} modelPath
      * @param {IParams} [params]
+     * @param {boolean} [isDynamic]
      * @return {*}  {Promise<IModel>}
      */
-    getModel(modelPath: string, params?: IParams): Promise<IModel>;
+    getModel(modelPath: string, params?: IParams, isDynamic?: boolean): Promise<IModel>;
     /**
      * 递归填充应用标识
      *
@@ -145,21 +147,23 @@ export declare class ModelUtil {
      * 计算应用模型请求路径
      *
      * @author chitanda
-     * @date 2023-04-16 12:04:03
+     * @date 2024-01-15 12:01:45
      * @protected
      * @param {string} modelPath
+     * @param {boolean} [isDynamic=false]
      * @return {*}  {string}
      */
-    protected calcAppPath(modelPath: string): string;
+    protected calcAppPath(modelPath: string, isDynamic?: boolean): string;
     /**
      * 计算子应用模型请求路径
      *
      * @author chitanda
-     * @date 2023-04-16 12:04:14
+     * @date 2024-01-15 12:01:39
      * @protected
      * @param {string} modelPath
+     * @param {boolean} [isDynamic=false]
      * @return {*}  {string}
      */
-    protected calcSubAppPath(modelPath: string): string;
+    protected calcSubAppPath(modelPath: string, isDynamic?: boolean): string;
 }
 //# sourceMappingURL=model-util.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"model-util.d.ts","sourceRoot":"","sources":["../src/model-util.ts"],"names":[],"mappings":"AAGA,OAAO,EAA0B,eAAe,EAAE,MAAM,SAAS,CAAC;AAGlE;;;;;;;GAOG;AACH,qBAAa,SAAS;IAyClB,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;IACjE,SAAS,CAAC,GAAG,EAAE,OAAO;IACtB,SAAS,CAAC,UAAU,EAAE,OAAO;IA5C/B;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAG,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,eAAe,EAAG,eAAe,CAAC;IAElC;;;;;;;;;OASG;gBAES,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EACvD,GAAG,EAAE,OAAO,EACZ,UAAU,GAAE,OAAc;IAGtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAoD3B;;;;;;;OAOG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAepC;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAqB3C;;;;;;;;;OASG;IACG,qBAAqB,CACzB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,OAAc,EACpB,UAAU,GAAE,OAAe,GAC1B,OAAO,CAAC,MAAM,CAAC;IA2BlB;;;;;;;;OAQG;IACG,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAerE;;;;;;;OAOG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAarD;;;;;;;OAOG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUjD;;;;;;;;OAQG;IACG,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAmBpE;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAmB5C;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAMhD;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;CAKpD"}
+{"version":3,"file":"model-util.d.ts","sourceRoot":"","sources":["../src/model-util.ts"],"names":[],"mappings":"AAGA,OAAO,EAA0B,eAAe,EAAE,MAAM,SAAS,CAAC;AAGlE;;;;;;;GAOG;AACH,qBAAa,SAAS;IAyClB,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC;IACjE,SAAS,CAAC,GAAG,EAAE,OAAO;IACtB,SAAS,CAAC,UAAU,EAAE,OAAO;IA5C/B;;;;;;;OAOG;IACH,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAG,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,eAAe,EAAG,eAAe,CAAC;IAElC;;;;;;;;;OASG;gBAES,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,EACvD,GAAG,EAAE,OAAO,EACZ,UAAU,GAAE,OAAc;IAGtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAoD3B;;;;;;;OAOG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAepC;;;;;;OAMG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAqB3C;;;;;;;;;OASG;IACG,qBAAqB,CACzB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,OAAc,EACpB,UAAU,GAAE,OAAe,GAC1B,OAAO,CAAC,MAAM,CAAC;IA2BlB;;;;;;;;;OASG;IACG,eAAe,CACnB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAChB,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,MAAM,CAAC;IAelB;;;;;;;OAOG;IACG,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAarD;;;;;;;OAOG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUjD;;;;;;;;;OASG;IACG,QAAQ,CACZ,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,SAAS,CAAC,EAAE,OAAO,GAClB,OAAO,CAAC,MAAM,CAAC;IAmBlB;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAmB5C;;;;;;;;;OASG;IACH,SAAS,CAAC,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,GAAE,OAAe,GAAG,MAAM;IAS5E;;;;;;;;;OASG;IACH,SAAS,CAAC,cAAc,CACtB,SAAS,EAAE,MAAM,EACjB,SAAS,GAAE,OAAe,GACzB,MAAM;CAQV"}

package/out/model-util.js

@@ -196,19 +196,20 @@ export class ModelUtil {
      * 根据应用视图 id 获取应用视图模型,如果给了 params 则每次都会重新加载模型
      *
      * @author chitanda
-     * @date 2024-01-08 11:01:39
+     * @date 2024-01-15 12:01:36
      * @param {string} tag
      * @param {IParams} [params]
+     * @param {boolean} [isDynamic]
      * @return {*}  {Promise<IModel>}
      */
-    async getAppViewModel(tag, params) {
+    async getAppViewModel(tag, params, isDynamic) {
         const allViews = this.appModel.getAllPSAppViews;
         if (allViews && allViews.length > 0) {
             const lowerTag = tag.toLowerCase();
             const exTag = `.${lowerTag}`;
             const view = allViews.find(v => v.id.endsWith(exTag) || v.id === lowerTag);
             if (view) {
-                return this.getModel(view.path, params);
+                return this.getModel(view.path, params, isDynamic);
             }
         }
         throw new Error(`应用[${this.appId}]未找到视图[${tag}]`);
@@ -255,18 +256,19 @@ export class ModelUtil {
      * 加载模型，如果给了 params 则不会缓存模型
      *
      * @author chitanda
-     * @date 2024-01-08 11:01:41
+     * @date 2024-01-15 12:01:57
      * @param {string} modelPath
      * @param {IParams} [params]
+     * @param {boolean} [isDynamic]
      * @return {*}  {Promise<IModel>}
      */
-    async getModel(modelPath, params) {
+    async getModel(modelPath, params, isDynamic) {
         let url;
         if (this.hub) {
-            url = this.calcAppPath(modelPath);
+            url = this.calcAppPath(modelPath, isDynamic);
         }
         else {
-            url = this.calcSubAppPath(modelPath);
+            url = this.calcSubAppPath(modelPath, isDynamic);
         }
         const isParams = params && !isEmpty(params);
         if (this.modelCache.has(url) && !isParams) {
@@ -310,24 +312,32 @@ export class ModelUtil {
      * 计算应用模型请求路径
      *
      * @author chitanda
-     * @date 2023-04-16 12:04:03
+     * @date 2024-01-15 12:01:45
      * @protected
      * @param {string} modelPath
+     * @param {boolean} [isDynamic=false]
      * @return {*}  {string}
      */
-    calcAppPath(modelPath) {
+    calcAppPath(modelPath, isDynamic = false) {
+        if (isDynamic) {
+            return formatPath(modelPath);
+        }
         return `${formatPath(modelPath)}${this.modelTag ? `?dynamodeltag=${this.modelTag}` : ''}`;
     }
     /**
      * 计算子应用模型请求路径
      *
      * @author chitanda
-     * @date 2023-04-16 12:04:14
+     * @date 2024-01-15 12:01:39
      * @protected
      * @param {string} modelPath
+     * @param {boolean} [isDynamic=false]
      * @return {*}  {string}
      */
-    calcSubAppPath(modelPath) {
+    calcSubAppPath(modelPath, isDynamic = false) {
+        if (isDynamic) {
+            return `/subapps/${this.appId}${formatPath(modelPath)}`;
+        }
         return `/subapps/${this.appId}${formatPath(modelPath)}?dynamodeltag=${this.modelTag}`;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/model-helper",
-  "version": "0.5.3-beta.4",
+  "version": "0.5.3-beta.6",
   "description": "控制器包",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -29,13 +29,13 @@
   "author": "chitanda",
   "license": "MIT",
   "dependencies": {
-    "@ibiz/model-core": "^0.1.2",
-    "@ibiz/rt-model-api": "^0.1.39",
+    "@ibiz/model-core": "^0.1.3",
+    "@ibiz/rt-model-api": "^0.1.40",
     "pluralize": "^8.0.0",
     "ramda": "^0.29.1"
   },
   "devDependencies": {
-    "@ibiz-template/runtime": "^0.5.3-beta.4",
+    "@ibiz-template/runtime": "^0.5.3-beta.6",
     "@types/pluralize": "^0.0.33",
     "@types/ramda": "^0.29.9"
   },
@@ -43,5 +43,5 @@
     "@ibiz-template/runtime": "^0.5.0-beta.0",
     "ramda": "^0.29.0"
   },
-  "gitHead": "ed060fe1367c03eb252f52ac33a93ee7350733e3"
+  "gitHead": "fd9a03832183acb0fbdfc3592b1ff820257c2783"
 }

package/src/model-helper.ts

@@ -115,7 +115,7 @@ export class ModelHelper {
     if (appSourceModel.getAllPSAppViews && appId === ibiz.env.appId) {
       const appViews = appSourceModel.getAllPSAppViews as IModel[];
       appViews.forEach(appView => {
-        ibiz.hub.setAppView(appView.id, appSourceModel.id);
+        ibiz.hub.setAppView(appView.id, appSourceModel.id, appView.priority);
       });
     }
     if (appSourceModel.getDefaultPSAppIndexView) {
@@ -150,10 +150,12 @@ export class ModelHelper {
     // 子应用模型相关处理
     {
       const { subAppRefs = [] } = app.model;
+      const { getAllPSSubAppRefs = [] } = appSourceModel;
       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);
+        await this.initSubApp(app, subApp, sourceSubApp);
       }
     }
   }
@@ -171,11 +173,14 @@ export class ModelHelper {
   protected async initSubApp(
     app: IApplication,
     subApp: ISubAppRef,
+    sourceSubApp: IModel,
   ): Promise<void> {
     this.subAppRefs.push(subApp);
     const ids = subApp.appViewIds || [];
-    ids.forEach(id => {
-      ibiz.hub.setAppView(id, subApp.id);
+    const views = sourceSubApp.getAllPSAppViews || [];
+    ids.forEach((id, index) => {
+      const view = views[index];
+      ibiz.hub.setAppView(id, subApp.id, view.priority);
     });
   }
 
@@ -292,6 +297,7 @@ export class ModelHelper {
     const model = await this.getModelUtil(appId).getAppViewModel(
       viewId,
       params,
+      true,
     );
     const dsl = this.dsl.appView(model) as IAppView;
     return dsl;

package/src/model-util.ts

@@ -233,12 +233,17 @@ export class ModelUtil {
    * 根据应用视图 id 获取应用视图模型,如果给了 params 则每次都会重新加载模型
    *
    * @author chitanda
-   * @date 2024-01-08 11:01:39
+   * @date 2024-01-15 12:01:36
    * @param {string} tag
    * @param {IParams} [params]
+   * @param {boolean} [isDynamic]
    * @return {*}  {Promise<IModel>}
    */
-  async getAppViewModel(tag: string, params?: IParams): Promise<IModel> {
+  async getAppViewModel(
+    tag: string,
+    params?: IParams,
+    isDynamic?: boolean,
+  ): Promise<IModel> {
     const allViews = this.appModel.getAllPSAppViews as IModel[];
     if (allViews && allViews.length > 0) {
       const lowerTag = tag.toLowerCase();
@@ -247,7 +252,7 @@ export class ModelUtil {
         v => v.id.endsWith(exTag) || v.id === lowerTag,
       );
       if (view) {
-        return this.getModel(view.path, params);
+        return this.getModel(view.path, params, isDynamic);
       }
     }
     throw new Error(`应用[${this.appId}]未找到视图[${tag}]`);
@@ -296,17 +301,22 @@ export class ModelUtil {
    * 加载模型，如果给了 params 则不会缓存模型
    *
    * @author chitanda
-   * @date 2024-01-08 11:01:41
+   * @date 2024-01-15 12:01:57
    * @param {string} modelPath
    * @param {IParams} [params]
+   * @param {boolean} [isDynamic]
    * @return {*}  {Promise<IModel>}
    */
-  async getModel(modelPath: string, params?: IParams): Promise<IModel> {
+  async getModel(
+    modelPath: string,
+    params?: IParams,
+    isDynamic?: boolean,
+  ): Promise<IModel> {
     let url: string;
     if (this.hub) {
-      url = this.calcAppPath(modelPath);
+      url = this.calcAppPath(modelPath, isDynamic);
     } else {
-      url = this.calcSubAppPath(modelPath);
+      url = this.calcSubAppPath(modelPath, isDynamic);
     }
     const isParams = params && !isEmpty(params);
     if (this.modelCache.has(url) && !isParams) {
@@ -351,12 +361,16 @@ export class ModelUtil {
    * 计算应用模型请求路径
    *
    * @author chitanda
-   * @date 2023-04-16 12:04:03
+   * @date 2024-01-15 12:01:45
    * @protected
    * @param {string} modelPath
+   * @param {boolean} [isDynamic=false]
    * @return {*}  {string}
    */
-  protected calcAppPath(modelPath: string): string {
+  protected calcAppPath(modelPath: string, isDynamic: boolean = false): string {
+    if (isDynamic) {
+      return formatPath(modelPath);
+    }
     return `${formatPath(modelPath)}${
       this.modelTag ? `?dynamodeltag=${this.modelTag}` : ''
     }`;
@@ -366,12 +380,19 @@ export class ModelUtil {
    * 计算子应用模型请求路径
    *
    * @author chitanda
-   * @date 2023-04-16 12:04:14
+   * @date 2024-01-15 12:01:39
    * @protected
    * @param {string} modelPath
+   * @param {boolean} [isDynamic=false]
    * @return {*}  {string}
    */
-  protected calcSubAppPath(modelPath: string): string {
+  protected calcSubAppPath(
+    modelPath: string,
+    isDynamic: boolean = false,
+  ): string {
+    if (isDynamic) {
+      return `/subapps/${this.appId}${formatPath(modelPath)}`;
+    }
     return `/subapps/${this.appId}${formatPath(modelPath)}?dynamodeltag=${
       this.modelTag
     }`;