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

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

@@ -1,9 +1,10 @@
 import { HttpResponse } from '@ibiz-template/core';
 import { ascSort, descSort } from 'qx-util';
 import { clone, equals, isEmpty, isNil, where } from 'ramda';
-import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { PSDEDQCondEngine, SearchFilter } from '../../../utils';
 import { Method } from './method';
+import { IDataEntity } from '../../../../interface';
+import { execFieldLogics } from '../../../../de-logic';
 
 /**
  * 数据集请求
@@ -19,36 +20,27 @@ export class FetchMethod extends Method {
     context: IParams,
     data: IData,
     params: IParams,
-  ): Promise<HttpResponse<AppDataEntity[]>> {
+  ): Promise<HttpResponse<IDataEntity[]>> {
     if (this.isLocalMode) {
       const items = await this.searchLocal(
         null,
         new SearchFilter(context, data),
       );
-      return new HttpResponse<AppDataEntity[]>(items, 200);
+      return new HttpResponse<IDataEntity[]>(items, 200);
     }
     const path = this.calcPath(context);
     const res = await this.request(path, context, data, params);
-    const items: IDatum[] = res.data || [];
+    const items: IData[] = res.data || [];
     res.data = items.map(item => this.createEntity(item));
 
-    // 计算属性逻辑
-    // const { compute } = this.entity.deFieldLogics;
-    // if (compute.length && res.data && res.data.length > 0) {
-    //   res.data = await Promise.all(
-    //     res.data.map(async (item: IDatum) => {
-    //       const promiseResult = await Promise.all(
-    //         compute.map(logic => {
-    //           return execDELogic(logic, context, item, params);
-    //         }),
-    //       );
-    //       promiseResult.forEach(value => {
-    //         Object.assign(item, value);
-    //       });
-    //       return item;
-    //     }),
-    //   );
-    // }
+    // 计算属性逻辑,每条数据走一遍
+    if (res.data.length) {
+      await Promise.all(
+        res.data.map((item: IData) =>
+          execFieldLogics(this.entity, 'compute', context, item, params),
+        ),
+      );
+    }
 
     return res;
   }
@@ -58,14 +50,14 @@ export class FetchMethod extends Method {
    *
    * @param {IParams} context
    * @param {IParams} params 根据多实体属性查找，例：{ name: '张三', age: 18, parent: null }
-   * @return {*}  {Promise<AppDataEntity[]>}
+   * @return {*}  {Promise<IDataEntity[]>}
    */
   protected async selectLocal(
     context: IParams,
     params: IParams = {},
-  ): Promise<AppDataEntity[]> {
+  ): Promise<IDataEntity[]> {
     const service = await this.getService();
-    let items: AppDataEntity[] = service.local.getList(context);
+    let items: IDataEntity[] = service.local.getList(context);
     items = ascSort(items, 'srfordervalue');
     // 查询数据条件集
     const data: IData = {};
@@ -132,15 +124,15 @@ export class FetchMethod extends Method {
    * @param {PSDEDQCondEngine | null} cond 查询实例
    * @param {SearchFilter} filter 过滤对象
    * @param {string[]} [queryParamKeys=this.entity.quickSearchKeys] 当前实体支持快速搜索的属性
-   * @return {*}  {Promise<AppDataEntity[]>}
+   * @return {*}  {Promise<IDataEntity[]>}
    */
   protected async searchLocal(
     cond: PSDEDQCondEngine | null,
     filter: SearchFilter,
     queryParamKeys: string[] = this.entity.quickSearchAppDEFieldIds!,
-  ): Promise<AppDataEntity[]> {
+  ): Promise<IDataEntity[]> {
     const service = await this.getService();
-    let list: AppDataEntity[] = [];
+    let list: IDataEntity[] = [];
     // 走查询条件
     if (cond) {
       list = service.local.getList(filter.context);

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

@@ -31,7 +31,7 @@ export class MethodInput {
         input.appDEMethodDTOId!,
       );
       if (methodDto) {
-        this.dto = new MethodDto(methodDto);
+        this.dto = new MethodDto(entity, methodDto);
       }
     }
   }

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

@@ -2,6 +2,7 @@ import { IAppDataEntity, IAppDEMethodReturn } from '@ibiz/model-core';
 import { MethodDto } from '../../../dto/method.dto';
 import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { findModelChild } from '../../../../model';
+import { IDataEntity } from '../../../../interface';
 
 /**
  * 应用实体方法输出转换
@@ -32,7 +33,7 @@ export class MethodReturn {
         output.appDEMethodDTOId!,
       );
       if (methodDto) {
-        this.dto = new MethodDto(methodDto);
+        this.dto = new MethodDto(entity, methodDto);
       }
     }
   }
@@ -44,9 +45,9 @@ export class MethodReturn {
    * @date 2022-10-19 21:10:06
    * @param {IParams} context
    * @param {IData} data
-   * @return {*}  {Promise<AppDataEntity>}
+   * @return {*}  {Promise<IDataEntity>}
    */
-  async handle(context: IParams, data: IData): Promise<AppDataEntity> {
+  async handle(context: IParams, 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

@@ -6,7 +6,7 @@ import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
 import { calcResPath } from '../../../utils';
 import { MethodInput } from './method-input';
 import { MethodReturn } from './method-renturn';
-import { IAppDEService } from '../../../interface';
+import { IAppDEService, IDataEntity } from '../../../../interface';
 
 /**
  * 应用实体方法
@@ -176,7 +176,7 @@ export abstract class Method {
    */
   protected async getService(): Promise<IAppDEService> {
     if (!this.service) {
-      this.service = await this.app.deService.getService(this.entity.codeName!);
+      this.service = await this.app.deService.getService(this.entity.id!);
     }
     return this.service!;
   }
@@ -187,10 +187,10 @@ export abstract class Method {
    * @author chitanda
    * @date 2022-10-11 22:10:05
    * @protected
-   * @param {(IData | AppDataEntity)} data
-   * @return {*}  {AppDataEntity}
+   * @param {(IData | IDataEntity)} data
+   * @return {*}  {IDataEntity}
    */
-  protected createEntity(data: IData | AppDataEntity): AppDataEntity {
+  protected createEntity(data: IData | IDataEntity): IDataEntity {
     return new AppDataEntity(this.entity, data);
   }
 }

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

@@ -1,8 +1,9 @@
 import { IHttpResponse } from '@ibiz-template/core';
 import { IAppDataEntity, IDEDataExport } from '@ibiz/model-core';
+import { IFileService } from '../../../interface';
 import { calcResPath } from '../../utils';
 
-export class FileService {
+export class FileService implements IFileService {
   /**
    * Creates an instance of FileService.
    * @author lxm

package/src/service/service/index.ts

@@ -2,4 +2,6 @@ export { CodeListService } from './code-list/code-list.service';
 export { CounterService } from './counter/counter.service';
 export { DEService } from './entity/de.service';
 export { WorkFlowService } from './work-flow/work-flow.service';
-export * from './widget';
+export * from './control';
+export * from './authority';
+export { AuthService } from './auth/auth.service';

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

@@ -1,6 +1,7 @@
 import { IHttpResponse, RuntimeError } from '@ibiz-template/core';
 import { IAppDataEntity } from '@ibiz/model-core';
 import { Application } from '../../../application';
+import { IWorkFlowService } from '../../../interface';
 
 /**
  * 工作流服务
@@ -10,7 +11,7 @@ import { Application } from '../../../application';
  * @export
  * @class WorkFlowService
  */
-export class WorkFlowService {
+export class WorkFlowService implements IWorkFlowService {
   private app!: Application;
 
   /**
@@ -30,12 +31,11 @@ export class WorkFlowService {
    * @param {IAppDataEntity} model 应用实体
    */
   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()}`;
+    this.app = ibiz.hub.getApp(model.appId);
+    const appContext = ibiz.appData!.context;
+    this.commonBaseUrl = `/wfcore/${
+      appContext.srfsystemid
+    }-app-${this.app.model.codeName!.toLowerCase()}/${this.model.name!.toLowerCase()}`;
   }
 
   /**
@@ -46,7 +46,7 @@ export class WorkFlowService {
    * @private
    * @returns {*}
    */
-  private getBaseUrl() {
+  private getBaseUrl(): string {
     return this.commonBaseUrl;
   }
 
@@ -72,9 +72,9 @@ export class WorkFlowService {
    * @author lxm
    * @date 2022-09-29 14:09:45
    * @param {IParams} context
-   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
+   * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
-  async getWFStep(context: IParams): Promise<IHttpResponse<IDatum>> {
+  async getWFStep(context: IParams): Promise<IHttpResponse<IData>> {
     const { processDefinitionKey, taskDefinitionKey } = context;
     return this.app.net.get(
       `${this.getBaseUrl()}/process-definitions/${processDefinitionKey}/usertasks/${taskDefinitionKey}`,
@@ -87,19 +87,19 @@ export class WorkFlowService {
    * @author lxm
    * @date 2022-09-29 14:09:52
    * @param {IParams} context 路径参数
-   * @param {IDatum} data 数据
-   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
+   * @param {IData} data 数据
+   * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
   async getWFLink(
     context: IParams,
-    data: IDatum,
-  ): Promise<IHttpResponse<IDatum[]>> {
-    const deKeyValue = context[this.model.codeName!];
+    data: IData,
+  ): Promise<IHttpResponse<IData[]>> {
+    const deKeyValue = context[this.model.codeName!.toLowerCase()];
     const { taskDefinitionKey } = context;
     return this.app.net.post(
       `${this.getBaseUrl()}/${deKeyValue}/usertasks/${taskDefinitionKey}/ways`,
       { activedata: this.getActiveData(data, context) },
-    ) as unknown as IHttpResponse<IDatum[]>;
+    ) as unknown as IHttpResponse<IData[]>;
   }
 
   /**
@@ -108,10 +108,10 @@ export class WorkFlowService {
    * @author lxm
    * @date 2022-09-29 14:09:45
    * @param {IParams} context
-   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
+   * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
-  async getWFHistory(context: IParams): Promise<IHttpResponse<IDatum>> {
-    const deKeyValue = context[this.model.codeName!];
+  async getWFHistory(context: IParams): Promise<IHttpResponse<IData>> {
+    const deKeyValue = context[this.model.codeName!.toLowerCase()];
     return this.app.net.get(
       `${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/history`,
     );
@@ -123,10 +123,10 @@ export class WorkFlowService {
    * @author lxm
    * @date 2022-10-27 16:10:13
    * @param {IParams} context
-   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
+   * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
-  async getWFProcessDiagram(context: IParams): Promise<IHttpResponse<IDatum>> {
-    const deKeyValue = context[this.model.codeName!];
+  async getWFProcessDiagram(context: IParams): Promise<IHttpResponse<IData>> {
+    const deKeyValue = context[this.model.codeName!.toLowerCase()];
     return this.app.net.request(
       `${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/processdiagram`,
       {
@@ -142,9 +142,9 @@ export class WorkFlowService {
    *
    * @author lxm
    * @date 2022-09-29 14:09:45
-   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
+   * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
-  async getWFVersion(): Promise<IHttpResponse<IDatum>> {
+  async getWFVersion(): Promise<IHttpResponse<IData>> {
     return this.app.net.get(`${this.getBaseUrl()}/process-definitions2`);
   }
 
@@ -155,16 +155,18 @@ export class WorkFlowService {
    * @date 2022-09-30 17:09:51
    * @param {IParams} context 路径参数
    * @param {IParams} params 请求参数
-   * @param {IDatum} data 数据
-   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
+   * @param {IData} data 数据
+   * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
   async wfStart(
     context: IParams,
     params: IParams,
-    data: IDatum,
-  ): Promise<IHttpResponse<IDatum>> {
+    data: IData,
+  ): Promise<IHttpResponse<IData>> {
     return this.app.net.post(
-      `${this.getBaseUrl()}/${context[this.model.codeName!]}/process-instances`,
+      `${this.getBaseUrl()}/${
+        context[this.model.codeName!.toLowerCase()]
+      }/process-instances`,
       {
         ...params,
         activedata: this.getActiveData(data, context),
@@ -179,18 +181,18 @@ export class WorkFlowService {
    * @date 2022-09-30 17:09:51
    * @param {IParams} context 路径参数
    * @param {IParams} params 请求参数
-   * @param {IDatum} data 数据
-   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
+   * @param {IData} data 数据
+   * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
   async wfSubmit(
     context: IParams,
     params: IParams,
-    data: IDatum,
-  ): Promise<IHttpResponse<IDatum>> {
+    data: IData,
+  ): Promise<IHttpResponse<IData>> {
     return this.app.net.post(
-      `${this.getBaseUrl()}/${context[this.model.codeName!]}/tasks/${
-        params.taskId
-      }`,
+      `${this.getBaseUrl()}/${
+        context[this.model.codeName!.toLowerCase()]
+      }/tasks/${params.taskId}`,
       {
         ...params,
         activedata: this.getActiveData(data, context),
@@ -199,24 +201,128 @@ export class WorkFlowService {
   }
 
   /**
-   * 提交工作流
+   * 工作流撤销
    *
    * @author lxm
    * @date 2022-09-30 17:09:51
    * @param {IParams} context 路径参数
    * @param {IParams} params 请求参数
-   * @param {IDatum} data 数据
-   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
+   * @param {IData} data 数据
+   * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
   async wfWithdraw(
     context: IParams,
     params: IParams,
-    data: IDatum,
-  ): Promise<IHttpResponse<IDatum>> {
+    data: IData,
+  ): Promise<IHttpResponse<IData>> {
     return this.app.net.post(
-      `${this.getBaseUrl()}/${context[this.model.codeName!]}/tasks/${
-        params.taskId
-      }/withdraw`,
+      `${this.getBaseUrl()}/${
+        context[this.model.codeName!.toLowerCase()]
+      }/tasks/${params.taskId}/withdraw`,
+      {
+        ...params,
+        activedata: this.getActiveData(data, context),
+      },
+    );
+  }
+
+  /**
+   * 转办
+   *
+   * @author lxm
+   * @date 2022-09-30 17:09:51
+   * @param {IParams} context 路径参数
+   * @param {IParams} params 请求参数
+   * @param {IData} data 数据
+   * @returns {*}  {Promise<IHttpResponse<IData>>}
+   */
+  async wfReassign(
+    context: IParams,
+    params: IParams,
+    data: IData,
+  ): Promise<IHttpResponse<IData>> {
+    return ibiz.net.post(
+      `${this.getBaseUrl()}/${
+        context[this.model.codeName!.toLowerCase()]
+      }/tasks/${params.taskId}/transfer`,
+      {
+        ...params,
+        activedata: this.getActiveData(data, context),
+      },
+    );
+  }
+
+  /**
+   * 前加签
+   *
+   * @author lxm
+   * @date 2022-09-30 17:09:51
+   * @param {IParams} context 路径参数
+   * @param {IParams} params 请求参数
+   * @param {IData} data 数据
+   * @returns {*}  {Promise<IHttpResponse<IData>>}
+   */
+  async wfAddStepBefore(
+    context: IParams,
+    params: IParams,
+    data: IData,
+  ): Promise<IHttpResponse<IData>> {
+    return ibiz.net.post(
+      `${this.getBaseUrl()}/${
+        context[this.model.codeName!.toLowerCase()]
+      }/tasks/${params.taskId}/beforesign`,
+      {
+        ...params,
+        activedata: this.getActiveData(data, context),
+      },
+    );
+  }
+
+  /**
+   * 回退
+   *
+   * @author lxm
+   * @date 2022-09-30 17:09:51
+   * @param {IParams} context 路径参数
+   * @param {IParams} params 请求参数
+   * @param {IData} data 数据
+   * @returns {*}  {Promise<IHttpResponse<IData>>}
+   */
+  async wfSendBack(
+    context: IParams,
+    params: IParams,
+    data: IData,
+  ): Promise<IHttpResponse<IData>> {
+    return ibiz.net.post(
+      `${this.getBaseUrl()}/${
+        context[this.model.codeName!.toLowerCase()]
+      }/tasks/${params.taskId}/sendback`,
+      {
+        ...params,
+        activedata: this.getActiveData(data, context),
+      },
+    );
+  }
+
+  /**
+   * 抄送
+   *
+   * @author lxm
+   * @date 2022-09-30 17:09:51
+   * @param {IParams} context 路径参数
+   * @param {IParams} params 请求参数
+   * @param {IData} data 数据
+   * @returns {*}  {Promise<IHttpResponse<IData>>}
+   */
+  async wfSendCopy(
+    context: IParams,
+    params: IParams,
+    data: IData,
+  ): Promise<IHttpResponse<IData>> {
+    return ibiz.net.post(
+      `${this.getBaseUrl()}/${
+        context[this.model.codeName!.toLowerCase()]
+      }/tasks/${params.taskId}/sendcopy`,
       {
         ...params,
         activedata: this.getActiveData(data, context),
@@ -232,20 +338,28 @@ export class WorkFlowService {
    * @param {string} methodName 接口名称
    * @param {IParams} context 路径参数
    * @param {IParams} [params={}] 查询参数
-   * @param {IDatum} [data={}] 主数据数据
-   * @returns {*}  {Promise<IHttpResponse<IDatum>>}
+   * @param {IData} [data={}] 主数据数据
+   * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
   async exec(
     methodName: string,
     context: IParams,
     params: IParams = {},
-    data: IDatum = {},
-  ): Promise<IHttpResponse<IDatum>> {
+    data: IData = {},
+  ): Promise<IHttpResponse<IData>> {
     switch (methodName) {
-      case 'WFSTART':
+      case 'wfstart':
         return this.wfStart(context, params, data);
-      case 'WFSUBMIT':
+      case 'wfsubmit':
         return this.wfSubmit(context, params, data);
+      case 'reassign':
+        return this.wfReassign(context, params, data);
+      case 'addstepbefore':
+        return this.wfAddStepBefore(context, params, data);
+      case 'sendback':
+        return this.wfSendBack(context, params, data);
+      case 'sendcopy':
+        return this.wfSendCopy(context, params, data);
       default: {
         throw new RuntimeError(`「${methodName}」未实现`);
       }

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

@@ -1,9 +1,8 @@
-import { IBizContext } from '@ibiz-template/core';
-import { IAppCounter, IAppDataEntity } from '@ibiz/model-core';
+import { IBizContext, RuntimeModelError } from '@ibiz-template/core';
+import { IAppCounter } from '@ibiz/model-core';
 import { notNilEmpty, QXEvent } from 'qx-util';
 import { clone } from 'ramda';
 import { Application } from '../../../application';
-import { IAppDEService } from '../../interface';
 
 /**
  * 应用实体计数器
@@ -16,9 +15,7 @@ import { IAppDEService } from '../../interface';
 export class AppCounter {
   protected app!: Application;
 
-  protected entity!: IAppDataEntity;
-
-  protected service!: IAppDEService;
+  protected appDataEntityId!: string;
 
   protected action!: string;
 
@@ -71,19 +68,16 @@ export class AppCounter {
    * @param {IParams} [context]
    * @param {IParams} [params]
    */
-  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();
+  async init(context?: IParams, params?: IParams): Promise<void> {
+    this.setParams(context, params);
+    this.appDataEntityId = this.model.appDataEntityId!;
+    const action = this.model.getAppDEActionId;
+    if (!action) {
+      throw new RuntimeModelError(this.model, `未找到获取计数器行为!`);
+    }
+    this.action = action;
+    this.interval();
+    await this.load();
   }
 
   /**
@@ -144,7 +138,13 @@ export class AppCounter {
    * @return {*}  {Promise<IData>}
    */
   protected async load(): Promise<IData> {
-    const res = await this.service.exec(this.action, this.context, this.params);
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    const res = await app.deService.exec(
+      this.appDataEntityId!,
+      this.action,
+      this.context,
+      this.params,
+    );
     if (res.ok) {
       this.data = res.data;
       this.evt.emit('change', this.data);