;
+}
+
+/**
+ * 审批表单动作(保存 / 校验)的当前记录跟随器。
+ *
+ * 背景:`FormActionContext` 以固定 key 只保留一个表单动作,而合并审批界面可以切换查看
+ * 不同的流程记录。如果注册时逐条记录注册、或始终读取第一条记录的表单实例,就会出现:
+ *
+ * - 查看第二条记录时,读取的是未挂载的第一条记录表单实例,`getFieldsValue()` 返回 `{}`;
+ * - 提交请求因此携带 `formData: {}`,被服务端 `Required field formData cannot be empty` 拒绝;
+ * - 减签等不依赖表单数据的动作也被这条通用校验拦截。
+ *
+ *
+ * 本类只注册一个动作,保存/校验时委托给「当前正在查看或提交的记录」的表单实例,
+ * 表单实例未挂载时用记录初始数据兜底。
+ */
+export class ActiveFormAction {
+
+ private readonly formActionContext: FormActionContext;
+
+ private current?: ApprovalFormItem;
+
+ public constructor(formActionContext: FormActionContext) {
+ this.formActionContext = formActionContext;
+ }
+
+ /**
+ * 注册表单动作。重复调用会先移除旧动作,保证切换组件/重新打开详情时不残留。
+ */
+ public register(): void {
+ this.formActionContext.removeAction(VIEW_FORM_ACTION_KEY);
+ this.formActionContext.addAction({
+ key: () => VIEW_FORM_ACTION_KEY,
+ save: () => this.save(),
+ validate: () => this.validate(),
+ });
+ }
+
+ /**
+ * 注销表单动作(组件卸载时调用)。
+ */
+ public unregister(): void {
+ this.current = undefined;
+ this.formActionContext.removeAction(VIEW_FORM_ACTION_KEY);
+ }
+
+ /**
+ * 切换当前正在查看/提交的记录表单。
+ *
+ * @param item 记录对应的表单实例,为空表示没有可提交的表单
+ */
+ public switchTo(item?: ApprovalFormItem): void {
+ this.current = item;
+ }
+
+ /**
+ * 当前记录的表单数据。
+ *
+ *
表单实例已挂载时以表单最新值为准(审批人可能编辑过字段);未挂载时
+ * `getFieldsValue()` 返回空对象,此时使用记录下发的初始数据兜底。
+ */
+ public save(): Record {
+ const item = this.current;
+ if (!item) {
+ return {};
+ }
+ return {...item.values, ...item.form.getFieldsValue()};
+ }
+
+ /**
+ * 校验当前记录的表单,返回表单数据(口径与 {@link #save()} 一致)。
+ */
+ public validate(): Promise> {
+ const item = this.current;
+ if (!item) {
+ return Promise.resolve({});
+ }
+ if (!item.form.validateFields) {
+ // 表单实例类型未声明校验方法时退化为直接提交当前数据
+ return Promise.resolve(this.save());
+ }
+ return item.form.validateFields()
+ .then(values => ({...item.values, ...values}));
+ }
+}
diff --git a/packages/flow-approval-presenter/tests/action-batchable.test.ts b/packages/flow-approval-presenter/tests/action-batchable.test.ts
new file mode 100644
index 00000000..14d0cd9a
--- /dev/null
+++ b/packages/flow-approval-presenter/tests/action-batchable.test.ts
@@ -0,0 +1,135 @@
+import { describe, expect, it, rs } from "@rstest/core";
+import { FlowActionPresenter } from "@/presenters/action";
+import { ApprovalState, FlowApprovalApi } from "@/typings";
+import { FlowAction, FormActionContext } from "@coding-flow/flow-types";
+
+const buildAction = (id: string, type: FlowAction['type'], batchable?: boolean): FlowAction => ({
+ id,
+ title: id,
+ type,
+ display: 'BUTTON',
+ enable: true,
+ batchable,
+} as FlowAction);
+
+/** 合并审批状态:当前详情记录为 1,合并组内还有记录 2 */
+const buildMergeState = (actions: FlowAction[]): ApprovalState => ({
+ flow: {
+ recordId: 1,
+ mergeable: true,
+ actions,
+ todos: [
+ { recordId: 1, data: { name: 'a' } },
+ { recordId: 2, data: { name: 'b' } },
+ ],
+ },
+} as unknown as ApprovalState);
+
+/** 表单上下文固定返回指定记录的表单数据,用于验证提交目标的优先级 */
+const buildFormContext = (recordId = 2) => {
+ const formContext = new FormActionContext();
+ formContext.addAction({
+ save: () => ({ recordId, name: 'b' }),
+ key: () => 'view-form',
+ validate: async () => ({ recordId, name: 'b' }),
+ });
+ return formContext;
+};
+
+const buildApi = () => {
+ const api: FlowApprovalApi = {
+ create: rs.fn(async () => 100),
+ processNodes: rs.fn(async () => []),
+ action: rs.fn(async () => ({ success: true })),
+ revoke: rs.fn(async () => ({ success: true })),
+ urge: rs.fn(async () => ({ success: true })),
+ };
+ return api;
+};
+
+describe.sequential('FlowActionPresenter 合并批量提交(batchable)', () => {
+
+ it('支持批量的动作按勾选记录逐条提交', async () => {
+ const passAction = buildAction('pass-1', 'PASS');
+ const api = buildApi();
+ const presenter = new FlowActionPresenter(
+ buildMergeState([passAction]),
+ api,
+ buildFormContext(),
+ 'mockKey',
+ () => {},
+ );
+ presenter.setSubmitRecordIds([1, 2]);
+
+ await presenter.action('pass-1');
+
+ expect(api.action).toHaveBeenCalledTimes(2);
+ const recordIds = api.action.mock.calls.map((call) => call[0].recordId);
+ expect(recordIds).toEqual([1, 2]);
+ // 提交完成后清空勾选,避免下一次动作重复提交
+ expect(presenter.getSubmitRecordIds()).toEqual([]);
+ });
+
+ it('不支持批量的动作(减签)只提交当前详情记录,忽略合并勾选', async () => {
+ const reduceAction = buildAction('reduce-1', 'REDUCE_AUDIT', false);
+ const api = buildApi();
+ const presenter = new FlowActionPresenter(
+ buildMergeState([reduceAction]),
+ api,
+ buildFormContext(),
+ 'mockKey',
+ () => {},
+ );
+ presenter.setSubmitRecordIds([1, 2]);
+
+ await presenter.action('reduce-1', { forwardOperatorIds: [3] });
+
+ expect(presenter.isBatchable('reduce-1')).toBe(false);
+ expect(api.action).toHaveBeenCalledTimes(1);
+ const request = api.action.mock.calls[0][0];
+ // 表单上下文返回的是记录 2,但非批量动作必须强制提交当前详情记录 1
+ expect(request.recordId).toBe(1);
+ expect(request.advice.forwardOperatorIds).toEqual([3]);
+ // 勾选记录保持不变,用户仍可用于通过等其他批量动作
+ expect(presenter.getSubmitRecordIds()).toEqual([1, 2]);
+ });
+
+ it('从合并列表进入单条流程后,所有动作只提交该条记录', async () => {
+ const passAction = buildAction('pass-1', 'PASS');
+ const api = buildApi();
+ const state = {
+ ...buildMergeState([passAction]),
+ mergeSingleRecordId: 2,
+ } as ApprovalState;
+ const presenter = new FlowActionPresenter(
+ state,
+ api,
+ buildFormContext(1),
+ 'mockKey',
+ () => {},
+ );
+ presenter.setSubmitRecordIds([1, 2]);
+
+ await presenter.action('pass-1');
+
+ // 不再循环合并勾选,表单数据中的记录 1 也让位于当前查看的记录 2
+ expect(api.action).toHaveBeenCalledTimes(1);
+ expect(api.action.mock.calls[0][0].recordId).toBe(2);
+ expect(presenter.getSubmitRecordIds()).toEqual([1, 2]);
+ });
+
+ it('缺少 batchable 标记时按支持批量处理(兼容旧服务端)', () => {
+ const passAction = buildAction('pass-1', 'PASS');
+ const api = buildApi();
+ const presenter = new FlowActionPresenter(
+ buildMergeState([passAction]),
+ api,
+ buildFormContext(),
+ 'mockKey',
+ () => {},
+ );
+
+ expect(presenter.isBatchable('pass-1')).toBe(true);
+ expect(presenter.isBatchable('unknown')).toBe(true);
+ });
+});
diff --git a/packages/flow-approval-presenter/tests/active-form.test.ts b/packages/flow-approval-presenter/tests/active-form.test.ts
new file mode 100644
index 00000000..84634336
--- /dev/null
+++ b/packages/flow-approval-presenter/tests/active-form.test.ts
@@ -0,0 +1,97 @@
+import {describe, expect, it, rs} from "@rstest/core";
+import {FormActionContext} from "@coding-flow/flow-types";
+import {ActiveFormAction, ApprovalFormItem, VIEW_FORM_ACTION_KEY} from "@/utils/active-form";
+
+/**
+ * 合并审批表单取数(bug:查看第二条流程后减签提交 formData 为 {})
+ *
+ * 合并审批中每条流程记录各有一个表单实例,而 FormActionContext 只允许一个同名动作,
+ * 因此必须跟随「当前正在查看/提交的记录」切换表单实例,否则会读到其它记录(或未挂载)的
+ * 表单实例,取到 {},被服务端 `Required field formData cannot be empty` 拒绝。
+ */
+
+/** 构造一条记录的表单实例:live 模拟表单实例当前值(未挂载时为 {}) */
+const buildItem = (values: any, live: any = {}): ApprovalFormItem => ({
+ form: {
+ getFieldsValue: rs.fn(() => live),
+ validateFields: rs.fn(async () => live),
+ },
+ values,
+});
+
+describe('合并审批表单动作', () => {
+
+ it('切换记录后保存的是当前记录的表单实例数据', () => {
+ // given 合并组内两条记录,表单一(记录1)已编辑,表单二(记录2)为原始数据
+ const formActionContext = new FormActionContext();
+ const activeForm = new ActiveFormAction(formActionContext);
+ activeForm.register();
+
+ const first = buildItem({recordId: 1, days: 22, desc: '22'}, {recordId: 1, days: 22, desc: '22'});
+ const second = buildItem({recordId: 3658, days: 3, desc: '病假'}, {recordId: 3658, days: 3, desc: '病假'});
+
+ // when 默认第一条,随后查看第二条记录
+ activeForm.switchTo(first);
+ activeForm.switchTo(second);
+
+ // then 提交目标必须是第二条记录的表单数据
+ expect(formActionContext.save()).toEqual({recordId: 3658, days: 3, desc: '病假'});
+ });
+
+ it('表单实例未挂载时用记录初始数据兜底,不提交空 formData', () => {
+ // given 查看第二条记录后又返回合并列表,此时表单实例已卸载,getFieldsValue 返回 {}
+ const formActionContext = new FormActionContext();
+ const activeForm = new ActiveFormAction(formActionContext);
+ activeForm.register();
+ activeForm.switchTo(buildItem({recordId: 3658, days: 3, desc: '病假'}, {}));
+
+ // when
+ const formData = formActionContext.save();
+
+ // then 不能用空对象提交(服务端会以 formData 必填拒绝)
+ expect(formData).toEqual({recordId: 3658, days: 3, desc: '病假'});
+ });
+
+ it('表单实例已挂载时以表单最新值覆盖初始数据', () => {
+ // given 审批人改写了表单字段
+ const activeForm = new ActiveFormAction(new FormActionContext());
+ activeForm.register();
+ activeForm.switchTo(buildItem({recordId: 3658, days: 3, desc: '病假'}, {recordId: 3658, days: 5}));
+
+ // when
+ const formData = activeForm.save();
+
+ // then 以输入为准,未挂载字段保留初始数据
+ expect(formData).toEqual({recordId: 3658, days: 5, desc: '病假'});
+ });
+
+ it('校验动作同样跟随当前记录的表单实例', async () => {
+ // given
+ const formActionContext = new FormActionContext();
+ const activeForm = new ActiveFormAction(formActionContext);
+ activeForm.register();
+ const item = buildItem({recordId: 3658, days: 3}, {recordId: 3658, days: 3});
+ activeForm.switchTo(item);
+
+ // when
+ await formActionContext.validate();
+
+ // then
+ expect(item.form.validateFields).toHaveBeenCalledTimes(1);
+ });
+
+ it('重复注册与销毁后不残留重复动作', () => {
+ // given 组件重复挂载(热更新/重新打开详情)
+ const formActionContext = new FormActionContext();
+ const activeForm = new ActiveFormAction(formActionContext);
+
+ // when
+ activeForm.register();
+ activeForm.register();
+ activeForm.unregister();
+
+ // then
+ expect(formActionContext.save()).toEqual({});
+ expect(VIEW_FORM_ACTION_KEY).toBe('view-form');
+ });
+});
diff --git a/packages/flow-core/CHANGELOG.md b/packages/flow-core/CHANGELOG.md
index 8f8c81ad..6bc966ed 100644
--- a/packages/flow-core/CHANGELOG.md
+++ b/packages/flow-core/CHANGELOG.md
@@ -1,5 +1,11 @@
# @coding-flow/flow-core
+## 0.2.20
+
+### Patch Changes
+
+- 版本升级至 0.2.20(配合 flow-engine 后端版本升级,本包无功能变更)
+
## 0.2.17
## 0.2.16
diff --git a/packages/flow-core/package.json b/packages/flow-core/package.json
index a2edbaa8..79b0c682 100644
--- a/packages/flow-core/package.json
+++ b/packages/flow-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@coding-flow/flow-core",
- "version": "0.2.17",
+ "version": "0.2.20",
"description": "flow-engine core lib framework ",
"type": "module",
"sideEffects": [
diff --git a/packages/flow-core/src/message.ts b/packages/flow-core/src/message.ts
index 3fb1809f..a7fa0ceb 100644
--- a/packages/flow-core/src/message.ts
+++ b/packages/flow-core/src/message.ts
@@ -29,6 +29,7 @@ export const FlowMessageKey = {
APPROVAL_REJECT: 'approval.reject',
APPROVAL_DELEGATE: 'approval.delegate',
APPROVAL_ADD_AUDIT: 'approval.add_audit',
+ APPROVAL_REDUCE_AUDIT: 'approval.reduce_audit',
APPROVAL_TRANSFER: 'approval.transfer',
APPROVAL_RETURN: 'approval.return',
APPROVAL_REVOKE: 'approval.revoke',
@@ -143,6 +144,7 @@ function getDefaultMessages(): Record {
[FlowMessageKey.APPROVAL_REJECT]: '操作成功',
[FlowMessageKey.APPROVAL_DELEGATE]: '操作成功',
[FlowMessageKey.APPROVAL_ADD_AUDIT]: '操作成功',
+ [FlowMessageKey.APPROVAL_REDUCE_AUDIT]: '操作成功',
[FlowMessageKey.APPROVAL_TRANSFER]: '操作成功',
[FlowMessageKey.APPROVAL_RETURN]: '操作成功',
[FlowMessageKey.APPROVAL_REVOKE]: '流程已撤回',
diff --git a/packages/flow-design/CHANGELOG.md b/packages/flow-design/CHANGELOG.md
index ed406c6c..0ad67457 100644
--- a/packages/flow-design/CHANGELOG.md
+++ b/packages/flow-design/CHANGELOG.md
@@ -1,5 +1,11 @@
# @coding-flow/flow-design
+## 0.2.20
+
+### Patch Changes
+
+- 版本升级至 0.2.20(配合 flow-engine 后端版本升级,本包无功能变更)
+
## 0.2.17
### Patch Changes
diff --git a/packages/flow-design/package.json b/packages/flow-design/package.json
index 560b000d..a9bd3c38 100644
--- a/packages/flow-design/package.json
+++ b/packages/flow-design/package.json
@@ -1,6 +1,6 @@
{
"name": "@coding-flow/flow-design",
- "version": "0.2.17",
+ "version": "0.2.20",
"description": "flow-engine design components ",
"type": "module",
"sideEffects": [
diff --git a/packages/flow-design/src/components/design-editor/node-components/strategy/same-operator-audit.tsx b/packages/flow-design/src/components/design-editor/node-components/strategy/same-operator-audit.tsx
index 3e85a434..58ad7e5b 100644
--- a/packages/flow-design/src/components/design-editor/node-components/strategy/same-operator-audit.tsx
+++ b/packages/flow-design/src/components/design-editor/node-components/strategy/same-operator-audit.tsx
@@ -37,7 +37,9 @@ export const SameOperatorAuditStrategy:React.FC = () => {
render={({field: {value, onChange}}: FieldRenderProps) => {
return (