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

package/src/service/service/entity/method/de-action.ts

@@ -11,7 +11,6 @@ import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
 import { findDELogic } from '../../../../model';
 import { execDELogicAction, execFieldLogics } from '../../../../de-logic';
-import { isLocalMode } from '../util/util';
 
 /**
  * 实体行为方法
@@ -25,29 +24,16 @@ import { isLocalMode } from '../util/util';
 export class DEActionMethod extends Method {
   declare method: IAppDEAction;
 
-  /**
-   * 是否为本地模式
-   *
-   * @author chitanda
-   * @date 2023-04-19 16:04:46
-   * @readonly
-   * @protected
-   * @type {boolean}
-   */
-  protected get isLocalMode(): boolean {
-    return isLocalMode(this.method);
-  }
-
   /**
    * 处理请求发送参数
    * @author lxm
    * @date 2023-10-19 02:50:36
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {(IData | IData[])} data 数据对象
    * @return {*}  {(Promise<IData | IData[]>)}
    */
   async inputHandle(
-    context: IParams,
+    context: IContext,
     data: IData | IData[],
   ): Promise<IData | IData[]> {
     if (isArray(data)) {
@@ -58,7 +44,7 @@ export class DEActionMethod extends Method {
   }
 
   async exec(
-    context: IParams,
+    context: IContext,
     data?: IData | IData[],
     params?: IParams,
   ): Promise<HttpResponse<IData>> {
@@ -152,12 +138,12 @@ export class DEActionMethod extends Method {
    *
    * @author chitanda
    * @date 2022-08-24 20:08:01
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} data
    * @return {*}  {Promise<IHttpResponse<IData>>}
    */
   async create(
-    context: IParams,
+    context: IContext,
     data?: IData | IData[],
     params?: IParams,
   ): Promise<IHttpResponse<IDataEntity>> {
@@ -178,12 +164,12 @@ export class DEActionMethod extends Method {
    *
    * @author chitanda
    * @date 2022-08-24 20:08:56
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params]
    * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
    */
   async remove(
-    context: IParams,
+    context: IContext,
     params?: IParams,
   ): Promise<IHttpResponse<IDataEntity>> {
     if (this.isLocalMode) {
@@ -202,13 +188,13 @@ export class DEActionMethod extends Method {
    *
    * @author chitanda
    * @date 2022-09-13 19:09:39
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {(IData | IDataEntity)} data
    * @param {IParams} [params={}]
    * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
    */
   async update(
-    context: IParams,
+    context: IContext,
     data?: IData | IData[],
     params?: IParams,
   ): Promise<IHttpResponse<IDataEntity>> {
@@ -233,12 +219,12 @@ export class DEActionMethod extends Method {
    *
    * @author chitanda
    * @date 2022-08-24 20:08:07
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params]
    * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
    */
   async get(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<IDataEntity>> {
     if (this.isLocalMode) {
@@ -258,12 +244,12 @@ export class DEActionMethod extends Method {
    *
    * @author chitanda
    * @date 2022-08-24 20:08:26
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params]
    * @return {*}  {Promise<IHttpResponse<IData>>}
    */
   async getDraft(
-    context: IParams,
+    context: IContext,
     params?: IParams,
   ): Promise<IHttpResponse<IData>> {
     if (this.isLocalMode) {
@@ -280,24 +266,23 @@ export class DEActionMethod extends Method {
    *
    * @author chitanda
    * @date 2022-08-21 17:08:45
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} entity
    * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
    */
   async createTemp(
-    context: IParams,
+    context: IContext,
     entity: IData | IData[],
   ): Promise<IHttpResponse<IDataEntity>> {
     try {
-      const s = await this.getService();
       const addData = this.createEntity(entity);
       let resultData: IDataEntity | IDataEntity[];
       if (isArray(addData)) {
         resultData = await Promise.all(
-          addData.map(item => s.local.add(context, item)!),
+          addData.map(item => this.service.local.add(context, item)!),
         );
       } else {
-        resultData = await s.local.add(context, addData)!;
+        resultData = await this.service.local.add(context, addData)!;
       }
       return new HttpResponse(resultData);
     } catch (err) {
@@ -310,7 +295,7 @@ export class DEActionMethod extends Method {
    *
    * @author chitanda
    * @date 2022-08-21 17:08:56
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params]
    * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
    */
@@ -335,12 +320,12 @@ export class DEActionMethod extends Method {
    *
    * @author chitanda
    * @date 2022-08-21 17:08:11
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params]
    * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
    */
   async removeTemp(
-    context: IParams,
+    context: IContext,
     params?: IParams,
   ): Promise<IHttpResponse<IDataEntity>> {
     try {
@@ -351,8 +336,7 @@ export class DEActionMethod extends Method {
       if (!key && context) {
         key = context[this.entity.codeName!.toLowerCase()];
       }
-      const s = await this.getService();
-      const data = s.local.delete(context, key)!;
+      const data = this.service.local.delete(context, key)!;
       if (data) {
         return new HttpResponse(data);
       }
@@ -367,24 +351,23 @@ export class DEActionMethod extends Method {
    *
    * @author chitanda
    * @date 2022-08-21 17:08:17
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} entity
    * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
    */
   async updateTemp(
-    context: IParams,
+    context: IContext,
     entity: IData | IData[],
   ): Promise<IHttpResponse<IDataEntity>> {
     try {
-      const s = await this.getService();
       const updateData = this.createEntity(entity);
       let resultData: IDataEntity | IDataEntity[];
       if (isArray(updateData)) {
         resultData = await Promise.all(
-          updateData.map(item => s.local.update(context, item)!),
+          updateData.map(item => this.service.local.update(context, item)!),
         );
       } else {
-        resultData = await s.local.update(context, updateData)!;
+        resultData = await this.service.local.update(context, updateData)!;
       }
       if (resultData) {
         return new HttpResponse(resultData);
@@ -400,12 +383,12 @@ export class DEActionMethod extends Method {
    *
    * @author chitanda
    * @date 2022-08-21 17:08:23
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params]
    * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
    */
   async getTemp(
-    context: IParams,
+    context: IContext,
     params?: IParams,
   ): Promise<IHttpResponse<IDataEntity>> {
     try {
@@ -416,8 +399,7 @@ export class DEActionMethod extends Method {
       if (!key && context) {
         key = context[this.entity.codeName!.toLowerCase()];
       }
-      const s = await this.getService();
-      const data = s.local.get(context, key);
+      const data = this.service.local.get(context, key);
       // await this.executeDEFelidLogic(context, data);
       if (data) {
         return new HttpResponse(data);
@@ -431,7 +413,7 @@ export class DEActionMethod extends Method {
   /**
    * 批量删除本地数据
    *
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params]
    * @return {*}  {Promise<IHttpResponse>}
    */

package/src/service/service/entity/method/fetch.ts

@@ -11,7 +11,6 @@ import { PSDEDQCondEngine, SearchFilter } from '../../../utils';
 import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
 import { execFieldLogics } from '../../../../de-logic';
-import { isLocalMode } from '../util/util';
 
 /**
  * 数据集请求
@@ -25,12 +24,8 @@ import { isLocalMode } from '../util/util';
 export class FetchMethod extends Method {
   declare method: IAppDEDataSet;
 
-  protected get isLocalMode(): boolean {
-    return isLocalMode(this.method);
-  }
-
   async exec(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<HttpResponse<IDataEntity[]>> {
@@ -100,16 +95,15 @@ export class FetchMethod extends Method {
     filter: SearchFilter,
     queryParamKeys: string[] = this.entity.quickSearchAppDEFieldIds!,
   ): Promise<IDataEntity[]> {
-    const service = await this.getService();
     let list: IDataEntity[] = [];
     // 走查询条件
     if (cond) {
-      list = service.local.getList(filter.context);
+      list = this.service.local.getList();
       if (list.length > 0) {
         list = list.filter(obj => cond.test(obj, filter));
       }
     } else {
-      list = await service.selectLocal(filter.context, filter.data);
+      list = await this.service.local.select(filter.context, filter.data);
       if (list.length > 0) {
         if (filter.query && filter.query !== '') {
           if (queryParamKeys) {
@@ -148,12 +142,12 @@ export class FetchMethod extends Method {
    * 获取代码表数据来源的集合
    * @author lxm
    * @date 2023-08-03 02:55:00
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} params
    * @return {*}  {Promise<HttpResponse<IData[]>>}
    */
   protected async fetchCodeListSet(
-    context: IParams,
+    context: IContext,
     params: IParams,
   ): Promise<HttpResponse<IData[]>> {
     const { appCodeListId } = this.method;

package/src/service/service/entity/method/method-input.ts

@@ -1,7 +1,7 @@
 import { IAppDataEntity, IAppDEMethod } from '@ibiz/model-core';
 import { MethodDto } from '../../../dto/method.dto';
 import { findModelChild } from '../../../../model';
-import { isLocalMode } from '../util/util';
+import { IAppDEService } from '../../../../interface';
 
 /**
  * 应用实体方法输入转换
@@ -14,20 +14,21 @@ import { isLocalMode } from '../util/util';
 export class MethodInput {
   protected dto?: MethodDto;
 
-  protected get isLocalMode(): boolean {
-    return isLocalMode(this.method);
-  }
-
   /**
    * Creates an instance of MethodInput.
+   *
    * @author chitanda
-   * @date 2023-09-06 16:09:26
+   * @date 2023-12-22 13:12:57
+   * @param {IAppDEService} service
    * @param {IAppDataEntity} entity
    * @param {IAppDEMethod} method
+   * @param {boolean} [isLocalMode=false]
    */
   constructor(
+    protected service: IAppDEService,
     protected entity: IAppDataEntity,
     protected method: IAppDEMethod,
+    protected isLocalMode: boolean = false,
   ) {
     const input = method.appDEMethodInput;
     if (input) {
@@ -36,7 +37,7 @@ export class MethodInput {
         input.appDEMethodDTOId!,
       );
       if (methodDto) {
-        this.dto = new MethodDto(entity, this.isLocalMode, methodDto);
+        this.dto = new MethodDto(service, entity, this.isLocalMode, methodDto);
       }
     }
   }
@@ -46,11 +47,11 @@ export class MethodInput {
    *
    * @author chitanda
    * @date 2022-10-11 14:10:22
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} data
    * @return {*}  {Promise<IData>}
    */
-  async handle(context: IParams, data: IData): Promise<IData> {
+  async handle(context: IContext, data: IData): Promise<IData> {
     if (this.dto) {
       return this.dto.get(context, data);
     }

package/src/service/service/entity/method/method-renturn.ts

@@ -3,8 +3,7 @@ import { isNilOrEmpty } from 'qx-util';
 import { MethodDto } from '../../../dto/method.dto';
 import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { findModelChild } from '../../../../model';
-import { IDataEntity } from '../../../../interface';
-import { isLocalMode } from '../util/util';
+import { IAppDEService, IDataEntity } from '../../../../interface';
 
 /**
  * 应用实体方法输出转换
@@ -17,21 +16,21 @@ import { isLocalMode } from '../util/util';
 export class MethodReturn {
   protected dto?: MethodDto;
 
-  protected get isLocalMode(): boolean {
-    return isLocalMode(this.method);
-  }
-
   /**
    * Creates an instance of MethodReturn.
+   *
    * @author chitanda
-   * @date 2023-09-06 16:09:45
+   * @date 2023-12-22 13:12:24
+   * @param {IAppDEService} service
    * @param {IAppDataEntity} entity
    * @param {IAppDEMethod} method
-   * @param {IAppDEMethodReturn} [output]
+   * @param {boolean} [isLocalMode=false]
    */
   constructor(
+    protected service: IAppDEService,
     protected entity: IAppDataEntity,
     protected method: IAppDEMethod,
+    protected isLocalMode: boolean = false,
   ) {
     const output = method.appDEMethodReturn;
     if (output) {
@@ -40,7 +39,7 @@ export class MethodReturn {
         output.appDEMethodDTOId!,
       );
       if (methodDto) {
-        this.dto = new MethodDto(entity, this.isLocalMode, methodDto);
+        this.dto = new MethodDto(service, entity, this.isLocalMode, methodDto);
       }
     }
   }
@@ -50,11 +49,11 @@ export class MethodReturn {
    *
    * @author chitanda
    * @date 2022-10-19 21:10:06
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} data
    * @return {*}  {Promise<IDataEntity>}
    */
-  async handle(context: IParams, data: IData): Promise<IDataEntity> {
+  async handle(context: IContext, data: IData): Promise<IDataEntity> {
     if (this.dto) {
       const items = await this.dto.sets(context, [data]);
       return items[0];

package/src/service/service/entity/method/method.ts

@@ -39,32 +39,24 @@ export abstract class Method {
    */
   protected result!: MethodReturn;
 
-  /**
-   * 实体服务
-   *
-   * @author chitanda
-   * @date 2022-10-11 21:10:23
-   * @protected
-   * @type {IAppDEService}
-   */
-  protected service?: IAppDEService;
-
   /**
    * Creates an instance of Method.
    *
    * @author chitanda
-   * @date 2022-10-10 14:10:19
+   * @date 2023-12-22 12:12:06
+   * @param {IAppDEService} service 当前服务实例
    * @param {IAppDataEntity} entity
    * @param {IAppDEMethod} method
-   * @param {ServicePathItem[][]} paths
    */
   constructor(
+    protected service: IAppDEService,
     protected entity: IAppDataEntity,
     protected method: IAppDEMethod,
+    protected isLocalMode: boolean = false,
   ) {
     this.app = ibiz.hub.getApp(entity.appId);
-    this.input = new MethodInput(entity, method);
-    this.result = new MethodReturn(entity, method);
+    this.input = new MethodInput(service, entity, method);
+    this.result = new MethodReturn(service, entity, method);
   }
 
   /**
@@ -73,13 +65,13 @@ export abstract class Method {
    * @author lxm
    * @date 2023-10-19 02:42:49
    * @abstract
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {(IData | IData[])} [params] 请求参数
    * @param {IParams} [params2] 查询参数
    * @return {*}  {Promise<HttpResponse>}
    */
   abstract exec(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<HttpResponse>;
@@ -91,14 +83,14 @@ export abstract class Method {
    * @date 2022-10-10 17:10:44
    * @protected
    * @param {string} path
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} data
    * @param {IParams} params
    * @return {*}  {Promise<HttpResponse<any>>}
    */
   protected async request(
     path: string,
-    context: IParams,
+    context: IContext,
     data?: IData | IData[],
     params?: IParams,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -158,30 +150,15 @@ export abstract class Method {
    * @author chitanda
    * @date 2022-08-24 18:08:46
    * @protected
-   * @param {IParams} context
+   * @param {IContext} context
    * @return {*}  {string} 拼接结果说明: /祖父实体/祖父实体主键/爷爷实体/爷爷实体主键/父实体/父实体主键/当前实体
    */
-  protected calcPath(context: IParams): string {
+  protected calcPath(context: IContext): string {
     const curPath = `/${this.entity.codeName2!.toLowerCase()}`;
     const resPath = calcResPath(context, this.entity);
     return resPath + curPath;
   }
 
-  /**
-   * 获取当前实体服务
-   *
-   * @author chitanda
-   * @date 2022-10-11 21:10:12
-   * @protected
-   * @return {*}  {Promise<IAppDEService>}
-   */
-  protected async getService(): Promise<IAppDEService> {
-    if (!this.service) {
-      this.service = await this.app.deService.getService(this.entity.id!);
-    }
-    return this.service!;
-  }
-
   /**
    * 创建实体
    * @author lxm

package/src/service/service/entity/method/provider/de-action-de-method.provider.ts

@@ -1,5 +1,6 @@
 import { IAppDataEntity, IAppDEMethod } from '@ibiz/model-core';
 import {
+  IAppDEService,
   IDEMethodCreateOptions,
   IDEMethodProvider,
 } from '../../../../../interface';
@@ -16,10 +17,11 @@ import { DEActionMethod } from '../de-action';
  */
 export class DeActionDeMethodProvider implements IDEMethodProvider {
   create(
+    service: IAppDEService,
     entity: IAppDataEntity,
     method: IAppDEMethod,
-    _opts: IDEMethodCreateOptions,
+    opts: IDEMethodCreateOptions,
   ): Method {
-    return new DEActionMethod(entity, method);
+    return new DEActionMethod(service, entity, method, opts.localMode);
   }
 }

package/src/service/service/entity/method/provider/fetch-de-method.provider.ts

@@ -1,5 +1,6 @@
 import { IAppDataEntity, IAppDEMethod } from '@ibiz/model-core';
 import {
+  IAppDEService,
   IDEMethodCreateOptions,
   IDEMethodProvider,
 } from '../../../../../interface';
@@ -17,13 +18,14 @@ import { FetchMethod } from '../fetch';
  */
 export class FetchDeMethodProvider implements IDEMethodProvider {
   create(
+    service: IAppDEService,
     entity: IAppDataEntity,
     method: IAppDEMethod,
     opts: IDEMethodCreateOptions,
   ): Method {
     if (opts.acMode) {
-      return new AcFetchMethod(entity, method);
+      return new AcFetchMethod(service, entity, method, opts.localMode);
     }
-    return new FetchMethod(entity, method);
+    return new FetchMethod(service, entity, method, opts.localMode);
   }
 }

package/src/service/service/file/file.service.ts

@@ -19,14 +19,14 @@ export class FileService implements IFileService {
    * @date 2022-11-25 14:11:53
    * @param {IDEDataExport} dataExport 导出模型
    * @param {string} fetchAction 查询方法
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} params 请求参数
    * @returns {*}  {Promise<IHttpResponse<Blob>>}
    */
   exportData(
     dataExport: IDEDataExport,
     fetchAction: string,
-    context: IParams,
+    context: IContext,
     params: IParams,
   ): Promise<IHttpResponse<Blob>> {
     const resPath = calcResPath(context, this.model);