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

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

@@ -1,11 +1,12 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { MenuPermissionMode, RuntimeError } from '@ibiz-template/core';
 import {
-  AppEntityModel,
-  AppMenuItemModel,
-  IPSDEOPPriv,
-  IPSDEUIAction,
-  ModelService,
-} from '@ibiz-template/model';
+  IAppDataEntity,
+  IAppMenuItem,
+  IApplication,
+  IDEOPPriv,
+  IDEUIAction,
+} from '@ibiz/model-core';
 
 /**
  * 权限服务
@@ -48,7 +49,7 @@ export class AuthorityService {
    */
   private rtMenuCodes: string[] = [];
 
-  constructor(protected modelService: ModelService) {}
+  constructor(protected appModel: IApplication) {}
 
   /**
    * 权限服务初始化
@@ -87,27 +88,26 @@ export class AuthorityService {
    */
   async hasOwnOPPrivs(
     dataAccessAction: string,
-    entityModel: AppEntityModel | undefined,
+    entityModel?: IAppDataEntity,
   ): Promise<boolean> {
-    const appModel = this.modelService.app;
+    // todo
+    const { appModel } = this;
     // 先收集所有的操作标识对象集合
-    const opPrivs: IPSDEOPPriv[] = [];
+    const opPrivs: IDEOPPriv[] = [];
     // 收集系统的所有操作标识
-    if (appModel.getAllPSDEOPPrivs()?.length) {
-      opPrivs.push(...appModel.getAllPSDEOPPrivs()!);
+    if (appModel.deopprivs) {
+      opPrivs.push(...appModel.deopprivs);
     }
     // 收集实体的所有操作标识
-    if (entityModel?.source.getAllPSDEOPPrivs()?.length) {
-      opPrivs.push(...entityModel.source.getAllPSDEOPPrivs()!);
+    if (entityModel?.deopprivs) {
+      opPrivs.push(...entityModel.deopprivs);
     }
 
-    const find = opPrivs.find(opPriv => opPriv.name === dataAccessAction);
-    if (find) {
-      // 操作标识没有映射统一资源或者映射了且在用户的统一资源集合内，则权限通过
-      return (
-        !find.mapSysUniRes || this.resCodes.includes(find.mapSysUniResCode)
-      );
-    }
+    // const op = opPrivs.find(opPriv => opPriv.name === dataAccessAction);
+    // if (op) {
+    //   // 操作标识没有映射统一资源或者映射了且在用户的统一资源集合内，则权限通过
+    //   return !op.mapSysUniRes || this.resCodes.includes(op.mapSysUniResCode);
+    // }
 
     // 找不到改操作标识则权限不通过
     return false;
@@ -118,10 +118,10 @@ export class AuthorityService {
    *
    * @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 {
     if (!ibiz.env.enablePermission) {
       return true;
     }
@@ -149,8 +149,9 @@ export class AuthorityService {
    * @param {AppMenuItemModel} menuItem
    * @returns {*}  {boolean}
    */
-  protected calcMenuPermissionByRT(menuItem: AppMenuItemModel): boolean {
-    return this.rtMenuCodes.includes(menuItem.rtMenuCode);
+  protected calcMenuPermissionByRT(menuItem: IAppMenuItem): boolean {
+    // return this.rtMenuCodes.includes(menuItem.rtMenuCode);
+    return false;
   }
 
   /**
@@ -159,12 +160,12 @@ export class AuthorityService {
    * @author lxm
    * @date 2022-10-12 18:10:23
    * @protected
-   * @param {AppMenuItemModel} menuItem
+   * @param {IAppMenuItem} menuItem
    * @returns {*}  {boolean}
    */
-  protected calcMenuPermissionByResource(menuItem: AppMenuItemModel): boolean {
-    if (this.enableResValidate && menuItem.source.accessKey) {
-      return this.resCodes.includes(menuItem.source.accessKey);
+  protected calcMenuPermissionByResource(menuItem: IAppMenuItem): boolean {
+    if (this.enableResValidate && menuItem.accessKey) {
+      return this.resCodes.includes(menuItem.accessKey);
     }
     return true;
   }
@@ -174,19 +175,18 @@ 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: IPSDEUIAction,
+    uiAction: IDEUIAction,
     data: IData | undefined,
-    entityModel: AppEntityModel | undefined,
+    entityModel: IAppDataEntity | undefined,
   ): boolean {
     const result = true;
-    const { dataAccessAction, uIActionTag } = uiAction;
-    let { actionTarget } = uiAction;
+    const { dataAccessAction } = uiAction;
 
     // *绑定了操作标识的界面行为
     if (dataAccessAction) {
@@ -214,22 +214,6 @@ export class AuthorityService {
       }
     }
 
-    // *预置界面行为的数据目标设置默认值
-    if (uiAction.uIActionMode === 'SYS' && !actionTarget) {
-      if (
-        ['SAVE', 'SaveAndExit', 'Edit', 'Remove', 'RemoveAndExit'].includes(
-          uIActionTag,
-        )
-      ) {
-        actionTarget = 'SINGLEKEY';
-      } else {
-        actionTarget = 'NONE';
-      }
-    }
-    // *有数据目标的需要有数据才有权限
-    if (actionTarget !== 'NONE' && !data) {
-      return false;
-    }
     return result;
   }
 
@@ -240,32 +224,32 @@ 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: string,
     data: IData,
-    entityModel: AppEntityModel,
+    entityModel: IAppDataEntity,
   ): boolean {
-    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/src/service/dto/method.dto.ts

@@ -1,12 +1,10 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable no-await-in-loop */
 import {
-  AppEntityModel,
-  IPSAppDataEntity,
-  IPSAppDEMethodDTO,
-  IPSAppDEMethodDTOField,
-  UnsupportedModelError,
-} from '@ibiz-template/model';
-import { isNilOrEmpty } from 'qx-util';
+  IAppDataEntity,
+  IAppDEMethodDTO,
+  IAppDEMethodDTOField,
+} from '@ibiz/model-core';
 import { Application } from '../../application';
 import { Entity } from '../entity/entity';
 
@@ -21,21 +19,26 @@ import { Entity } from '../entity/entity';
 export class MethodDto {
   protected app?: Application;
 
-  protected fields: IPSAppDEMethodDTOField[];
+  protected fields!: IAppDEMethodDTOField[];
 
   protected dtoMap: Map<string, MethodDto> = new Map();
 
-  protected _entity?: AppEntityModel;
+  protected _entity?: IAppDataEntity;
 
-  protected get entity(): AppEntityModel {
-    if (!this._entity) {
-      this._entity = new AppEntityModel(
-        this.dto?.getParentPSModelObject(
-          'app.dataentity.IPSAppDataEntity',
-        ) as IPSAppDataEntity,
-      );
-    }
-    return this._entity;
+  protected get entity(): IAppDataEntity {
+    // if (!this._entity) {
+    //   this._entity = new IAppDataEntity(
+    //     this.dto?.getParentPSModelObject(
+    //       'app.dataentity.IAppDataEntity',
+    //     ) as IAppDataEntity,
+    //   );
+    // }
+    return this._entity!;
+  }
+
+  get isLocalMode(): boolean {
+    // return this.entity.isLocalMode;
+    return false;
   }
 
   /**
@@ -43,15 +46,15 @@ export class MethodDto {
    *
    * @author chitanda
    * @date 2022-10-10 23:10:06
-   * @param {IPSAppDEMethodDTO} dto
+   * @param {IAppDEMethodDTO} dto
    */
-  constructor(protected dto?: IPSAppDEMethodDTO) {
-    if (dto) {
-      this.app = ibiz.hub.getApp(dto.getPSModelService().app);
-      this.fields = dto.getPSAppDEMethodDTOFields() || [];
-    } else {
-      this.fields = [];
-    }
+  constructor(protected dto?: IAppDEMethodDTO) {
+    // if (dto) {
+    //   this.app = ibiz.hub.getApp(dto.getPSModelService().app);
+    //   this.fields = dto.getPSAppDEMethodDTOFields() || [];
+    // } else {
+    //   this.fields = [];
+    // }
   }
 
   /**
@@ -65,40 +68,40 @@ export class MethodDto {
    */
   async get(context: IParams, data: IData): Promise<IData> {
     const params: IData = {};
-    for (let i = 0; i < this.fields.length; i++) {
-      const field = this.fields[i];
-      const key = field.codeName.toLowerCase();
-      switch (field.type) {
-        case 'SIMPLE': {
-          const val = data[key];
-          if (isNilOrEmpty(val)) {
-            params[key] = null;
-          } else {
-            params[key] = val;
-          }
-          break;
-        }
-        case 'DTOS': {
-          const dto = await this.getFieldDto(field);
-          const refEntity = field.getRefPSAppDataEntity()!;
-          const service = await this.app!.es.getService(refEntity.codeName);
-          const items: IData[] = service.local.getList(context);
-          if (items) {
-            const arr = [];
-            for (let j = 0; j < items.length; j++) {
-              arr.push(await dto.get(context, items[j]));
-            }
-            params[key] = arr;
-          }
-          break;
-        }
-        default:
-          throw new UnsupportedModelError(
-            field,
-            `未支持的应用实体方法输入属性类型: ${field.type}`,
-          );
-      }
-    }
+    // for (let i = 0; i < this.fields.length; i++) {
+    //   const field = this.fields[i];
+    //   const key = field.codeName.toLowerCase();
+    //   switch (field.type) {
+    //     case 'SIMPLE': {
+    //       const val = data[key];
+    //       if (isNilOrEmpty(val)) {
+    //         params[key] = null;
+    //       } else {
+    //         params[key] = val;
+    //       }
+    //       break;
+    //     }
+    //     case 'DTOS': {
+    //       const dto = await this.getFieldDto(field);
+    //       const refEntity = field.getRefPSAppDataEntity()!;
+    //       const service = await this.app!.es.getService(refEntity.codeName);
+    //       const items: IDatum[] = service.local.getList(context);
+    //       if (items) {
+    //         const arr = [];
+    //         for (let j = 0; j < items.length; j++) {
+    //           arr.push(await dto.get(context, items[j]));
+    //         }
+    //         params[key] = arr;
+    //       }
+    //       break;
+    //     }
+    //     default:
+    //       throw new ModelError(
+    //         field,
+    //         `未支持的应用实体方法输入属性类型: ${field.type}`,
+    //       );
+    //   }
+    // }
     return params;
   }
 
@@ -108,20 +111,20 @@ export class MethodDto {
    * @author chitanda
    * @date 2022-10-10 23:10:50
    * @param {IParams} context
-   * @param {IData[]} data
+   * @param {IDatum[]} data
    * @return {*}  {Promise<Entity[]>}
    */
-  async sets(context: IParams, data: IData[]): Promise<Entity[]> {
-    const service = await this.app!.es.getService(this.entity.codeName);
+  async sets(context: IParams, data: IDatum[]): Promise<Entity[]> {
+    const service = await this.app!.es.getService(this.entity.codeName!);
     service.local.clear(context);
     return Promise.all(
       data.map(async datum => {
         const all = this.fields
           .filter(field => field.type === 'DTOS')
           .map(async field => {
-            const key = field.codeName.toLowerCase();
+            const key = field.codeName!.toLowerCase();
             const dto = await this.getFieldDto(field);
-            const items: IData[] = datum[key];
+            const items: IDatum[] = datum[key];
             if (items) {
               await dto.sets(context, items);
             }
@@ -129,8 +132,8 @@ export class MethodDto {
         for (let i = 0; i < all.length; i++) {
           await all[i];
         }
-        const entityData = new Entity(this.entity.source, datum);
-        if (this.entity.isLocalMode) {
+        const entityData = new Entity(this.entity, datum);
+        if (this.isLocalMode) {
           await service.local.add(context, entityData);
         }
         return entityData;
@@ -144,18 +147,18 @@ export class MethodDto {
    * @author chitanda
    * @date 2022-10-17 16:10:47
    * @protected
-   * @param {IPSAppDEMethodDTOField} field
+   * @param {IAppDEMethodDTOField} field
    * @return {*}  {Promise<MethodDto>}
    */
-  protected async getFieldDto(
-    field: IPSAppDEMethodDTOField,
-  ): Promise<MethodDto> {
-    if (this.dtoMap.has(field.codeName)) {
-      return this.dtoMap.get(field.codeName)!;
-    }
-    await field.getRefPSAppDataEntity()?.fill(true);
-    const dto = new MethodDto(field.getRefPSAppDEMethodDTO()!);
-    this.dtoMap.set(field.codeName, dto);
-    return dto;
+  protected async getFieldDto(field: IAppDEMethodDTOField): Promise<MethodDto> {
+    // todo
+    // if (this.dtoMap.has(field.codeName)) {
+    //   return this.dtoMap.get(field.codeName)!;
+    // }
+    // await field.getRefPSAppDataEntity()?.fill(true);
+    // const dto = new MethodDto(field.getRefPSAppDEMethodDTO()!);
+    // this.dtoMap.set(field.codeName, dto);
+    // return dto;
+    throw new Error();
   }
 }

package/src/service/entity/entity.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-constructor-return */
 /* eslint-disable max-classes-per-file */
-import { IPSAppDataEntity } from '@ibiz-template/model';
+import { IAppDataEntity } from '@ibiz/model-core';
 import { clone } from 'ramda';
 import { Srfuf } from '../constant';
 
@@ -18,7 +18,7 @@ export class Entity {
 
   protected declare data: IData;
 
-  protected declare entity: IPSAppDataEntity;
+  protected declare entity: IAppDataEntity;
 
   /**
    * 前端临时主键
@@ -45,10 +45,10 @@ export class Entity {
    *
    * @author chitanda
    * @date 2022-10-11 21:10:21
-   * @param {IPSAppDataEntity} entity
+   * @param {IAppDataEntity} entity
    * @param {(IData | Entity)} data
    */
-  constructor(entity: IPSAppDataEntity, data: IData | Entity) {
+  constructor(entity: IAppDataEntity, data: IData | Entity) {
     Object.defineProperty(this, 'entity', {
       enumerable: false,
       configurable: true,
@@ -59,8 +59,11 @@ export class Entity {
       configurable: true,
       value: data instanceof Entity ? clone(data.data) : clone(data),
     });
-    const key = entity.getKeyPSAppDEField()!.codeName.toLowerCase();
-    const major = entity.getMajorPSAppDEField()!.codeName.toLowerCase();
+    // todo
+    // const key = entity.getKeyPSAppDEField()!.codeName.toLowerCase();
+    // const major = entity.getMajorPSAppDEField()!.codeName.toLowerCase();
+    const key = '';
+    const major = '';
     Object.defineProperty(this, 'srfdename', {
       get() {
         return entity.codeName;
@@ -93,22 +96,22 @@ export class Entity {
    * @protected
    */
   protected defineProperties(): void {
-    const { data } = this;
-    const properties: { [key: string]: PropertyDescriptor } = {};
-    const fields = this.entity.getAllPSAppDEFields() || [];
-    fields.forEach(field => {
-      const key = field.codeName.toLowerCase();
-      properties[key] = {
-        enumerable: true,
-        set(val: unknown) {
-          data[key] = val;
-        },
-        get() {
-          return data[key];
-        },
-      };
-    });
-    Object.defineProperties(this, properties);
+    // const { data } = this;
+    // const properties: { [key: string]: PropertyDescriptor } = {};
+    // const fields = this.entity.getAllPSAppDEFields() || [];
+    // fields.forEach(field => {
+    //   const key = field.codeName.toLowerCase();
+    //   properties[key] = {
+    //     enumerable: true,
+    //     set(val: unknown) {
+    //       data[key] = val;
+    //     },
+    //     get() {
+    //       return data[key];
+    //     },
+    //   };
+    // });
+    // Object.defineProperties(this, properties);
   }
 
   /**

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

@@ -1,8 +1,4 @@
-import {
-  IPSAppCodeList,
-  IPSCodeItem,
-  ModelService,
-} from '@ibiz-template/model';
+import { IAppCodeList, IApplication, ICodeItem } from '@ibiz/model-core';
 import { CodeListItem } from '../../interface';
 import { DynamicCodeListCache } from '../../utils';
 
@@ -21,7 +17,7 @@ export class CodeListService {
    * @author lxm
    * @date 2022-08-25 20:08:16
    */
-  allCodeLists = new Map<string, IPSAppCodeList>();
+  allCodeLists = new Map<string, IAppCodeList>();
 
   /**
    * 代码表项数据缓存
@@ -34,7 +30,7 @@ export class CodeListService {
   protected cache: Map<string, readonly CodeListItem[] | DynamicCodeListCache> =
     new Map();
 
-  constructor(protected modelService: ModelService) {}
+  constructor(protected appModel: IApplication) {}
 
   /**
    * 初始化所有代码表缓存
@@ -46,13 +42,14 @@ export class CodeListService {
    */
   protected async initAllCodeList() {
     if (this.allCodeLists.size !== 0) {
-      return;
+      return null;
     }
-    const items = this.modelService.app.getAllPSAppCodeLists() || [];
-    items.forEach(item => {
-      const codeName = item.isFill ? item.codeName : item.refM.codeName;
-      this.allCodeLists.set(codeName, item);
-    });
+    // todo
+    // const items = this.appModel.appCodeLists || [];
+    // items.forEach(item => {
+    //   const { codeName } = item;
+    //   this.allCodeLists.set(codeName, item);
+    // });
   }
 
   /**
@@ -63,16 +60,17 @@ export class CodeListService {
    * @param {string} _tag
    * @return {*}  {CodeListItem[]}
    */
-  protected getStatic(codeList: IPSAppCodeList): CodeListItem[] {
-    if (this.cache.has(codeList.codeName)) {
-      return this.cache.get(codeList.codeName)! as CodeListItem[];
+  protected getStatic(codeList: IAppCodeList): CodeListItem[] {
+    const codeName = codeList.codeName!;
+    if (this.cache.has(codeName)) {
+      return this.cache.get(codeName)! as CodeListItem[];
     }
-    const items = codeList.getPSCodeItems();
+    const items = codeList.codeItems;
     let result: CodeListItem[] = [];
     if (items?.length) {
-      result = this.formatStaticItems(items, codeList.codeItemValueNumber);
+      result = this.formatStaticItems(items, codeList.codeItemValueNumber!);
     }
-    this.cache.set(codeList.codeName, Object.freeze(result));
+    this.cache.set(codeName, Object.freeze(result));
     return result;
   }
 
@@ -82,25 +80,22 @@ export class CodeListService {
    * @author lxm
    * @date 2022-08-25 21:08:03
    * @protected
-   * @param {IPSCodeItem[]} codeItems
+   * @param {ICodeItem[]} codeItems
    * @param {boolean} isValueNumber
    * @returns {*}
    */
-  protected formatStaticItems(
-    codeItems: IPSCodeItem[],
-    isValueNumber: boolean,
-  ) {
+  protected formatStaticItems(codeItems: ICodeItem[], isValueNumber: boolean) {
     return codeItems.map(codeItem => {
       // todo代码项其他属性，表单数据
       const _codeItem: CodeListItem = {
-        text: codeItem.text,
-        value: isValueNumber ? Number(codeItem.value) : codeItem.value,
+        text: codeItem.text!,
+        value: isValueNumber ? Number(codeItem.value) : codeItem.value!,
         color: codeItem.color,
-        id: codeItem.codeName,
+        id: codeItem.codeName!,
       };
-      if (codeItem.getPSCodeItems()?.length) {
+      if (codeItem.codeItems?.length) {
         _codeItem.children = this.formatStaticItems(
-          codeItem.getPSCodeItems()!,
+          codeItem.codeItems!,
           isValueNumber,
         );
       }
@@ -114,20 +109,21 @@ export class CodeListService {
    * @author lxm
    * @date 2022-08-25 21:08:06
    * @protected
-   * @param {IPSAppCodeList} codeList
-   * @returns {*}  {IData[]}
+   * @param {IAppCodeList} codeList
+   * @returns {*}  {IDatum[]}
    */
   protected async getDynamicCodeList(
-    codeList: IPSAppCodeList,
+    codeList: IAppCodeList,
     context: IParams = {},
     params: IParams = {},
   ): Promise<CodeListItem[]> {
     let dynamicCache: DynamicCodeListCache;
-    if (this.cache.has(codeList.codeName)) {
-      dynamicCache = this.cache.get(codeList.codeName)! as DynamicCodeListCache;
+    const codeName = codeList.codeName!;
+    if (this.cache.has(codeName)) {
+      dynamicCache = this.cache.get(codeName)! as DynamicCodeListCache;
     } else {
       dynamicCache = new DynamicCodeListCache(codeList);
-      this.cache.set(codeList.codeName, dynamicCache);
+      this.cache.set(codeName, dynamicCache);
       await dynamicCache.init();
     }
     return dynamicCache.get(context, params);
@@ -155,7 +151,6 @@ export class CodeListService {
     if (!codeList) {
       throw new Error(`找不到${tag}代码表`);
     }
-    await codeList.fill(true);
     if (codeList.codeListType === 'STATIC') {
       return this.getStatic(codeList);
     }