@ibiz-template/runtime 0.4.16 → 0.4.17-dev.0

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

@@ -7,7 +7,7 @@ import {
 import { ModelError } from '@ibiz-template/core';
 import { AppDataEntity } from '../app-data-entity/app-data-entity';
 import { findModelChild } from '../../model';
-import { IAppService } from '../../interface';
+import { IAppDEService, IAppService, IDataEntity } from '../../interface';
 
 interface listMap {
   [key: number]: IData;
@@ -29,6 +29,7 @@ export class MethodDto {
   protected dtoMap: Map<string, MethodDto> = new Map();
 
   constructor(
+    protected service: IAppDEService,
     protected entity: IAppDataEntity,
     protected isLocalMode?: boolean,
     protected dto?: IAppDEMethodDTO,
@@ -41,6 +42,19 @@ export class MethodDto {
     }
   }
 
+  /**
+   * 查找本地 DTO 存储数据
+   *
+   * @author chitanda
+   * @date 2023-12-22 14:12:19
+   * @param {IContext} context
+   * @param {IParams} [params]
+   * @return {*}  {IDataEntity[]}
+   */
+  select(context: IContext, params?: IParams): IDataEntity[] {
+    return this.service.local.select(context, params);
+  }
+
   /**
    * 转换数组成ListMap
    *
@@ -75,11 +89,11 @@ export class MethodDto {
    *
    * @author chitanda
    * @date 2022-10-10 23:10:33
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} data
    * @return {*}  {Promise<IData>}
    */
-  async get(context: IParams, data: IData): Promise<IData> {
+  async get(context: IContext, data: IData): Promise<IData> {
     const params: IData = {};
     // 拷贝数据
     for (let i = 0; i < this.fields.length; i++) {
@@ -107,13 +121,13 @@ export class MethodDto {
             if (!field.refAppDataEntityId) {
               break;
             }
-            const dto = await this.getFieldDto(field);
-            const service = await this.app!.deService.getService(
-              field.refAppDataEntityId!,
-            );
-            const items = await service.selectLocal(context, {
-              // srfpkey: data[this.entity.keyAppDEFieldId!],
-            });
+            const dto = await this.getFieldDto(context, field);
+            // 子数据过滤参数
+            const filterParams: IParams = {};
+            if (field.refPickupAppDEFieldId) {
+              filterParams[field.refPickupAppDEFieldId!] = data.srfkey;
+            }
+            const items = await dto.select(context, filterParams);
             if (items) {
               const arr = [];
               for (let j = 0; j < items.length; j++) {
@@ -140,14 +154,13 @@ export class MethodDto {
    *
    * @author chitanda
    * @date 2022-10-10 23:10:50
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData[]} data
    * @return {*}  {Promise<AppDataEntity[]>}
    */
-  async sets(context: IParams, data: IData[]): Promise<AppDataEntity[]> {
-    const service = await this.app!.deService.getService(this.entity.id!);
+  async sets(context: IContext, data: IData[]): Promise<AppDataEntity[]> {
     if (this.isLocalMode) {
-      service.local.clear(context);
+      this.service.local.clear();
     }
     return Promise.all(
       data.map(async datum => {
@@ -162,13 +175,14 @@ export class MethodDto {
               if (!field.refAppDataEntityId) {
                 return;
               }
-              const dto = await this.getFieldDto(field);
+              const dto = await this.getFieldDto(context, field);
               const items: IData[] = datum[key];
               if (items) {
                 const pKey = datum[this.entity.keyAppDEFieldId!];
                 // 特殊处理，在子包内设置父对象标识
                 items.forEach(item => {
                   item.srfpkey = pKey;
+                  item[field.refPickupAppDEFieldId!] = pKey;
                 });
                 await dto.sets(context, items);
               } else {
@@ -181,7 +195,7 @@ export class MethodDto {
         }
         const entityData = new AppDataEntity(this.entity, datum);
         if (this.isLocalMode) {
-          await service.local.add(context, entityData);
+          await this.service.local.add(context, entityData);
         }
         return entityData;
       }),
@@ -192,12 +206,16 @@ export class MethodDto {
    * 获取子属性 DTO
    *
    * @author chitanda
-   * @date 2022-10-17 16:10:47
+   * @date 2023-12-22 13:12:06
    * @protected
+   * @param {IContext} context
    * @param {IAppDEMethodDTOField} field
    * @return {*}  {Promise<MethodDto>}
    */
-  protected async getFieldDto(field: IAppDEMethodDTOField): Promise<MethodDto> {
+  protected async getFieldDto(
+    context: IContext,
+    field: IAppDEMethodDTOField,
+  ): Promise<MethodDto> {
     if (this.dtoMap.has(field.codeName!)) {
       return this.dtoMap.get(field.codeName!)!;
     }
@@ -209,7 +227,9 @@ export class MethodDto {
       entity.appDEMethodDTOs || [],
       field.refAppDEMethodDTOId!,
     )!;
-    const dto = new MethodDto(entity, true, methodDto);
+    const service = await this.app!.deService.getService(context, entity.id!);
+    service.isLocalMode = true;
+    const dto = new MethodDto(service, entity, true, methodDto);
     this.dtoMap.set(field.codeName!, dto);
     return dto;
   }

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

@@ -82,7 +82,7 @@ export class AuthorityService {
    * @author chitanda
    * @date 2022-12-23 10:12:24
    * @param {string} id 实体标识
-   * @param {IParams} [context] 上下文,用于计算模型所属沙箱环境
+   * @param {IContext} [context] 上下文,用于计算模型所属沙箱环境
    * @return {*}  {Promise<IAppDEService>}
    */
   async getService(id: string): Promise<IAppDeAuthorityService> {

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

@@ -146,7 +146,7 @@ export class CodeListService {
    */
   protected async getDynamicCodeList(
     codeList: IAppCodeList,
-    context: IParams = {},
+    context: IContext,
     params: IParams = {},
   ): Promise<CodeListItem[]> {
     let dynamicCache: DynamicCodeListCache;
@@ -167,13 +167,13 @@ export class CodeListService {
    * @author chitanda
    * @date 2022-08-25 15:08:45
    * @param {string} tag
-   * @param {IParams} [context]
+   * @param {IContext} [context]
    * @param {IParams} [params]
    * @return {*}  {Promise<CodeListItem[]>}
    */
   async get(
     tag: string,
-    context?: IParams,
+    context: IContext,
     params?: IParams,
   ): Promise<readonly CodeListItem[]> {
     const codeList = this.allCodeLists.get(tag);

package/src/service/service/control/control.service.ts

@@ -62,13 +62,13 @@ export class ControlService<T extends IControl = IControl> {
    * @author lxm
    * @date 2022-08-31 17:08:41
    * @param {string} methodName 方法名
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数或数据
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async exec(
     methodName: string,
-    context: IParams,
+    context: IContext,
     data?: IData,
     params?: IParams,
   ): Promise<IHttpResponse> {

package/src/service/service/control/md-control.service.ts

@@ -12,12 +12,12 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async fetch(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO[]>> {
     const fetchAction =
@@ -32,12 +32,12 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async get(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     const getAction = this.model.getControlAction?.appDEMethodId || 'get';
@@ -51,12 +51,12 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async getDraft(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     const getDraftAction =
@@ -71,11 +71,14 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:48
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}
    */
-  async remove(context: IParams, params: IParams = {}): Promise<IHttpResponse> {
+  async remove(
+    context: IContext,
+    params: IParams = {},
+  ): Promise<IHttpResponse> {
     const removeAction =
       this.model.removeControlAction?.appDEMethodId || 'remove';
     const res = await this.exec(removeAction, context, undefined, params);
@@ -87,12 +90,12 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {ControlVO} data 数据
    * @returns {*}
    */
   async create(
-    context: IParams,
+    context: IContext,
     data: ControlVO,
   ): Promise<IHttpResponse<ControlVO>> {
     const createAction =
@@ -107,12 +110,12 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {ControlVO} data 数据
    * @returns {*}
    */
   async update(
-    context: IParams,
+    context: IContext,
     data: ControlVO,
   ): Promise<IHttpResponse<ControlVO>> {
     const updateAction =
@@ -152,7 +155,7 @@ export class MDControlService<
    * @author lxm
    * @date 2022-11-25 14:11:09
    * @param {IPSDEDataExport} dataExport 导出模型
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 请求参数
    * @returns {*}  {Promise<IHttpResponse>}
    */

package/src/service/service/counter/counter.service.ts

@@ -34,7 +34,7 @@ export class CounterService {
    */
   static async getCounter(
     model: IAppCounter,
-    context?: IParams,
+    context?: IContext,
     params?: IParams,
   ): Promise<AppCounter> {
     const id = model.id!;
@@ -59,13 +59,13 @@ export class CounterService {
    * @date 2022-10-26 20:10:20
    * @static
    * @param {IAppCounterRef} model
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} params
    * @return {*}  {Promise<AppCounter>}
    */
   static async getCounterByRef(
     model: IAppCounterRef,
-    context?: IParams,
+    context?: IContext,
     params?: IParams,
   ): Promise<AppCounter> {
     const { appCounter } = model;

package/src/service/service/entity/de.service.ts

@@ -5,8 +5,6 @@ import {
   ModelError,
   RuntimeError,
 } from '@ibiz-template/core';
-import { equals, isEmpty, where } from 'ramda';
-import { ascSort } from 'qx-util';
 import { DECache, calcResPath } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
 import { Method } from './method/method';
@@ -72,13 +70,26 @@ export class DEService implements IAppDEService {
   readonly local: DECache;
 
   /**
-   * Creates an instance of EntityService.
+   * 是否为本地模式(临时数据模式)服务
    *
    * @author chitanda
-   * @date 2022-08-24 18:08:44
-   * @param {IAppDataEntity} model 应用实体模型
+   * @date 2023-12-22 16:12:13
+   * @type {boolean}
    */
-  constructor(protected model: IAppDataEntity) {
+  isLocalMode: boolean = false;
+
+  /**
+   * Creates an instance of DEService.
+   *
+   * @author chitanda
+   * @date 2023-12-22 13:12:21
+   * @param {string} srfSessionId 当前实体会话标识
+   * @param {IAppDataEntity} model 实体模型
+   */
+  constructor(
+    protected srfSessionId: string,
+    protected model: IAppDataEntity,
+  ) {
     this.local = new DECache(model);
     this.configCache = new ConfigService(
       model.appId!,
@@ -114,7 +125,10 @@ export class DEService implements IAppDEService {
     if (!provider) {
       throw new ModelError(model, `未支持的服务方法类型: ${model.methodType}`);
     }
-    const method: Method = provider.create(this.model, model, { acMode });
+    const method: Method = provider.create(this, this.model, model, {
+      acMode,
+      localMode: this.isLocalMode,
+    });
     this.methodMap.set(cacheId, method);
     return method;
   }
@@ -125,14 +139,14 @@ export class DEService implements IAppDEService {
    * @author chitanda
    * @date 2022-09-13 19:09:55
    * @param {string} id 执行服务方法标识
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} [params={}] 请求参数
    * @param {IParams} [params2={}] 查询参数
    * @return {*}  {Promise<IHttpResponse>}
    */
   async exec(
     id: string,
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse> {
@@ -144,7 +158,7 @@ export class DEService implements IAppDEService {
   }
 
   getDraft(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse<IData>> {
@@ -152,7 +166,7 @@ export class DEService implements IAppDEService {
   }
 
   create(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse<IData>> {
@@ -160,7 +174,7 @@ export class DEService implements IAppDEService {
   }
 
   get(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse<IData>> {
@@ -168,7 +182,7 @@ export class DEService implements IAppDEService {
   }
 
   update(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse<IData>> {
@@ -176,7 +190,7 @@ export class DEService implements IAppDEService {
   }
 
   remove(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse<IData>> {
@@ -184,7 +198,7 @@ export class DEService implements IAppDEService {
   }
 
   fetchDefault(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse<IData>> {
@@ -192,7 +206,7 @@ export class DEService implements IAppDEService {
   }
 
   getDraftTemp(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse<IData>> {
@@ -200,7 +214,7 @@ export class DEService implements IAppDEService {
   }
 
   createTemp(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse<IData>> {
@@ -208,7 +222,7 @@ export class DEService implements IAppDEService {
   }
 
   getTemp(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse<IData>> {
@@ -216,7 +230,7 @@ export class DEService implements IAppDEService {
   }
 
   updateTemp(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse<IData>> {
@@ -224,7 +238,7 @@ export class DEService implements IAppDEService {
   }
 
   removeTemp(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse<IData>> {
@@ -232,7 +246,7 @@ export class DEService implements IAppDEService {
   }
 
   fetchTempDefault(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse<IData>> {
@@ -242,72 +256,15 @@ export class DEService implements IAppDEService {
   /**
    * 查询本地数据，根据属性
    *
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} params 根据多实体属性查找，例：{ name: '张三', age: 18, parent: null }
    * @return {*}  {Promise<IDataEntity[]>}
    */
   async selectLocal(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IDataEntity[]> {
-    let items: IDataEntity[] = this.local.getList(context);
-    items = ascSort(items, 'srfordervalue');
-    // 查询数据条件集
-    const data: IData = {};
-    // if (notNilEmpty(context)) {
-    //   const map = this.entity.majorKeyMap;
-    //   if (map) {
-    //     for (const key in map) {
-    //       if (Object.prototype.hasOwnProperty.call(map, key)) {
-    //         const val = map[key];
-    //         if (notNilEmpty(context[key])) {
-    //           data[val] = equals(context[key]);
-    //         }
-    //       }
-    //     }
-    //   }
-    // }
-    const nullData: Record<string, unknown> = {};
-    const undefinedData: Record<string, unknown> = {};
-    const emptyData: Record<string, unknown> = {};
-    if (params.srfkey) {
-      data.srfkey = equals(params.srfkey);
-      delete params.srfkey;
-    }
-    for (const key in params) {
-      if (Object.prototype.hasOwnProperty.call(params, key)) {
-        const val = params[key];
-        if (val == null) {
-          nullData[key] = equals(null);
-          undefinedData[key] = equals(undefined);
-          emptyData[key] = equals('');
-        } else {
-          data[key] = equals(val);
-        }
-      }
-    }
-    if (!isEmpty(data)) {
-      // 返回柯里化函数，用于判断数据是否满足要求
-      const pred = where(data);
-      const nullPred = where(nullData);
-      const undefinedPred = where(undefinedData);
-      const emptyPred = where(emptyData);
-      items = items.filter(obj => {
-        if (isEmpty(nullData)) {
-          if (pred(obj)) {
-            return true;
-          }
-        } else if (
-          pred(obj) &&
-          (nullPred(obj) || undefinedPred(obj) || emptyPred(obj))
-        ) {
-          return true;
-        }
-        return false;
-      });
-    }
-    const list = items.map(obj => obj.clone());
-    return list;
+    return this.local.select(context, params);
   }
 
   /**
@@ -316,14 +273,14 @@ export class DEService implements IAppDEService {
    * @author chitanda
    * @date 2022-09-13 19:09:55
    * @param {string} id 执行服务方法标识
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} [params={}] 请求参数
    * @param {IParams} [params2={}] 查询参数
    * @return {*}  {Promise<IHttpResponse>}
    */
   async execAc(
     id: string,
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2: IParams = {},
   ): Promise<IHttpResponse> {
@@ -340,14 +297,14 @@ export class DEService implements IAppDEService {
    * @author chitanda
    * @date 2023-10-16 16:10:16
    * @param {(data: IPortalAsyncAction) => void} onmessage
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params={}]
    * @param {IData} [data={}]
    * @return {*}  {Promise<void>}
    */
   aiChatSse(
     onmessage: (data: IPortalAsyncAction) => void,
-    context: IParams,
+    context: IContext,
     params: IParams = {},
     data: IData = {},
   ): Promise<void> {
@@ -384,13 +341,13 @@ export class DEService implements IAppDEService {
    *
    * @author chitanda
    * @date 2023-10-26 14:10:58
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params={}]
    * @param {IData} [data={}]
    * @return {*}  {Promise<IHttpResponse>}
    */
   aiChatHistory(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
     data: IData = {},
   ): Promise<IHttpResponse> {
@@ -405,12 +362,12 @@ export class DEService implements IAppDEService {
    * @author chitanda
    * @date 2023-10-26 14:10:25
    * @protected
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {boolean} [isHistories=false]
    * @return {*}  {string}
    */
   protected calcSsePath(
-    context: IParams,
+    context: IContext,
     isHistories: boolean = false,
   ): string {
     const srfkey = context[this.model.codeName!.toLowerCase()];
@@ -420,4 +377,15 @@ export class DEService implements IAppDEService {
     const resPath = calcResPath(context, this.model);
     return resPath + curPath;
   }
+
+  /**
+   * 服务实例销毁
+   *
+   * @author chitanda
+   * @date 2023-12-22 14:12:11
+   * @return {*}  {Promise<void>}
+   */
+  async destroy(): Promise<void> {
+    this.local.clear();
+  }
 }