@ibiz-template/runtime 0.5.3-beta.7 → 0.5.3-beta.9

package/out/service/service/entity/method/de-action.js

@@ -1,5 +1,7 @@
 import { HttpError, HttpResponse, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
 import { isArray, isNil } from 'lodash-es';
+import { ascSort } from 'qx-util';
+import { clone } from 'ramda';
 import { Method } from './method';
 import { calcDeCodeNameById, findDELogic } from '../../../../model';
 import { execDELogicAction, execFieldLogics } from '../../../../de-logic';
@@ -29,7 +31,9 @@ export class DEActionMethod extends Method {
         return this.input.handle(context, data);
     }
     async exec(context, data, params) {
-        if (data) {
+        let result;
+        // 执行变更属性逻辑
+        if (data && !['READ', 'GETDRAFT'].includes(this.method.actionMode)) {
             await execFieldLogics(this.entity, 'change', context, data, params);
         }
         // 实体逻辑处理
@@ -38,61 +42,58 @@ export class DEActionMethod extends Method {
             if (!deLogic) {
                 throw new RuntimeModelError(this.method, '缺少实体处理逻辑');
             }
-            return execDELogicAction(deLogic, context, data, params);
+            result = await 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;
-        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 === null || data === void 0 ? void 0 : data[this.entity.keyAppDEFieldId];
+        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 === null || data === void 0 ? void 0 : 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;
             }
         }
         // 计算属性逻辑
@@ -262,6 +263,14 @@ 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.message),
+                });
+            }
             const data = this.service.local.delete(context, key);
             if (data) {
                 return new HttpResponse(data);
@@ -272,6 +281,106 @@ export class DEActionMethod extends Method {
             throw new HttpError(err);
         }
     }
+    /**
+     * 关联删除
+     *
+     * @author chitanda
+     * @date 2024-01-17 16:01:47
+     * @protected
+     * @param {string} key
+     * @param {IContext} context
+     * @param {IParams} [params]
+     * @return {*}  {Promise<void>}
+     */
+    async associationDeletion(key, context, _params) {
+        // 当前执行界面域
+        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 || []);
+                    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();
+            }
+        }
+    }
     /**
      * 更新临时数据
      *
@@ -319,7 +428,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);
             }
@@ -341,8 +449,7 @@ export class DEActionMethod extends Method {
         //   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/out/service/service/entity/method/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAgB,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAExB,IAAI,CACR,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IAqDvC;;;;;;;;;OASG;IACG,WAAW,CACf,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IAwCzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAkBlC"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,OAAO,EAAgB,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAExB,IAAI,CACR,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IAmDvC;;;;;;;;;OASG;IACG,WAAW,CACf,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IAwCzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAkBlC"}

package/out/service/service/entity/method/fetch.js

@@ -22,7 +22,8 @@ export class FetchMethod extends Method {
         let res;
         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(items, 200);
         }
         else {

package/out/service/service/entity/method/method-renturn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,qBAAa,YAAY;IAcrB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,WAAW,EAAE,OAAO;IAhBhC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;;;;;OASG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,WAAW,GAAE,OAAe;IAgBxC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;CAUnE"}
+{"version":3,"file":"method-renturn.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method-renturn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEnE;;;;;;;GAOG;AACH,qBAAa,YAAY;IAcrB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,WAAW,EAAE,OAAO;IAhBhC,SAAS,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;;;;;OASG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,WAAW,GAAE,OAAe;IAgBxC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC;CAgBnE"}

package/out/service/service/entity/method/method-renturn.js

@@ -46,6 +46,12 @@ export class MethodReturn {
      */
     async handle(context, data) {
         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/out/service/utils/de-cache/de-cache.d.ts

@@ -1,5 +1,5 @@
 import { IAppDataEntity } from '@ibiz/model-core';
-import { IDataEntity } from '../../../interface';
+import { IDataEntity, ITransaction } from '../../../interface';
 /**
  * 实体缓存工具类
  *
@@ -169,5 +169,15 @@ export declare class DECache {
      * @param {(IDataEntity | IDataEntity[])} data 需要计算的数据或数据集合
      */
     protected calcUnionKey(data: IDataEntity): void;
+    /**
+     * 根据上下文，获取已经开启的事务
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:28
+     * @protected
+     * @param {IContext} context
+     * @return {*}  {(ITransaction | null)}
+     */
+    protected getTransaction(context: IContext): ITransaction | null;
 }
 //# sourceMappingURL=de-cache.d.ts.map

package/out/service/utils/de-cache/de-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-cache.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-cache/de-cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMlD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,OAAO;IAoBN,SAAS,CAAC,MAAM,EAAE,cAAc;IAnB5C;;;;;;;OAOG;IACH,SAAS,KAAK,UAAU,IAAI,OAAO,CAElC;IAED;;;;;;OAMG;gBACmB,MAAM,EAAE,cAAc;IAE5C;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAExD;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAQvD;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAK1D;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAKrD;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAyB/D;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAY1D;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IA+BlE;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAkB7D;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IAqBtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA0BtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IA2B3D;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAItD;;;;;;OAMG;IACH,OAAO,IAAI,WAAW,EAAE;IAKxB;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;OAKG;IACH,KAAK,IAAI,IAAI;IAOb;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;CAehD"}
+{"version":3,"file":"de-cache.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-cache/de-cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMlD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IAoBN,SAAS,CAAC,MAAM,EAAE,cAAc;IAnB5C;;;;;;;OAOG;IACH,SAAS,KAAK,UAAU,IAAI,OAAO,CAElC;IAED;;;;;;OAMG;gBACmB,MAAM,EAAE,cAAc;IAE5C;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAExD;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAQvD;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAK1D;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAKrD;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAoC/D;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAY1D;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IA+ClE;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IA2B7D;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA8BtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA4DtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAwC3D;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAItD;;;;;;OAMG;IACH,OAAO,IAAI,WAAW,EAAE;IAKxB;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;OAKG;IACH,KAAK,IAAI,IAAI;IAOb;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAgB/C;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,YAAY,GAAG,IAAI;CAOjE"}

package/out/service/utils/de-cache/de-cache.js

@@ -103,8 +103,20 @@ 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 = () => {
+                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) {
@@ -156,10 +168,27 @@ 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 = () => {
+                    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('数据不存在，无法更新!');
         }
@@ -182,9 +211,19 @@ 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 = () => {
+                    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;
@@ -206,6 +245,11 @@ export class DECache {
     createBatch(context, entities) {
         try {
             isExistSessionId('add', context);
+            const commit = (entity) => {
+                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)) {
@@ -213,9 +257,14 @@ 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;
         }
@@ -236,16 +285,44 @@ export class DECache {
     updateBatch(context, entities) {
         try {
             isExistSessionId('update', context);
+            const commit = (entity, oldKey) => {
+                // 如果主键改变，删除旧的数据再设置新数据
+                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})]不存在，无法更新!`);
@@ -285,10 +362,21 @@ export class DECache {
         if (notRemoveKeys.length > 0) {
             throw new Error(`未找到以下数据「${notRemoveKeys.join('、')}」，无法删除!`);
         }
-        for (let i = 0; i < srfKeys.length; i++) {
-            const key = srfKeys[i];
+        const commit = (key) => {
             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 [];
     }
@@ -369,4 +457,20 @@ export class DECache {
         });
         data.srfkey = unionValues.join('||');
     }
+    /**
+     * 根据上下文，获取已经开启的事务
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:28
+     * @protected
+     * @param {IContext} context
+     * @return {*}  {(ITransaction | null)}
+     */
+    getTransaction(context) {
+        const uiDomain = ibiz.uiDomainManager.get(context.srfsessionid);
+        if (uiDomain && uiDomain.transaction.state.isOpen === true) {
+            return uiDomain.transaction;
+        }
+        return null;
+    }
 }

package/out/service/utils/de-dq-cond/ps-model-cond-engine-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ps-model-cond-engine-base.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-dq-cond/ps-model-cond-engine-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE;;;;;;GAMG;AACH,8BAAsB,qBAAqB;IACzC;;;;;;OAMG;IACH,OAAO,CAAC,oBAAoB,CAAqC;IAEjE;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI;IAS3B;;;;;;;;;OASG;IACH,SAAS,CAAC,cAAc,CACtB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,YAAY,EAAE,MAAM,GAAG,MAAM,GAC5B,OAAO;IA+EV;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,sBAAsB,IAAI,oBAAoB;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,uBAAuB,IAAI,qBAAqB;IAEnE;;;;;OAKG;IACH,uBAAuB,IAAI,oBAAoB;CAGhD"}
+{"version":3,"file":"ps-model-cond-engine-base.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-dq-cond/ps-model-cond-engine-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE;;;;;;GAMG;AACH,8BAAsB,qBAAqB;IACzC;;;;;;OAMG;IACH,OAAO,CAAC,oBAAoB,CAAqC;IAEjE;;;;;OAKG;IACH,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI;IAS3B;;;;;;;;;OASG;IACH,SAAS,CAAC,cAAc,CACtB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,YAAY,EAAE,MAAM,GAAG,MAAM,GAC5B,OAAO;IAmFV;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,sBAAsB,IAAI,oBAAoB;IAEjE;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,uBAAuB,IAAI,qBAAqB;IAEnE;;;;;OAKG;IACH,uBAAuB,IAAI,oBAAoB;CAGhD"}

package/out/service/utils/de-dq-cond/ps-model-cond-engine-base.js

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

package/out/ui-action/provider/front-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+D3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA2C3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;CAqDjB"}
+{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+D3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA4C3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;CAqDjB"}

package/out/ui-action/provider/front-ui-action-provider.js

@@ -147,7 +147,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
     async executeDataImport(action, args) {
         var _a;
         // 处理参数
-        const { resultParams } = await this.handleParams(action, args.context, args.data, args.params);
+        const { resultContext, resultParams } = await this.handleParams(action, args.context, args.data, args.params);
         const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
         const appDEDataImport = (_a = appDataEntity.appDEDataImports) === null || _a === void 0 ? void 0 : _a.find(dataImport => dataImport.id === action.appDEDataImportId);
         let importName = 'DataImport';
@@ -159,6 +159,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
                 dismiss: () => modal.dismiss(),
                 appDataEntity,
                 dataImport: appDEDataImport,
+                context: resultContext,
                 params: resultParams,
             }, {
                 width: 'auto',

package/out/utils/ui-domain/transaction.d.ts

@@ -0,0 +1,66 @@
+import { ITransaction, ITransactionState } from '../../interface';
+/**
+ * 界面域下简单数据事务
+ *
+ * @author chitanda
+ * @date 2024-01-17 15:01:39
+ * @export
+ * @class Transaction
+ */
+export declare class Transaction implements ITransaction {
+    /**
+     * 待提交队列
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:38
+     * @protected
+     */
+    protected commitQueue: Map<string, () => void>;
+    /**
+     * 事务状态
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:45
+     * @type {ITransactionState}
+     */
+    readonly state: ITransactionState;
+    /**
+     * 开启事务
+     *
+     * @description 事务开启后，所有的数据操作都会被缓存，直到事务提交或者回滚
+     * @author chitanda
+     * @date 2024-01-17 15:01:46
+     */
+    open(): void;
+    /**
+     * 新增变更事务回调，事务提交时会按照添加顺序倒序执行
+     *
+     * @author chitanda
+     * @date 2024-01-17 16:01:50
+     * @param {string} id 回调标识，用于去重。一个数据只能有一个回调
+     * @param {() => void} commit
+     */
+    change(id: string, commit: () => void): void;
+    /**
+     * 提交事务
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:05
+     */
+    commit(): void;
+    /**
+     * 回滚事务
+     *
+     * @author chitanda
+     * @date 2024-01-17 19:01:43
+     */
+    rollback(): void;
+    /**
+     * 关闭事务
+     *
+     * @author chitanda
+     * @date 2024-01-17 15:01:02
+     */
+    close(): void;
+}
+//# sourceMappingURL=transaction.d.ts.map

package/out/utils/ui-domain/transaction.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../../src/utils/ui-domain/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAElE;;;;;;;GAOG;AACH,qBAAa,WAAY,YAAW,YAAY;IAC9C;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,CAAa;IAE3D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAG/B;IAEF;;;;;;OAMG;IACH,IAAI,IAAI,IAAI;IAQZ;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,IAAI,GAAG,IAAI;IAK5C;;;;;OAKG;IACH,MAAM,IAAI,IAAI;IAUd;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAKhB;;;;;OAKG;IACH,KAAK,IAAI,IAAI;CAMd"}