@ibiz-template/runtime 0.0.4-beta.4 → 0.1.0

package/out/app-hub.d.ts

@@ -1,7 +1,7 @@
 import { IAppDataEntity, IAppView, IApplication } from '@ibiz/model-core';
 import { Application } from './application';
 import { IAppHubService, ModelLoaderProvider } from './interface';
-import { Convert } from './hub';
+import { AppConfigService, Convert } from './hub';
 /**
  * 运行时总集
  *
@@ -72,6 +72,12 @@ export declare class AppHub implements IAppHubService {
      * @type {ModelLoaderProvider}
      */
     protected modelLoaderProvider?: ModelLoaderProvider;
+    /**
+     * hub配置信息服务
+     * @author lxm
+     * @date 2023-07-03 07:12:05
+     */
+    config: AppConfigService;
     /**
      * 默认首页视图名称
      *

package/out/app-hub.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-hub.d.ts","sourceRoot":"","sources":["../src/app-hub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC;;;;;;;GAOG;AACH,qBAAa,MAAO,YAAW,cAAc;IAC3C;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAiB;IAE1C;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAa;IAEnD;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAa;IAE7E;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAEpD;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAW;IAE1C;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAW5C;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI;IAIhE;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI;IAItC;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAItC;;;;;;;OAOG;IACH,qBAAqB,CACnB,KAAK,EAAE,cAAc,EACrB,KAAK,GAAE,MAAuB,GAC7B,IAAI;IAQP;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,GAAE,MAAuB,GAAG,IAAI;IAK7D;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAKhC;;;;;;;OAOG;IACG,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAiBhD;;;;;;;;OAQG;IACG,gBAAgB,CACpB,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,MAAuB,GAC7B,OAAO,CAAC,cAAc,CAAC;IAe1B;;;;;;;OAOG;cACa,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAmB3D;;;;;;;OAOG;IACG,WAAW,CAAC,GAAG,GAAE,MAAuB,GAAG,OAAO,CAAC,WAAW,CAAC;IAIrE;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW;CAajD"}
+{"version":3,"file":"app-hub.d.ts","sourceRoot":"","sources":["../src/app-hub.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAElD;;;;;;;GAOG;AACH,qBAAa,MAAO,YAAW,cAAc;IAC3C;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAiB;IAE1C;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAa;IAEnD;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAa;IAE7E;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IAEpD;;;;OAIG;IACH,MAAM,mBAA0B;IAEhC;;;;;;OAMG;IACH,uBAAuB,EAAE,MAAM,CAAW;IAE1C;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAW5C;;;;;;OAMG;IACH,2BAA2B,CAAC,QAAQ,EAAE,mBAAmB,GAAG,IAAI;IAIhE;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI;IAItC;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAItC;;;;;;;OAOG;IACH,qBAAqB,CACnB,KAAK,EAAE,cAAc,EACrB,KAAK,GAAE,MAAuB,GAC7B,IAAI;IAQP;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,GAAE,MAAuB,GAAG,IAAI;IAK7D;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAKhC;;;;;;;OAOG;IACG,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAiBhD;;;;;;;;OAQG;IACG,gBAAgB,CACpB,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,MAAuB,GAC7B,OAAO,CAAC,cAAc,CAAC;IAuB1B;;;;;;;OAOG;cACa,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAmB3D;;;;;;;OAOG;IACG,WAAW,CAAC,GAAG,GAAE,MAAuB,GAAG,OAAO,CAAC,WAAW,CAAC;IAIrE;;;;;;;OAOG;IACH,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,WAAW;CAajD"}

package/out/app-hub.js

@@ -1,6 +1,6 @@
 import { RuntimeError } from '@ibiz-template/core';
 import { Application } from './application';
-import { Convert } from './hub';
+import { AppConfigService, Convert } from './hub';
 /**
  * 运行时总集
  *
@@ -64,6 +64,12 @@ export class AppHub {
          * @type {Map<string, Map<string, IAppDataEntity>>}
          */
         this.dataEntities = new Map();
+        /**
+         * hub配置信息服务
+         * @author lxm
+         * @date 2023-07-03 07:12:05
+         */
+        this.config = new AppConfigService();
         /**
          * 默认首页视图名称
          *
@@ -203,7 +209,13 @@ export class AppHub {
             }
         }
         if (this.modelLoaderProvider) {
-            const entity = await this.modelLoaderProvider.getAppDataEntity(appId, id);
+            let entity;
+            if (id.indexOf('.') !== -1) {
+                entity = await this.modelLoaderProvider.getAppDataEntity(appId, id);
+            }
+            else {
+                entity = await this.modelLoaderProvider.getAppDataEntityByCodeName(appId, id);
+            }
             this.registerAppDataEntity(entity, appId);
             return entity;
         }

package/out/application.d.ts

@@ -1,5 +1,5 @@
 import { Net } from '@ibiz-template/core';
-import { IAppFunc, IApplication } from '@ibiz/model-core';
+import { IAppDEUIAction, IAppFunc, IApplication, IDEOPPriv, IDEUILogic } from '@ibiz/model-core';
 import { AuthorityService, CodeListService, DEServiceUtil } from './service';
 import { IAppService } from './interface';
 /**
@@ -22,6 +22,14 @@ export declare class Application implements IAppService {
      * @type {string}
      */
     get appId(): string;
+    /**
+     * 应用实体名称到应用实体代码名称的映射
+     *
+     * @author chitanda
+     * @date 2023-06-14 17:06:02
+     * @type {Map<string, string>}
+     */
+    readonly deName2DeCodeName: Map<string, string>;
     /**
      * 应用请求服务
      *
@@ -69,6 +77,15 @@ export declare class Application implements IAppService {
      * @return {*}  {Promise<void>}
      */
     init(): Promise<void>;
+    /**
+     * 加载应用模型全局样式
+     *
+     * @author chitanda
+     * @date 2023-07-24 20:07:41
+     * @protected
+     * @return {*}  {Promise<void>}
+     */
+    protected loadAppModelStyle(): Promise<void>;
     /**
      * 根据 id 查找应用功能
      *
@@ -86,6 +103,24 @@ export declare class Application implements IAppService {
      * @param {string} [_appDataEntityId]
      * @return {*}
      */
-    getUIAction(actionId: string, _appDataEntityId?: string): import("@ibiz/model-core").IAppDEUIAction | undefined;
+    getUIAction(actionId: string): Promise<IAppDEUIAction | undefined>;
+    /**
+     * 获取操作标识模型
+     * @author lxm
+     * @date 2023-05-10 11:24:17
+     * @param {string} id
+     * @param {string} [appDataEntityId]
+     * @return {*}  {(Promise<IDEOPPriv | undefined>)}
+     */
+    getOPPriv(id: string, appDataEntityId?: string): Promise<IDEOPPriv | undefined>;
+    /**
+     * 查找实体的界面逻辑模型
+     * @author lxm
+     * @date 2023-06-14 07:20:30
+     * @param {string} deUILogicId
+     * @param {string} appDataEntityId
+     * @return {*}  {(Promise<IDEUILogic | undefined>)}
+     */
+    getDEUILogic(deUILogicId: string, appDataEntityId: string): Promise<IDEUILogic | undefined>;
 }
 //# sourceMappingURL=application.d.ts.map

package/out/application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;;;;;;;GAQG;AACH,qBAAa,WAAY,YAAW,WAAW;aAuDjB,KAAK,EAAE,YAAY;IAtD/C;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAElC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAErC;;;;;;OAMG;gBACyB,KAAK,EAAE,YAAY;IAS/C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAMvC;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM;CAKxD"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EACL,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,UAAU,EACX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;;;;;;;GAQG;AACH,qBAAa,WAAY,YAAW,WAAW;aAgEjB,KAAK,EAAE,YAAY;IA/D/C;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,MAAM,CAElB;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE5D;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;IAElC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IAEnC;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;IAErC;;;;;;OAMG;gBACyB,KAAK,EAAE,YAAY;IAS/C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B;;;;;;;OAOG;cACa,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBlD;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAMvC;;;;;;;OAOG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAqBxE;;;;;;;OAOG;IACG,SAAS,CACb,EAAE,EAAE,MAAM,EACV,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAajC;;;;;;;OAOG;IACG,YAAY,CAChB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CASnC"}

package/out/application.js

@@ -30,6 +30,14 @@ export class Application {
      */
     constructor(model) {
         this.model = model;
+        /**
+         * 应用实体名称到应用实体代码名称的映射
+         *
+         * @author chitanda
+         * @date 2023-06-14 17:06:02
+         * @type {Map<string, string>}
+         */
+        this.deName2DeCodeName = new Map();
         this.net = new Net({
             baseURL: `${ibiz.env.baseUrl}/${model.appId}`,
         });
@@ -46,6 +54,32 @@ export class Application {
      */
     async init() {
         await this.authority.init();
+        await this.loadAppModelStyle();
+    }
+    /**
+     * 加载应用模型全局样式
+     *
+     * @author chitanda
+     * @date 2023-07-24 20:07:41
+     * @protected
+     * @return {*}  {Promise<void>}
+     */
+    async loadAppModelStyle() {
+        await this.net
+            .get(`${ibiz.env.remoteModelUrl}/PSSYSAPP.json.css`)
+            .then(res => {
+            const dom = document.createElement('style');
+            dom.setAttribute('type', 'text/css');
+            if (res.request && res.request.responseURL) {
+                const url = new URL(res.request.responseURL);
+                dom.id = url.pathname;
+            }
+            dom.innerHTML = res.data;
+            document.head.appendChild(dom);
+        })
+            .catch(err => {
+            ibiz.log.error(`应用[${this.appId}]模型全局样式加载失败：${err.message}`);
+        });
     }
     /**
      * 根据 id 查找应用功能
@@ -68,9 +102,53 @@ export class Application {
      * @param {string} [_appDataEntityId]
      * @return {*}
      */
-    getUIAction(actionId, _appDataEntityId) {
+    async getUIAction(actionId) {
+        const [, appDeId] = actionId.split('@');
+        // 查找实体界面行为
+        if (appDeId) {
+            const appDataEntity = await ibiz.hub.getAppDataEntity(appDeId, this.model.appId);
+            const find = appDataEntity.appDEUIActions.find(action => {
+                return action.id === actionId;
+            });
+            if (find) {
+                return find;
+            }
+        }
+        // 查找应用的界面行为
         return this.model.appDEUIActions.find(action => {
             return action.id === actionId;
         });
     }
+    /**
+     * 获取操作标识模型
+     * @author lxm
+     * @date 2023-05-10 11:24:17
+     * @param {string} id
+     * @param {string} [appDataEntityId]
+     * @return {*}  {(Promise<IDEOPPriv | undefined>)}
+     */
+    async getOPPriv(id, appDataEntityId) {
+        var _a, _b;
+        let result = (_a = this.model.deopprivs) === null || _a === void 0 ? void 0 : _a.find(item => item.name === id);
+        // 查找实体的操作标识
+        if (!result && appDataEntityId) {
+            const appDataEntity = await ibiz.hub.getAppDataEntity(appDataEntityId, this.model.appId);
+            result = (_b = appDataEntity.deopprivs) === null || _b === void 0 ? void 0 : _b.find(item => item.name === id);
+        }
+        return result;
+    }
+    /**
+     * 查找实体的界面逻辑模型
+     * @author lxm
+     * @date 2023-06-14 07:20:30
+     * @param {string} deUILogicId
+     * @param {string} appDataEntityId
+     * @return {*}  {(Promise<IDEUILogic | undefined>)}
+     */
+    async getDEUILogic(deUILogicId, appDataEntityId) {
+        const appDataEntity = await ibiz.hub.getAppDataEntity(appDataEntityId, this.model.appId);
+        return appDataEntity.appDEUILogics.find(logic => {
+            return logic.id === deUILogicId;
+        });
+    }
 }

package/out/command/app/app-func/app-func.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-func.d.ts","sourceRoot":"","sources":["../../../../src/command/app/app-func/app-func.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,CAAC,GAAG,wBAAwB;;IAM3C;;;;;;;;;;OAUG;IACG,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,IAAI,CAAC;IA8BhB;;;;;;;;;;OAUG;cACa,WAAW,CACzB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,IAAI,CAAC;IAahB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAK/C;;;;;;;;;OASG;IACH,SAAS,CAAC,aAAa,CACrB,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,IAAI;IAKP;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,IAAI;IAKP;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CACd,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,IAAI;CAIR"}
+{"version":3,"file":"app-func.d.ts","sourceRoot":"","sources":["../../../../src/command/app/app-func/app-func.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAI5C;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;;;;;;OAOG;IACH,MAAM,CAAC,QAAQ,CAAC,GAAG,wBAAwB;;IAM3C;;;;;;;;;;OAUG;IACG,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,IAAI,CAAC;IA4BhB;;;;;;;;;;OAUG;cACa,WAAW,CACzB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GACX,OAAO,CAAC,IAAI,CAAC;IAahB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAK/C;;;;;;;;;OASG;IACH,SAAS,CAAC,aAAa,CACrB,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,IAAI;IAKP;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,IAAI;IAKP;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CACd,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,QAAQ,EAClB,MAAM,CAAC,EAAE,OAAO,GACf,IAAI;CAIR"}

package/out/command/app/app-func/app-func.js

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { RuntimeError } from '@ibiz-template/core';
+import { ModelError, RuntimeError } from '@ibiz-template/core';
+import { convertNavData } from '../../../utils';
 import { OpenAppViewCommand } from '../open-app-view/open-app-view';
 /**
  * 执行应用功能
@@ -9,7 +10,7 @@ import { OpenAppViewCommand } from '../open-app-view/open-app-view';
  * @export
  * @class AppFuncCommand
  */
-class AppFuncCommand {
+export class AppFuncCommand {
     constructor() {
         ibiz.commands.register(AppFuncCommand.TAG, this.exec.bind(this));
     }
@@ -29,27 +30,24 @@ class AppFuncCommand {
         if (!appFunc) {
             throw new RuntimeError(`找不到叫${appFuncId}的应用功能`);
         }
-        const navContext = appFunc.navigateContexts;
-        if (navContext) {
-            Object.assign(context, navContext);
-        }
-        const navParams = appFunc.navigateParams;
-        if (navParams) {
-            Object.assign(params, navParams);
-        }
-        switch (appFunc.appFuncType) {
+        // 导航参数转换
+        const { navigateContexts, navigateParams, appFuncType } = appFunc;
+        const _context = context.clone();
+        Object.assign(_context, convertNavData(navigateContexts, context, params));
+        const _params = convertNavData(navigateParams, context, params);
+        switch (appFuncType) {
             case 'APPVIEW':
-                return this.openAppView(appFunc, context, params, opts);
+                return this.openAppView(appFunc, _context, _params, opts);
             case 'OPENHTMLPAGE':
                 return this.openHtmlPage(appFunc);
             case 'PDTAPPFUNC':
-                return this.openPdAppFunc(appFunc, context, params);
+                return this.openPdAppFunc(appFunc, _context, _params);
             case 'JAVASCRIPT':
-                return this.executeJavaScript(appFunc, context, params);
+                return this.executeJavaScript(appFunc, _context, _params);
             case 'CUSTOM':
-                return this.custom(appFunc, context, params);
+                return this.custom(appFunc, _context, _params);
             default:
-                throw new Error(`未知的应用功能类型: ${appFunc.appFuncType}`);
+                throw new ModelError(appFunc, `未支持的应用功能类型: ${appFuncType}`);
         }
     }
     /**
@@ -65,7 +63,7 @@ class AppFuncCommand {
      */
     async openAppView(appFunc, context, params, opts) {
         if (!appFunc.appViewId) {
-            throw new Error('应用视图不存在');
+            throw new RuntimeError(`应用视图[${appFunc.appViewId}]不存在`);
         }
         return ibiz.commands.execute(OpenAppViewCommand.TAG, appFunc.appViewId, context, params, opts);
     }
@@ -93,7 +91,7 @@ class AppFuncCommand {
      */
     openPdAppFunc(appFunc, context, params) {
         ibiz.log.warn('openPdAppFunc', appFunc, context, params);
-        throw new Error('未实现');
+        throw new RuntimeError('未实现');
     }
     /**
      * 执行 JavaScript 脚本
@@ -107,7 +105,7 @@ class AppFuncCommand {
      */
     executeJavaScript(appFunc, context, params) {
         ibiz.log.warn('executeJavaScript', appFunc, context, params);
-        throw new Error('未实现');
+        throw new RuntimeError('未实现');
     }
     /**
      * 自定义应用功能
@@ -121,7 +119,7 @@ class AppFuncCommand {
      */
     custom(appFunc, context, params) {
         ibiz.log.warn('custom', appFunc, context, params);
-        throw new Error('未实现');
+        throw new RuntimeError('未实现');
     }
 }
 /**
@@ -133,4 +131,3 @@ class AppFuncCommand {
  * @static
  */
 AppFuncCommand.TAG = 'ibiz.app-func.exec';
-export { AppFuncCommand };

package/out/command/app/open-app-view/open-app-view.d.ts

@@ -1,5 +1,4 @@
-import { IAppView } from '@ibiz/model-core';
-import { IModalData } from '../../../interface';
+import { IModalData, IViewConfig } from '../../../interface';
 /**
  * 打开应用视图
  *
@@ -29,58 +28,58 @@ export declare class OpenAppViewCommand {
      * @author chitanda
      * @date 2022-07-25 20:07:43
      * @protected
-     * @param {IAppView} appView
+     * @param {IViewConfig} appView
      * @param {IContext} [context]
      * @param {IParams} [params={}]
      */
-    protected openIndexViewTab(appView: IAppView, context: IContext, params?: IParams): void;
+    protected openIndexViewTab(appView: IViewConfig, context: IContext, params?: IParams): Promise<IModalData>;
     /**
      * 模态窗口打开
      *
      * @author chitanda
      * @date 2022-07-25 20:07:55
      * @protected
-     * @param {IAppView} appView
+     * @param {IViewConfig} appView
      * @param {IContext} [context]
      * @param {IParams} [params={}]
      * @return {*}  {Promise<IModalData>}
      */
-    protected openModal(appView: IAppView, context: IContext, params?: IParams): Promise<IModalData>;
+    protected openModal(appView: IViewConfig, context: IContext, params?: IParams): Promise<IModalData>;
     /**
      * 气泡模式打开
      *
      * @author chitanda
      * @date 2022-07-25 20:07:17
      * @protected
-     * @param {IAppView} appView
+     * @param {IViewConfig} appView
      * @param {IContext} [context]
      * @param {IParams} [params={}]
      * @return {*}  {Promise<IModalData>}
      */
-    protected openPopover(appView: IAppView, event: MouseEvent, context: IContext, params?: IParams): Promise<IModalData>;
+    protected openPopover(appView: IViewConfig, event: MouseEvent, context: IContext, params?: IParams): Promise<IModalData>;
     /**
      * 抽屉模式打开
      *
      * @author chitanda
      * @date 2022-07-25 20:07:08
      * @protected
-     * @param {IAppView} appView
+     * @param {IViewConfig} appView
      * @param {IContext} [context]
      * @param {IParams} [params={}]
      * @return {*}  {Promise<void>}
      */
-    protected openDrawer(appView: IAppView, context: IContext, params?: IParams): Promise<IModalData>;
+    protected openDrawer(appView: IViewConfig, context: IContext, params?: IParams): Promise<IModalData>;
     /**
      * 用户自定义
      *
      * @author chitanda
      * @date 2022-07-25 20:07:41
      * @protected
-     * @param {IAppView} appView
+     * @param {IViewConfig} appView
      * @param {IContext} [context]
      * @param {IParams} [params={}]
      * @return {*}  {Promise<void>}
      */
-    protected openUserCustom(appView: IAppView, context: IContext, params?: IParams): Promise<IModalData>;
+    protected openUserCustom(appView: IViewConfig, context: IContext, params?: IParams): Promise<IModalData>;
 }
 //# sourceMappingURL=open-app-view.d.ts.map

package/out/command/app/open-app-view/open-app-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-app-view.d.ts","sourceRoot":"","sources":["../../../../src/command/app/open-app-view/open-app-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD;;;;;;;GAOG;AACH,qBAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,CAAC,GAAG,wBAAwB;;IAM3C;;;;;;;;;;OAUG;IACG,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAqC7B;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CACxB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,IAAI;IAIP;;;;;;;;;;OAUG;cACa,SAAS,CACvB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,WAAW,CACzB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,UAAU,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,UAAU,CACxB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,cAAc,CAC5B,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;CAGvB"}
+{"version":3,"file":"open-app-view.d.ts","sourceRoot":"","sources":["../../../../src/command/app/open-app-view/open-app-view.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAI7D;;;;;;;GAOG;AACH,qBAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,CAAC,GAAG,wBAAwB;;IAM3C;;;;;;;;;;OAUG;IACG,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAkD7B;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,SAAS,CACvB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,WAAW,CACzB,OAAO,EAAE,WAAW,EACpB,KAAK,EAAE,UAAU,EACjB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,UAAU,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,cAAc,CAC5B,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;CAGvB"}

package/out/command/app/open-app-view/open-app-view.js

@@ -1,3 +1,5 @@
+import { ModelError, RuntimeError } from '@ibiz-template/core';
+import { calcDeCodeNameById } from '../../../model';
 import { openRedirectView } from '../../../utils';
 /**
  * 打开应用视图
@@ -7,7 +9,7 @@ import { openRedirectView } from '../../../utils';
  * @export
  * @class OpenAppViewCommand
  */
-class OpenAppViewCommand {
+export class OpenAppViewCommand {
     constructor() {
         ibiz.commands.register(OpenAppViewCommand.TAG, this.exec.bind(this));
     }
@@ -23,23 +25,34 @@ class OpenAppViewCommand {
      * @return {*}  {(Promise<IModalData | void>)}
      */
     async exec(appViewId, context, params = {}, opts = {}) {
-        const appView = await ibiz.hub.getAppView(appViewId);
+        const appView = await ibiz.hub.config.view.get(appViewId);
         if (!appView) {
-            throw new Error('应用视图不存在');
+            throw new RuntimeError(`应用视图[${appViewId}]不存在`);
+        }
+        // 识别上下文的srfkey并转成对应视图实体名称，然后置空srfkey
+        if (context.srfkey && appView.appDataEntityId) {
+            const deName = calcDeCodeNameById(appView.appDataEntityId);
+            context[deName] = context.srfkey;
+            context.srfkey = undefined;
         }
         if (appView.redirectView) {
-            return openRedirectView(appView, context, params, opts.data);
+            const fullViewModel = await ibiz.hub.getAppView(appViewId);
+            return openRedirectView(fullViewModel, context, params, opts.data);
         }
         const { openMode = 'INDEXVIEWTAB' } = appView;
         switch (openMode) {
             case 'INDEXVIEWTAB':
+                if (opts.noWaitRoute) {
+                    this.openIndexViewTab(appView, context, params);
+                    return;
+                }
                 return this.openIndexViewTab(appView, context, params);
             case 'POPUP':
-                throw new Error('未支持的视图打开模式: POPUP');
+                throw new ModelError(appView, '未支持的视图打开模式: POPUP');
             case 'POPUPMODAL':
                 return this.openModal(appView, context, params);
             case 'POPUPAPP':
-                throw new Error('未支持的视图打开模式: POPUPAPP');
+                throw new ModelError(appView, '未支持的视图打开模式: POPUPAPP');
             case 'POPOVER':
                 return this.openPopover(appView, opts.event, context, params);
             case 'DRAWER_LEFT':
@@ -59,7 +72,7 @@ class OpenAppViewCommand {
      * @author chitanda
      * @date 2022-07-25 20:07:43
      * @protected
-     * @param {IAppView} appView
+     * @param {IViewConfig} appView
      * @param {IContext} [context]
      * @param {IParams} [params={}]
      */
@@ -72,7 +85,7 @@ class OpenAppViewCommand {
      * @author chitanda
      * @date 2022-07-25 20:07:55
      * @protected
-     * @param {IAppView} appView
+     * @param {IViewConfig} appView
      * @param {IContext} [context]
      * @param {IParams} [params={}]
      * @return {*}  {Promise<IModalData>}
@@ -86,7 +99,7 @@ class OpenAppViewCommand {
      * @author chitanda
      * @date 2022-07-25 20:07:17
      * @protected
-     * @param {IAppView} appView
+     * @param {IViewConfig} appView
      * @param {IContext} [context]
      * @param {IParams} [params={}]
      * @return {*}  {Promise<IModalData>}
@@ -100,7 +113,7 @@ class OpenAppViewCommand {
      * @author chitanda
      * @date 2022-07-25 20:07:08
      * @protected
-     * @param {IAppView} appView
+     * @param {IViewConfig} appView
      * @param {IContext} [context]
      * @param {IParams} [params={}]
      * @return {*}  {Promise<void>}
@@ -114,7 +127,7 @@ class OpenAppViewCommand {
      * @author chitanda
      * @date 2022-07-25 20:07:41
      * @protected
-     * @param {IAppView} appView
+     * @param {IViewConfig} appView
      * @param {IContext} [context]
      * @param {IParams} [params={}]
      * @return {*}  {Promise<void>}
@@ -124,4 +137,3 @@ class OpenAppViewCommand {
     }
 }
 OpenAppViewCommand.TAG = 'ibiz.app-view.open';
-export { OpenAppViewCommand };

package/out/config/global-config.d.ts

@@ -1,4 +1,4 @@
-import { IGlobalConfig } from '../interface/i-global-config/i-global-config';
+import { IGlobalConfig, IGlobalGridConfig, IGlobalAppMenuConfig, IGlobalCodeListConfig, IGlobalViewConfig } from '../interface';
 /**
  * 全局配置类,控制应用的功能开关。
  *
@@ -9,10 +9,9 @@ import { IGlobalConfig } from '../interface/i-global-config/i-global-config';
  * @implements {IGlobalConfig}
  */
 export declare class GlobalConfig implements IGlobalConfig {
-    enableDataInfoBar: boolean;
-    defaultCodeListCacheTimeout: number;
-    gridEditShowMode: 'cell' | 'row' | 'all';
-    gridEditSaveMode: 'cell-blur' | 'auto' | 'manual';
-    defaultTimerLogicInterval: number;
+    view: IGlobalViewConfig;
+    grid: IGlobalGridConfig;
+    appMenu: IGlobalAppMenuConfig;
+    codeList: IGlobalCodeListConfig;
 }
 //# sourceMappingURL=global-config.d.ts.map

package/out/config/global-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/config/global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAE7E;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAChD,iBAAiB,EAAE,OAAO,CAAQ;IAElC,2BAA2B,EAAE,MAAM,CAAW;IAE9C,gBAAgB,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,CAAU;IAElD,gBAAgB,EAAE,WAAW,GAAG,MAAM,GAAG,QAAQ,CAAe;IAEhE,yBAAyB,SAAS;CACnC"}
+{"version":3,"file":"global-config.d.ts","sourceRoot":"","sources":["../../src/config/global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,cAAc,CAAC;AAEtB;;;;;;;;GAQG;AACH,qBAAa,YAAa,YAAW,aAAa;IAEhD,IAAI,EAAE,iBAAiB,CAErB;IAGF,IAAI,EAAE,iBAAiB,CAGrB;IAGF,OAAO,EAAE,oBAAoB,CAE3B;IAGF,QAAQ,EAAE,qBAAqB,CAE7B;CACH"}

package/out/config/global-config.js

@@ -9,10 +9,22 @@
  */
 export class GlobalConfig {
     constructor() {
-        this.enableDataInfoBar = true;
-        this.defaultCodeListCacheTimeout = 3600000;
-        this.gridEditShowMode = 'cell';
-        this.gridEditSaveMode = 'cell-blur';
-        this.defaultTimerLogicInterval = 60000;
+        // 全局视图配置
+        this.view = {
+            enableDataInfoBar: true,
+        };
+        // 全局表格配置
+        this.grid = {
+            editShowMode: 'cell',
+            editSaveMode: 'cell-blur',
+        };
+        // 全局菜单配置
+        this.appMenu = {
+            enableEcho: false,
+        };
+        // 全局代码表配置
+        this.codeList = {
+            timeout: 60 * 60 * 1000,
+        };
     }
 }