@ibiz-template/runtime 0.0.3-beta.6 → 0.0.4-beta.1

package/out/runtime-hub.d.ts

@@ -1,5 +1,6 @@
-import { IPSApplication, ModelObject, ModelService } from '@ibiz-template/model';
+import { IAppDataEntity, IAppView, IApplication } from '@ibiz-template/model';
 import { Application } from './application';
+import { ModelLoaderProvider } from './interface';
 /**
  * 运行时总集
  *
@@ -19,17 +20,136 @@ export declare class RuntimeHub {
      */
     protected appMap: Map<string, Application>;
     /**
-     * 创建应用对象
+     * 当前基座下所有的应用视图
      *
      * @author chitanda
-     * @date 2022-12-21 14:12:33
-     * @param {string} key 应用标识
-     * @param {ModelService} service 应用所对应的模型服务
+     * @date 2023-04-17 11:04:20
+     * @protected
+     * @type {Map<string, appId>} Map<视图名称, 视图所属应用>
+     */
+    protected view2appMap: Map<string, string>;
+    /**
+     * 实例化的应用模型
+     *
+     * @author chitanda
+     * @date 2023-04-17 23:04:45
+     * @protected
+     * @type {Map<string, IApplication>}
+     */
+    protected apps: Map<string, IApplication>;
+    /**
+     * 实例化的应用视图模型
+     *
+     * @author chitanda
+     * @date 2023-04-17 23:04:00
+     * @protected
+     * @type {Map<string, IAppView>}
+     */
+    protected views: Map<string, IAppView>;
+    /**
+     * 应用实体实例模型
+     *
+     * @author chitanda
+     * @date 2023-04-17 23:04:32
+     * @protected
+     * @type {Map<string, Map<string, IAppDataEntity>>}
+     */
+    protected dataEntities: Map<string, Map<string, IAppDataEntity>>;
+    /**
+     * 模型加载适配器由外部注册，存在时使用
+     *
+     * @author chitanda
+     * @date 2023-04-17 23:04:02
+     * @type {ModelLoaderProvider}
+     */
+    protected modelLoaderProvider?: ModelLoaderProvider;
+    /**
+     * 注册模型加载适配器
+     *
+     * @author chitanda
+     * @date 2023-04-17 23:04:14
+     * @param {ModelLoaderProvider} provider
+     */
+    registerModelLoaderProvider(provider: ModelLoaderProvider): void;
+    /**
+     * 注册应用实例模型
+     *
+     * @author chitanda
+     * @date 2023-04-17 23:04:29
+     * @param {IApplication} model
+     */
+    registerApp(model: IApplication): void;
+    /**
+     * 注册应用视图实例模型
+     *
+     * @author chitanda
+     * @date 2023-04-17 23:04:42
+     * @param {IAppView} model
+     */
+    registerAppView(model: IAppView): void;
+    /**
+     * 注册应用实体
+     *
+     * @author chitanda
+     * @date 2023-04-17 23:04:24
+     * @param {IAppDataEntity} model
+     * @param {string} [appId=ibiz.env.appId]
+     */
+    registerAppDataEntity(model: IAppDataEntity, appId?: string): void;
+    /**
+     * 设置应用视图所属应用
+     *
+     * @author chitanda
+     * @date 2023-04-17 23:04:37
+     * @param {string} name
+     * @param {string} [appId=ibiz.env.appId]
+     */
+    setAppView(name: string, appId?: string): void;
+    /**
+     * 根据视图代码名称查找视图
+     *
+     * @author chitanda
+     * @date 2023-04-17 21:04:14
+     * @param {string} name
+     * @return {*}  {Promise<IAppView>}
+     */
+    getAppView(name: string): Promise<IAppView>;
+    /**
+     * 根据应用实体代码名称查找应用视图
+     *
+     * @author chitanda
+     * @date 2023-04-17 23:04:08
+     * @param {string} name
+     * @param {string} [appId=ibiz.env.appId]
+     * @return {*}  {Promise<IAppDataEntity>}
+     */
+    getAppDataEntity(name: string, appId?: string): Promise<IAppDataEntity>;
+    /**
+     * 新建 hub 应用
+     *
+     * @author chitanda
+     * @date 2023-04-17 21:04:11
+     * @param {string} id
      * @return {*}  {Promise<Application>}
      */
-    createApp(key: string, service: ModelService): Promise<Application>;
-    getApp(key?: string): Application;
-    getApp(appModel?: IPSApplication): Application;
-    getApp(model?: ModelObject): Application;
+    protected createApp(id: string): Promise<Application>;
+    /**
+     * 异步获取应用对象，用于不确定应用是否已经加载的情况
+     *
+     * @author chitanda
+     * @date 2023-04-17 21:04:41
+     * @param {string} [key=ibiz.env.appId]
+     * @return {*}  {Promise<Application>}
+     */
+    getAppAsync(key?: string): Promise<Application>;
+    /**
+     * 根据应用 id 或应用模型获取应用实例
+     *
+     * @author chitanda
+     * @date 2023-04-17 22:04:42
+     * @param {(string | IApplication)} [app]
+     * @return {*}  {Application}
+     */
+    getApp(app?: string | IApplication): Application;
 }
 //# sourceMappingURL=runtime-hub.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"runtime-hub.d.ts","sourceRoot":"","sources":["../src/runtime-hub.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAEd,WAAW,EACX,YAAY,EACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEvD;;;;;;;;OAQG;IACG,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;IAOzE,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,WAAW;IAEjC,MAAM,CAAC,QAAQ,CAAC,EAAE,cAAc,GAAG,WAAW;IAE9C,MAAM,CAAC,KAAK,CAAC,EAAE,WAAW,GAAG,WAAW;CA4BzC"}
+{"version":3,"file":"runtime-hub.d.ts","sourceRoot":"","sources":["../src/runtime-hub.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,QAAQ,EACR,YAAY,EACb,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEvD;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAEtD;;;;;;;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,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,IAAI,EAAE,MAAM,EAAE,KAAK,GAAE,MAAuB,GAAG,IAAI;IAI9D;;;;;;;OAOG;IACG,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAgBjD;;;;;;;;OAQG;IACG,gBAAgB,CACpB,IAAI,EAAE,MAAM,EACZ,KAAK,GAAE,MAAuB,GAC7B,OAAO,CAAC,cAAc,CAAC;IAiB1B;;;;;;;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/runtime-hub.js

@@ -1,4 +1,5 @@
-import { ModelConst, ModelObject, } from '@ibiz-template/model';
+import { ApplicationModel, } from '@ibiz-template/model';
+import { RuntimeError } from '@ibiz-template/core';
 import { Application } from './application';
 /**
  * 运行时总集
@@ -19,47 +20,203 @@ export class RuntimeHub {
          * @type {Map<string, Application>}
          */
         this.appMap = new Map();
+        /**
+         * 当前基座下所有的应用视图
+         *
+         * @author chitanda
+         * @date 2023-04-17 11:04:20
+         * @protected
+         * @type {Map<string, appId>} Map<视图名称, 视图所属应用>
+         */
+        this.view2appMap = new Map();
+        /**
+         * 实例化的应用模型
+         *
+         * @author chitanda
+         * @date 2023-04-17 23:04:45
+         * @protected
+         * @type {Map<string, IApplication>}
+         */
+        this.apps = new Map();
+        /**
+         * 实例化的应用视图模型
+         *
+         * @author chitanda
+         * @date 2023-04-17 23:04:00
+         * @protected
+         * @type {Map<string, IAppView>}
+         */
+        this.views = new Map();
+        /**
+         * 应用实体实例模型
+         *
+         * @author chitanda
+         * @date 2023-04-17 23:04:32
+         * @protected
+         * @type {Map<string, Map<string, IAppDataEntity>>}
+         */
+        this.dataEntities = new Map();
+    }
+    /**
+     * 注册模型加载适配器
+     *
+     * @author chitanda
+     * @date 2023-04-17 23:04:14
+     * @param {ModelLoaderProvider} provider
+     */
+    registerModelLoaderProvider(provider) {
+        this.modelLoaderProvider = provider;
+    }
+    /**
+     * 注册应用实例模型
+     *
+     * @author chitanda
+     * @date 2023-04-17 23:04:29
+     * @param {IApplication} model
+     */
+    registerApp(model) {
+        this.apps.set(model.codeName, model);
+    }
+    /**
+     * 注册应用视图实例模型
+     *
+     * @author chitanda
+     * @date 2023-04-17 23:04:42
+     * @param {IAppView} model
+     */
+    registerAppView(model) {
+        this.views.set(model.codeName, model);
+    }
+    /**
+     * 注册应用实体
+     *
+     * @author chitanda
+     * @date 2023-04-17 23:04:24
+     * @param {IAppDataEntity} model
+     * @param {string} [appId=ibiz.env.appId]
+     */
+    registerAppDataEntity(model, appId = ibiz.env.appId) {
+        if (!this.dataEntities.has(appId)) {
+            this.dataEntities.set(appId, new Map());
+        }
+        const map = this.dataEntities.get(appId);
+        map.set(model.codeName, model);
+    }
+    /**
+     * 设置应用视图所属应用
+     *
+     * @author chitanda
+     * @date 2023-04-17 23:04:37
+     * @param {string} name
+     * @param {string} [appId=ibiz.env.appId]
+     */
+    setAppView(name, appId = ibiz.env.appId) {
+        this.view2appMap.set(name, appId);
+    }
+    /**
+     * 根据视图代码名称查找视图
+     *
+     * @author chitanda
+     * @date 2023-04-17 21:04:14
+     * @param {string} name
+     * @return {*}  {Promise<IAppView>}
+     */
+    async getAppView(name) {
+        const appId = this.view2appMap.get(name) || ibiz.env.appId;
+        if (this.appMap.has(appId)) {
+            await this.createApp(appId);
+        }
+        if (this.views.has(name)) {
+            return this.views.get(name);
+        }
+        if (this.modelLoaderProvider) {
+            const appView = await this.modelLoaderProvider.getAppView(appId, name);
+            this.registerAppView(appView);
+            return appView;
+        }
+        throw new RuntimeError(`视图[${name}]不存在`);
     }
     /**
-     * 创建应用对象
+     * 根据应用实体代码名称查找应用视图
      *
      * @author chitanda
-     * @date 2022-12-21 14:12:33
-     * @param {string} key 应用标识
-     * @param {ModelService} service 应用所对应的模型服务
+     * @date 2023-04-17 23:04:08
+     * @param {string} name
+     * @param {string} [appId=ibiz.env.appId]
+     * @return {*}  {Promise<IAppDataEntity>}
+     */
+    async getAppDataEntity(name, appId = ibiz.env.appId) {
+        if (this.dataEntities.has(appId)) {
+            const map = this.dataEntities.get(appId);
+            if (map.has(name)) {
+                return map.get(name);
+            }
+        }
+        if (this.modelLoaderProvider) {
+            const entity = await this.modelLoaderProvider.getAppDataEntity(appId, name);
+            this.registerAppDataEntity(entity, appId);
+        }
+        throw new RuntimeError(`未找到应用实体[${name}]`);
+    }
+    /**
+     * 新建 hub 应用
+     *
+     * @author chitanda
+     * @date 2023-04-17 21:04:11
+     * @param {string} id
      * @return {*}  {Promise<Application>}
      */
-    async createApp(key, service) {
-        const app = new Application(service);
-        this.appMap.set(key, app);
+    async createApp(id) {
+        if (this.appMap.has(id)) {
+            return this.appMap.get(id);
+        }
+        let appModel;
+        if (this.apps.has(id)) {
+            appModel = this.apps.get(id);
+        }
+        else if (this.modelLoaderProvider) {
+            appModel = await this.modelLoaderProvider.getApp(id);
+            this.registerApp(appModel);
+        }
+        else {
+            throw new RuntimeError(`未找到应用[${id}]模型`);
+        }
+        const app = new Application(new ApplicationModel(appModel));
+        this.appMap.set(id, app);
         await app.init();
         return app;
     }
     /**
-     * 根据标识获取应用对象
+     * 异步获取应用对象，用于不确定应用是否已经加载的情况
+     *
+     * @author chitanda
+     * @date 2023-04-17 21:04:41
+     * @param {string} [key=ibiz.env.appId]
+     * @return {*}  {Promise<Application>}
+     */
+    async getAppAsync(key = ibiz.env.appId) {
+        return this.createApp(key);
+    }
+    /**
+     * 根据应用 id 或应用模型获取应用实例
      *
      * @author chitanda
-     * @date 2022-12-21 20:12:53
-     * @param {(string | IPSApplication)} [app]
+     * @date 2023-04-17 22:04:42
+     * @param {(string | IApplication)} [app]
      * @return {*}  {Application}
      */
     getApp(app) {
         let key = null;
         if (app) {
             if (app instanceof Object) {
-                if (app instanceof ModelObject) {
-                    key = app.modelService.app.appId;
-                }
-                else {
-                    key = app.appId;
-                }
+                key = app.id;
             }
             else {
                 key = app;
             }
         }
-        if (!key) {
-            key = ModelConst.DEFAULT_SANDBOX;
+        else {
+            key = ibiz.env.appId;
         }
         return this.appMap.get(key);
     }

package/out/service/authority/authority.service.d.ts

@@ -1,4 +1,4 @@
-import { AppEntityModel, AppMenuItemModel, IPSDEUIAction, ModelService } from '@ibiz-template/model';
+import { IAppDataEntity, IAppMenuItem, IApplication, IDEUIAction } from '@ibiz/model-core';
 /**
  * 权限服务
  *
@@ -8,7 +8,7 @@ import { AppEntityModel, AppMenuItemModel, IPSDEUIAction, ModelService } from '@
  * @class AuthorityService
  */
 export declare class AuthorityService {
-    protected modelService: ModelService;
+    protected appModel: IApplication;
     protected isInit: boolean;
     /**
      * 统一资源集合
@@ -37,7 +37,7 @@ export declare class AuthorityService {
      * @type {string[]}
      */
     private rtMenuCodes;
-    constructor(modelService: ModelService);
+    constructor(appModel: IApplication);
     /**
      * 权限服务初始化
      *
@@ -55,16 +55,16 @@ export declare class AuthorityService {
      * @param {string[]} resCodes
      * @returns {*}  {Promise<void>}
      */
-    hasOwnOPPrivs(dataAccessAction: string, entityModel: AppEntityModel | undefined): Promise<boolean>;
+    hasOwnOPPrivs(dataAccessAction: string, entityModel?: IAppDataEntity): Promise<boolean>;
     /**
      * 菜单项是否有权限
      *
      * @author lxm
      * @date 2022-10-12 18:10:26
-     * @param {AppMenuItemModel} menuItem 菜单项
+     * @param {IAppMenuItem} menuItem 菜单项
      * @returns {*}  {boolean}
      */
-    hasMenuPermitted(menuItem: AppMenuItemModel): boolean;
+    hasMenuPermitted(menuItem: IAppMenuItem): boolean;
     /**
      * 通过RT菜单标识计算菜单权限
      *
@@ -74,28 +74,28 @@ export declare class AuthorityService {
      * @param {AppMenuItemModel} menuItem
      * @returns {*}  {boolean}
      */
-    protected calcMenuPermissionByRT(menuItem: AppMenuItemModel): boolean;
+    protected calcMenuPermissionByRT(menuItem: IAppMenuItem): boolean;
     /**
      * 通过统一资源计算菜单权限
      *
      * @author lxm
      * @date 2022-10-12 18:10:23
      * @protected
-     * @param {AppMenuItemModel} menuItem
+     * @param {IAppMenuItem} menuItem
      * @returns {*}  {boolean}
      */
-    protected calcMenuPermissionByResource(menuItem: AppMenuItemModel): boolean;
+    protected calcMenuPermissionByResource(menuItem: IAppMenuItem): boolean;
     /**
      * 界面行为是否有权限
      *
      * @author lxm
      * @date 2022-10-13 18:10:06
-     * @param {IPSDEUIAction} uiAction 界面行为
+     * @param {IDEUIAction} uiAction 界面行为
      * @param {IData} data 后台数据（key是实体属性）
-     * @param {AppEntityModel} entityModel 实体模型
+     * @param {IAppDataEntity} entityModel 实体模型
      * @returns {*}  {boolean}
      */
-    hasUIActionPermitted(uiAction: IPSDEUIAction, data: IData | undefined, entityModel: AppEntityModel | undefined): boolean;
+    hasUIActionPermitted(uiAction: IDEUIAction, data: IData | undefined, entityModel: IAppDataEntity | undefined): boolean;
     /**
      * 计算主状态的权限
      *
@@ -103,9 +103,9 @@ export declare class AuthorityService {
      * @date 2022-10-13 18:10:34
      * @param {string} dataAccessAction 操作标识
      * @param {IData} data 后台数据
-     * @param {AppEntityModel} entityModel 实体模型
+     * @param {IAppDataEntity} entityModel 实体模型
      * @returns {*}
      */
-    calcDeMainStatePermission(dataAccessAction: string, data: IData, entityModel: AppEntityModel): boolean;
+    calcDeMainStatePermission(dataAccessAction: string, data: IData, entityModel: IAppDataEntity): boolean;
 }
 //# sourceMappingURL=authority.service.d.ts.map

package/out/service/authority/authority.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authority.service.d.ts","sourceRoot":"","sources":["../../../src/service/authority/authority.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,gBAAgB,EAEhB,aAAa,EACb,YAAY,EACb,MAAM,sBAAsB,CAAC;AAE9B;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IAiCf,SAAS,CAAC,YAAY,EAAE,YAAY;IAhChD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAS;IAElC;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAgB;IAEhC;;;;;;;OAOG;IACH,OAAO,CAAC,iBAAiB,CAAiB;IAE1C;;;;;;;OAOG;IACH,OAAO,CAAC,WAAW,CAAgB;gBAEb,YAAY,EAAE,YAAY;IAEhD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,oBAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBjD;;;;;;;OAOG;IACG,aAAa,CACjB,gBAAgB,EAAE,MAAM,EACxB,WAAW,EAAE,cAAc,GAAG,SAAS,GACtC,OAAO,CAAC,OAAO,CAAC;IAyBnB;;;;;;;OAOG;IACH,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO;IAmBrD;;;;;;;;OAQG;IACH,SAAS,CAAC,sBAAsB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO;IAIrE;;;;;;;;OAQG;IACH,SAAS,CAAC,4BAA4B,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO;IAO3E;;;;;;;;;OASG;IACH,oBAAoB,CAClB,QAAQ,EAAE,aAAa,EACvB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,WAAW,EAAE,cAAc,GAAG,SAAS,GACtC,OAAO;IAiCV;;;;;;;;;OASG;IACH,yBAAyB,CACvB,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,EACX,WAAW,EAAE,cAAc,GAC1B,OAAO;CAqBX"}
+{"version":3,"file":"authority.service.d.ts","sourceRoot":"","sources":["../../../src/service/authority/authority.service.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,YAAY,EAEZ,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IAiCf,SAAS,CAAC,QAAQ,EAAE,YAAY;IAhC5C,SAAS,CAAC,MAAM,EAAE,OAAO,CAAS;IAElC;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAgB;IAEhC;;;;;;;OAOG;IACH,OAAO,CAAC,iBAAiB,CAAiB;IAE1C;;;;;;;OAOG;IACH,OAAO,CAAC,WAAW,CAAgB;gBAEb,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,oBAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBjD;;;;;;;OAOG;IACG,aAAa,CACjB,gBAAgB,EAAE,MAAM,EACxB,WAAW,CAAC,EAAE,cAAc,GAC3B,OAAO,CAAC,OAAO,CAAC;IAwBnB;;;;;;;OAOG;IACH,gBAAgB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO;IAmBjD;;;;;;;;OAQG;IACH,SAAS,CAAC,sBAAsB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO;IAKjE;;;;;;;;OAQG;IACH,SAAS,CAAC,4BAA4B,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO;IAOvE;;;;;;;;;OASG;IACH,oBAAoB,CAClB,QAAQ,EAAE,WAAW,EACrB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,WAAW,EAAE,cAAc,GAAG,SAAS,GACtC,OAAO;IAiCV;;;;;;;;;OASG;IACH,yBAAyB,CACvB,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,EACX,WAAW,EAAE,cAAc,GAC1B,OAAO;CAqBX"}

package/out/service/authority/authority.service.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { MenuPermissionMode, RuntimeError } from '@ibiz-template/core';
 /**
  * 权限服务
@@ -8,8 +9,8 @@ import { MenuPermissionMode, RuntimeError } from '@ibiz-template/core';
  * @class AuthorityService
  */
 export class AuthorityService {
-    constructor(modelService) {
-        this.modelService = modelService;
+    constructor(appModel) {
+        this.appModel = appModel;
         this.isInit = false;
         /**
          * 统一资源集合
@@ -72,23 +73,23 @@ export class AuthorityService {
      * @returns {*}  {Promise<void>}
      */
     async hasOwnOPPrivs(dataAccessAction, entityModel) {
-        var _a, _b;
-        const appModel = this.modelService.app;
+        // todo
+        const { appModel } = this;
         // 先收集所有的操作标识对象集合
         const opPrivs = [];
         // 收集系统的所有操作标识
-        if ((_a = appModel.getAllPSDEOPPrivs()) === null || _a === void 0 ? void 0 : _a.length) {
-            opPrivs.push(...appModel.getAllPSDEOPPrivs());
+        if (appModel.deopprivs) {
+            opPrivs.push(...appModel.deopprivs);
         }
         // 收集实体的所有操作标识
-        if ((_b = entityModel === null || entityModel === void 0 ? void 0 : entityModel.source.getAllPSDEOPPrivs()) === null || _b === void 0 ? void 0 : _b.length) {
-            opPrivs.push(...entityModel.source.getAllPSDEOPPrivs());
-        }
-        const find = opPrivs.find(opPriv => opPriv.name === dataAccessAction);
-        if (find) {
-            // 操作标识没有映射统一资源或者映射了且在用户的统一资源集合内，则权限通过
-            return (!find.mapSysUniRes || this.resCodes.includes(find.mapSysUniResCode));
+        if (entityModel === null || entityModel === void 0 ? void 0 : entityModel.deopprivs) {
+            opPrivs.push(...entityModel.deopprivs);
         }
+        // const op = opPrivs.find(opPriv => opPriv.name === dataAccessAction);
+        // if (op) {
+        //   // 操作标识没有映射统一资源或者映射了且在用户的统一资源集合内，则权限通过
+        //   return !op.mapSysUniRes || this.resCodes.includes(op.mapSysUniResCode);
+        // }
         // 找不到改操作标识则权限不通过
         return false;
     }
@@ -97,7 +98,7 @@ export class AuthorityService {
      *
      * @author lxm
      * @date 2022-10-12 18:10:26
-     * @param {AppMenuItemModel} menuItem 菜单项
+     * @param {IAppMenuItem} menuItem 菜单项
      * @returns {*}  {boolean}
      */
     hasMenuPermitted(menuItem) {
@@ -126,7 +127,8 @@ export class AuthorityService {
      * @returns {*}  {boolean}
      */
     calcMenuPermissionByRT(menuItem) {
-        return this.rtMenuCodes.includes(menuItem.rtMenuCode);
+        // return this.rtMenuCodes.includes(menuItem.rtMenuCode);
+        return false;
     }
     /**
      * 通过统一资源计算菜单权限
@@ -134,12 +136,12 @@ export class AuthorityService {
      * @author lxm
      * @date 2022-10-12 18:10:23
      * @protected
-     * @param {AppMenuItemModel} menuItem
+     * @param {IAppMenuItem} menuItem
      * @returns {*}  {boolean}
      */
     calcMenuPermissionByResource(menuItem) {
-        if (this.enableResValidate && menuItem.source.accessKey) {
-            return this.resCodes.includes(menuItem.source.accessKey);
+        if (this.enableResValidate && menuItem.accessKey) {
+            return this.resCodes.includes(menuItem.accessKey);
         }
         return true;
     }
@@ -148,9 +150,9 @@ export class AuthorityService {
      *
      * @author lxm
      * @date 2022-10-13 18:10:06
-     * @param {IPSDEUIAction} uiAction 界面行为
+     * @param {IDEUIAction} uiAction 界面行为
      * @param {IData} data 后台数据（key是实体属性）
-     * @param {AppEntityModel} entityModel 实体模型
+     * @param {IAppDataEntity} entityModel 实体模型
      * @returns {*}  {boolean}
      */
     hasUIActionPermitted(uiAction, data, entityModel) {
@@ -184,23 +186,28 @@ export class AuthorityService {
      * @date 2022-10-13 18:10:34
      * @param {string} dataAccessAction 操作标识
      * @param {IData} data 后台数据
-     * @param {AppEntityModel} entityModel 实体模型
+     * @param {IAppDataEntity} entityModel 实体模型
      * @returns {*}
      */
     calcDeMainStatePermission(dataAccessAction, data, entityModel) {
-        const fields = entityModel.source.getMainStatePSAppDEFields() || [];
-        const { enableDEMainState } = entityModel.source;
-        // 不启用主状态，没有配置主状态属性的情况直接返回true
-        if (!enableDEMainState || fields.length === 0) {
-            return true;
-        }
-        const values = fields.map(field => {
-            return data[field.codeName.toLowerCase()];
-        });
-        const matchState = entityModel.findMainState(values[0], values[1], values[2]);
-        if (!matchState) {
-            return true;
-        }
-        return matchState.opPrivs.includes(dataAccessAction);
+        // const fields = entityModel.source.getMainStatePSAppDEFields() || [];
+        // const { enableDEMainState } = entityModel.source;
+        // // 不启用主状态，没有配置主状态属性的情况直接返回true
+        // if (!enableDEMainState || fields.length === 0) {
+        //   return true;
+        // }
+        // const values = fields.map(field => {
+        //   return data[field.codeName.toLowerCase()];
+        // });
+        // const matchState = entityModel.findMainState(
+        //   values[0],
+        //   values[1],
+        //   values[2],
+        // );
+        // if (!matchState) {
+        //   return true;
+        // }
+        // return matchState.opPrivs.includes(dataAccessAction);
+        return true;
     }
 }

package/out/service/dto/method.dto.d.ts

@@ -1,4 +1,4 @@
-import { AppEntityModel, IPSAppDEMethodDTO, IPSAppDEMethodDTOField } from '@ibiz-template/model';
+import { IAppDataEntity, IAppDEMethodDTO, IAppDEMethodDTOField } from '@ibiz/model-core';
 import { Application } from '../../application';
 import { Entity } from '../entity/entity';
 /**
@@ -10,20 +10,21 @@ import { Entity } from '../entity/entity';
  * @class MethodDto
  */
 export declare class MethodDto {
-    protected dto?: IPSAppDEMethodDTO | undefined;
+    protected dto?: IAppDEMethodDTO | undefined;
     protected app?: Application;
-    protected fields: IPSAppDEMethodDTOField[];
+    protected fields: IAppDEMethodDTOField[];
     protected dtoMap: Map<string, MethodDto>;
-    protected _entity?: AppEntityModel;
-    protected get entity(): AppEntityModel;
+    protected _entity?: IAppDataEntity;
+    protected get entity(): IAppDataEntity;
+    get isLocalMode(): boolean;
     /**
      * Creates an instance of MethodDto.
      *
      * @author chitanda
      * @date 2022-10-10 23:10:06
-     * @param {IPSAppDEMethodDTO} dto
+     * @param {IAppDEMethodDTO} dto
      */
-    constructor(dto?: IPSAppDEMethodDTO | undefined);
+    constructor(dto?: IAppDEMethodDTO | undefined);
     /**
      * 请求参数组合 DTO
      *
@@ -50,9 +51,9 @@ export declare class MethodDto {
      * @author chitanda
      * @date 2022-10-17 16:10:47
      * @protected
-     * @param {IPSAppDEMethodDTOField} field
+     * @param {IAppDEMethodDTOField} field
      * @return {*}  {Promise<MethodDto>}
      */
-    protected getFieldDto(field: IPSAppDEMethodDTOField): Promise<MethodDto>;
+    protected getFieldDto(field: IAppDEMethodDTOField): Promise<MethodDto>;
 }
 //# sourceMappingURL=method.dto.d.ts.map

package/out/service/dto/method.dto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EAEd,iBAAiB,EACjB,sBAAsB,EAEvB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C;;;;;;;GAOG;AACH,qBAAa,SAAS;IA2BR,SAAS,CAAC,GAAG,CAAC;IA1B1B,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAE,sBAAsB,EAAE,CAAC;IAE3C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAErD,SAAS,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC;IAEnC,SAAS,KAAK,MAAM,IAAI,cAAc,CASrC;IAED;;;;;;OAMG;gBACmB,GAAG,CAAC,+BAAmB;IAS7C;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAuCxD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IA2B/D;;;;;;;;OAQG;cACa,WAAW,CACzB,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CAAC,SAAS,CAAC;CAStB"}
+{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAgCR,SAAS,CAAC,GAAG,CAAC;IA/B1B,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;IAErD,SAAS,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC;IAEnC,SAAS,KAAK,MAAM,IAAI,cAAc,CASrC;IAED,IAAI,WAAW,IAAI,OAAO,CAGzB;IAED;;;;;;OAMG;gBACmB,GAAG,CAAC,6BAAiB;IAS3C;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAuCxD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IA2B/D;;;;;;;;OAQG;cACa,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC;CAW7E"}