@ibiz-template/model-helper 0.5.1 → 0.5.2

package/out/model-helper.d.ts

@@ -10,7 +10,7 @@ import { ModelUtil } from './model-util';
  * @class ModelHelper
  */
 export declare class ModelHelper {
-    protected getModel: (url: string) => Promise<IModel>;
+    protected getModel: (url: string, params?: IParams) => Promise<IModel>;
     protected defaultAppId: string;
     protected permission: boolean;
     protected dsl: DSLHelper;
@@ -35,12 +35,12 @@ export declare class ModelHelper {
     /**
      * Creates an instance of ModelHelper.
      * @author chitanda
-     * @date 2023-04-16 17:04:01
-     * @param {(url: string) => Promise<IModel>} getModel 模型加载方法
+     * @date 2024-01-08 10:01:20
+     * @param {(url: string, params?: IParams) => Promise<IModel>} getModel 模型加载方法
      * @param {string} defaultAppId 默认应用标识
      * @param {boolean} [permission=true] 是否启用权限
      */
-    constructor(getModel: (url: string) => Promise<IModel>, defaultAppId: string, permission?: boolean);
+    constructor(getModel: (url: string, params?: IParams) => Promise<IModel>, defaultAppId: string, permission?: boolean);
     /**
      * 初始化应用内容
      *
@@ -129,6 +129,17 @@ export declare class ModelHelper {
      * @return {*}  {Promise<IAppView>}
      */
     getAppViewModel(name: string, appId?: string | IObject): Promise<IAppView>;
+    /**
+     * 根据路径和参数加载应用视图模型，主要用于后台根据运行时参数重新计算视图模型
+     *
+     * @author chitanda
+     * @date 2024-01-08 10:01:43
+     * @param {string} viewId
+     * @param {IParams} [params]
+     * @param {string} [appId]
+     * @return {*}  {Promise<IAppView>}
+     */
+    loadAppViewModel(viewId: string, params?: IParams, appId?: string): Promise<IAppView>;
     /**
      * 获取应用多语言模型
      *

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;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;;;;;;;;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;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"}

package/out/model-helper.js

@@ -14,8 +14,8 @@ export class ModelHelper {
     /**
      * Creates an instance of ModelHelper.
      * @author chitanda
-     * @date 2023-04-16 17:04:01
-     * @param {(url: string) => Promise<IModel>} getModel 模型加载方法
+     * @date 2024-01-08 10:01:20
+     * @param {(url: string, params?: IParams) => Promise<IModel>} getModel 模型加载方法
      * @param {string} defaultAppId 默认应用标识
      * @param {boolean} [permission=true] 是否启用权限
      */
@@ -225,6 +225,21 @@ export class ModelHelper {
         this.calcAppViewSubAppModel(dsl);
         return dsl;
     }
+    /**
+     * 根据路径和参数加载应用视图模型，主要用于后台根据运行时参数重新计算视图模型
+     *
+     * @author chitanda
+     * @date 2024-01-08 10:01:43
+     * @param {string} viewId
+     * @param {IParams} [params]
+     * @param {string} [appId]
+     * @return {*}  {Promise<IAppView>}
+     */
+    async loadAppViewModel(viewId, params, appId) {
+        const model = await this.getModelUtil(appId).getAppViewModel(viewId, params);
+        const dsl = this.dsl.appView(model);
+        return dsl;
+    }
     /**
      * 获取应用多语言模型
      *

package/out/model-loader.d.ts

@@ -19,5 +19,6 @@ export declare class ModelLoader implements ModelLoaderProvider {
     getAppDataEntity(appId: string, id: string): Promise<IAppDataEntity>;
     getAppDataEntityByCodeName(appId: string, codeName: string): Promise<IAppDataEntity>;
     getAppStyle(appId: string): Promise<string | null>;
+    loadAppView(appId: string, viewId: string, params: IParams): Promise<IAppView>;
 }
 //# sourceMappingURL=model-loader.d.ts.map

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,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"}
+{"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;IAIlD,WAAW,CACT,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,QAAQ,CAAC;CAGrB"}

package/out/model-loader.js

@@ -29,4 +29,7 @@ export class ModelLoader {
     getAppStyle(appId) {
         return this.helper.getAppStyle(appId);
     }
+    loadAppView(appId, viewId, params) {
+        return this.helper.loadAppViewModel(viewId, params, appId);
+    }
 }

package/out/model-util.d.ts

@@ -10,7 +10,7 @@ import { ServicePathUtil } from './utils';
 export declare class ModelUtil {
     protected appId: string;
     protected modelTag: string;
-    protected get: (url: string) => Promise<IModel>;
+    protected get: (url: string, params?: IParams) => Promise<IModel>;
     protected hub: boolean;
     protected permission: boolean;
     /**
@@ -46,10 +46,10 @@ export declare class ModelUtil {
      * @date 2023-04-13 21:04:21
      * @param {string}appId 应用标识
      * @param {string} modelTag
-     * @param {(url: string) => Promise<IModel>} get 模型加载方法
+     * @param {(url: string, params?: IParams) => Promise<IModel>} get 模型加载方法
      * @param {boolean} hub 是否为 hub 应用基座
      */
-    constructor(appId: string, modelTag: string, get: (url: string) => Promise<IModel>, hub: boolean, permission?: boolean);
+    constructor(appId: string, modelTag: string, get: (url: string, params?: IParams) => Promise<IModel>, hub: boolean, permission?: boolean);
     /**
      * 在使用前需要初始化，来进行异步加载
      *
@@ -95,15 +95,15 @@ export declare class ModelUtil {
      */
     getAppDataEntityModel(tag: string, isId?: boolean, ignoreCase?: boolean): Promise<IModel>;
     /**
-     * 根据应用视图 codeName 获取应用视图模型
+     * 根据应用视图 id 获取应用视图模型,如果给了 params 则每次都会重新加载模型
      *
      * @author chitanda
-     * @date 2023-04-16 18:04:00
+     * @date 2024-01-08 11:01:39
      * @param {string} tag
-     * @param {boolean} [ignoreCase=false]
+     * @param {IParams} [params]
      * @return {*}  {Promise<IModel>}
      */
-    getAppViewModel(tag: string): Promise<IModel>;
+    getAppViewModel(tag: string, params?: IParams): Promise<IModel>;
     /**
      * 加载应用多语言模型
      *
@@ -123,14 +123,15 @@ export declare class ModelUtil {
      */
     getStyleModel(modelPath: string): Promise<string>;
     /**
-     * 获取模型
+     * 加载模型，如果给了 params 则不会缓存模型
      *
      * @author chitanda
-     * @date 2023-04-16 16:04:10
+     * @date 2024-01-08 11:01:41
      * @param {string} modelPath
+     * @param {IParams} [params]
      * @return {*}  {Promise<IModel>}
      */
-    getModel(modelPath: string): Promise<IModel>;
+    getModel(modelPath: string, params?: IParams): Promise<IModel>;
     /**
      * 递归填充应用标识
      *

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

@@ -1 +1 @@
-{"version":3,"file":"model-util.d.ts","sourceRoot":"","sources":["../src/model-util.ts"],"names":[],"mappings":"AAEA,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,KAAK,OAAO,CAAC,MAAM,CAAC;IAC/C,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,KAAK,OAAO,CAAC,MAAM,CAAC,EACrC,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,GAAG,OAAO,CAAC,MAAM,CAAC;IAenD;;;;;;;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;;;;;;;OAOG;IACG,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgBlD;;;;;;;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;;;;;;;;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"}

package/out/model-util.js

@@ -1,4 +1,5 @@
 import { calcUniqueTag } from '@ibiz/rt-model-api';
+import { isEmpty } from 'ramda';
 import { formatPath, mergeModel, ServicePathUtil } from './utils';
 import { PSSysApp } from './model/PSSYSAPP';
 /**
@@ -17,7 +18,7 @@ export class ModelUtil {
      * @date 2023-04-13 21:04:21
      * @param {string}appId 应用标识
      * @param {string} modelTag
-     * @param {(url: string) => Promise<IModel>} get 模型加载方法
+     * @param {(url: string, params?: IParams) => Promise<IModel>} get 模型加载方法
      * @param {boolean} hub 是否为 hub 应用基座
      */
     constructor(appId, modelTag, get, hub, permission = true) {
@@ -192,22 +193,22 @@ export class ModelUtil {
         throw new Error(`应用[${this.appId}]未找到数据实体[${tag}]`);
     }
     /**
-     * 根据应用视图 codeName 获取应用视图模型
+     * 根据应用视图 id 获取应用视图模型,如果给了 params 则每次都会重新加载模型
      *
      * @author chitanda
-     * @date 2023-04-16 18:04:00
+     * @date 2024-01-08 11:01:39
      * @param {string} tag
-     * @param {boolean} [ignoreCase=false]
+     * @param {IParams} [params]
      * @return {*}  {Promise<IModel>}
      */
-    async getAppViewModel(tag) {
+    async getAppViewModel(tag, params) {
         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);
+                return this.getModel(view.path, params);
             }
         }
         throw new Error(`应用[${this.appId}]未找到视图[${tag}]`);
@@ -251,14 +252,15 @@ export class ModelUtil {
         return this.get(url);
     }
     /**
-     * 获取模型
+     * 加载模型，如果给了 params 则不会缓存模型
      *
      * @author chitanda
-     * @date 2023-04-16 16:04:10
+     * @date 2024-01-08 11:01:41
      * @param {string} modelPath
+     * @param {IParams} [params]
      * @return {*}  {Promise<IModel>}
      */
-    async getModel(modelPath) {
+    async getModel(modelPath, params) {
         let url;
         if (this.hub) {
             url = this.calcAppPath(modelPath);
@@ -266,11 +268,14 @@ export class ModelUtil {
         else {
             url = this.calcSubAppPath(modelPath);
         }
-        if (this.modelCache.has(url)) {
+        const isParams = params && !isEmpty(params);
+        if (this.modelCache.has(url) && !isParams) {
             return this.modelCache.get(url);
         }
-        const model = await this.get(url);
-        this.modelCache.set(url, model);
+        const model = await this.get(url, params);
+        if (!isParams) {
+            this.modelCache.set(url, model);
+        }
         this.deepFillAppId(model);
         return model;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/model-helper",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "控制器包",
   "main": "out/index.js",
   "types": "out/index.d.ts",
@@ -35,7 +35,7 @@
     "ramda": "^0.29.1"
   },
   "devDependencies": {
-    "@ibiz-template/runtime": "^0.5.1",
+    "@ibiz-template/runtime": "^0.5.2",
     "@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": "f442a5daebbca26f24b167d8afa470d8fd2ff8b8"
+  "gitHead": "e7e869a5ceda4a77a8bf73dbcf0bf1a0c9acf6c5"
 }

package/src/model-helper.ts

@@ -47,13 +47,13 @@ export class ModelHelper {
   /**
    * Creates an instance of ModelHelper.
    * @author chitanda
-   * @date 2023-04-16 17:04:01
-   * @param {(url: string) => Promise<IModel>} getModel 模型加载方法
+   * @date 2024-01-08 10:01:20
+   * @param {(url: string, params?: IParams) => Promise<IModel>} getModel 模型加载方法
    * @param {string} defaultAppId 默认应用标识
    * @param {boolean} [permission=true] 是否启用权限
    */
   constructor(
-    protected getModel: (url: string) => Promise<IModel>,
+    protected getModel: (url: string, params?: IParams) => Promise<IModel>,
     protected defaultAppId: string,
     protected permission: boolean = true,
   ) {
@@ -274,6 +274,29 @@ export class ModelHelper {
     return dsl;
   }
 
+  /**
+   * 根据路径和参数加载应用视图模型，主要用于后台根据运行时参数重新计算视图模型
+   *
+   * @author chitanda
+   * @date 2024-01-08 10:01:43
+   * @param {string} viewId
+   * @param {IParams} [params]
+   * @param {string} [appId]
+   * @return {*}  {Promise<IAppView>}
+   */
+  async loadAppViewModel(
+    viewId: string,
+    params?: IParams,
+    appId?: string,
+  ): Promise<IAppView> {
+    const model = await this.getModelUtil(appId).getAppViewModel(
+      viewId,
+      params,
+    );
+    const dsl = this.dsl.appView(model) as IAppView;
+    return dsl;
+  }
+
   /**
    * 获取应用多语言模型
    *

package/src/model-loader.ts

@@ -40,4 +40,12 @@ export class ModelLoader implements ModelLoaderProvider {
   getAppStyle(appId: string): Promise<string | null> {
     return this.helper.getAppStyle(appId);
   }
+
+  loadAppView(
+    appId: string,
+    viewId: string,
+    params: IParams,
+  ): Promise<IAppView> {
+    return this.helper.loadAppViewModel(viewId, params, appId);
+  }
 }

package/src/model-util.ts

@@ -1,5 +1,6 @@
 import { calcUniqueTag } from '@ibiz/rt-model-api';
 import { IAppDERS } from '@ibiz/model-core';
+import { isEmpty } from 'ramda';
 import { formatPath, mergeModel, ServicePathUtil } from './utils';
 import { PSSysApp } from './model/PSSYSAPP';
 
@@ -48,13 +49,13 @@ export class ModelUtil {
    * @date 2023-04-13 21:04:21
    * @param {string}appId 应用标识
    * @param {string} modelTag
-   * @param {(url: string) => Promise<IModel>} get 模型加载方法
+   * @param {(url: string, params?: IParams) => Promise<IModel>} get 模型加载方法
    * @param {boolean} hub 是否为 hub 应用基座
    */
   constructor(
     protected appId: string,
     protected modelTag: string,
-    protected get: (url: string) => Promise<IModel>,
+    protected get: (url: string, params?: IParams) => Promise<IModel>,
     protected hub: boolean,
     protected permission: boolean = true,
   ) {}
@@ -229,15 +230,15 @@ export class ModelUtil {
   }
 
   /**
-   * 根据应用视图 codeName 获取应用视图模型
+   * 根据应用视图 id 获取应用视图模型,如果给了 params 则每次都会重新加载模型
    *
    * @author chitanda
-   * @date 2023-04-16 18:04:00
+   * @date 2024-01-08 11:01:39
    * @param {string} tag
-   * @param {boolean} [ignoreCase=false]
+   * @param {IParams} [params]
    * @return {*}  {Promise<IModel>}
    */
-  async getAppViewModel(tag: string): Promise<IModel> {
+  async getAppViewModel(tag: string, params?: IParams): Promise<IModel> {
     const allViews = this.appModel.getAllPSAppViews as IModel[];
     if (allViews && allViews.length > 0) {
       const lowerTag = tag.toLowerCase();
@@ -246,7 +247,7 @@ export class ModelUtil {
         v => v.id.endsWith(exTag) || v.id === lowerTag,
       );
       if (view) {
-        return this.getModel(view.path);
+        return this.getModel(view.path, params);
       }
     }
     throw new Error(`应用[${this.appId}]未找到视图[${tag}]`);
@@ -292,25 +293,29 @@ export class ModelUtil {
   }
 
   /**
-   * 获取模型
+   * 加载模型，如果给了 params 则不会缓存模型
    *
    * @author chitanda
-   * @date 2023-04-16 16:04:10
+   * @date 2024-01-08 11:01:41
    * @param {string} modelPath
+   * @param {IParams} [params]
    * @return {*}  {Promise<IModel>}
    */
-  async getModel(modelPath: string): Promise<IModel> {
+  async getModel(modelPath: string, params?: IParams): Promise<IModel> {
     let url: string;
     if (this.hub) {
       url = this.calcAppPath(modelPath);
     } else {
       url = this.calcSubAppPath(modelPath);
     }
-    if (this.modelCache.has(url)) {
+    const isParams = params && !isEmpty(params);
+    if (this.modelCache.has(url) && !isParams) {
       return this.modelCache.get(url)!;
     }
-    const model = await this.get(url);
-    this.modelCache.set(url, model);
+    const model = await this.get(url, params);
+    if (!isParams) {
+      this.modelCache.set(url, model);
+    }
     this.deepFillAppId(model);
     return model;
   }