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

package/src/service/app-data-entity/app-data-entity.ts

@@ -5,6 +5,7 @@ import { IAppDataEntity } from '@ibiz/model-core';
 import { clone } from 'ramda';
 import { Srfuf } from '../constant';
 import { findModelChild } from '../../model';
+import { IDataEntity } from '../../interface';
 
 /**
  * 实体
@@ -14,24 +15,20 @@ import { findModelChild } from '../../model';
  * @export
  * @class AppDataEntity
  */
-export class AppDataEntity {
+export class AppDataEntity implements IDataEntity {
   [key: string | symbol]: any;
 
-  protected declare data: IData;
+  protected declare _data: IData;
 
-  protected declare entity: IAppDataEntity;
+  protected declare _entity: IAppDataEntity;
 
-  /**
-   * 前端临时主键
-   *
-   * @author chitanda
-   * @date 2023-03-08 17:03:12
-   * @protected
-   * @type {string}
-   */
-  protected _srfkey: string = '';
+  declare srfdeid: string;
+
+  declare srfdecodename: string;
 
-  declare srfdename: string;
+  declare srfkeyfile: string;
+
+  declare srfmajorfile: string;
 
   declare srfkey: string;
 
@@ -50,17 +47,23 @@ export class AppDataEntity {
    * @param {(IData | AppDataEntity)} data
    */
   constructor(entity: IAppDataEntity, data: IData | AppDataEntity) {
-    Object.defineProperty(this, 'entity', {
+    let _srfkey: unknown;
+    Object.defineProperty(this, '_entity', {
       enumerable: false,
       configurable: true,
       value: entity,
     });
-    Object.defineProperty(this, 'data', {
+    Object.defineProperty(this, '_data', {
       enumerable: false,
       configurable: true,
-      value: data instanceof AppDataEntity ? clone(data.data) : clone(data),
+      value: data instanceof AppDataEntity ? clone(data._data) : clone(data),
     });
-    Object.defineProperty(this, 'srfdename', {
+    Object.defineProperty(this, 'srfdeid', {
+      get() {
+        return entity.id;
+      },
+    });
+    Object.defineProperty(this, 'srfdecodename', {
       get() {
         return entity.codeName;
       },
@@ -71,12 +74,18 @@ export class AppDataEntity {
     );
     if (keyAppField) {
       const key = keyAppField.codeName!.toLowerCase();
+      Object.defineProperty(this, 'srfkeyfile', {
+        get() {
+          return key;
+        },
+      });
       Object.defineProperty(this, 'srfkey', {
         set(val: unknown) {
-          this._srfkey = val;
+          _srfkey = val;
+          this._data[key] = val;
         },
         get() {
-          return this.data[key] || this._srfkey;
+          return this._data[key] || _srfkey;
         },
       });
     } else {
@@ -88,12 +97,17 @@ export class AppDataEntity {
     );
     if (majorAppField) {
       const major = majorAppField.codeName!.toLowerCase();
+      Object.defineProperty(this, 'srfmajorfile', {
+        get() {
+          return major;
+        },
+      });
       Object.defineProperty(this, 'srfmajortext', {
         set(val: unknown) {
-          this.data[major] = val;
+          this._data[major] = val;
         },
         get() {
-          return this.data[major];
+          return this._data[major];
         },
       });
     } else {
@@ -110,21 +124,34 @@ export class AppDataEntity {
    * @protected
    */
   protected defineProperties(): void {
-    const { data } = this;
+    const { _data } = this;
     const properties: { [key: string]: PropertyDescriptor } = {};
-    const fields = this.entity.appDEFields || [];
-    fields.forEach(field => {
-      const key = field.codeName!.toLowerCase();
+    const keys = Object.keys(_data);
+    keys.forEach(key => {
       properties[key] = {
         enumerable: true,
-        set(val: unknown) {
-          data[key] = val;
+        set(val: unknown): void {
+          _data[key] = val;
         },
-        get() {
-          return data[key];
+        get(): any {
+          return _data[key];
         },
       };
     });
+    this._entity.appDEFields?.forEach(field => {
+      const key = field.codeName!.toLowerCase();
+      if (!keys.includes(key)) {
+        properties[key] = {
+          enumerable: true,
+          set(val: unknown): void {
+            _data[key] = val;
+          },
+          get(): any {
+            return _data[key];
+          },
+        };
+      }
+    });
     Object.defineProperties(this, properties);
   }
 
@@ -136,7 +163,7 @@ export class AppDataEntity {
    * @return {*}  {AppDataEntity}
    */
   clone(): AppDataEntity {
-    return new AppDataEntity(this.entity, this.data);
+    return new AppDataEntity(this._entity, this._data);
   }
 
   /**
@@ -149,9 +176,9 @@ export class AppDataEntity {
    */
   assign(data: IData | AppDataEntity): AppDataEntity {
     if (data instanceof AppDataEntity) {
-      Object.assign(this.data, data.data);
+      Object.assign(this._data, data._data);
     } else {
-      Object.assign(this.data, data);
+      Object.assign(this._data, data);
     }
     return this;
   }

package/src/service/de-service-util.ts

@@ -1,6 +1,6 @@
-import { IApplication } from '@ibiz/model-core';
-import { IHttpResponse, RuntimeModelError } from '@ibiz-template/core';
-import { IAppDEService } from './interface';
+import { IAppDataEntity, IApplication } from '@ibiz/model-core';
+import { IHttpResponse, RuntimeError } from '@ibiz-template/core';
+import { IAppDEService } from '../interface';
 import { DEService } from './service';
 
 /**
@@ -22,6 +22,17 @@ export class DEServiceUtil {
    */
   protected cache: Map<string, IAppDEService> = new Map();
 
+  /**
+   * 实体服务构造方法缓存
+   * @author lxm
+   * @date 2023-05-15 08:37:13
+   * @protected
+   */
+  protected constructorCache: Map<
+    string,
+    (entityModel: IAppDataEntity) => Promise<IAppDEService>
+  > = new Map();
+
   /**
    * Creates an instance of DEServiceUtil.
    *
@@ -32,15 +43,18 @@ export class DEServiceUtil {
   constructor(protected appModel: IApplication) {}
 
   /**
-   * 注册实体服务实例
+   * 注册服务工厂方法
    *
    * @author chitanda
-   * @date 2023-04-23 17:04:03
+   * @date 2023-06-14 10:06:31
    * @param {string} id
-   * @param {IAppDEService} service
+   * @param {(entityModel: IAppDataEntity) => Promise<IAppDEService>} constructor
    */
-  registerService(id: string, service: IAppDEService): void {
-    this.cache.set(id, service);
+  register(
+    id: string,
+    constructor: (entityModel: IAppDataEntity) => Promise<IAppDEService>,
+  ): void {
+    this.constructorCache.set(id, constructor);
   }
 
   /**
@@ -59,9 +73,15 @@ export class DEServiceUtil {
         this.appModel.appId,
       );
       if (!entityModel) {
-        throw new RuntimeModelError(`未找到应用实体[${id}]`);
+        throw new RuntimeError(`未找到应用实体[${id}]`);
+      }
+      const constructor = this.constructorCache.get(id);
+      let service: IAppDEService;
+      if (constructor) {
+        service = await constructor(entityModel);
+      } else {
+        service = new DEService(entityModel);
       }
-      const service = await new DEService(entityModel);
       this.cache.set(id, service);
     }
     return this.cache.get(id)!;

package/src/service/dto/method.dto.ts

@@ -70,7 +70,7 @@ export class MethodDto {
           const service = await this.app!.deService.getService(
             field.refAppDataEntityId!,
           );
-          const items: IDatum[] = service.local.getList(context);
+          const items: IData[] = service.local.getList(context);
           if (items) {
             const arr = [];
             for (let j = 0; j < items.length; j++) {
@@ -96,11 +96,11 @@ export class MethodDto {
    * @author chitanda
    * @date 2022-10-10 23:10:50
    * @param {IParams} context
-   * @param {IDatum[]} data
+   * @param {IData[]} data
    * @return {*}  {Promise<AppDataEntity[]>}
    */
-  async sets(context: IParams, data: IDatum[]): Promise<AppDataEntity[]> {
-    const service = await this.app!.deService.getService(this.entity.codeName!);
+  async sets(context: IParams, data: IData[]): Promise<AppDataEntity[]> {
+    const service = await this.app!.deService.getService(this.entity.id!);
     service.local.clear(context);
     return Promise.all(
       data.map(async datum => {
@@ -109,7 +109,7 @@ export class MethodDto {
           .map(async field => {
             const key = field.codeName!.toLowerCase();
             const dto = await this.getFieldDto(field);
-            const items: IDatum[] = datum[key];
+            const items: IData[] = datum[key];
             if (items) {
               await dto.sets(context, items);
             }

package/src/service/index.ts

@@ -1,9 +1,9 @@
-export * from './interface';
 export * from './utils';
 export * from './service';
 export * from './constant';
 export * from './vo';
+export * from './constant';
+export * from './dto/method.dto';
+export * from './app-data-entity/app-data-entity';
 
-export { AuthService } from './auth/auth.service';
-export { AuthorityService } from './authority/authority.service';
 export { DEServiceUtil } from './de-service-util';

package/src/service/service/authority/authority.service.ts

@@ -0,0 +1,182 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import { RuntimeError } from '@ibiz-template/core';
+import { IAppDataEntity, IApplication } from '@ibiz/model-core';
+import { IAppDeAuthorityService } from '../../../interface';
+import { DeAuthorityService } from './de-authority.service';
+
+/**
+ * 权限服务
+ *
+ * @author lxm
+ * @date 2022-10-12 17:10:01
+ * @export
+ * @class AuthorityService
+ */
+export class AuthorityService {
+  /**
+   * 实体服务缓存
+   *
+   * @author chitanda
+   * @date 2022-08-17 23:08:36
+   * @protected
+   * @type {Map<string, IAppDEService>}
+   */
+  protected cache: Map<string, IAppDeAuthorityService> = new Map();
+
+  /**
+   * 实体服务构造方法缓存
+   *
+   * @author chitanda
+   * @date 2022-08-17 23:08:36
+   * @protected
+   * @type {Map<string, IAppDEService>}
+   */
+  protected constructorCache: Map<
+    string,
+    (entityModel: IAppDataEntity) => Promise<IAppDeAuthorityService>
+  > = new Map();
+
+  /**
+   * 统一资源集合
+   *
+   * @author lxm
+   * @date 2022-10-12 17:10:46
+   * @private
+   * @type {string[]}
+   */
+  protected resCodes: string[] = [];
+
+  /**
+   * 是否启用权限校验
+   * @author lxm
+   * @date 2022-10-14 19:10:50
+   * @private
+   * @type {boolean}
+   */
+  protected enablePermission: boolean = false;
+
+  constructor(protected appModel: IApplication) {}
+
+  /**
+   * 注册服务工厂方法
+   *
+   * @author chitanda
+   * @date 2023-06-14 10:06:21
+   * @param {string} id
+   * @param {(
+   *       entityModel: IAppDataEntity,
+   *     ) => Promise<IAppDeAuthorityService>} constructor
+   */
+  register(
+    id: string,
+    constructor: (
+      entityModel: IAppDataEntity,
+    ) => Promise<IAppDeAuthorityService>,
+  ): void {
+    this.constructorCache.set(id, constructor);
+  }
+
+  /**
+   * 根据实体标识获取实体服务
+   *
+   * @author chitanda
+   * @date 2022-12-23 10:12:24
+   * @param {string} id 实体标识
+   * @param {IParams} [context] 上下文,用于计算模型所属沙箱环境
+   * @return {*}  {Promise<IAppDEService>}
+   */
+  async getService(id: string): Promise<IAppDeAuthorityService> {
+    if (!this.cache.has(id)) {
+      const entityModel = await ibiz.hub.getAppDataEntity(
+        id,
+        this.appModel.appId,
+      );
+      if (!entityModel) {
+        throw new RuntimeError(`未找到应用实体[${id}]`);
+      }
+
+      const constructor = this.constructorCache.get(id);
+      let service: IAppDeAuthorityService;
+      if (constructor) {
+        service = await constructor(entityModel);
+      } else {
+        service = new DeAuthorityService(entityModel);
+      }
+      this.cache.set(id, service);
+    }
+    return this.cache.get(id)!;
+  }
+
+  /**
+   * 权限服务初始化
+   *
+   * @author lxm
+   * @date 2022-10-13 15:10:44
+   * @param {*} [appData=ibiz.appData]
+   * @returns {*}  {Promise<void>}
+   */
+  async init(appData = ibiz.appData): Promise<void> {
+    if (!appData) {
+      throw new RuntimeError('没有appData数据');
+    }
+    // 设置当前用户拥有的统一标识集合
+    if (appData.unires) {
+      this.resCodes = appData.unires;
+    }
+
+    // 设置权限校验开启与否
+    if (appData.enablepermissionvalid === true && ibiz.env.enablePermission) {
+      this.enablePermission = true;
+    }
+  }
+
+  /**
+   * 通过统一资源标识计算权限
+   * @author lxm
+   * @date 2023-05-10 12:29:53
+   * @param {string} resCode
+   */
+  calcByResCode(resCode: string): boolean {
+    return !this.enablePermission || this.resCodes.includes(resCode);
+  }
+
+  /**
+   * 通过操作标识计算权限
+   * @author lxm
+   * @date 2023-05-10 12:33:10
+   * @param {string} dataAccessAction 操作标识
+   * @param {IData} [data] 实体数据
+   * @param {string} [appDeId] 应用实体id
+   * @return {*}  {Promise<boolean>}
+   */
+  async calcByDataAccessAction(
+    dataAccessAction: string,
+    data?: IData,
+    appDeId?: string,
+  ): Promise<boolean> {
+    // 默认为true
+    const result = true;
+
+    // 启用权限校验的通过操作标识去找它映射的统一资源校验，先通过了才走主状态
+    if (this.enablePermission) {
+      const app = await ibiz.hub.getApp(this.appModel.appId);
+      const opPriv = await app.getOPPriv(dataAccessAction, appDeId);
+      // 存在映射统一资源并且校验统一资源不通过时，返回false
+      if (
+        this.enablePermission &&
+        opPriv?.mapSysUniResCode &&
+        !this.calcByResCode(opPriv.mapSysUniResCode)
+      ) {
+        return false;
+      }
+    }
+
+    // 有实体的走主状态的校验
+    if (data && appDeId) {
+      const service = await this.getService(appDeId);
+      return service.calcByDataAccessAction(dataAccessAction, data);
+    }
+
+    return result;
+  }
+}

package/src/service/service/authority/de-authority.service.ts

@@ -0,0 +1,83 @@
+import { IAppDataEntity } from '@ibiz/model-core';
+import { IAppDeAuthorityService } from '../../../interface';
+import { matchMainState, calcMainStateOPPrivsStrs } from '../../../model';
+
+export class DeAuthorityService implements IAppDeAuthorityService {
+  constructor(protected entityModel: IAppDataEntity) {}
+
+  /**
+   * 通过操作标识计算权限
+   * @author lxm
+   * @date 2023-05-10 12:33:10
+   * @param {string} dataAccessAction 操作标识
+   * @param {IData} [data] 实体数据
+   * @param {string} [appDeId] 应用实体id
+   * @return {*}  {Promise<boolean>}
+   */
+  async calcByDataAccessAction(
+    dataAccessAction: string,
+    data: IData,
+  ): Promise<boolean> {
+    // 判断实体数据带回来的权限,不通过就返回false
+    if (data.srfopprivs && !data.srfopprivs.includes(dataAccessAction)) {
+      return false;
+    }
+
+    // 判断主状态的权限
+    const mainStateResult = await this.calcByDeMainState(
+      dataAccessAction,
+      data,
+    );
+    if (!mainStateResult) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * 通过实体主状态计算权限
+   * @author lxm
+   * @date 2023-05-10 01:15:43
+   * @param {string} dataAccessAction 权限操作标识
+   * @param {IData} data 当前数据
+   * @param {string} appDeId 应用实体id
+   * @return {*}  {Promise<boolean>}
+   */
+  protected async calcByDeMainState(
+    dataAccessAction: string,
+    data: IData,
+  ): Promise<boolean> {
+    let result = true;
+    const appDataEntity = this.entityModel;
+
+    // 实体没有启用主状态，默认有权限
+    if (!appDataEntity.enableDEMainState) {
+      ibiz.log.debug(
+        `${appDataEntity.codeName}实体不存在或者为启用主状态，返回true`,
+      );
+      return result;
+    }
+
+    ibiz.log.debug(
+      `操作标识${dataAccessAction}主状态计算开始`,
+      data,
+      appDataEntity,
+    );
+
+    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/src/service/service/authority/index.ts

@@ -0,0 +1,2 @@
+export * from './authority.service';
+export * from './de-authority.service';

package/src/service/service/code-list/code-list.service.ts

@@ -1,5 +1,6 @@
+import { RuntimeError } from '@ibiz-template/core';
 import { IAppCodeList, IApplication, ICodeItem } from '@ibiz/model-core';
-import { CodeListItem } from '../../interface';
+import { CodeListItem } from '../../../interface';
 import { DynamicCodeListCache } from '../../utils';
 
 /**
@@ -17,7 +18,7 @@ export class CodeListService {
    * @author lxm
    * @date 2022-08-25 20:08:16
    */
-  allCodeLists = new Map<string, IAppCodeList>();
+  protected allCodeLists = new Map<string, IAppCodeList>();
 
   /**
    * 代码表项数据缓存
@@ -32,26 +33,6 @@ export class CodeListService {
 
   constructor(protected appModel: IApplication) {}
 
-  /**
-   * 初始化所有代码表缓存
-   *
-   * @author lxm
-   * @date 2022-08-25 21:08:32
-   * @protected
-   * @returns {*}
-   */
-  protected async initAllCodeList() {
-    if (this.allCodeLists.size !== 0) {
-      return null;
-    }
-    // todo
-    // const items = this.appModel.appCodeLists || [];
-    // items.forEach(item => {
-    //   const { codeName } = item;
-    //   this.allCodeLists.set(codeName, item);
-    // });
-  }
-
   /**
    * 获取静态代码表
    *
@@ -74,6 +55,34 @@ export class CodeListService {
     return result;
   }
 
+  /**
+   * 设置代码表模型
+   *
+   * @author lxm
+   * @date 2023-5-23 19:38:51
+   * @protected
+   * @param {IAppCodeList} codeList
+   * @returns {*}
+   */
+  setCodeList(codeList: IAppCodeList): void {
+    const { id, codeName } = codeList;
+    this.allCodeLists.set(id!, codeList);
+    this.allCodeLists.set(codeName!, codeList);
+  }
+
+  /**
+   * 获取代码表模型
+   *
+   * @author lxm
+   * @date 2023-5-23 19:38:51
+   * @protected
+   * @param {string} tag
+   * @returns {*}
+   */
+  getCodeList(tag: string): IAppCodeList | undefined {
+    return this.allCodeLists.get(tag);
+  }
+
   /**
    * 格式化代码表
    *
@@ -84,7 +93,10 @@ export class CodeListService {
    * @param {boolean} isValueNumber
    * @returns {*}
    */
-  protected formatStaticItems(codeItems: ICodeItem[], isValueNumber: boolean) {
+  protected formatStaticItems(
+    codeItems: ICodeItem[],
+    isValueNumber: boolean,
+  ): Readonly<CodeListItem>[] {
     return codeItems.map(codeItem => {
       // todo代码项其他属性，表单数据
       const _codeItem: CodeListItem = {
@@ -110,7 +122,7 @@ export class CodeListService {
    * @date 2022-08-25 21:08:06
    * @protected
    * @param {IAppCodeList} codeList
-   * @returns {*}  {IDatum[]}
+   * @returns {*}  {IData[]}
    */
   protected async getDynamicCodeList(
     codeList: IAppCodeList,
@@ -144,12 +156,9 @@ export class CodeListService {
     context?: IParams,
     params?: IParams,
   ): Promise<readonly CodeListItem[]> {
-    if (this.allCodeLists.size === 0) {
-      await this.initAllCodeList();
-    }
     const codeList = this.allCodeLists.get(tag);
     if (!codeList) {
-      throw new Error(`找不到${tag}代码表`);
+      throw new RuntimeError(`找不到${tag}代码表`);
     }
     if (codeList.codeListType === 'STATIC') {
       return this.getStatic(codeList);