@ibiz-template/runtime 0.5.3-beta.8 → 0.5.3

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

@@ -7,6 +7,8 @@ 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 { calcDeCodeNameById, findDELogic } from '../../../../model';
@@ -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);
     //     }

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

@@ -37,10 +37,8 @@ export class FetchMethod extends Method {
 
     if (this.isLocalMode) {
       const cond = DEDQCondUtil.getCond(this.method);
-      const items = await this.searchLocal(
-        cond,
-        new SearchFilter(context, searchParams),
-      );
+      const filter = new SearchFilter(context, searchParams);
+      const items = await this.searchLocal(cond, filter);
       res = new HttpResponse<IDataEntity[]>(items, 200);
     } else {
       switch (this.method.dataSetType) {

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

@@ -58,11 +58,20 @@ 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 uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+      if (uiDomain && uiDomain.state.rsInit !== true) {
+        await this.dto.calcRs(context);
+        uiDomain.calcParentRs();
+        uiDomain.state.rsInit = true;
+      }
+      // 设置之前，根据关系清理掉当前界面域下的数据缓存
+      app.deService.clearTempCacheByRs(
+        {
+          srfappid: app.appId,
+          srfsessionid: context.srfsessionid,
+        },
+        this.entity.id!,
+      );
       const items = await this.dto.sets(context, [data]);
       return items[0];
     }

package/src/service/utils/de-cache/de-cache.ts

@@ -6,7 +6,7 @@ import {
   isExistSessionId,
   isExistSrfKey,
 } from '../service-exist-util/service-exist-util';
-import { IDataEntity } from '../../../interface';
+import { IDataEntity, ITransaction } from '../../../interface';
 import { findModelChild } from '../../../model';
 
 /**
@@ -114,8 +114,19 @@ export class DECache {
         entity.srfkey = createUUID();
       }
       entity.srftempdate = new Date().getTime();
-      this.cacheMap.set(entity.srfkey, clone(entity));
-      ibiz.log.warn('add', entity.srfkey, entity);
+      // 提交回调
+      const commit = (): void => {
+        this.cacheMap.set(entity.srfkey!, clone(entity));
+        ibiz.log.warn('add', entity.srfkey, entity);
+      };
+      const t = this.getTransaction(context);
+      if (t) {
+        t.change(entity.srfkey, () => {
+          commit();
+        });
+      } else {
+        commit();
+      }
       return entity;
     } catch (err) {
       ibiz.log.error(err);
@@ -170,10 +181,26 @@ export class DECache {
       entity.srftempdate = new Date().getTime();
       const data = this.cacheMap.get(oldKey);
       if (data) {
-        data.assign!(entity);
-        this.cacheMap.set(oldKey, data);
-        ibiz.log.warn('update', oldKey, entity);
-        return clone(data);
+        const _data = clone(data);
+        _data.assign!(entity);
+        // 提交回调
+        const commit = (): void => {
+          data.assign!(entity);
+          if (oldKey !== entity.srfkey) {
+            this.cacheMap.delete(oldKey);
+          }
+          this.cacheMap.set(entity.srfkey, data);
+          ibiz.log.warn('update', entity.srfkey, entity);
+        };
+        const t = this.getTransaction(context);
+        if (t) {
+          t.change(entity.srfkey, () => {
+            commit();
+          });
+        } else {
+          commit();
+        }
+        return _data;
       }
       throw new Error('数据不存在，无法更新!');
     } catch (err) {
@@ -196,9 +223,18 @@ export class DECache {
       const key = srfKey;
       if (this.cacheMap.has(key)) {
         const data = this.cacheMap.get(key)!;
-        data.srftempdate = new Date().getTime();
-        this.cacheMap.delete(key);
-        ibiz.log.warn('delete', key);
+        const commit = (): void => {
+          this.cacheMap.delete(key);
+          ibiz.log.warn('delete', key);
+        };
+        const t = this.getTransaction(context);
+        if (t) {
+          t.change(key, () => {
+            commit();
+          });
+        } else {
+          commit();
+        }
         return data;
       }
       return null;
@@ -220,6 +256,11 @@ export class DECache {
   createBatch(context: IContext, entities: IDataEntity[]): IDataEntity[] {
     try {
       isExistSessionId('add', context);
+      const commit = (entity: IDataEntity): void => {
+        this.cacheMap.set(entity.srfkey, entity);
+        ibiz.log.warn('add', entity.srfkey, entity);
+      };
+      const t = this.getTransaction(context);
       for (let i = 0; i < entities.length; i++) {
         const entity = entities[i];
         if (isNil(entity.srfkey) || isEmpty(entity.srfkey)) {
@@ -227,9 +268,13 @@ export class DECache {
         }
         entity.srftempdate = new Date().getTime();
         const data = clone(entity);
-        this.cacheMap.set(entity.srfkey, data);
-        entities[i] = data;
-        ibiz.log.warn('add', entity.srfkey, entity);
+        if (t) {
+          t.change(data.srfkey, () => {
+            commit(data);
+          });
+        } else {
+          commit(data);
+        }
       }
       return entities;
     } catch (err) {
@@ -250,16 +295,50 @@ export class DECache {
   updateBatch(context: IContext, entities: IDataEntity[]): IDataEntity[] {
     try {
       isExistSessionId('update', context);
+      const commit = (entity: IDataEntity, oldKey: string): void => {
+        // 如果主键改变，删除旧的数据再设置新数据
+        if (oldKey !== entity.srfkey) {
+          this.cacheMap.delete(oldKey);
+        }
+        this.cacheMap.set(entity.srfkey!, entity);
+        ibiz.log.warn('update', entity.srfkey, entity);
+      };
+
+      const t = this.getTransaction(context);
+
       for (let i = 0; i < entities.length; i++) {
         const entity = entities[i];
         isExistSrfKey('update', entity);
+        const oldKey = entity.srfkey!;
+        // 联合主键相关数据处理
+        if (this.isUnionKey) {
+          this.calcUnionKey(entity);
+          // 主键改变的时候，检测变更之后的主键是否已经存在
+          if (
+            oldKey !== entity.srfkey &&
+            this.checkData(context, entity.srfkey)
+          ) {
+            throw new RuntimeError(
+              `更新联合主键数据失败，已有主键为${entity.srfkey}的数据`,
+            );
+          }
+        }
+
         entity.srftempdate = new Date().getTime();
         const data = this.cacheMap.get(entity.srfkey!);
         if (data) {
-          data.assign!(entity);
-          this.cacheMap.set(entity.srfkey!, data);
-          ibiz.log.warn('update', entity.srfkey, entity);
-          entities[i] = clone(data);
+          const _data = clone(data);
+          _data.assign!(entity);
+          entities[i] = _data;
+          if (t) {
+            t.change(entity.srfkey!, () => {
+              data.assign!(entity);
+              commit(data, oldKey);
+            });
+          } else {
+            data.assign!(entity);
+            commit(data, oldKey);
+          }
         } else {
           throw new Error(
             `数据[${entity.srfdename}-${entity.srfmajortext}(${entity.srfkey})]不存在，无法更新!`,
@@ -301,10 +380,23 @@ export class DECache {
         `未找到以下数据「${notRemoveKeys.join('、')}」，无法删除!`,
       );
     }
-    for (let i = 0; i < srfKeys.length; i++) {
-      const key = srfKeys[i];
+
+    const commit = (key: string): void => {
       this.cacheMap.delete(key);
       ibiz.log.warn('delete', key);
+    };
+
+    const t = this.getTransaction(context);
+
+    for (let i = 0; i < srfKeys.length; i++) {
+      const key = srfKeys[i];
+      if (t) {
+        t.change(key, () => {
+          commit(key);
+        });
+      } else {
+        commit(key);
+      }
     }
     return [];
   }
@@ -392,4 +484,21 @@ export class DECache {
     });
     data.srfkey = unionValues.join('||');
   }
+
+  /**
+   * 根据上下文，获取已经开启的事务
+   *
+   * @author chitanda
+   * @date 2024-01-17 15:01:28
+   * @protected
+   * @param {IContext} context
+   * @return {*}  {(ITransaction | null)}
+   */
+  protected getTransaction(context: IContext): ITransaction | null {
+    const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+    if (uiDomain && uiDomain.transaction.state.isOpen === true) {
+      return uiDomain.transaction;
+    }
+    return null;
+  }
 }

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

@@ -67,6 +67,10 @@ export abstract class PSModelCondEngineBase {
         CondType.CONDOP_LTANDEQ === strCondOp ||
         CondType.CONDOP_NOTEQ === strCondOp
       ) {
+        // 特殊处理，如果值为空，直接返回false
+        if (objValue == null || objCondValue == null) {
+          return false;
+        }
         // 大小比较
         let nRet = -1;
         // eslint-disable-next-line eqeqeq

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

@@ -133,6 +133,7 @@ export class DynamicCodeListCache {
    */
   protected convertData(data: IData): CodeListItem {
     const result = {} as CodeListItem;
+
     const {
       valueAppDEFieldId,
       textAppDEFieldId,
@@ -142,6 +143,8 @@ export class DynamicCodeListCache {
       iconPathXAppDEFieldId,
       disableAppDEFieldId,
       dataAppDEFieldId,
+      clsAppDEFieldId,
+      colorAppDEFieldId,
     } = this.codeList;
     // 值属性
     const value = valueAppDEFieldId ? data[valueAppDEFieldId] : data.srfkey;
@@ -177,6 +180,14 @@ export class DynamicCodeListCache {
     if (disableAppDEFieldId) {
       result.disableSelect = fieldValueToBoolean(data[disableAppDEFieldId]);
     }
+    // 样式表属性
+    if (clsAppDEFieldId) {
+      result.textCls = data[clsAppDEFieldId];
+    }
+    // 颜色值属性
+    if (colorAppDEFieldId) {
+      result.color = data[colorAppDEFieldId];
+    }
     // 数据属性
     if (dataAppDEFieldId && data[dataAppDEFieldId]) {
       try {

package/src/service/vo/tree-node-data/tree-node-data.ts

@@ -86,6 +86,9 @@ export abstract class TreeNodeData implements ITreeNodeData {
       if (sysImage.imagePath) {
         icon.imagePath = sysImage.imagePath;
       }
+      if (sysImage.rawContent) {
+        icon.htmlStr = sysImage.rawContent;
+      }
     }
     return Object.values(icon).length > 0 ? icon : undefined;
   }

package/src/ui-action/provider/front-ui-action-provider.ts

@@ -199,7 +199,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
     args: IUILogicParams,
   ): Promise<IUIActionResult> {
     // 处理参数
-    const { resultParams } = await this.handleParams(
+    const { resultContext, resultParams } = await this.handleParams(
       action,
       args.context,
       args.data,
@@ -223,6 +223,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
           dismiss: () => modal.dismiss(),
           appDataEntity,
           dataImport: appDEDataImport,
+          context: resultContext,
           params: resultParams,
         },
         {

package/src/utils/index.ts

@@ -18,4 +18,5 @@ export { ThemeUtil } from './theme-util/theme-util';
 export { UIDomain } from './ui-domain/ui-domain';
 export { UIDomainManager } from './ui-domain-manager/ui-domain-manager';
 export { RawValueUtil } from './raw-value-util/raw-value-util';
+export { ViewStack } from './view-stack/view-stack';
 export { handleAllSettled } from './promise/promise';