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

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

@@ -1,9 +1,6 @@
-import { HttpResponse } from '@ibiz-template/core';
-import {
-  AppEntityModel,
-  DefectModelError,
-  IAppDEMethod,
-} from '@ibiz-template/model';
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import { HttpResponse, RuntimeModelError } from '@ibiz-template/core';
+import { IAppDataEntity, IAppDEMethod } from '@ibiz/model-core';
 import { Application } from '../../../../application';
 import { Entity } from '../../../entity/entity';
 import { calcResPath, ServicePathItem } from '../../../utils';
@@ -20,7 +17,7 @@ import { MethodReturn } from './method-renturn';
  * @class Method
  */
 export abstract class Method {
-  protected app: Application;
+  protected app!: Application;
 
   /**
    * 输入 DTO
@@ -30,7 +27,7 @@ export abstract class Method {
    * @protected
    * @type {MethodInput}
    */
-  protected input: MethodInput;
+  protected input!: MethodInput;
 
   /**
    * 输出 DTO
@@ -40,7 +37,7 @@ export abstract class Method {
    * @protected
    * @type {MethodReturn}
    */
-  protected result: MethodReturn;
+  protected result!: MethodReturn;
 
   /**
    * 实体服务
@@ -52,23 +49,37 @@ export abstract class Method {
    */
   protected service?: EntityService;
 
+  /**
+   * 是否为本地模式
+   *
+   * @author chitanda
+   * @date 2023-04-19 16:04:46
+   * @readonly
+   * @protected
+   * @type {boolean}
+   */
+  protected get isLocalMode(): boolean {
+    // 临时处理，默认返回 false
+    return false;
+  }
+
   /**
    * Creates an instance of Method.
    *
    * @author chitanda
    * @date 2022-10-10 14:10:19
-   * @param {AppEntityModel} entity
+   * @param {IAppDataEntity} entity
    * @param {IAppDEMethod} method
    * @param {ServicePathItem[][]} paths
    */
   constructor(
-    protected entity: AppEntityModel,
+    protected entity: IAppDataEntity,
     protected method: IAppDEMethod,
     protected paths: ServicePathItem[][],
   ) {
-    this.app = ibiz.hub.getApp(entity.modelService.app);
-    this.input = new MethodInput(entity, method.getPSAppDEMethodInput()!);
-    this.result = new MethodReturn(entity, method.getPSAppDEMethodReturn()!);
+    // this.app = ibiz.hub.getApp(entity.modelService.app);
+    // this.input = new MethodInput(entity, method.getPSAppDEMethodInput()!);
+    // this.result = new MethodReturn(entity, method.getPSAppDEMethodReturn()!);
   }
 
   /**
@@ -106,40 +117,44 @@ export abstract class Method {
     params: IParams,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ): Promise<HttpResponse<any>> {
-    const { actionType, requestMethod } = this.method;
-    if (actionType === 'REMOTE') {
-      const methodName = this.method.codeName.toLowerCase();
-      let res: HttpResponse | null = null;
-      switch (requestMethod) {
-        case 'POST':
-          res = await this.app.net.post(`${path}/${methodName}`, data, params);
-          break;
-        case 'GET':
-          res = await this.app.net.get(`${path}/${methodName}`, data, params);
-          break;
-        case 'PUT':
-          res = await this.app.net.put(`${path}/${methodName}`, data, params);
-          break;
-        case 'DELETE':
-          res = await this.app.net.delete(
-            `${path}/${methodName}`,
-            data,
-            params,
-          );
-          break;
-        default:
-          if (requestMethod) {
-            throw new DefectModelError(
-              this.method,
-              `未支持的请求方式: ${requestMethod}`,
-            );
-          } else {
-            throw new DefectModelError(this.method, '未配置请求方式');
-          }
-      }
-      return res;
-    }
-    throw new DefectModelError(this.method, `未支持的行为类型[${actionType}]`);
+    // todo
+    // const { actionType, requestMethod } = this.method;
+    // if (actionType === 'REMOTE') {
+    //   const methodName = this.method.codeName.toLowerCase();
+    //   let res: HttpResponse | null = null;
+    //   switch (requestMethod) {
+    //     case 'POST':
+    //       res = await this.app.net.post(`${path}/${methodName}`, data, params);
+    //       break;
+    //     case 'GET':
+    //       res = await this.app.net.get(`${path}/${methodName}`, data, params);
+    //       break;
+    //     case 'PUT':
+    //       res = await this.app.net.put(`${path}/${methodName}`, data, params);
+    //       break;
+    //     case 'DELETE':
+    //       res = await this.app.net.delete(
+    //         `${path}/${methodName}`,
+    //         data,
+    //         params,
+    //       );
+    //       break;
+    //     default:
+    //       if (requestMethod) {
+    //         throw new RuntimeModelError(
+    //           this.method,
+    //           `未支持的请求方式: ${requestMethod}`,
+    //         );
+    //       } else {
+    //         throw new RuntimeModelError(this.method, '未配置请求方式');
+    //       }
+    //   }
+    //   return res;
+    // }
+    throw new RuntimeModelError(
+      this.method,
+      `未支持的行为类型[${'actionType'}]`,
+    );
   }
 
   /**
@@ -152,7 +167,7 @@ export abstract class Method {
    * @return {*}  {string} 拼接结果说明: /祖父实体/祖父实体主键/爷爷实体/爷爷实体主键/父实体/父实体主键/当前实体
    */
   protected calcPath(context: IParams): string {
-    const curPath = `/${this.entity.deNamePlural}`;
+    const curPath = `/${this.entity.codeName2}`;
     const resPath = calcResPath(context, this.paths);
     return resPath + curPath;
   }
@@ -166,10 +181,10 @@ export abstract class Method {
    * @return {*}  {Promise<EntityService>}
    */
   protected async getService(): Promise<EntityService> {
-    if (!this.service) {
-      this.service = await this.app.es.getService(this.entity.codeName);
-    }
-    return this.service;
+    // if (!this.service) {
+    //   this.service = await this.app.es.getService(this.entity.codeName);
+    // }
+    return this.service!;
   }
 
   /**
@@ -182,6 +197,6 @@ export abstract class Method {
    * @return {*}  {Entity}
    */
   protected createEntity(data: IData | Entity): Entity {
-    return new Entity(this.entity.source, data);
+    return new Entity(this.entity, data);
   }
 }

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

@@ -1,5 +1,5 @@
 import { IHttpResponse } from '@ibiz-template/core';
-import { AppEntityModel, IPSDEDataExport } from '@ibiz-template/model';
+import { IAppDataEntity, IDEDataExport } from '@ibiz/model-core';
 import { calcResPath, ServicePathItem } from '../../utils';
 
 export class FileService {
@@ -7,11 +7,11 @@ export class FileService {
    * Creates an instance of FileService.
    * @author lxm
    * @date 2022-11-25 13:11:49
-   * @param {AppEntityModel} model 应用实体
+   * @param {IAppDataEntity} model 应用实体
    * @param {ServicePathItem[][]} paths 计算出的资源关系路径
    */
   constructor(
-    protected model: AppEntityModel,
+    protected model: IAppDataEntity,
     protected paths: ServicePathItem[][],
   ) {}
 
@@ -20,22 +20,21 @@ export class FileService {
    *
    * @author lxm
    * @date 2022-11-25 14:11:53
-   * @param {IPSDEDataExport} dataExport 导出模型
+   * @param {IDEDataExport} dataExport 导出模型
    * @param {string} fetchAction 查询方法
    * @param {IParams} context 上下文
    * @param {IParams} params 请求参数
    * @returns {*}  {Promise<IHttpResponse<Blob>>}
    */
   exportData(
-    dataExport: IPSDEDataExport,
+    dataExport: IDEDataExport,
     fetchAction: string,
     context: IParams,
     params: IParams,
   ): Promise<IHttpResponse<Blob>> {
     const resPath = calcResPath(context, this.paths);
-    const exportUrl = `${resPath}/${
-      this.model.deNamePlural
-    }/exportdata/${fetchAction.toLowerCase()}/?srfexporttag=${
+    const exportUrl = `${resPath}/${this.model
+      .codeName2!}/exportdata/${fetchAction.toLowerCase()}/?srfexporttag=${
       dataExport.codeName
     }`;
     return ibiz.net.request(exportUrl, {

package/src/service/service/index.ts

@@ -2,4 +2,3 @@ export { CodeListService } from './code-list/code-list.service';
 export { CounterService } from './counter/counter.service';
 export { EntityService } from './entity/entity.service';
 export { WorkFlowService } from './work-flow/work-flow.service';
-export * from './widget';

package/src/service/service/work-flow/work-flow.service.ts

@@ -1,5 +1,5 @@
 import { IHttpResponse, RuntimeError } from '@ibiz-template/core';
-import { AppEntityModel } from '@ibiz-template/model';
+import { IAppDataEntity } from '@ibiz/model-core';
 import { Application } from '../../../application';
 
 /**
@@ -11,7 +11,7 @@ import { Application } from '../../../application';
  * @class WorkFlowService
  */
 export class WorkFlowService {
-  private app: Application;
+  private app!: Application;
 
   /**
    * 常规基础路径
@@ -21,20 +21,21 @@ export class WorkFlowService {
    * @private
    * @type {string}
    */
-  private commonBaseUrl: string;
+  private commonBaseUrl: string = '';
 
   /**
    * Creates an instance of WorkFlowService.
    * @author lxm
    * @date 2022-09-29 11:09:54
-   * @param {AppEntityModel} model 应用实体
+   * @param {IAppDataEntity} model 应用实体
    */
-  constructor(protected model: AppEntityModel) {
-    this.app = ibiz.hub.getApp(model.modelService.app);
-    const appContext = ibiz.appData!.context;
-    this.commonBaseUrl = `/wfcore/${
-      appContext.srfsystemid
-    }-app-${model.modelService.app.codeName.toLowerCase()}/${this.model.source.name.toLowerCase()}`;
+  constructor(protected model: IAppDataEntity) {
+    // todo
+    // this.app = ibiz.hub.getApp(model.modelService.app);
+    // const appContext = ibiz.appData!.context;
+    // this.commonBaseUrl = `/wfcore/${
+    //   appContext.srfsystemid
+    // }-app-${model.modelService.app.codeName.toLowerCase()}/${this.model.name.toLowerCase()}`;
   }
 
   /**
@@ -49,15 +50,31 @@ export class WorkFlowService {
     return this.commonBaseUrl;
   }
 
+  /**
+   * 获取activeData
+   *
+   * @private
+   * @param {IData} data
+   * @param {IParams} context
+   * @returns {*}
+   * @memberof WorkFlowService
+   */
+  private getActiveData(data: IData, context: IParams): IData {
+    if (context.srfprocessinstanceid) {
+      data.srfprocessinstanceid = context.srfprocessinstanceid;
+    }
+    return data;
+  }
+
   /**
    * 根据当前步骤和任务获取工作流步骤数据（如：流程表单等）
    *
    * @author lxm
    * @date 2022-09-29 14:09:45
    * @param {IParams} context
-   * @returns {*}  {Promise<IHttpResponse<IData>>}
+   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
    */
-  async getWFStep(context: IParams): Promise<IHttpResponse<IData>> {
+  async getWFStep(context: IParams): Promise<IHttpResponse<IDatum>> {
     const { processDefinitionKey, taskDefinitionKey } = context;
     return this.app.net.get(
       `${this.getBaseUrl()}/process-definitions/${processDefinitionKey}/usertasks/${taskDefinitionKey}`,
@@ -70,19 +87,19 @@ export class WorkFlowService {
    * @author lxm
    * @date 2022-09-29 14:09:52
    * @param {IParams} context 路径参数
-   * @param {IData} data 数据
-   * @returns {*}  {Promise<IHttpResponse<IData>>}
+   * @param {IDatum} data 数据
+   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
    */
   async getWFLink(
     context: IParams,
-    data: IData,
-  ): Promise<IHttpResponse<IData[]>> {
-    const deKeyValue = context[this.model.deName];
+    data: IDatum,
+  ): Promise<IHttpResponse<IDatum[]>> {
+    const deKeyValue = context[this.model.codeName!];
     const { taskDefinitionKey } = context;
     return this.app.net.post(
       `${this.getBaseUrl()}/${deKeyValue}/usertasks/${taskDefinitionKey}/ways`,
-      { activedata: data },
-    ) as unknown as IHttpResponse<IData[]>;
+      { activedata: this.getActiveData(data, context) },
+    ) as unknown as IHttpResponse<IDatum[]>;
   }
 
   /**
@@ -91,10 +108,10 @@ export class WorkFlowService {
    * @author lxm
    * @date 2022-09-29 14:09:45
    * @param {IParams} context
-   * @returns {*}  {Promise<IHttpResponse<IData>>}
+   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
    */
-  async getWFHistory(context: IParams): Promise<IHttpResponse<IData>> {
-    const deKeyValue = context[this.model.deName];
+  async getWFHistory(context: IParams): Promise<IHttpResponse<IDatum>> {
+    const deKeyValue = context[this.model.codeName!];
     return this.app.net.get(
       `${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/history`,
     );
@@ -106,10 +123,10 @@ export class WorkFlowService {
    * @author lxm
    * @date 2022-10-27 16:10:13
    * @param {IParams} context
-   * @returns {*}  {Promise<IHttpResponse<IData>>}
+   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
    */
-  async getWFProcessDiagram(context: IParams): Promise<IHttpResponse<IData>> {
-    const deKeyValue = context[this.model.deName];
+  async getWFProcessDiagram(context: IParams): Promise<IHttpResponse<IDatum>> {
+    const deKeyValue = context[this.model.codeName!];
     return this.app.net.request(
       `${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/processdiagram`,
       {
@@ -125,9 +142,9 @@ export class WorkFlowService {
    *
    * @author lxm
    * @date 2022-09-29 14:09:45
-   * @returns {*}  {Promise<IHttpResponse<IData>>}
+   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
    */
-  async getWFVersion(): Promise<IHttpResponse<IData>> {
+  async getWFVersion(): Promise<IHttpResponse<IDatum>> {
     return this.app.net.get(`${this.getBaseUrl()}/process-definitions2`);
   }
 
@@ -138,19 +155,19 @@ export class WorkFlowService {
    * @date 2022-09-30 17:09:51
    * @param {IParams} context 路径参数
    * @param {IParams} params 请求参数
-   * @param {IData} data 数据
-   * @returns {*}  {Promise<IHttpResponse<IData>>}
+   * @param {IDatum} data 数据
+   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
    */
   async wfStart(
     context: IParams,
     params: IParams,
-    data: IData,
-  ): Promise<IHttpResponse<IData>> {
+    data: IDatum,
+  ): Promise<IHttpResponse<IDatum>> {
     return this.app.net.post(
-      `${this.getBaseUrl()}/${context[this.model.deName]}/process-instances`,
+      `${this.getBaseUrl()}/${context[this.model.codeName!]}/process-instances`,
       {
         ...params,
-        activedata: data,
+        activedata: this.getActiveData(data, context),
       },
     );
   }
@@ -162,21 +179,21 @@ export class WorkFlowService {
    * @date 2022-09-30 17:09:51
    * @param {IParams} context 路径参数
    * @param {IParams} params 请求参数
-   * @param {IData} data 数据
-   * @returns {*}  {Promise<IHttpResponse<IData>>}
+   * @param {IDatum} data 数据
+   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
    */
   async wfSubmit(
     context: IParams,
     params: IParams,
-    data: IData,
-  ): Promise<IHttpResponse<IData>> {
+    data: IDatum,
+  ): Promise<IHttpResponse<IDatum>> {
     return this.app.net.post(
-      `${this.getBaseUrl()}/${context[this.model.deName]}/tasks/${
+      `${this.getBaseUrl()}/${context[this.model.codeName!]}/tasks/${
         params.taskId
       }`,
       {
         ...params,
-        activedata: data,
+        activedata: this.getActiveData(data, context),
       },
     );
   }
@@ -188,21 +205,21 @@ export class WorkFlowService {
    * @date 2022-09-30 17:09:51
    * @param {IParams} context 路径参数
    * @param {IParams} params 请求参数
-   * @param {IData} data 数据
-   * @returns {*}  {Promise<IHttpResponse<IData>>}
+   * @param {IDatum} data 数据
+   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
    */
   async wfWithdraw(
     context: IParams,
     params: IParams,
-    data: IData,
-  ): Promise<IHttpResponse<IData>> {
+    data: IDatum,
+  ): Promise<IHttpResponse<IDatum>> {
     return this.app.net.post(
-      `${this.getBaseUrl()}/${context[this.model.deName]}/tasks/${
+      `${this.getBaseUrl()}/${context[this.model.codeName!]}/tasks/${
         params.taskId
       }/withdraw`,
       {
         ...params,
-        activedata: data,
+        activedata: this.getActiveData(data, context),
       },
     );
   }
@@ -215,15 +232,15 @@ export class WorkFlowService {
    * @param {string} methodName 接口名称
    * @param {IParams} context 路径参数
    * @param {IParams} [params={}] 查询参数
-   * @param {IData} [data={}] 主数据数据
-   * @returns {*}  {Promise<IHttpResponse<IData>>}
+   * @param {IDatum} [data={}] 主数据数据
+   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
    */
   async exec(
     methodName: string,
     context: IParams,
     params: IParams = {},
-    data: IData = {},
-  ): Promise<IHttpResponse<IData>> {
+    data: IDatum = {},
+  ): Promise<IHttpResponse<IDatum>> {
     switch (methodName) {
       case 'WFSTART':
         return this.wfStart(context, params, data);

package/src/service/service-util.ts

@@ -1,8 +1,4 @@
-import {
-  AppEntityModel,
-  IPSAppDataEntity,
-  ModelService,
-} from '@ibiz-template/model';
+import { IAppDataEntity, IApplication } from '@ibiz/model-core';
 import { EntityService } from './service';
 
 /**
@@ -30,18 +26,18 @@ export class ServiceUtil {
    * @author chitanda
    * @date 2022-08-18 22:08:45
    * @protected
-   * @type {Map<string, IPSAppDataEntity>}
+   * @type {Map<string, IAppDataEntity>}
    */
-  protected allEntities: Map<string, IPSAppDataEntity> = new Map();
+  protected allEntities: Map<string, IAppDataEntity> = new Map();
 
   /**
    * Creates an instance of ServiceUtil.
    *
    * @author chitanda
-   * @date 2022-12-23 10:12:24
-   * @param {ModelService} modelService 应用模型服务
+   * @date 2023-04-18 14:04:01
+   * @param {IApplication} appModel
    */
-  constructor(protected modelService: ModelService) {}
+  constructor(protected appModel: IApplication) {}
 
   /**
    * 初始化实体缓存
@@ -53,13 +49,13 @@ export class ServiceUtil {
    */
   protected async initAllEntities(): Promise<void> {
     if (this.allEntities.size !== 0) {
-      return;
+      // todo
     }
-    const items = this.modelService.app.getAllPSAppDataEntities() || [];
-    items.forEach(item => {
-      const codeName = item.isFill ? item.codeName : item.refM.codeName;
-      this.allEntities.set(codeName, item);
-    });
+    // const items = this.app.getAllPSAppDataEntities() || [];
+    // items.forEach(item => {
+    //   const codeName = item.isFill ? item.codeName : item.refM.codeName;
+    //   this.allEntities.set(codeName, item);
+    // });
   }
 
   /**
@@ -72,20 +68,20 @@ export class ServiceUtil {
    * @return {*}  {Promise<EntityService>}
    */
   async getService(entityCodeName: string): Promise<EntityService> {
-    if (!this.cache.has(entityCodeName)) {
-      await this.initAllEntities();
-      const entity = this.allEntities.get(entityCodeName);
-      if (!entity) {
-        throw new Error(`找不到实体[${entityCodeName}]模型`);
-      }
-      await entity.fill(true);
-      const entityModel = new AppEntityModel(entity);
-      await entityModel.init();
-      const app = ibiz.hub.getApp(this.modelService.app);
-      const paths = app.resourcePathUtil.calcPaths(entityCodeName);
-      const service = await new EntityService(entityModel, paths);
-      this.cache.set(entityCodeName, service);
-    }
+    // if (!this.cache.has(entityCodeName)) {
+    //   await this.initAllEntities();
+    //   const entity = this.allEntities.get(entityCodeName);
+    //   if (!entity) {
+    //     throw new Error(`找不到实体[${entityCodeName}]模型`);
+    //   }
+    //   await entity.fill(true);
+    //   const entityModel = new IAppDataEntity(entity);
+    //   await entityModel.init();
+    //   const app = ibiz.hub.getApp(this.modelService.app);
+    //   const paths = app.resourcePathUtil.calcPaths(entityCodeName);
+    //   const service = await new EntityService(entityModel, paths);
+    //   this.cache.set(entityCodeName, service);
+    // }
     return this.cache.get(entityCodeName)!;
   }
 

package/src/service/utils/app-counter/app-counter.ts

@@ -1,9 +1,5 @@
 import { IBizContext } from '@ibiz-template/core';
-import {
-  DefectModelError,
-  IPSAppCounter,
-  IPSAppDataEntity,
-} from '@ibiz-template/model';
+import { IAppCounter, IAppDataEntity } from '@ibiz/model-core';
 import { notNilEmpty, QXEvent } from 'qx-util';
 import { clone } from 'ramda';
 import { Application } from '../../../application';
@@ -18,9 +14,9 @@ import { EntityService } from '../../service';
  * @class AppCounter
  */
 export class AppCounter {
-  protected app: Application;
+  protected app!: Application;
 
-  protected entity!: IPSAppDataEntity;
+  protected entity!: IAppDataEntity;
 
   protected service!: EntityService;
 
@@ -63,11 +59,9 @@ export class AppCounter {
    *
    * @author chitanda
    * @date 2022-10-26 20:10:55
-   * @param {IPSAppCounter} model 应用计数器模型
+   * @param {IAppCounter} model 应用计数器模型
    */
-  constructor(public model: IPSAppCounter) {
-    this.app = ibiz.hub.getApp(model.getPSModelService().app);
-  }
+  constructor(public model: IAppCounter) {}
 
   /**
    * 计数器初始化
@@ -77,18 +71,19 @@ export class AppCounter {
    * @param {IParams} [context]
    * @param {IParams} [params]
    */
-  async init(context?: IParams, params?: IParams) {
-    this.setParams(context, params);
-    this.entity = this.model.getPSAppDataEntity()!;
-    await this.entity.fill(true);
-    this.service = await this.app.es.getService(this.entity.codeName);
-    const action = this.model.getGetPSAppDEAction();
-    if (!action) {
-      throw new DefectModelError(this.model, `未找到获取计数器行为!`);
-    }
-    this.action = action.codeName;
-    this.interval();
-    await this.load();
+  async init(_context?: IParams, _params?: IParams) {
+    // todo
+    // this.setParams(context, params);
+    // this.entity = this.model.getPSAppDataEntity()!;
+    // await this.entity.fill(true);
+    // this.service = await this.app.es.getService(this.entity.codeName);
+    // const action = this.model.getGetPSAppDEAction();
+    // if (!action) {
+    //   throw new RuntimeModelError(this.model, `未找到获取计数器行为!`);
+    // }
+    // this.action = action.codeName;
+    // this.interval();
+    // await this.load();
   }
 
   /**

package/src/service/utils/de-dq-cond/ps-model-cond-engine-base.ts

@@ -22,7 +22,7 @@ export abstract class PSModelCondEngineBase {
   /**
    * 解析条件
    *
-   * @param {IData[]} obj
+   * @param {IDatum[]} obj
    * @memberof PSModelCondEngineBase
    */
   parse(obj: unknown[]): void {