@ibiz-template/runtime 0.5.3-beta.0 → 0.5.3-beta.10

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

@@ -7,9 +7,11 @@ import {
 } from '@ibiz-template/core';
 import { IAppDEAction } from '@ibiz/model-core';
 import { isArray, isNil } from 'lodash-es';
+import { ascSort } from 'qx-util';
+import { clone } from 'ramda';
 import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
-import { findDELogic } from '../../../../model';
+import { calcDeCodeNameById, findDELogic } from '../../../../model';
 import { execDELogicAction, execFieldLogics } from '../../../../de-logic';
 
 /**
@@ -48,7 +50,10 @@ export class DEActionMethod extends Method {
     data?: IData | IData[],
     params?: IParams,
   ): Promise<HttpResponse<IData>> {
-    if (data) {
+    let result: IHttpResponse<IData>;
+
+    // 执行变更属性逻辑
+    if (data && !['READ', 'GETDRAFT'].includes(this.method.actionMode!)) {
       await execFieldLogics(this.entity, 'change', context, data, params);
     }
 
@@ -58,64 +63,57 @@ export class DEActionMethod extends Method {
       if (!deLogic) {
         throw new RuntimeModelError(this.method, '缺少实体处理逻辑');
       }
-      return execDELogicAction(deLogic, context, data, params);
-    }
-
-    if (data && !this.isLocalMode) {
-      data = await this.inputHandle(context, data);
-    }
-
-    // 执行变更属性逻辑
-    if (data && !['READ', 'GETDRAFT'].includes(this.method.actionMode!)) {
-      await execFieldLogics(this.entity, 'change', context, data, params);
-    }
-
-    let result: IHttpResponse<IData>;
-    switch (this.method.codeName) {
-      case 'Create':
-        result = await this.create(context, data!, params || {});
-        break;
-      case 'Get':
-        result = await this.get(context, params);
-        break;
-      case 'GetDraft':
-        result = await this.getDraft(context, params);
-        break;
-      case 'Remove':
-        result = await this.remove(context, params);
-        break;
-      case 'Update':
-        result = await this.update(context, data!, params);
-        break;
-      case 'CreateTemp':
-        result = await this.createTemp(context, data!);
-        break;
-      case 'GetTemp':
-        result = await this.getTemp(context, data);
-        break;
-      case 'GetDraftTemp':
-        result = await this.getDraftTemp(context, params);
-        break;
-      case 'RemoveTemp':
-        result = await this.removeTemp(context, data);
-        break;
-      case 'UpdateTemp':
-        result = await this.updateTemp(context, data!);
-        break;
-      default: {
-        let path = this.calcPath(context);
-        if (this.method.needResourceKey) {
-          let srfkey = context[this.entity.codeName!.toLowerCase()];
-          if (isNil(srfkey)) {
-            srfkey = isArray(data)
-              ? null
-              : data?.[this.entity.keyAppDEFieldId!];
+      result = await execDELogicAction(deLogic, context, data, params);
+    } else {
+      if (data && !this.isLocalMode) {
+        data = await this.inputHandle(context, data);
+      }
+      switch (this.method.codeName) {
+        case 'Create':
+          result = await this.create(context, data!, params || {});
+          break;
+        case 'Get':
+          result = await this.get(context, params);
+          break;
+        case 'GetDraft':
+          result = await this.getDraft(context, params);
+          break;
+        case 'Remove':
+          result = await this.remove(context, params);
+          break;
+        case 'Update':
+          result = await this.update(context, data!, params);
+          break;
+        case 'CreateTemp':
+          result = await this.createTemp(context, data!);
+          break;
+        case 'GetTemp':
+          result = await this.getTemp(context, data);
+          break;
+        case 'GetDraftTemp':
+          result = await this.getDraftTemp(context, params);
+          break;
+        case 'RemoveTemp':
+          result = await this.removeTemp(context, data);
+          break;
+        case 'UpdateTemp':
+          result = await this.updateTemp(context, data!);
+          break;
+        default: {
+          let path = this.calcPath(context);
+          if (this.method.needResourceKey) {
+            let srfkey = context[this.entity.codeName!.toLowerCase()];
+            if (isNil(srfkey)) {
+              srfkey = isArray(data)
+                ? null
+                : data?.[this.entity.keyAppDEFieldId!];
+            }
+            path = `${path}/${srfkey}`;
           }
-          path = `${path}/${srfkey}`;
+          const res = await this.request(path, context, data, params);
+          res.data = await this.result.handle(context, res.data);
+          result = res;
         }
-        const res = await this.request(path, context, data, params);
-        res.data = await this.result.handle(context, res.data);
-        result = res;
       }
     }
 
@@ -342,6 +340,13 @@ export class DEActionMethod extends Method {
       if (!key && context) {
         key = context[this.entity.codeName!.toLowerCase()];
       }
+      try {
+        await this.associationDeletion(key, context, params);
+      } catch (error) {
+        throw new HttpError({
+          response: new HttpResponse(null, 500, (error as IData).message),
+        } as unknown as Error);
+      }
       const data = this.service.local.delete(context, key)!;
       if (data) {
         return new HttpResponse(data);
@@ -352,6 +357,124 @@ export class DEActionMethod extends Method {
     }
   }
 
+  /**
+   * 关联删除
+   *
+   * @author chitanda
+   * @date 2024-01-17 16:01:47
+   * @protected
+   * @param {string} key
+   * @param {IContext} context
+   * @param {IParams} [params]
+   * @return {*}  {Promise<void>}
+   */
+  protected async associationDeletion(
+    key: string,
+    context: IContext,
+    _params?: IParams,
+  ): Promise<void> {
+    // 当前执行界面域
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+
+    // 当前事务
+    const t = uiDomain.transaction;
+    let selfOpenTransaction = false;
+    // 由第一层触发关联删除的位置来打开事务，后续子的关联删除不需要再次打开事务
+    if (t.state.isOpen === false) {
+      t.open();
+      selfOpenTransaction = true;
+    }
+
+    try {
+      let configs = uiDomain.getDERConfigByMajor(this.entity.id!);
+      if (configs.length > 0) {
+        // 当前主数据
+        const data = this.service.local.get(context, key)!;
+
+        // 根据删除顺序排序
+        configs = ascSort(configs, 'removeOrder');
+
+        // 根据关系进行关联删除
+        for (const config of configs) {
+          if (config.rstype !== 'DER1N') {
+            throw new RuntimeModelError(
+              config,
+              '目前只支持[DER1N]关系类型关联删除删除',
+            );
+          }
+          const {
+            removeActionType,
+            removeRejectMsg,
+            minorAppDataEntityId,
+            nestedAppDEDataSetId = 'FetchDefault',
+          } = config;
+          // 获取当前应用域下的子实体服务
+          const app = ibiz.hub.getApp(this.entity.appId!);
+          const minorService = await app.deService.getService(
+            context,
+            minorAppDataEntityId!,
+          );
+          // 克隆上下文，防止污染。并设置当前实体的主键上下文
+          const _context = clone(context);
+          _context[this.entity.codeName!.toLowerCase()] = key;
+          // 查询出关联的子实体数据
+          const res = await minorService.exec(nestedAppDEDataSetId, _context);
+          const items = (res.data || []) as IDataEntity[];
+          switch (removeActionType) {
+            // 同时删除
+            case 1: {
+              for (let i = 0; i < items.length; i++) {
+                const item = items[i];
+                _context[minorService.model.codeName!.toLowerCase()] =
+                  item.srfkey;
+                const res2 = await minorService.remove(_context, item);
+                if (res2.ok === false) {
+                  throw new Error(res2.statusText);
+                }
+              }
+              break;
+            }
+            // 置空
+            case 2:
+              for (let i = 0; i < items.length; i++) {
+                const item = items[i];
+                _context[minorService.model.codeName!.toLowerCase()] =
+                  item.srfkey;
+                item[config.parentAppDEFieldId!.toLowerCase()] = undefined;
+                const res2 = await minorService.updateTemp(_context, item);
+                if (res2.ok === false) {
+                  throw new Error(res2.statusText);
+                }
+              }
+              break;
+            // 限制删除
+            case 3:
+              if (items.length > 0) {
+                const msg = items.map(item => item.srfmajortext).join('、');
+                const message = `无法删除[${this.entity.logicName}-${data.srfmajortext}], 数据被[${minorService.model.logicName}-${msg}]引用`;
+                throw new Error(removeRejectMsg || message);
+              }
+              break;
+            default:
+          }
+        }
+      }
+      // 谁打开的事务，由谁来提交和关闭
+      if (selfOpenTransaction && t.state.isOpen) {
+        t.commit();
+      }
+    } catch (error) {
+      if (selfOpenTransaction && t.state.isOpen) {
+        t.rollback();
+      }
+      throw error;
+    } finally {
+      if (selfOpenTransaction && t.state.isOpen) {
+        t.close();
+      }
+    }
+  }
+
   /**
    * 更新临时数据
    *
@@ -412,7 +535,6 @@ export class DEActionMethod extends Method {
         key = context[this.entity.codeName!.toLowerCase()];
       }
       const data = this.service.local.get(context, key);
-      // await this.executeDEFelidLogic(context, data);
       if (data) {
         return new HttpResponse(data);
       }
@@ -430,15 +552,14 @@ export class DEActionMethod extends Method {
    * @return {*}  {Promise<IHttpResponse>}
    */
   async removeBatchTemp(
-    _context: IParams,
+    _context: IContext,
     _params?: IParams,
   ): Promise<IHttpResponse> {
     // if (params) {
     //   const keys: string[] = params[this.entity.keyName];
     //   if (keys) {
     //     try {
-    //       const s = await this.getService();
-    //       await s.local.deleteBatch(context, keys);
+    //       await this.service.local.deleteBatch(context, keys);
     //     } catch (err) {
     //       return new HttpResponse(err, 500);
     //     }
@@ -463,10 +584,11 @@ export class DEActionMethod extends Method {
     const configs = uiDomain.getDERConfig(this.entity.id!);
     if (configs.length > 0) {
       configs.forEach(config => {
-        if (config.pickupDEFName) {
-          const { majorDECodeName, pickupDEFName } = config;
-          const majorLowerCodeName = majorDECodeName.toLowerCase();
-          const pickupLowerDEFName = pickupDEFName.toLowerCase();
+        if (config.parentAppDEFieldId) {
+          const { majorAppDataEntityId, parentAppDEFieldId } = config;
+          const majorDECodeName = calcDeCodeNameById(majorAppDataEntityId!);
+          const majorLowerCodeName = majorDECodeName;
+          const pickupLowerDEFName = parentAppDEFieldId.toLowerCase();
           const majorkey = context[majorLowerCodeName];
           // 父主键不能是自身，否则自关系的时候就改错了
           if (majorkey && majorkey !== data.srfkey) {

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

@@ -7,7 +7,7 @@ import { IAppDEDataSet } from '@ibiz/model-core';
 import { isArray } from 'lodash-es';
 import { clone, isEmpty, isNil } from 'ramda';
 import { ascSort, descSort } from 'qx-util';
-import { PSDEDQCondEngine, SearchFilter } from '../../../utils';
+import { DEDQCondUtil, PSDEDQCondEngine, SearchFilter } from '../../../utils';
 import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
 import { execFieldLogics } from '../../../../de-logic';
@@ -32,39 +32,38 @@ export class FetchMethod extends Method {
     // 过滤参数，必须是对象
     const searchParams = params && !isArray(params) ? params : params2 || {};
 
-    if (this.isLocalMode) {
-      // 临时数据
-      const items = await this.searchLocal(
-        null,
-        new SearchFilter(context, searchParams),
-      );
-      return new HttpResponse<IDataEntity[]>(items, 200);
-    }
-
     // 根据数据集合来源查询数据
     let res: HttpResponse<IData[]>;
-    switch (this.method.dataSetType) {
-      case 'INDEXDE':
-      case 'CODELIST':
-      case 'MULTIFORM':
-        res = await this.fetchCodeListSet(context, searchParams);
-        break;
-      case 'REMOTE':
-        {
-          const path = this.calcPath(context);
-          res = await this.request(path, context, params, params2);
-        }
-        break;
-      default:
-        throw new ModelError(
-          this.method,
-          `数据来源类型${this.method.dataSetType}暂未支持`,
-        );
-    }
 
-    // 转换实体对象
-    const items: IData[] = res.data || [];
-    res.data = items.map(item => this.createEntity(item));
+    if (this.isLocalMode) {
+      const cond = DEDQCondUtil.getCond(this.method);
+      const filter = new SearchFilter(context, searchParams);
+      const items = await this.searchLocal(cond, filter);
+      res = new HttpResponse<IDataEntity[]>(items, 200);
+    } else {
+      switch (this.method.dataSetType) {
+        case 'INDEXDE':
+        case 'CODELIST':
+        case 'MULTIFORM':
+          res = await this.fetchCodeListSet(context, searchParams);
+          break;
+        case 'REMOTE':
+          {
+            const path = this.calcPath(context);
+            res = await this.request(path, context, params, params2);
+          }
+          break;
+        default:
+          throw new ModelError(
+            this.method,
+            `数据来源类型${this.method.dataSetType}暂未支持`,
+          );
+      }
+
+      // 转换实体对象
+      const items: IData[] = res.data || [];
+      res.data = items.map(item => this.createEntity(item));
+    }
 
     // 计算属性逻辑,每条数据走一遍
     if (res.data) {
@@ -95,30 +94,26 @@ export class FetchMethod extends Method {
     filter: SearchFilter,
     queryParamKeys: string[] = this.entity.quickSearchAppDEFieldIds!,
   ): Promise<IDataEntity[]> {
-    let list: IDataEntity[] = [];
+    let list: IDataEntity[] = this.service.local.getList();
     // 走查询条件
     if (cond) {
-      list = this.service.local.getList();
       if (list.length > 0) {
         list = list.filter(obj => cond.test(obj, filter));
       }
-    } else {
-      list = await this.service.local.select(filter.context, filter.data);
-      if (list.length > 0) {
-        if (filter.query && filter.query !== '') {
-          if (queryParamKeys) {
-            list = list.filter(obj => {
-              const reg = new RegExp(filter.query);
-              for (let i = 0; i < queryParamKeys.length; i += 1) {
-                const key = queryParamKeys[i];
-                const val: string = obj[key];
-                if (reg.test(val)) {
-                  return true;
-                }
+    } else if (list.length > 0) {
+      if (filter.query && filter.query !== '') {
+        if (queryParamKeys) {
+          list = list.filter(obj => {
+            const reg = new RegExp(filter.query);
+            for (let i = 0; i < queryParamKeys.length; i += 1) {
+              const key = queryParamKeys[i];
+              const val: string = obj[key];
+              if (reg.test(val)) {
+                return true;
               }
-              return false;
-            });
-          }
+            }
+            return false;
+          });
         }
       }
     }

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

@@ -37,7 +37,9 @@ export class MethodInput {
         input.appDEMethodDTOId!,
       );
       if (methodDto) {
-        this.dto = new MethodDto(service, entity, this.isLocalMode, methodDto);
+        this.dto = service.createMethodDto(methodDto, {
+          isLocalMode: this.isLocalMode,
+        });
       }
     }
   }

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

@@ -39,7 +39,9 @@ export class MethodReturn {
         output.appDEMethodDTOId!,
       );
       if (methodDto) {
-        this.dto = new MethodDto(service, entity, this.isLocalMode, methodDto);
+        this.dto = service.createMethodDto(methodDto, {
+          isLocalMode: this.isLocalMode,
+        });
       }
     }
   }
@@ -55,6 +57,12 @@ export class MethodReturn {
    */
   async handle(context: IContext, data: IData): Promise<IDataEntity> {
     if (this.dto) {
+      const app = ibiz.hub.getApp(this.entity.appId);
+      // 设置之前清理掉当前界面域下的数据缓存
+      app.deService.clearTempCache({
+        srfappid: app.appId,
+        srfsessionid: context.srfsessionid,
+      });
       const items = await this.dto.sets(context, [data]);
       return items[0];
     }

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

@@ -161,8 +161,14 @@ export class WorkFlowService implements IWorkFlowService {
    * @date 2022-09-29 14:09:45
    * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
-  async getWFVersion(): Promise<IHttpResponse<IData>> {
-    return this.app.net.get(`${this.getBaseUrl()}/process-definitions2`);
+  async getWFVersion(srfWFTag?: string): Promise<IHttpResponse<IData>> {
+    return this.app.net.get(
+      `/wfcore/${
+        ibiz.appData!.context.srfsystemid
+      }-app-${this.app.model.codeName!.toLowerCase()}/${this.model.name!.toLowerCase()}${
+        srfWFTag ? `-${srfWFTag}` : ''
+      }/process-definitions2`,
+    );
   }
 
   /**