From 861e6235dfa13b86fe0bbe194ff1592272adfa92 Mon Sep 17 00:00:00 2001
From: JY <1140938202@qq.com>
Date: Tue, 8 Jul 2025 14:55:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/executor/tools/generate/columns.tsx | 2 +-
src/executor/tools/workForm/detail.tsx | 2 +-
src/ts/scripting/core/rule/SplitHandler.ts | 10 ++++++++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/executor/tools/generate/columns.tsx b/src/executor/tools/generate/columns.tsx
index c0b9a6331..77c92e3e7 100644
--- a/src/executor/tools/generate/columns.tsx
+++ b/src/executor/tools/generate/columns.tsx
@@ -265,7 +265,7 @@ export const GenerateColumn = (
flexDirection: 'row',
gap: 2,
}}>
- {localizationText}
+ {/* {localizationText} */}
{beforeText}
{!data.text ? '（置空）' : text}
= (props) => {
break;
case 'assignment':
formData.current.after = args.data;
- formData.current.before = args.data;
+ formData.current.before = args.before
break;
}
break;
diff --git a/src/ts/scripting/core/rule/SplitHandler.ts b/src/ts/scripting/core/rule/SplitHandler.ts
index f9c642fb3..d7e6a9c3e 100644
--- a/src/ts/scripting/core/rule/SplitHandler.ts
+++ b/src/ts/scripting/core/rule/SplitHandler.ts
@@ -176,10 +176,15 @@ export default class SplitHandler implements IService {
/** 保留原数据的部分内容不被更改 */
if (i === splitNum - 1 && !id) {
newAsset['id'] = this.curSplitAsset.id;
+ newAsset['changes'] = Object.keys(newAsset);
}
newThing.push({ ...newAsset });
}
- this.commandDetailForm([...this.changeData, ...newThing]);
+ const beforeList = [...newThing];
+ if (beforeList.length > 0) {
+ beforeList.pop();
+ }
+ this.commandDetailForm([...this.changeData, ...newThing],[...beforeList,deepClone(this.curSplitAsset)]);
}
// 计算每个单位的数值字段值（静态方法）
@@ -297,11 +302,12 @@ export default class SplitHandler implements IService {
}
/** 通知子表变更 */
- commandDetailForm(data: XThing[]) {
+ commandDetailForm(data: XThing[],before: XThing[]) {
this.service.command.emitter('change', 'assignment', {
formId: this.splitDetailFormId,
value: this.curFieldId,
data: data,
+ before: before,
});
}
--
Gitee