From 2dcfacd6d2b5a15a0d8796388e5198be164c0ac8 Mon Sep 17 00:00:00 2001
From: lorne <1991wangliang@gmail.com>
Date: Thu, 12 Nov 2026 11:08:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E5=BF=85=E9=A1=BB=E9=80=89=E6=8B=A9=E6=B5=81=E7=A8=8B=E5=90=8E?=
 =?UTF-8?q?=E6=89=8D=E8=83=BD=E6=8F=90=E4=BA=A4=EF=BC=9B=E7=9B=B8=E5=90=8C?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=85=8D=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E6=89=8B=E5=8A=A8=E5=AE=A1=E6=89=B9=20(#72)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- PC / 移动端：合并待办（todos > 1）未勾选流程记录时拦截所有动作，
  不再以「表单已有数据」替代选择；取消勾选同步清空已选记录
- PC 合并记录表格：选择为空时也回传（此前空数组不回调，导致残留上次选择）
- 设计器：相同人员提交配置未配置时展示「手动审批」，与后端实际行为一致（issue #224）
- changeset 补充 flow-pc-form 与本次修复说明
---
 .changeset/reduce-audit-action.md                        | 6 ++++++
 .../node-components/strategy/same-operator-audit.tsx     | 4 +++-
 .../flow-approval/components/flow-approval-actions.tsx   | 8 +++++---
 .../flow-approval/components/flow-approval-actions.tsx   | 9 ++++++---
 .../flow-pc/flow-pc-form/src/components/table/index.tsx  | 8 ++++----
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/.changeset/reduce-audit-action.md b/.changeset/reduce-audit-action.md
index ece35811..283b206e 100644
--- a/.changeset/reduce-audit-action.md
+++ b/.changeset/reduce-audit-action.md
@@ -2,6 +2,7 @@
 "@coding-flow/flow-types": patch
 "@coding-flow/flow-core": patch
 "@coding-flow/flow-approval-presenter": patch
+"@coding-flow/flow-pc-form": patch
 "@coding-flow/flow-pc-approval": patch
 "@coding-flow/flow-mobile-approval": patch
 "@coding-flow/flow-design": patch
@@ -14,3 +15,8 @@ feat: 支持减签动作 REDUCE_AUDIT（codingapi/flow-engine#266、codingapi/fl
 - 新增 `ReduceAuditViewPlugin`（`ReduceAuditViewPluginKey`）用于替换减签人员选择视图；默认实现为占位，集成方应列出当前节点的待审批人（不含当前审批人）。
 - 设计器新增减签动作配置：仅「减签人员范围」（script），不提供「最大可选人数」。
 - `FlowMessageKey.APPROVAL_REDUCE_AUDIT` 增加默认提示文案。
+
+fix: 测试反馈问题（codingapi/flow-frontend#72）
+
+- 合并审批（记录合并）必须先勾选要处理的流程记录才能提交，取消勾选会同步清空选择；此前表单有数据即可绕过校验，导致未选择流程也能通过/拒绝/保存/转办。
+- 设计器「相同人员提交配置」未配置时默认展示「手动审批」，与后端未配置时的实际行为一致（issue #224 已移除默认策略，不再显示空值）。
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<any>) => {
                         return (
                             <Select
-                                value={value}
+                                // 未配置时后端按「手动审批」处理（issue #224 已将默认策略移除），
+                                // 这里同样以手动审批作为默认展示，避免下拉框空白造成误解
+                                value={value ?? 'MANUAL_PASS'}
                                 onChange={onChange}
                                 options={[
                                     {
diff --git a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/flow-approval-actions.tsx b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/flow-approval-actions.tsx
index b4019942..0c23c9b7 100644
--- a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/flow-approval-actions.tsx
+++ b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/flow-approval-actions.tsx
@@ -7,7 +7,7 @@ import { RevokeAction } from "@/components/flow-approval/components/action/revok
 import { UrgeAction } from "@/components/flow-approval/components/action/urge";
 import { ActionFactory } from "@/components/flow-approval/components/action/factory";
 import { dispatchApprovalFrontEvent } from "@/components/flow-approval/components/action-front-event";
-import { EventBus, ObjectUtils, FlowMessageKey, FlowMessageRegistry } from "@coding-flow/flow-core";
+import { EventBus, FlowMessageKey, FlowMessageRegistry } from "@coding-flow/flow-core";
 import { useApprovalContext } from "@coding-flow/flow-approval-presenter";
 
 export const FlowApprovalActions = () => {
@@ -23,10 +23,12 @@ export const FlowApprovalActions = () => {
 
     const handlerAction = (id: string) => {
         const action = actionPresenter.getAction(id);
+        // 合并待办必须先显式选择要处理的流程记录，不能以「表单已有数据」代替选择
+        // （未选择时提交会落到默认记录上，issue-72 测试反馈）
         if (state.flow?.mergeable) {
+            const todoCount = state.flow?.todos?.length ?? 0;
             const selectRecordIds = actionPresenter.getSubmitRecordIds();
-            const currentFormData = actionPresenter.getCurrentFormData();
-            if (ObjectUtils.isEmptyObject(currentFormData) && selectRecordIds.length == 0) {
+            if (todoCount > 1 && selectRecordIds.length == 0) {
                 Toast.show(FlowMessageRegistry.getInstance().get(FlowMessageKey.APPROVAL_NO_SELECTED))
                 return;
             }
diff --git a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/flow-approval-actions.tsx b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/flow-approval-actions.tsx
index 9fa98b16..c1302d46 100644
--- a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/flow-approval-actions.tsx
+++ b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/flow-approval-actions.tsx
@@ -1,7 +1,7 @@
 import {useApprovalContext, FlowActionPresenter} from "@coding-flow/flow-approval-presenter";
 import React from "react";
 import {message, Space} from "antd";
-import {ObjectUtils, FlowMessageKey, FlowMessageRegistry} from "@coding-flow/flow-core";
+import {FlowMessageKey, FlowMessageRegistry} from "@coding-flow/flow-core";
 import {ActionFactory} from "@/components/flow-approval/components/action/factory";
 import {UrgeAction} from "@/components/flow-approval/components/action/urge";
 import {RevokeAction} from "@/components/flow-approval/components/action/revoke";
@@ -17,10 +17,13 @@ export const FlowApprovalActions = () => {
    const actionPresenter = context.getPresenter().getFlowActionPresenter();
 
     const handlerClickCheck = (id: string) => {
+        // 合并待办（多条记录合并成一条 todo）必须先显式选择要处理的流程记录。
+        // 不能以「表单已有数据」代替选择：表单数据只代表当前展示的记录，
+        // 未选择时提交会落到默认记录上（issue-72 测试反馈）
         if (state.flow?.mergeable) {
+            const todoCount = state.flow?.todos?.length ?? 0;
             const selectRecordIds = actionPresenter.getSubmitRecordIds();
-            const currentFormData = actionPresenter.getCurrentFormData();
-            if (ObjectUtils.isEmptyObject(currentFormData) && selectRecordIds.length == 0) {
+            if (todoCount > 1 && selectRecordIds.length == 0) {
                 message.error(
                     FlowMessageRegistry.getInstance().get(FlowMessageKey.APPROVAL_NO_SELECTED)
                 )
diff --git a/packages/flow-pc/flow-pc-form/src/components/table/index.tsx b/packages/flow-pc/flow-pc-form/src/components/table/index.tsx
index 0b3e99b4..39d099e7 100644
--- a/packages/flow-pc/flow-pc-form/src/components/table/index.tsx
+++ b/packages/flow-pc/flow-pc-form/src/components/table/index.tsx
@@ -38,11 +38,11 @@ export const FlowTable: React.FC<FlowTableProps> = (props) => {
         return [...columns, option];
     }, []);
 
-    // 回掉登记当前选中中的合并流程
+    // 回掉登记当前选中中的合并流程。
+    // 取消选择时必须同步空数组，否则 presenter 会残留上一次的选择，
+    // 导致「未勾选任何流程」也能提交（issue-72 测试反馈）
     React.useEffect(() => {
-        if (recordIdList.length > 0) {
-            props.onMergeRecordIdsSelected?.(recordIdList);
-        }
+        props.onMergeRecordIdsSelected?.(recordIdList);
     }, [recordIdList]);
 
     // 切换是触发右侧节点列表的筛选