@ibiz-template/runtime 0.0.4-beta.3 → 0.0.4-beta.5

package/out/register/register-center.d.ts

@@ -1,6 +1,5 @@
-import { IControlRegister, IEditorRegister, IGridColumnRegister, IPanelItemRegister, IViewRegister } from '../interface';
-import { IFormDetailRegister } from '../interface/register/i-form-detail-register';
-import { UIActionRegister } from './ui-action-register';
+import { IProvider } from '../interface';
+type NewProvider = (...args: any[]) => IProvider;
 /**
  * 注册中心
  *
@@ -11,61 +10,37 @@ import { UIActionRegister } from './ui-action-register';
  */
 export declare class RegisterCenter {
     /**
-     * 界面行为注册器
-     *
+     * 已注册的适配器Map
      * @author lxm
-     * @date 2022-10-25 15:10:39
-     * @type {UIActionRegister}
+     * @date 2023-05-06 09:55:33
+     * @protected
+     * @type {Map<string, NewProvider>}
      */
-    uiAction: UIActionRegister;
+    protected providers: Map<string, NewProvider>;
     /**
-     * 编辑器注册器
-     *
+     * 注册适配器
      * @author lxm
-     * @date 2022-09-19 22:09:08
-     * @type {IEditorRegister}
+     * @date 2023-05-06 09:55:55
+     * @param {string} key 唯一标识
+     * @param {NewProvider} newProvider 创建适配器实例的回调
      */
-    editor: IEditorRegister;
+    register(key: string, newProvider: NewProvider): void;
     /**
-     * 表单成员注册器
-     *
+     * 注销适配器
      * @author lxm
-     * @date 2022-10-17 17:10:40
-     * @type {IFormDetailRegister}
+     * @date 2023-05-06 09:56:19
+     * @param {string} key
      */
-    formDetail: IFormDetailRegister;
+    unRegister(key: string): void;
     /**
-     * 面板成员注册
-     *
+     * 获取适配器的实例
      * @author lxm
-     * @date 2023-02-07 05:35:56
-     * @type {IPanelItemRegister}
-     * @memberof RegisterCenter
+     * @date 2023-05-06 09:56:34
+     * @param {string} key 唯一标识
+     * @param {...Parameters<NewProvider>} args 回调参数
+     * @return {*}  {(IProvider | undefined)}
      */
-    panelItem: IPanelItemRegister;
-    /**
-     * 表格列注册器
-     *
-     * @author lxm
-     * @date 2022-11-14 10:11:52
-     * @type {IGridColumnRegister}
-     */
-    gridColumn: IGridColumnRegister;
-    /**
-     * 部件注册器
-     *
-     * @author lxm
-     * @date 2022-10-25 18:10:16
-     * @type {IControlRegister}
-     */
-    control: IControlRegister;
-    /**
-     * 视图注册器
-     *
-     * @author lxm
-     * @date 2022-10-26 11:10:24
-     * @type {IViewRegister}
-     */
-    view: IViewRegister;
+    get(key: string, ...args: Parameters<NewProvider>): IProvider | undefined;
 }
+export {};
 //# sourceMappingURL=register-center.d.ts.map

package/out/register/register-center.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register-center.d.ts","sourceRoot":"","sources":["../../src/register/register-center.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,EACd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAMnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;;;;;OAMG;IACH,QAAQ,EAAE,gBAAgB,CAA0B;IAEpD;;;;;;OAMG;IACH,MAAM,EAAE,eAAe,CAAwB;IAE/C;;;;;;OAMG;IACH,UAAU,EAAE,mBAAmB,CAA4B;IAE3D;;;;;;;OAOG;IACH,SAAS,EAAE,kBAAkB,CAA2B;IAExD;;;;;;OAMG;IACH,UAAU,EAAE,mBAAmB,CAA4B;IAW3D;;;;;;OAMG;IACH,OAAO,EAAE,gBAAgB,CAAyB;IAElD;;;;;;OAMG;IACH,IAAI,EAAE,aAAa,CAAsB;CAC1C"}
+{"version":3,"file":"register-center.d.ts","sourceRoot":"","sources":["../../src/register/register-center.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,KAAK,WAAW,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,SAAS,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;;;;;OAMG;IACH,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAE1D;;;;;;OAMG;IACH,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI;IAIrD;;;;;OAKG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI7B;;;;;;;OAOG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,SAAS,GAAG,SAAS;CAM1E"}

package/out/register/register-center.js

@@ -1,10 +1,3 @@
-import { ControlRegister } from './control-register';
-import { EditorRegister } from './editor-register';
-import { FormDetailRegister } from './form-detail-register';
-import { GridColumnRegister } from './grid-column-register';
-import { PanelItemRegister } from './panel-item-register';
-import { UIActionRegister } from './ui-action-register';
-import { ViewRegister } from './view-register';
 /**
  * 注册中心
  *
@@ -16,69 +9,45 @@ import { ViewRegister } from './view-register';
 export class RegisterCenter {
     constructor() {
         /**
-         * 界面行为注册器
-         *
+         * 已注册的适配器Map
          * @author lxm
-         * @date 2022-10-25 15:10:39
-         * @type {UIActionRegister}
+         * @date 2023-05-06 09:55:33
+         * @protected
+         * @type {Map<string, NewProvider>}
          */
-        this.uiAction = new UIActionRegister();
-        /**
-         * 编辑器注册器
-         *
-         * @author lxm
-         * @date 2022-09-19 22:09:08
-         * @type {IEditorRegister}
-         */
-        this.editor = new EditorRegister();
-        /**
-         * 表单成员注册器
-         *
-         * @author lxm
-         * @date 2022-10-17 17:10:40
-         * @type {IFormDetailRegister}
-         */
-        this.formDetail = new FormDetailRegister();
-        /**
-         * 面板成员注册
-         *
-         * @author lxm
-         * @date 2023-02-07 05:35:56
-         * @type {IPanelItemRegister}
-         * @memberof RegisterCenter
-         */
-        this.panelItem = new PanelItemRegister();
-        /**
-         * 表格列注册器
-         *
-         * @author lxm
-         * @date 2022-11-14 10:11:52
-         * @type {IGridColumnRegister}
-         */
-        this.gridColumn = new GridColumnRegister();
-        // /**
-        //  * 数据看板成员注册器
-        //  *
-        //  * @author lxm
-        //  * @date 2022-10-17 17:10:40
-        //  * @type {IPortletPartRegister}
-        //  */
-        // portletPart: IPortletPartRegister = new PortletPartRegister();
-        /**
-         * 部件注册器
-         *
-         * @author lxm
-         * @date 2022-10-25 18:10:16
-         * @type {IControlRegister}
-         */
-        this.control = new ControlRegister();
-        /**
-         * 视图注册器
-         *
-         * @author lxm
-         * @date 2022-10-26 11:10:24
-         * @type {IViewRegister}
-         */
-        this.view = new ViewRegister();
+        this.providers = new Map();
+    }
+    /**
+     * 注册适配器
+     * @author lxm
+     * @date 2023-05-06 09:55:55
+     * @param {string} key 唯一标识
+     * @param {NewProvider} newProvider 创建适配器实例的回调
+     */
+    register(key, newProvider) {
+        this.providers.set(key, newProvider);
+    }
+    /**
+     * 注销适配器
+     * @author lxm
+     * @date 2023-05-06 09:56:19
+     * @param {string} key
+     */
+    unRegister(key) {
+        this.providers.delete(key);
+    }
+    /**
+     * 获取适配器的实例
+     * @author lxm
+     * @date 2023-05-06 09:56:34
+     * @param {string} key 唯一标识
+     * @param {...Parameters<NewProvider>} args 回调参数
+     * @return {*}  {(IProvider | undefined)}
+     */
+    get(key, ...args) {
+        const func = this.providers.get(key);
+        if (func) {
+            return func(...args);
+        }
     }
 }

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

@@ -1,4 +1,4 @@
-import { IAppDataEntity, IAppMenuItem, IApplication, IDEUIAction } from '@ibiz/model-core';
+import { IApplication } from '@ibiz/model-core';
 /**
  * 权限服务
  *
@@ -9,7 +9,6 @@ import { IAppDataEntity, IAppMenuItem, IApplication, IDEUIAction } from '@ibiz/m
  */
 export declare class AuthorityService {
     protected appModel: IApplication;
-    protected isInit: boolean;
     /**
      * 统一资源集合
      *
@@ -18,25 +17,16 @@ export declare class AuthorityService {
      * @private
      * @type {string[]}
      */
-    private resCodes;
+    protected resCodes: string[];
     /**
-     * 是否启用统一资源校验
+     * 是否启用权限校验
      *
      * @author lxm
      * @date 2022-10-14 19:10:50
      * @private
      * @type {boolean}
      */
-    private enableResValidate;
-    /**
-     * RT菜单权限标识集合
-     *
-     * @author lxm
-     * @date 2022-10-12 17:10:46
-     * @private
-     * @type {string[]}
-     */
-    private rtMenuCodes;
+    protected enablePermission: boolean;
     constructor(appModel: IApplication);
     /**
      * 权限服务初始化
@@ -48,64 +38,31 @@ export declare class AuthorityService {
      */
     init(appData?: IData | undefined): Promise<void>;
     /**
-     * 根据统一资源计算出用户是否拥有该操作标识的权限
-     *
+     * 通过统一资源标识计算权限
      * @author lxm
-     * @date 2022-10-13 15:10:56
-     * @param {string[]} resCodes
-     * @returns {*}  {Promise<void>}
+     * @date 2023-05-10 12:29:53
+     * @param {string} resCode
      */
-    hasOwnOPPrivs(dataAccessAction: string, entityModel?: IAppDataEntity): Promise<boolean>;
+    calcByResCode(resCode: string): boolean;
     /**
-     * 菜单项是否有权限
-     *
+     * 通过操作标识计算权限
      * @author lxm
-     * @date 2022-10-12 18:10:26
-     * @param {IAppMenuItem} menuItem 菜单项
-     * @returns {*}  {boolean}
-     */
-    hasMenuPermitted(menuItem: IAppMenuItem): boolean;
-    /**
-     * 通过RT菜单标识计算菜单权限
-     *
-     * @author lxm
-     * @date 2022-10-12 18:10:50
-     * @protected
-     * @param {AppMenuItemModel} menuItem
-     * @returns {*}  {boolean}
-     */
-    protected calcMenuPermissionByRT(menuItem: IAppMenuItem): boolean;
-    /**
-     * 通过统一资源计算菜单权限
-     *
-     * @author lxm
-     * @date 2022-10-12 18:10:23
-     * @protected
-     * @param {IAppMenuItem} menuItem
-     * @returns {*}  {boolean}
-     */
-    protected calcMenuPermissionByResource(menuItem: IAppMenuItem): boolean;
-    /**
-     * 界面行为是否有权限
-     *
-     * @author lxm
-     * @date 2022-10-13 18:10:06
-     * @param {IDEUIAction} uiAction 界面行为
-     * @param {IData} data 后台数据（key是实体属性）
-     * @param {IAppDataEntity} entityModel 实体模型
-     * @returns {*}  {boolean}
+     * @date 2023-05-10 12:33:10
+     * @param {string} dataAccessAction 操作标识
+     * @param {IData} [data] 实体数据
+     * @param {string} [appDeId] 应用实体id
+     * @return {*}  {Promise<boolean>}
      */
-    hasUIActionPermitted(uiAction: IDEUIAction, data: IData | undefined, entityModel: IAppDataEntity | undefined): boolean;
+    calcByDataAcessAction(dataAccessAction: string, data?: IData, appDeId?: string): Promise<boolean>;
     /**
-     * 计算主状态的权限
-     *
+     * 通过实体主状态计算权限
      * @author lxm
-     * @date 2022-10-13 18:10:34
-     * @param {string} dataAccessAction 操作标识
-     * @param {IData} data 后台数据
-     * @param {IAppDataEntity} entityModel 实体模型
-     * @returns {*}
+     * @date 2023-05-10 01:15:43
+     * @param {string} dataAccessAction 权限操作标识
+     * @param {IData} data 当前数据
+     * @param {string} appDeId 应用实体id
+     * @return {*}  {Promise<boolean>}
      */
-    calcDeMainStatePermission(dataAccessAction: string, data: IData, entityModel: IAppDataEntity): boolean;
+    protected calcByDeMainState(dataAccessAction: string, data: IData, appDeId: string): Promise<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":"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"}
+{"version":3,"file":"authority.service.d.ts","sourceRoot":"","sources":["../../../src/service/authority/authority.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGhD;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IAqBf,SAAS,CAAC,QAAQ,EAAE,YAAY;IApB5C;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAElC;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,EAAE,OAAO,CAAS;gBAEtB,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,oBAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAejD;;;;;OAKG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIvC;;;;;;;;OAQG;IACG,qBAAqB,CACzB,gBAAgB,EAAE,MAAM,EACxB,IAAI,CAAC,EAAE,KAAK,EACZ,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,OAAO,CAAC;IAuCnB;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,gBAAgB,EAAE,MAAM,EACxB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,OAAO,CAAC;CA8BpB"}

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

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { MenuPermissionMode, RuntimeError } from '@ibiz-template/core';
+import { RuntimeError } from '@ibiz-template/core';
+import { calcMainStateOPPrivsStrs, matchMainState } from '../../model';
 /**
  * 权限服务
  *
@@ -11,7 +12,6 @@ import { MenuPermissionMode, RuntimeError } from '@ibiz-template/core';
 export class AuthorityService {
     constructor(appModel) {
         this.appModel = appModel;
-        this.isInit = false;
         /**
          * 统一资源集合
          *
@@ -22,23 +22,14 @@ export class AuthorityService {
          */
         this.resCodes = [];
         /**
-         * 是否启用统一资源校验
+         * 是否启用权限校验
          *
          * @author lxm
          * @date 2022-10-14 19:10:50
          * @private
          * @type {boolean}
          */
-        this.enableResValidate = true;
-        /**
-         * RT菜单权限标识集合
-         *
-         * @author lxm
-         * @date 2022-10-12 17:10:46
-         * @private
-         * @type {string[]}
-         */
-        this.rtMenuCodes = [];
+        this.enablePermission = false;
     }
     /**
      * 权限服务初始化
@@ -52,127 +43,55 @@ export class AuthorityService {
         if (!appData) {
             throw new RuntimeError('没有appData数据');
         }
-        // 设置权限服务需要的appData里的数据
+        // 设置当前用户拥有的统一标识集合
         if (appData.unires) {
             this.resCodes = appData.unires;
         }
-        // 设置统一资源校验开启与否
-        if (appData.enablepermissionvalid === false) {
-            this.enableResValidate = false;
-        }
-        if (appData.appmenu) {
-            this.rtMenuCodes = appData.appmenu;
+        // 设置权限校验开启与否
+        if (appData.enablepermissionvalid === true && ibiz.env.enablePermission) {
+            this.enablePermission = true;
         }
     }
     /**
-     * 根据统一资源计算出用户是否拥有该操作标识的权限
-     *
+     * 通过统一资源标识计算权限
      * @author lxm
-     * @date 2022-10-13 15:10:56
-     * @param {string[]} resCodes
-     * @returns {*}  {Promise<void>}
+     * @date 2023-05-10 12:29:53
+     * @param {string} resCode
      */
-    async hasOwnOPPrivs(dataAccessAction, entityModel) {
-        // todo
-        const { appModel } = this;
-        // 先收集所有的操作标识对象集合
-        const opPrivs = [];
-        // 收集系统的所有操作标识
-        if (appModel.deopprivs) {
-            opPrivs.push(...appModel.deopprivs);
-        }
-        // 收集实体的所有操作标识
-        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;
+    calcByResCode(resCode) {
+        return !this.enablePermission || this.resCodes.includes(resCode);
     }
     /**
-     * 菜单项是否有权限
-     *
+     * 通过操作标识计算权限
      * @author lxm
-     * @date 2022-10-12 18:10:26
-     * @param {IAppMenuItem} menuItem 菜单项
-     * @returns {*}  {boolean}
+     * @date 2023-05-10 12:33:10
+     * @param {string} dataAccessAction 操作标识
+     * @param {IData} [data] 实体数据
+     * @param {string} [appDeId] 应用实体id
+     * @return {*}  {Promise<boolean>}
      */
-    hasMenuPermitted(menuItem) {
-        if (!ibiz.env.enablePermission) {
+    async calcByDataAcessAction(dataAccessAction, data, appDeId) {
+        // 没开启权限校验时永远true
+        if (!this.enablePermission) {
             return true;
         }
-        switch (ibiz.env.menuPermissionMode) {
-            case MenuPermissionMode.RT:
-                return this.calcMenuPermissionByRT(menuItem);
-            case MenuPermissionMode.RESOURCE:
-                return this.calcMenuPermissionByResource(menuItem);
-            case MenuPermissionMode.MIXIN:
-                return (this.calcMenuPermissionByResource(menuItem) ||
-                    this.calcMenuPermissionByRT(menuItem));
-            default:
-                return true;
-        }
-    }
-    /**
-     * 通过RT菜单标识计算菜单权限
-     *
-     * @author lxm
-     * @date 2022-10-12 18:10:50
-     * @protected
-     * @param {AppMenuItemModel} menuItem
-     * @returns {*}  {boolean}
-     */
-    calcMenuPermissionByRT(menuItem) {
-        // return this.rtMenuCodes.includes(menuItem.rtMenuCode);
-        return false;
-    }
-    /**
-     * 通过统一资源计算菜单权限
-     *
-     * @author lxm
-     * @date 2022-10-12 18:10:23
-     * @protected
-     * @param {IAppMenuItem} menuItem
-     * @returns {*}  {boolean}
-     */
-    calcMenuPermissionByResource(menuItem) {
-        if (this.enableResValidate && menuItem.accessKey) {
-            return this.resCodes.includes(menuItem.accessKey);
-        }
-        return true;
-    }
-    /**
-     * 界面行为是否有权限
-     *
-     * @author lxm
-     * @date 2022-10-13 18:10:06
-     * @param {IDEUIAction} uiAction 界面行为
-     * @param {IData} data 后台数据（key是实体属性）
-     * @param {IAppDataEntity} entityModel 实体模型
-     * @returns {*}  {boolean}
-     */
-    hasUIActionPermitted(uiAction, data, entityModel) {
         const result = true;
-        const { dataAccessAction } = uiAction;
-        // *绑定了操作标识的界面行为
-        if (dataAccessAction) {
-            // 判断绑定数据操作标识的界面行为
-            if (this.enableResValidate &&
-                !this.hasOwnOPPrivs(dataAccessAction, entityModel)) {
+        const app = await ibiz.hub.getApp(this.appModel.appId);
+        const opPriv = await app.getOPPriv(dataAccessAction, appDeId);
+        // 存在映射统一资源并且校验统一资源不通过时，返回false
+        if ((opPriv === null || opPriv === void 0 ? void 0 : opPriv.mapSysUniResCode) &&
+            !this.calcByResCode(opPriv.mapSysUniResCode)) {
+            return false;
+        }
+        if (data) {
+            // 判断实体数据带回来的权限,不通过就返回false
+            if (data.srfopprivs && !data.srfopprivs.includes(dataAccessAction)) {
                 return false;
             }
-            // 有数据才算
-            if (data) {
-                // 判断实体数据带回来的权限
-                if (data.srfopprivs && !data.srfopprivs.includes(dataAccessAction)) {
-                    return false;
-                }
-                // 判断实体主状态操作标识,如果没权限直接返回false
-                if (!this.calcDeMainStatePermission(dataAccessAction, data, entityModel)) {
+            // 判断主状态的权限
+            if (appDeId) {
+                const mainStateResult = await this.calcByDeMainState(dataAccessAction, data, appDeId);
+                if (!mainStateResult) {
                     return false;
                 }
             }
@@ -180,34 +99,36 @@ export class AuthorityService {
         return result;
     }
     /**
-     * 计算主状态的权限
-     *
+     * 通过实体主状态计算权限
      * @author lxm
-     * @date 2022-10-13 18:10:34
-     * @param {string} dataAccessAction 操作标识
-     * @param {IData} data 后台数据
-     * @param {IAppDataEntity} entityModel 实体模型
-     * @returns {*}
+     * @date 2023-05-10 01:15:43
+     * @param {string} dataAccessAction 权限操作标识
+     * @param {IData} data 当前数据
+     * @param {string} appDeId 应用实体id
+     * @return {*}  {Promise<boolean>}
      */
-    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);
-        return true;
+    async calcByDeMainState(dataAccessAction, data, appDeId) {
+        const appDataEntity = await ibiz.hub.getAppDataEntity(appDeId, this.appModel.appId);
+        let result = true;
+        // 实体没有启用主状态，默认有权限
+        if (!appDataEntity || !appDataEntity.enableDEMainState) {
+            ibiz.log.debug(`${appDeId}实体不存在或者为启用主状态，返回true`);
+            return result;
+        }
+        ibiz.log.debug(`操作标识${dataAccessAction}主状态计算开始`, data, appDeId);
+        const match = matchMainState(appDataEntity, data);
+        if (match) {
+            ibiz.log.debug('匹配主状态', match);
+            const opprivs = calcMainStateOPPrivsStrs(match, appDataEntity);
+            ibiz.log.debug('允许的主状态权限集合', opprivs);
+            result = opprivs.includes(dataAccessAction);
+        }
+        else {
+            ibiz.log.debug('没匹配主状态，返回false');
+            // 开启了主状态但没有匹配主状态的情况，默认都无权限
+            result = false;
+        }
+        ibiz.log.debug(`操作标识${dataAccessAction}权限计算结束：${result}`);
+        return result;
     }
 }

package/out/utils/index.d.ts

@@ -1,8 +1,9 @@
 export { calcNavParams } from './nav-params/calc-nav-params';
 export * from './nav-params/nav-params';
-export * from './app-de-ui-action-util';
+export * from './uiaction-util';
 export { toLocalOpenWFRedirectView, openRedirectView, } from './open-redirect-view/open-redirect-view';
 export * from './verify';
 export { ViewLayoutUtil } from './view-layout-util/view-layout-util';
 export * from './wf-helper/wf-helper';
+export * from './modal/modal';
 //# sourceMappingURL=index.d.ts.map

package/out/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC;AAChC,OAAO,EACL,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,yCAAyC,CAAC;AACjD,cAAc,UAAU,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC"}

package/out/utils/index.js

@@ -1,7 +1,8 @@
 export { calcNavParams } from './nav-params/calc-nav-params';
 export * from './nav-params/nav-params';
-export * from './app-de-ui-action-util';
+export * from './uiaction-util';
 export { toLocalOpenWFRedirectView, openRedirectView, } from './open-redirect-view/open-redirect-view';
 export * from './verify';
 export { ViewLayoutUtil } from './view-layout-util/view-layout-util';
 export * from './wf-helper/wf-helper';
+export * from './modal/modal';