From 8a5ee2a867844687df360d556e94bd28292e0ffb Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Tue, 10 Nov 2026 20:24:17 +0800 Subject: [PATCH 01/12] =?UTF-8?q?chore:=20=E5=8F=91=E5=B8=83=20@coding-flo?= =?UTF-8?q?w/*@0.2.20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 11 个 @coding-flow/* 包统一升级至 0.2.20 - 同步更新各包 CHANGELOG --- packages/flow-approval-presenter/CHANGELOG.md | 6 ++++++ packages/flow-approval-presenter/package.json | 2 +- packages/flow-core/CHANGELOG.md | 6 ++++++ packages/flow-core/package.json | 2 +- packages/flow-design/CHANGELOG.md | 6 ++++++ packages/flow-design/package.json | 2 +- packages/flow-icons/CHANGELOG.md | 6 ++++++ packages/flow-icons/package.json | 2 +- packages/flow-mobile/flow-mobile-approval/CHANGELOG.md | 6 ++++++ packages/flow-mobile/flow-mobile-approval/package.json | 2 +- packages/flow-mobile/flow-mobile-form/CHANGELOG.md | 6 ++++++ packages/flow-mobile/flow-mobile-form/package.json | 2 +- packages/flow-mobile/flow-mobile-ui/CHANGELOG.md | 6 ++++++ packages/flow-mobile/flow-mobile-ui/package.json | 2 +- packages/flow-pc/flow-pc-approval/CHANGELOG.md | 6 ++++++ packages/flow-pc/flow-pc-approval/package.json | 2 +- packages/flow-pc/flow-pc-form/CHANGELOG.md | 6 ++++++ packages/flow-pc/flow-pc-form/package.json | 2 +- packages/flow-pc/flow-pc-ui/CHANGELOG.md | 6 ++++++ packages/flow-pc/flow-pc-ui/package.json | 2 +- packages/flow-types/CHANGELOG.md | 6 ++++++ packages/flow-types/package.json | 2 +- 22 files changed, 77 insertions(+), 11 deletions(-) diff --git a/packages/flow-approval-presenter/CHANGELOG.md b/packages/flow-approval-presenter/CHANGELOG.md index e739ea0..3884f7a 100644 --- a/packages/flow-approval-presenter/CHANGELOG.md +++ b/packages/flow-approval-presenter/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-approval-presenter +## 0.2.20 + +### Patch Changes + +- 版本升级至 0.2.20(配合 flow-engine 后端版本升级,本包无功能变更) + ## 0.2.17 ### Patch Changes diff --git a/packages/flow-approval-presenter/package.json b/packages/flow-approval-presenter/package.json index c8cbebf..ea7238d 100644 --- a/packages/flow-approval-presenter/package.json +++ b/packages/flow-approval-presenter/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-approval-presenter", - "version": "0.2.17", + "version": "0.2.20", "description": "flow-engine approval presenter framework ", "type": "module", "sideEffects": [ diff --git a/packages/flow-core/CHANGELOG.md b/packages/flow-core/CHANGELOG.md index 8f8c81a..6bc966e 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 a2edbaa..79b0c68 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-design/CHANGELOG.md b/packages/flow-design/CHANGELOG.md index ed406c6..0ad6745 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 560b000..a9bd3c3 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-icons/CHANGELOG.md b/packages/flow-icons/CHANGELOG.md index c99ef6d..ad5ad37 100644 --- a/packages/flow-icons/CHANGELOG.md +++ b/packages/flow-icons/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-icons +## 0.2.20 + +### Patch Changes + +- 版本升级至 0.2.20(配合 flow-engine 后端版本升级,本包无功能变更) + ## 0.2.17 ## 0.2.16 diff --git a/packages/flow-icons/package.json b/packages/flow-icons/package.json index 3b2aa17..44ca4ff 100644 --- a/packages/flow-icons/package.json +++ b/packages/flow-icons/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-icons", - "version": "0.2.17", + "version": "0.2.20", "description": "flow-engine icons ", "type": "module", "sideEffects": [ diff --git a/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md b/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md index 2ee21a6..ad36a3c 100644 --- a/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md +++ b/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-mobile-approval +## 0.2.20 + +### Patch Changes + +- 版本升级至 0.2.20(配合 flow-engine 后端版本升级,本包无功能变更) + ## 0.2.17 ### Patch Changes diff --git a/packages/flow-mobile/flow-mobile-approval/package.json b/packages/flow-mobile/flow-mobile-approval/package.json index 29d29d0..be5f960 100644 --- a/packages/flow-mobile/flow-mobile-approval/package.json +++ b/packages/flow-mobile/flow-mobile-approval/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-mobile-approval", - "version": "0.2.17", + "version": "0.2.20", "description": "flow-engine pc mobile approval components", "type": "module", "sideEffects": [ diff --git a/packages/flow-mobile/flow-mobile-form/CHANGELOG.md b/packages/flow-mobile/flow-mobile-form/CHANGELOG.md index 36b9e23..514eec1 100644 --- a/packages/flow-mobile/flow-mobile-form/CHANGELOG.md +++ b/packages/flow-mobile/flow-mobile-form/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-mobile-form +## 0.2.20 + +### Patch Changes + +- 版本升级至 0.2.20(配合 flow-engine 后端版本升级,本包无功能变更) + ## 0.2.17 ### Patch Changes diff --git a/packages/flow-mobile/flow-mobile-form/package.json b/packages/flow-mobile/flow-mobile-form/package.json index 9dacb5f..b68c023 100644 --- a/packages/flow-mobile/flow-mobile-form/package.json +++ b/packages/flow-mobile/flow-mobile-form/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-mobile-form", - "version": "0.2.17", + "version": "0.2.20", "description": "flow-engine mobile form engine", "type": "module", "sideEffects": [ diff --git a/packages/flow-mobile/flow-mobile-ui/CHANGELOG.md b/packages/flow-mobile/flow-mobile-ui/CHANGELOG.md index 3e58695..d8d3668 100644 --- a/packages/flow-mobile/flow-mobile-ui/CHANGELOG.md +++ b/packages/flow-mobile/flow-mobile-ui/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-mobile-ui +## 0.2.20 + +### Patch Changes + +- 版本升级至 0.2.20(配合 flow-engine 后端版本升级,本包无功能变更) + ## 0.2.17 ## 0.2.16 diff --git a/packages/flow-mobile/flow-mobile-ui/package.json b/packages/flow-mobile/flow-mobile-ui/package.json index cea85a4..184a3e3 100644 --- a/packages/flow-mobile/flow-mobile-ui/package.json +++ b/packages/flow-mobile/flow-mobile-ui/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-mobile-ui", - "version": "0.2.17", + "version": "0.2.20", "description": "flow-engine mobile ui components", "type": "module", "sideEffects": [ diff --git a/packages/flow-pc/flow-pc-approval/CHANGELOG.md b/packages/flow-pc/flow-pc-approval/CHANGELOG.md index 91f86a5..cbbd913 100644 --- a/packages/flow-pc/flow-pc-approval/CHANGELOG.md +++ b/packages/flow-pc/flow-pc-approval/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-pc-approval +## 0.2.20 + +### Patch Changes + +- 版本升级至 0.2.20(配合 flow-engine 后端版本升级,本包无功能变更) + ## 0.2.17 ### Patch Changes diff --git a/packages/flow-pc/flow-pc-approval/package.json b/packages/flow-pc/flow-pc-approval/package.json index 1dbd4b9..74224db 100644 --- a/packages/flow-pc/flow-pc-approval/package.json +++ b/packages/flow-pc/flow-pc-approval/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-pc-approval", - "version": "0.2.17", + "version": "0.2.20", "description": "flow-engine pc form approval components", "type": "module", "sideEffects": [ diff --git a/packages/flow-pc/flow-pc-form/CHANGELOG.md b/packages/flow-pc/flow-pc-form/CHANGELOG.md index cfb95b3..571a12b 100644 --- a/packages/flow-pc/flow-pc-form/CHANGELOG.md +++ b/packages/flow-pc/flow-pc-form/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-pc-form +## 0.2.20 + +### Patch Changes + +- 版本升级至 0.2.20(配合 flow-engine 后端版本升级,本包无功能变更) + ## 0.2.17 ### Patch Changes diff --git a/packages/flow-pc/flow-pc-form/package.json b/packages/flow-pc/flow-pc-form/package.json index 54bd5a2..3dc30a5 100644 --- a/packages/flow-pc/flow-pc-form/package.json +++ b/packages/flow-pc/flow-pc-form/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-pc-form", - "version": "0.2.17", + "version": "0.2.20", "description": "flow-engine pc form engine", "type": "module", "sideEffects": [ diff --git a/packages/flow-pc/flow-pc-ui/CHANGELOG.md b/packages/flow-pc/flow-pc-ui/CHANGELOG.md index ba05688..1c94946 100644 --- a/packages/flow-pc/flow-pc-ui/CHANGELOG.md +++ b/packages/flow-pc/flow-pc-ui/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-pc-ui +## 0.2.20 + +### Patch Changes + +- 版本升级至 0.2.20(配合 flow-engine 后端版本升级,本包无功能变更) + ## 0.2.17 ## 0.2.16 diff --git a/packages/flow-pc/flow-pc-ui/package.json b/packages/flow-pc/flow-pc-ui/package.json index bf01c0e..3fb258b 100644 --- a/packages/flow-pc/flow-pc-ui/package.json +++ b/packages/flow-pc/flow-pc-ui/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-pc-ui", - "version": "0.2.17", + "version": "0.2.20", "description": "flow-engine pc ui components", "type": "module", "sideEffects": [ diff --git a/packages/flow-types/CHANGELOG.md b/packages/flow-types/CHANGELOG.md index 6e03948..0a3eca0 100644 --- a/packages/flow-types/CHANGELOG.md +++ b/packages/flow-types/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-types +## 0.2.20 + +### Patch Changes + +- 版本升级至 0.2.20(配合 flow-engine 后端版本升级,本包无功能变更) + ## 0.2.17 ## 0.2.16 diff --git a/packages/flow-types/package.json b/packages/flow-types/package.json index 5954196..5f2d2f8 100644 --- a/packages/flow-types/package.json +++ b/packages/flow-types/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-types", - "version": "0.2.17", + "version": "0.2.20", "description": "flow-engine types", "type": "module", "sideEffects": [ From f48d5898ac1131333f035a93339aaa451908664f Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Thu, 12 Nov 2026 10:44:11 +0800 Subject: [PATCH 02/12] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E5=8D=8F?= =?UTF-8?q?=E4=BD=9C=E8=A7=84=E8=8C=83=EF=BC=9A=E5=85=81=E8=AE=B8=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E4=B8=8E=E6=8E=A8=E9=80=81=EF=BC=8C=E7=A6=81=E6=AD=A2?= =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E5=90=88=E5=B9=B6=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 允许执行 git commit / git push,提交前需完成本地编译与测试验证 - 明确禁止主动执行 git merge、自行合并或关闭 PR,dev / main 的合并由用户决定 --- AGENTS.md | 7 ++++--- CLAUDE.md | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 0dc8053..8a7b92b 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -98,10 +98,11 @@ React 18、TypeScript 5、pnpm 10、Rsbuild/Rslib(构建)、@rstest/core( ## 开发规范 -### 禁止自动提交 +### 提交、推送与分支合并 -- **未经用户明确要求,任何情况下不得执行 `git commit` / `git push` / `git merge` 操作** -- 所有代码变更需经用户审核后再提交 +- **允许执行 `git commit` 与 `git push`**:提交前必须完成本地编译与测试验证,提交信息使用中文并说明改动内容 +- **禁止主动合并分支**:不得执行 `git merge`,也不得自行合并或关闭 PR;`dev` / `main` 的合并一律由用户决定 +- 推送后保持分支可审核状态,由用户决定是否合并 ### 基本规范 diff --git a/CLAUDE.md b/CLAUDE.md index 34259e7..68a58e5 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -103,10 +103,11 @@ React 18、TypeScript 5、pnpm 10、Rsbuild/Rslib(构建)、@rstest/core( ## 开发规范 -### 禁止自动提交 +### 提交、推送与分支合并 -- **未经用户明确要求,任何情况下不得执行 `git commit` / `git push` / `git merge` 操作** -- 所有代码变更需经用户审核后再提交 +- **允许执行 `git commit` 与 `git push`**:提交前必须完成本地编译与测试验证,提交信息使用中文并说明改动内容 +- **禁止主动合并分支**:不得执行 `git merge`,也不得自行合并或关闭 PR;`dev` / `main` 的合并一律由用户决定 +- 推送后保持分支可审核状态,由用户决定是否合并 ### 基本规范 From c12677f401d2ee48ef231eb69346ac618db1117f Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Thu, 12 Nov 2026 10:44:16 +0800 Subject: [PATCH 03/12] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=87=8F?= =?UTF-8?q?=E7=AD=BE=E5=8A=A8=E4=BD=9C=20REDUCE=5FAUDIT=EF=BC=88PC=20/=20?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=20/=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=EF=BC=89(#72)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - flow-types:ActionType 增加 REDUCE_AUDIT,actionOptions 增加「减签」 - flow-core:FlowMessageKey.APPROVAL_REDUCE_AUDIT 及默认文案 - flow-approval-presenter:新增 ReduceAuditViewPlugin,供集成方替换减签人员选择视图 - flow-pc-approval / flow-mobile-approval:新增减签按钮与提交逻辑(advice.forwardOperatorIds),ActionFactory 注册 - flow-design:新增减签动作配置(人员范围 script),ActionFactory 注册 - 补充 PC / 移动端 / 设计器的动作注册单元测试 --- .changeset/reduce-audit-action.md | 16 ++ .../src/plugins/index.ts | 1 + .../src/plugins/reduce-audit-type.ts | 19 +++ packages/flow-core/src/message.ts | 2 + .../components/action/components/factory.tsx | 2 + .../action/components/reduce-audit.tsx | 47 ++++++ .../components/reduce-audit-action.test.ts | 26 +++ .../components/action/factory.tsx | 2 + .../components/action/reduce-audit.tsx | 133 +++++++++++++++ .../flow-approval/typings/plugin-type.ts | 1 + .../src/plugins/view/reduce-audit-view.tsx | 54 ++++++ .../tests/reduce-audit-action.test.tsx | 39 +++++ .../components/action/factory.tsx | 2 + .../components/action/reduce-audit.tsx | 155 ++++++++++++++++++ .../flow-approval/typings/plugin-type.ts | 1 + .../src/plugins/view/reduce-audit-view.tsx | 48 ++++++ .../tests/reduce-audit-action.test.tsx | 39 +++++ packages/flow-types/src/types/flow-design.ts | 3 + 18 files changed, 590 insertions(+) create mode 100644 .changeset/reduce-audit-action.md create mode 100644 packages/flow-approval-presenter/src/plugins/reduce-audit-type.ts create mode 100644 packages/flow-design/src/script-components/components/action/components/reduce-audit.tsx create mode 100644 packages/flow-design/tests/components/reduce-audit-action.test.ts create mode 100644 packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/action/reduce-audit.tsx create mode 100644 packages/flow-mobile/flow-mobile-approval/src/plugins/view/reduce-audit-view.tsx create mode 100644 packages/flow-mobile/flow-mobile-approval/tests/reduce-audit-action.test.tsx create mode 100644 packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/reduce-audit.tsx create mode 100644 packages/flow-pc/flow-pc-approval/src/plugins/view/reduce-audit-view.tsx create mode 100644 packages/flow-pc/flow-pc-approval/tests/reduce-audit-action.test.tsx diff --git a/.changeset/reduce-audit-action.md b/.changeset/reduce-audit-action.md new file mode 100644 index 0000000..ece3581 --- /dev/null +++ b/.changeset/reduce-audit-action.md @@ -0,0 +1,16 @@ +--- +"@coding-flow/flow-types": patch +"@coding-flow/flow-core": patch +"@coding-flow/flow-approval-presenter": patch +"@coding-flow/flow-pc-approval": patch +"@coding-flow/flow-mobile-approval": patch +"@coding-flow/flow-design": patch +--- + +feat: 支持减签动作 REDUCE_AUDIT(codingapi/flow-engine#266、codingapi/flow-frontend#72) + +- `ActionType` 增加 `REDUCE_AUDIT`,`actionOptions` 增加「减签」,设计器可配置减签动作。 +- PC / 移动端新增减签按钮与提交逻辑,通过 `advice.forwardOperatorIds` 传递被减签人;与加签同构,支持自定义弹框内容与事件总线触发。 +- 新增 `ReduceAuditViewPlugin`(`ReduceAuditViewPluginKey`)用于替换减签人员选择视图;默认实现为占位,集成方应列出当前节点的待审批人(不含当前审批人)。 +- 设计器新增减签动作配置:仅「减签人员范围」(script),不提供「最大可选人数」。 +- `FlowMessageKey.APPROVAL_REDUCE_AUDIT` 增加默认提示文案。 diff --git a/packages/flow-approval-presenter/src/plugins/index.ts b/packages/flow-approval-presenter/src/plugins/index.ts index 454c6e6..8e765ec 100644 --- a/packages/flow-approval-presenter/src/plugins/index.ts +++ b/packages/flow-approval-presenter/src/plugins/index.ts @@ -1,4 +1,5 @@ export {type AddAuditViewPlugin,VIEW_KEY as AddAuditViewPluginKey} from "./add-audit-type"; +export {type ReduceAuditViewPlugin,VIEW_KEY as ReduceAuditViewPluginKey} from "./reduce-audit-type"; export {type DelegateViewPlugin,VIEW_KEY as DelegateViewPluginKey} from "./delegate-type"; export {type ReturnViewPlugin,VIEW_KEY as ReturnViewPluginKey} from "./return-type"; export {type SignKeyViewPlugin,VIEW_KEY as SignKeyViewPluginKey} from "./sign-key-type"; diff --git a/packages/flow-approval-presenter/src/plugins/reduce-audit-type.ts b/packages/flow-approval-presenter/src/plugins/reduce-audit-type.ts new file mode 100644 index 0000000..49f589c --- /dev/null +++ b/packages/flow-approval-presenter/src/plugins/reduce-audit-type.ts @@ -0,0 +1,19 @@ +import React from "react"; +import {ApprovalViewPluginAction} from "@/plugins/approval-view-plugin-action"; + +export const VIEW_KEY = 'ReduceAuditViewPlugin'; + +/** + * 减签人员选择视图(issue-72) + * + * 默认实现只是占位,真实项目应注册该视图,列出当前节点的待审批人(不含当前审批人)。 + * 被减签人是否合法最终由服务端校验。 + */ +export interface ReduceAuditViewPlugin { + /** 返回用户 */ + onChange?: (value: string|string[]) => void; + /** 当前用户 */ + value?: string|string[]; + /** 动作控制 **/ + action?:React.Ref; +} diff --git a/packages/flow-core/src/message.ts b/packages/flow-core/src/message.ts index 3fb1809..a7fa0ce 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/src/script-components/components/action/components/factory.tsx b/packages/flow-design/src/script-components/components/action/components/factory.tsx index 53e519c..4e0192d 100644 --- a/packages/flow-design/src/script-components/components/action/components/factory.tsx +++ b/packages/flow-design/src/script-components/components/action/components/factory.tsx @@ -3,6 +3,7 @@ import {ActionFormProps} from "@/script-components/typings"; import {ActionType} from "@coding-flow/flow-types"; import {CustomActionForm} from "@/script-components/components/action/components/custom"; import {AddAuditActionForm} from "@/script-components/components/action/components/add-audit"; +import {ReduceAuditActionForm} from "@/script-components/components/action/components/reduce-audit"; import {DelegateActionForm} from "@/script-components/components/action/components/delegate"; import {RejectActionForm} from "@/script-components/components/action/components/reject"; import {TransferActionForm} from "@/script-components/components/action/components/transfer"; @@ -18,6 +19,7 @@ export class ActionFactory{ private initialize():void{ this.actions.set('ADD_AUDIT',AddAuditActionForm); + this.actions.set('REDUCE_AUDIT',ReduceAuditActionForm); this.actions.set('CUSTOM',CustomActionForm); this.actions.set('DELEGATE',DelegateActionForm); this.actions.set('REJECT',RejectActionForm); diff --git a/packages/flow-design/src/script-components/components/action/components/reduce-audit.tsx b/packages/flow-design/src/script-components/components/action/components/reduce-audit.tsx new file mode 100644 index 0000000..9f26939 --- /dev/null +++ b/packages/flow-design/src/script-components/components/action/components/reduce-audit.tsx @@ -0,0 +1,47 @@ +import React from "react"; +import {ActionFormProps} from "@/script-components/typings"; +import {Col, Form, Row} from "antd"; +import {OperatorLoadPluginView} from "@/plugins/view/operator-load-view"; + +interface ReduceAuditInputProps{ + value?:string; + onChange?:(value:string) => void; +} + +const ReduceAuditInput:React.FC = (props)=>{ + + const script = props.value || ''; + + const handleChange = (value:string)=>{ + props.onChange && props.onChange(value); + } + + return ( + + ) +} + +/** + * 减签动作配置 + * + * 仅配置可减签的人员范围,不需要「最大可选人数」:一次减签可以撤下多位审批人。 + */ +export const ReduceAuditActionForm:React.FC = (props)=>{ + + return ( + + + + + + + + ) +} diff --git a/packages/flow-design/tests/components/reduce-audit-action.test.ts b/packages/flow-design/tests/components/reduce-audit-action.test.ts new file mode 100644 index 0000000..14d4d08 --- /dev/null +++ b/packages/flow-design/tests/components/reduce-audit-action.test.ts @@ -0,0 +1,26 @@ +import { describe, expect, it } from "@rstest/core"; +import { ActionFactory } from "@/script-components/components/action/components/factory"; + +/** + * 减签动作配置(后端 issue #266 / 前端 issue-72) + * + * 设计器动作列表依赖 actionOptions 展示类型名称,配置弹窗依赖 ActionFactory 选择表单。 + */ +describe('设计器减签动作', () => { + + it('REDUCE_AUDIT 应映射到减签动作表单', () => { + // when + const form = ActionFactory.getInstance().getActionForm('REDUCE_AUDIT'); + + // then + expect(form).toBeTruthy(); + }); + + it('未注册的动作类型应返回 undefined', () => { + // when + const form = ActionFactory.getInstance().getActionForm('UNKNOWN_ACTION' as never); + + // then + expect(form).toBeUndefined(); + }); +}); diff --git a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/action/factory.tsx b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/action/factory.tsx index b5173e6..df48382 100644 --- a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/action/factory.tsx +++ b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/action/factory.tsx @@ -3,6 +3,7 @@ import {FlowActionProps} from "./type"; import {FlowAction} from "@coding-flow/flow-types"; import {PassAction} from "@/components/flow-approval/components/action/pass"; import {AddAuditAction} from "@/components/flow-approval/components/action/add-audit"; +import {ReduceAuditAction} from "@/components/flow-approval/components/action/reduce-audit"; import {CustomAction} from "@/components/flow-approval/components/action/custom"; import {DelegateAction} from "@/components/flow-approval/components/action/delegate"; import {RejectAction} from "@/components/flow-approval/components/action/reject"; @@ -28,6 +29,7 @@ export class ActionFactory { private initActions() { this.cache.set("ADD_AUDIT", AddAuditAction); + this.cache.set("REDUCE_AUDIT", ReduceAuditAction); this.cache.set("CUSTOM", CustomAction); this.cache.set("DELEGATE", DelegateAction); this.cache.set("PASS", PassAction); diff --git a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/action/reduce-audit.tsx b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/action/reduce-audit.tsx new file mode 100644 index 0000000..ab012c7 --- /dev/null +++ b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/action/reduce-audit.tsx @@ -0,0 +1,133 @@ +import React from "react"; +import {FlowActionProps} from "./type"; +import {Form, Toast} from "antd-mobile"; +import {ApprovalViewPluginAction, DialogContent, useApprovalContext} from "@coding-flow/flow-approval-presenter"; +import {ReduceAuditView} from "@/plugins/view/reduce-audit-view"; +import {PopupModal} from "@coding-flow/flow-mobile-ui"; +import {EventBus, ViewBindPlugin, FlowMessageKey, FlowMessageRegistry} from "@coding-flow/flow-core"; +import {APPROVAL_ACTION_REDUCE_AUDIT_KEY} from "@/components/flow-approval"; + +/** + * 减签 + * + * 由当前审批人把指定审批人从当前节点撤下,提交时通过 forwardOperatorIds 传递被减签人; + * 目标是否属于当前节点的待审批人由服务端校验。 + * @param props + * @constructor + */ +export const ReduceAuditAction: React.FC = (props) => { + + const action = props.action; + const {state, context} = useApprovalContext(); + const [form] = Form.useForm(); + + const actionPresenter = context.getPresenter().getFlowActionPresenter(); + const actionLoading = state.actionLoading ?? false; + + const [modalVisible, setModalVisible] = React.useState(false); + const [dialogContent, setDialogContent] = React.useState(null); + + const actionRef = React.useRef(null); + + /** 打开弹框:解析自定义弹框内容(标题/中间内容),并重置表单 */ + const openModal = () => { + form.resetFields(); + setDialogContent(null); + actionPresenter.resolveDialogContent(action.id).then(setDialogContent); + setModalVisible(true); + } + + const handlerOK = ()=>{ + // 自定义弹框内容时退化为纯确认框,直接提交(无表单可校验) + if(dialogContent?.content){ + handleSubmit(); + return; + } + if(actionRef.current){ + actionRef.current.onValidate().then(res=>{ + if(res){ + form.submit(); + } + }) + return; + } + form.submit(); + } + + const handleSubmit = (params?: any) => { + actionPresenter.action(action.id, params).then((res) => { + if (res.success) { + Toast.show( + FlowMessageRegistry.getInstance().get( + FlowMessageKey.APPROVAL_REDUCE_AUDIT, + actionPresenter.buildActionContext(action.id) + ) + ); + setModalVisible(false); + context.close(); + } + }); + } + + React.useEffect(()=>{ + EventBus.getInstance().on(action.id,()=>{ + openModal(); + }); + + return () => { + EventBus.getInstance().off(action.id); + } + },[]); + + const ActionView = ViewBindPlugin.getInstance().get(APPROVAL_ACTION_REDUCE_AUDIT_KEY); + + if (ActionView) { + return ( + + ) + } + + return ( + <> + setModalVisible(false)} + onOk={() => { + handlerOK(); + }} + > + {dialogContent?.content ? ( + dialogContent.content + ) : ( +
{ + handleSubmit(values); + }} + > + + + +
+ )} +
+ + ) +} diff --git a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/typings/plugin-type.ts b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/typings/plugin-type.ts index 7c6f395..49349be 100644 --- a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/typings/plugin-type.ts +++ b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/typings/plugin-type.ts @@ -3,6 +3,7 @@ export const APPROVAL_BODY_VIEW_KEY = 'APPROVAL_BODY_VIEW_KEY'; export const APPROVAL_FOOTER_VIEW_KEY = 'APPROVAL_FOOTER_VIEW_KEY'; export const APPROVAL_ACTION_ADD_AUDIT_KEY = 'APPROVAL_ACTION_ADD_AUDIT_KEY'; +export const APPROVAL_ACTION_REDUCE_AUDIT_KEY = 'APPROVAL_ACTION_REDUCE_AUDIT_KEY'; export const APPROVAL_ACTION_CUSTOM_KEY = 'APPROVAL_ACTION_CUSTOM_KEY'; export const APPROVAL_ACTION_DELEGATE_KEY = 'APPROVAL_ACTION_DELEGATE_KEY'; export const APPROVAL_ACTION_PASS_KEY = 'APPROVAL_ACTION_PASS_KEY'; diff --git a/packages/flow-mobile/flow-mobile-approval/src/plugins/view/reduce-audit-view.tsx b/packages/flow-mobile/flow-mobile-approval/src/plugins/view/reduce-audit-view.tsx new file mode 100644 index 0000000..1a3cca1 --- /dev/null +++ b/packages/flow-mobile/flow-mobile-approval/src/plugins/view/reduce-audit-view.tsx @@ -0,0 +1,54 @@ +import React from "react"; +import {ReduceAuditViewPlugin, ReduceAuditViewPluginKey} from "@coding-flow/flow-approval-presenter"; +import {ViewBindPlugin} from "@coding-flow/flow-core"; +import {Selector} from "antd-mobile"; +import {useApprovalContext} from "@coding-flow/flow-approval-presenter"; + +/** + * 减签人员选择视图 + * + * 默认实现只提供占位选项,真实项目应通过 ViewBindPlugin 注册视图, + * 列出当前节点的待审批人(不含当前审批人)。 + */ +export const ReduceAuditView: React.FC = (props) => { + const ReduceAuditViewComponent = ViewBindPlugin.getInstance().get(ReduceAuditViewPluginKey); + + const {state} = useApprovalContext(); + + const value = React.useMemo(()=>{ + if(props.value) { + if (Array.isArray(props.value)) { + return props.value; + }else { + return [props.value] + } + } + return []; + },[props.value]); + + const createOperator = state.flow?.createOperator; + + const options = createOperator?[ + { + label:createOperator.name, + value:createOperator.id + '', + } + ]:[]; + + if (ReduceAuditViewComponent) { + return ( + + ); + } + + return ( + { + props.onChange?.(next); + }} + options={options} + /> + ) +} diff --git a/packages/flow-mobile/flow-mobile-approval/tests/reduce-audit-action.test.tsx b/packages/flow-mobile/flow-mobile-approval/tests/reduce-audit-action.test.tsx new file mode 100644 index 0000000..ad92d50 --- /dev/null +++ b/packages/flow-mobile/flow-mobile-approval/tests/reduce-audit-action.test.tsx @@ -0,0 +1,39 @@ +import { describe, expect, it } from "@rstest/core"; +import { FlowAction } from "@coding-flow/flow-types"; +import { ActionFactory } from "@/components/flow-approval/components/action/factory"; + +/** + * 减签动作(后端 issue #266 / 前端 issue-72) + * + * 后端审批节点会返回 REDUCE_AUDIT 动作,前端必须注册对应组件,否则按钮不渲染。 + */ +describe('移动端减签动作注册', () => { + + it('REDUCE_AUDIT 应渲染减签组件', () => { + // given + const action = { + id: 'reduce-audit-1', + type: 'REDUCE_AUDIT', + } as FlowAction; + + // when + const element = ActionFactory.getInstance().render(action); + + // then + expect(element).toBeTruthy(); + }); + + it('未注册的动作类型应返回 undefined', () => { + // given + const action = { + id: 'unknown-1', + type: 'UNKNOWN_ACTION', + } as unknown as FlowAction; + + // when + const element = ActionFactory.getInstance().render(action); + + // then + expect(element).toBeUndefined(); + }); +}); diff --git a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/factory.tsx b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/factory.tsx index 71a5fcd..2831072 100644 --- a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/factory.tsx +++ b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/factory.tsx @@ -3,6 +3,7 @@ import {FlowActionProps} from "./type"; import {FlowAction} from "@coding-flow/flow-types"; import {PassAction} from "@/components/flow-approval/components/action/pass"; import {AddAuditAction} from "@/components/flow-approval/components/action/add-audit"; +import {ReduceAuditAction} from "@/components/flow-approval/components/action/reduce-audit"; import {CustomAction} from "@/components/flow-approval/components/action/custom"; import {DelegateAction} from "@/components/flow-approval/components/action/delegate"; import {RejectAction} from "@/components/flow-approval/components/action/reject"; @@ -28,6 +29,7 @@ export class ActionFactory { private initActions() { this.cache.set("ADD_AUDIT", AddAuditAction); + this.cache.set("REDUCE_AUDIT", ReduceAuditAction); this.cache.set("CUSTOM", CustomAction); this.cache.set("DELEGATE", DelegateAction); this.cache.set("PASS", PassAction); diff --git a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/reduce-audit.tsx b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/reduce-audit.tsx new file mode 100644 index 0000000..8687b03 --- /dev/null +++ b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/reduce-audit.tsx @@ -0,0 +1,155 @@ +import React from "react"; +import { FlowActionProps } from "./type"; +import { Form, message } from "antd"; +import { ApprovalViewPluginAction, DialogContent, useApprovalContext } from "@coding-flow/flow-approval-presenter"; +import { ReduceAuditView } from "@/plugins/view/reduce-audit-view"; +import { CustomStyleButton } from "@/components/flow-approval/components/custom-style-button"; +import { ViewBindPlugin, FlowMessageKey, FlowMessageRegistry, EventBus } from "@coding-flow/flow-core"; +import { ResizableModal } from "@/components/flow-approval/components/resizable-modal"; +import { APPROVAL_ACTION_REDUCE_AUDIT_KEY } from "@/components/flow-approval"; + +/** + * 减签 + * + * 由当前审批人把指定审批人从当前节点撤下,提交时通过 forwardOperatorIds 传递被减签人; + * 目标是否属于当前节点的待审批人由服务端校验。 + * @param props + * @constructor + */ +export const ReduceAuditAction: React.FC = (props) => { + + const action = props.action; + const { state, context } = useApprovalContext(); + const [form] = Form.useForm(); + + const actionPresenter = context.getPresenter().getFlowActionPresenter(); + const actionLoading = state.actionLoading ?? false; + + const [modalVisible, setModalVisible] = React.useState(false); + const [dialogContent, setDialogContent] = React.useState(null); + + const actionRef = React.useRef(null); + + /** 打开弹框:解析自定义弹框内容(标题/中间内容),并重置表单 */ + const openModal = () => { + form.resetFields(); + setDialogContent(null); + actionPresenter.resolveDialogContent(action.id).then(setDialogContent); + setModalVisible(true); + } + + const handlerOK = () => { + // 自定义弹框内容时退化为纯确认框,直接提交(无表单可校验) + if (dialogContent?.content) { + handleSubmit(); + return; + } + if (actionRef.current) { + actionRef.current.onValidate().then(res => { + if (res) { + form.submit(); + } + }) + return; + } + form.submit(); + } + + const handleSubmit = (params?: any) => { + actionPresenter.action(action.id, params).then((res) => { + if (res.success) { + message.success( + FlowMessageRegistry.getInstance().get( + FlowMessageKey.APPROVAL_REDUCE_AUDIT, + actionPresenter.buildActionContext(action.id) + ) + ); + setModalVisible(false); + context.close(); + } + }); + } + + React.useEffect(() => { + EventBus.getInstance().on(action.id, () => { + if (props.onClickCheck?.(action.id)) { + openModal(); + } + }); + + return () => { + EventBus.getInstance().off(action.id); + } + }, []); + + const ActionView = ViewBindPlugin.getInstance().get(APPROVAL_ACTION_REDUCE_AUDIT_KEY); + + if (ActionView) { + return ( + + ) + } + + + return ( + <> + {!props.hidden && ( + { + if (props.onClickCheck?.(action.id)) { + openModal(); + } + }} + title={action.title} + /> + )} + + setModalVisible(false)} + onOk={() => { + handlerOK(); + }} + > + {dialogContent?.content ? ( + dialogContent.content + ) : ( +
{ + handleSubmit(values); + }} + > + + + +
+ )} +
+ + ) +} diff --git a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/typings/plugin-type.ts b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/typings/plugin-type.ts index 73425fd..a410386 100644 --- a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/typings/plugin-type.ts +++ b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/typings/plugin-type.ts @@ -5,6 +5,7 @@ export const APPROVAL_FOOTER_VIEW_KEY = 'APPROVAL_FOOTER_VIEW_KEY'; export const APPROVAL_BODY_SIDER_VIEW_KEY = 'APPROVAL_BODY_SIDER_VIEW_KEY'; export const APPROVAL_ACTION_ADD_AUDIT_KEY = 'APPROVAL_ACTION_ADD_AUDIT_KEY'; +export const APPROVAL_ACTION_REDUCE_AUDIT_KEY = 'APPROVAL_ACTION_REDUCE_AUDIT_KEY'; export const APPROVAL_ACTION_CLOSE_KEY = 'APPROVAL_ACTION_CLOSE_KEY'; export const APPROVAL_ACTION_CUSTOM_KEY = 'APPROVAL_ACTION_CUSTOM_KEY'; export const APPROVAL_ACTION_DELEGATE_KEY = 'APPROVAL_ACTION_DELEGATE_KEY'; diff --git a/packages/flow-pc/flow-pc-approval/src/plugins/view/reduce-audit-view.tsx b/packages/flow-pc/flow-pc-approval/src/plugins/view/reduce-audit-view.tsx new file mode 100644 index 0000000..727fca9 --- /dev/null +++ b/packages/flow-pc/flow-pc-approval/src/plugins/view/reduce-audit-view.tsx @@ -0,0 +1,48 @@ +import React from "react"; +import {ReduceAuditViewPlugin, ReduceAuditViewPluginKey} from "@coding-flow/flow-approval-presenter"; +import {ViewBindPlugin} from "@coding-flow/flow-core"; +import {Select} from "antd"; +import {useApprovalContext} from "@coding-flow/flow-approval-presenter"; + +/** + * 减签人员选择视图 + * + * 默认实现只提供占位选项,真实项目应通过 ViewBindPlugin 注册视图, + * 列出当前节点的待审批人(不含当前审批人)。 + */ +export const ReduceAuditView: React.FC = (props) => { + const ReduceAuditViewComponent = ViewBindPlugin.getInstance().get(ReduceAuditViewPluginKey); + + const {state} = useApprovalContext(); + + const createOperator = state.flow?.createOperator; + + const options = createOperator?[ + { + label:createOperator.name, + value:createOperator.id, + } + ]:[]; + + if (ReduceAuditViewComponent) { + return ( + + ); + } + + const handleChange = (value: string|string[]) => { + props.onChange?.(value); + } + + return ( + { @@ -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 9fa98b1..c1302d4 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 0b3e99b..39d099e 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 = (props) => { return [...columns, option]; }, []); - // 回掉登记当前选中中的合并流程 + // 回掉登记当前选中中的合并流程。 + // 取消选择时必须同步空数组,否则 presenter 会残留上一次的选择, + // 导致「未勾选任何流程」也能提交(issue-72 测试反馈) React.useEffect(() => { - if (recordIdList.length > 0) { - props.onMergeRecordIdsSelected?.(recordIdList); - } + props.onMergeRecordIdsSelected?.(recordIdList); }, [recordIdList]); // 切换是触发右侧节点列表的筛选 From b7663c46127e389ca72ecc07031197a7df8e132e Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Thu, 12 Nov 2026 11:37:51 +0800 Subject: [PATCH 05/12] =?UTF-8?q?feat(approval):=20=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=8C=89=E5=8A=A8=E4=BD=9C=20batchable=20?= =?UTF-8?q?=E5=86=B3=E5=AE=9A=E6=98=AF=E5=90=A6=E6=89=B9=E9=87=8F=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - FlowAction 增加 batchable 标记,ActionType 补充 REDUCE_AUDIT - FlowActionPresenter 新增 isBatchable,非批量动作只提交当前详情记录 - PC/移动端合并审批不再强制要求为非批量动作勾选流程 - 新增 action-batchable 单测 --- .../src/presenters/action.ts | 27 ++++- .../tests/action-batchable.test.ts | 111 ++++++++++++++++++ .../components/flow-approval-actions.tsx | 3 +- .../components/flow-approval-actions.tsx | 3 +- .../flow-types/src/types/flow-approval.ts | 2 + 5 files changed, 140 insertions(+), 6 deletions(-) create mode 100644 packages/flow-approval-presenter/tests/action-batchable.test.ts diff --git a/packages/flow-approval-presenter/src/presenters/action.ts b/packages/flow-approval-presenter/src/presenters/action.ts index 78792ee..44b6296 100644 --- a/packages/flow-approval-presenter/src/presenters/action.ts +++ b/packages/flow-approval-presenter/src/presenters/action.ts @@ -188,6 +188,20 @@ export class FlowActionPresenter { return this.submitRecordIds; } + /** + * 动作是否支持合并批量提交。 + * + * 由服务端 detail 响应的 `action.batchable` 声明,缺省视为支持(兼容旧版本服务端)。 + * 减签等「目标按流程实例隔离」的动作声明为 false:合并审批时不循环提交多个勾选记录, + * 只提交当前打开详情的那条流程记录,避免把 A 流程的候选人错配到 B 流程。 + * + * @param actionId 动作 ID + */ + public isBatchable(actionId: string): boolean { + const action = this.getAction(actionId); + return action?.batchable !== false; + } + public syncState(state: ApprovalState) { this.state = JSON.parse(JSON.stringify(state)); } @@ -283,8 +297,8 @@ export class FlowActionPresenter { } - private async submitAction(actionId: string, formData: any, params?: any) { - const recordId = formData.recordId || this.createdRecordId || this.state.flow?.recordId; + private async submitAction(actionId: string, formData: any, params?: any, fixedRecordId?: number) { + const recordId = fixedRecordId || formData.recordId || this.createdRecordId || this.state.flow?.recordId; const workCode = this.state.flow?.workCode || ''; if (formData.recordId) { @@ -357,14 +371,14 @@ export class FlowActionPresenter { } } - private async executeAction(actionId: string, params?: any) { + private async executeAction(actionId: string, params?: any, fixedRecordId?: number) { let formData; if (this.isPassAction(actionId)) { formData = await this.formActionContext.validate(); } else { formData = this.formActionContext.save(); } - return await this.submitAction(actionId, formData, params); + return await this.submitAction(actionId, formData, params, fixedRecordId); } @@ -461,7 +475,12 @@ export class FlowActionPresenter { try { // 流程合并审批 const mergeable = this.state.flow?.mergeable || false; + const batchable = this.isBatchable(actionId); const submitRecordIds = this.submitRecordIds; + if (mergeable && !batchable) { + // 不支持批量的动作(如减签)只提交当前详情的记录,忽略合并勾选 + return await this.executeAction(actionId, params, this.state.flow?.recordId); + } if (mergeable && submitRecordIds.length > 0) { const submitRecordIds = this.submitRecordIds; for (const recordId of submitRecordIds) { 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 0000000..6bc09ff --- /dev/null +++ b/packages/flow-approval-presenter/tests/action-batchable.test.ts @@ -0,0 +1,111 @@ +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); + +/** 表单上下文固定返回记录 2 的数据,用于验证非批量动作仍提交当前详情记录 */ +const buildFormContext = () => { + const formContext = new FormActionContext(); + formContext.addAction({ + save: () => ({ recordId: 2, name: 'b' }), + key: () => 'view-form', + validate: async () => ({ recordId: 2, 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('缺少 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-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 0c23c9b..4fe9b26 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 @@ -25,7 +25,8 @@ export const FlowApprovalActions = () => { const action = actionPresenter.getAction(id); // 合并待办必须先显式选择要处理的流程记录,不能以「表单已有数据」代替选择 // (未选择时提交会落到默认记录上,issue-72 测试反馈) - if (state.flow?.mergeable) { + // 不支持批量的动作(如减签)只作用于当前记录,不要求勾选合并流程 + if (state.flow?.mergeable && actionPresenter.isBatchable(id)) { const todoCount = state.flow?.todos?.length ?? 0; const selectRecordIds = actionPresenter.getSubmitRecordIds(); if (todoCount > 1 && selectRecordIds.length == 0) { 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 c1302d4..a3cf10d 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 @@ -20,7 +20,8 @@ export const FlowApprovalActions = () => { // 合并待办(多条记录合并成一条 todo)必须先显式选择要处理的流程记录。 // 不能以「表单已有数据」代替选择:表单数据只代表当前展示的记录, // 未选择时提交会落到默认记录上(issue-72 测试反馈) - if (state.flow?.mergeable) { + // 不支持批量的动作(如减签)只作用于当前记录,不要求勾选合并流程 + if (state.flow?.mergeable && actionPresenter.isBatchable(id)) { const todoCount = state.flow?.todos?.length ?? 0; const selectRecordIds = actionPresenter.getSubmitRecordIds(); if (todoCount > 1 && selectRecordIds.length == 0) { diff --git a/packages/flow-types/src/types/flow-approval.ts b/packages/flow-types/src/types/flow-approval.ts index 2b9515d..40fcb95 100644 --- a/packages/flow-types/src/types/flow-approval.ts +++ b/packages/flow-types/src/types/flow-approval.ts @@ -119,6 +119,8 @@ export interface FlowAction { script?: string; // 最大可选人数,-1 表示不限制,正整数表示可选人员的最大数(转办/委托/加签选人时使用) maxOperatorCount?: number; + // 是否支持合并批量提交,由服务端声明;缺省视为支持(减签等目标按流程实例隔离的动作为 false) + batchable?: boolean; // 触发类型,自定义脚本使用 triggerType?:string; // 前端触发事件,自定义脚本使用 From a367fd5ab1757ea2fba0b70c2820645c623fcd75 Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Thu, 12 Nov 2026 11:41:45 +0800 Subject: [PATCH 06/12] =?UTF-8?q?feat(approval):=20=E5=87=8F=E7=AD=BE?= =?UTF-8?q?=E5=80=99=E9=80=89=E4=BA=BA=E6=94=B9=E7=94=A8=20detail=20?= =?UTF-8?q?=E7=9A=84=20currentNodeOperators?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - FlowContent 类型增加 currentNodeOperators - PC/移动端默认减签视图列出当前节点待审批人,不再使用发起人占位 --- .../src/plugins/reduce-audit-type.ts | 3 ++- .../src/plugins/view/reduce-audit-view.tsx | 16 +++++++--------- .../src/plugins/view/reduce-audit-view.tsx | 16 +++++++--------- packages/flow-types/src/types/flow-approval.ts | 2 ++ 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/packages/flow-approval-presenter/src/plugins/reduce-audit-type.ts b/packages/flow-approval-presenter/src/plugins/reduce-audit-type.ts index 49f589c..2e779f3 100644 --- a/packages/flow-approval-presenter/src/plugins/reduce-audit-type.ts +++ b/packages/flow-approval-presenter/src/plugins/reduce-audit-type.ts @@ -6,7 +6,8 @@ export const VIEW_KEY = 'ReduceAuditViewPlugin'; /** * 减签人员选择视图(issue-72) * - * 默认实现只是占位,真实项目应注册该视图,列出当前节点的待审批人(不含当前审批人)。 + * 默认实现读取详情响应的 `currentNodeOperators`(当前节点待审批人,不含当前审批人), + * 真实项目可通过 ViewBindPlugin 注册该视图换成自己的选人组件。 * 被减签人是否合法最终由服务端校验。 */ export interface ReduceAuditViewPlugin { diff --git a/packages/flow-mobile/flow-mobile-approval/src/plugins/view/reduce-audit-view.tsx b/packages/flow-mobile/flow-mobile-approval/src/plugins/view/reduce-audit-view.tsx index 1a3cca1..177bef1 100644 --- a/packages/flow-mobile/flow-mobile-approval/src/plugins/view/reduce-audit-view.tsx +++ b/packages/flow-mobile/flow-mobile-approval/src/plugins/view/reduce-audit-view.tsx @@ -7,8 +7,8 @@ import {useApprovalContext} from "@coding-flow/flow-approval-presenter"; /** * 减签人员选择视图 * - * 默认实现只提供占位选项,真实项目应通过 ViewBindPlugin 注册视图, - * 列出当前节点的待审批人(不含当前审批人)。 + * 默认实现列出当前节点的待审批人(服务端 detail 响应的 currentNodeOperators, + * 已排除当前审批人,含顺序审批尚未激活的隐藏记录);真实项目可通过 ViewBindPlugin 覆盖。 */ export const ReduceAuditView: React.FC = (props) => { const ReduceAuditViewComponent = ViewBindPlugin.getInstance().get(ReduceAuditViewPluginKey); @@ -26,14 +26,12 @@ export const ReduceAuditView: React.FC = (props) => { return []; },[props.value]); - const createOperator = state.flow?.createOperator; + const operators = state.flow?.currentNodeOperators || []; - const options = createOperator?[ - { - label:createOperator.name, - value:createOperator.id + '', - } - ]:[]; + const options = operators.map(operator => ({ + label: operator.name, + value: operator.id + '', + })); if (ReduceAuditViewComponent) { return ( diff --git a/packages/flow-pc/flow-pc-approval/src/plugins/view/reduce-audit-view.tsx b/packages/flow-pc/flow-pc-approval/src/plugins/view/reduce-audit-view.tsx index 727fca9..3bfb6c9 100644 --- a/packages/flow-pc/flow-pc-approval/src/plugins/view/reduce-audit-view.tsx +++ b/packages/flow-pc/flow-pc-approval/src/plugins/view/reduce-audit-view.tsx @@ -7,22 +7,20 @@ import {useApprovalContext} from "@coding-flow/flow-approval-presenter"; /** * 减签人员选择视图 * - * 默认实现只提供占位选项,真实项目应通过 ViewBindPlugin 注册视图, - * 列出当前节点的待审批人(不含当前审批人)。 + * 默认实现列出当前节点的待审批人(服务端 detail 响应的 currentNodeOperators, + * 已排除当前审批人,含顺序审批尚未激活的隐藏记录);真实项目可通过 ViewBindPlugin 覆盖。 */ export const ReduceAuditView: React.FC = (props) => { const ReduceAuditViewComponent = ViewBindPlugin.getInstance().get(ReduceAuditViewPluginKey); const {state} = useApprovalContext(); - const createOperator = state.flow?.createOperator; + const operators = state.flow?.currentNodeOperators || []; - const options = createOperator?[ - { - label:createOperator.name, - value:createOperator.id, - } - ]:[]; + const options = operators.map(operator => ({ + label: operator.name, + value: operator.id, + })); if (ReduceAuditViewComponent) { return ( diff --git a/packages/flow-types/src/types/flow-approval.ts b/packages/flow-types/src/types/flow-approval.ts index 40fcb95..ea5ea10 100644 --- a/packages/flow-types/src/types/flow-approval.ts +++ b/packages/flow-types/src/types/flow-approval.ts @@ -369,6 +369,8 @@ export interface FlowContent { createOperator: FlowOperator; // 当前流程 currentOperator: FlowOperator; + // 当前节点待审批人员(不含当前操作人),减签等动作的候选人来源;按单条流程记录计算 + currentNodeOperators?: FlowOperator[]; // 流程状态 flowState: number; // 记录状态 From ee5f5452a9763bdadeebaae476a637c8d7bd3b09 Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Thu, 12 Nov 2026 11:57:52 +0800 Subject: [PATCH 07/12] =?UTF-8?q?feat(approval):=20=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=9F=A5=E7=9C=8B=E5=8D=95=E6=9D=A1=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=97=B6=E5=88=87=E6=8D=A2=E5=88=B0=E8=AF=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E6=8C=89=E9=92=AE=E4=B8=8E=E5=87=8F=E7=AD=BE?= =?UTF-8?q?=E5=80=99=E9=80=89=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 合并列表隐藏 batchable=false 的动作(减签),只在查看单条流程时展示 - 查看单条流程时按该记录重新取 detail,切换 actions/currentNodeOperators,返回时恢复 - 单条流程状态下的提交目标固定为该记录(不再循环合并勾选) - PC 表格与移动端单条列表均接入,审批状态新增 mergeSingleRecordId --- .../src/presenters/action.ts | 14 +++++- .../src/presenters/index.ts | 20 ++++++++ .../src/typings/index.ts | 7 +++ .../tests/action-batchable.test.ts | 32 ++++++++++-- .../components/flow-approval-actions.tsx | 10 ++-- .../components/form-view-component.tsx | 50 ++++++++++++++++++- .../flow-approval/layout/presenter.ts | 13 ++++- .../src/components/form/index.tsx | 1 + .../list/components/single-list.tsx | 5 ++ .../src/components/list/types.ts | 2 + .../components/flow-approval-actions.tsx | 12 +++-- .../components/form-view-component.tsx | 50 ++++++++++++++++++- .../src/components/form/index.tsx | 1 + .../src/components/table/index.tsx | 4 ++ .../src/components/table/types.ts | 2 + packages/flow-types/src/types/form-view.ts | 2 + 16 files changed, 210 insertions(+), 15 deletions(-) diff --git a/packages/flow-approval-presenter/src/presenters/action.ts b/packages/flow-approval-presenter/src/presenters/action.ts index 44b6296..808794b 100644 --- a/packages/flow-approval-presenter/src/presenters/action.ts +++ b/packages/flow-approval-presenter/src/presenters/action.ts @@ -206,6 +206,13 @@ export class FlowActionPresenter { this.state = JSON.parse(JSON.stringify(state)); } + /** + * 获取 presenter 内部的最新状态快照(用于异步回调中基于最新状态做更新)。 + */ + public getState(): ApprovalState { + return this.state; + } + /** * 判断某个动作按钮是否应隐藏(纯函数,单一事实来源)。 * @@ -298,7 +305,8 @@ export class FlowActionPresenter { private async submitAction(actionId: string, formData: any, params?: any, fixedRecordId?: number) { - const recordId = fixedRecordId || formData.recordId || this.createdRecordId || this.state.flow?.recordId; + // 合并审批中已进入单条流程时,提交目标固定为该条记录 + const recordId = fixedRecordId || this.state.mergeSingleRecordId || formData.recordId || this.createdRecordId || this.state.flow?.recordId; const workCode = this.state.flow?.workCode || ''; if (formData.recordId) { @@ -477,6 +485,10 @@ export class FlowActionPresenter { const mergeable = this.state.flow?.mergeable || false; const batchable = this.isBatchable(actionId); const submitRecordIds = this.submitRecordIds; + if (mergeable && this.state.mergeSingleRecordId != null) { + // 已从合并列表进入单条流程:所有动作都只提交这条记录(submitAction 内部取 mergeSingleRecordId) + return await this.executeAction(actionId, params); + } if (mergeable && !batchable) { // 不支持批量的动作(如减签)只提交当前详情的记录,忽略合并勾选 return await this.executeAction(actionId, params, this.state.flow?.recordId); diff --git a/packages/flow-approval-presenter/src/presenters/index.ts b/packages/flow-approval-presenter/src/presenters/index.ts index 42d2167..1864841 100644 --- a/packages/flow-approval-presenter/src/presenters/index.ts +++ b/packages/flow-approval-presenter/src/presenters/index.ts @@ -37,6 +37,13 @@ export class ApprovalPresenter { return this.formActionContext; } + /** + * 获取 presenter 内部的最新状态快照。 + */ + public getState(): ApprovalState { + return this.state; + } + public getFlowActionPresenter() { return this.flowActionPresenter; } @@ -45,6 +52,19 @@ export class ApprovalPresenter { this.dispatch(state); } + /** + * 局部更新审批状态。 + * + * 合并审批从列表进入单条流程时,用它切换当前记录的按钮与选人范围; + * 返回列表时再恢复原状态。 + */ + public updateState(partial: Partial) { + this.initialState({ + ...this.state, + ...partial, + }); + } + public processNodes(){ return this.flowActionPresenter.processNodes(); } diff --git a/packages/flow-approval-presenter/src/typings/index.ts b/packages/flow-approval-presenter/src/typings/index.ts index 42cfec0..3c3f231 100644 --- a/packages/flow-approval-presenter/src/typings/index.ts +++ b/packages/flow-approval-presenter/src/typings/index.ts @@ -38,6 +38,13 @@ export type ApprovalState = { review?: boolean; /** 审批操作请求进行中(action/revoke/urge),用于驱动按钮 loading 与禁用 */ actionLoading?: boolean; + /** + * 合并审批中当前正在查看的单条流程记录id。 + * + * 设置后表示已从合并列表进入单条流程:动作、选人范围与提交目标都按该条记录计算, + * 不支持批量的动作(如减签)只有在此状态下才允许操作。 + */ + mergeSingleRecordId?: number; }; diff --git a/packages/flow-approval-presenter/tests/action-batchable.test.ts b/packages/flow-approval-presenter/tests/action-batchable.test.ts index 6bc09ff..14d0cd9 100644 --- a/packages/flow-approval-presenter/tests/action-batchable.test.ts +++ b/packages/flow-approval-presenter/tests/action-batchable.test.ts @@ -25,13 +25,13 @@ const buildMergeState = (actions: FlowAction[]): ApprovalState => ({ }, } as unknown as ApprovalState); -/** 表单上下文固定返回记录 2 的数据,用于验证非批量动作仍提交当前详情记录 */ -const buildFormContext = () => { +/** 表单上下文固定返回指定记录的表单数据,用于验证提交目标的优先级 */ +const buildFormContext = (recordId = 2) => { const formContext = new FormActionContext(); formContext.addAction({ - save: () => ({ recordId: 2, name: 'b' }), + save: () => ({ recordId, name: 'b' }), key: () => 'view-form', - validate: async () => ({ recordId: 2, name: 'b' }), + validate: async () => ({ recordId, name: 'b' }), }); return formContext; }; @@ -94,6 +94,30 @@ describe.sequential('FlowActionPresenter 合并批量提交(batchable)', () 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(); 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 4fe9b26..e639607 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 @@ -17,7 +17,11 @@ export const FlowApprovalActions = () => { const actionPresenter = context.getPresenter().getFlowActionPresenter(); const actionLoading = state.actionLoading ?? false; - const actionList = state.flow?.actionList || []; + // 合并列表(未进入单条流程)只保留支持批量的动作 + const mergedList = (state.flow?.mergeable || false) && state.mergeSingleRecordId == null; + const actionList = (state.flow?.actionList || []).filter(action => { + return !(mergedList && action.batchable === false); + }); const [moreVisible, setMoreVisible] = useState(false); @@ -25,8 +29,8 @@ export const FlowApprovalActions = () => { const action = actionPresenter.getAction(id); // 合并待办必须先显式选择要处理的流程记录,不能以「表单已有数据」代替选择 // (未选择时提交会落到默认记录上,issue-72 测试反馈) - // 不支持批量的动作(如减签)只作用于当前记录,不要求勾选合并流程 - if (state.flow?.mergeable && actionPresenter.isBatchable(id)) { + // 单条流程查看状态与不支持批量的动作(如减签)都不要求勾选合并流程 + if (state.flow?.mergeable && state.mergeSingleRecordId == null && actionPresenter.isBatchable(id)) { const todoCount = state.flow?.todos?.length ?? 0; const selectRecordIds = actionPresenter.getSubmitRecordIds(); if (todoCount > 1 && selectRecordIds.length == 0) { diff --git a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/form-view-component.tsx b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/form-view-component.tsx index 43f2325..20f59e8 100644 --- a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/form-view-component.tsx +++ b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/form-view-component.tsx @@ -1,8 +1,10 @@ import React from "react"; -import { useApprovalContext } from "@coding-flow/flow-approval-presenter"; +import { useApprovalContext, useMockContext } from "@coding-flow/flow-approval-presenter"; import { ViewBindPlugin } from "@coding-flow/flow-core"; import { FlowFormView } from "@coding-flow/flow-mobile-form"; import { createFormInstance } from "@coding-form/form-engine"; +import { detail } from "@/api/record"; +import type { FlowContent } from "@coding-flow/flow-types"; interface FormViewComponentProps { onValuesChange?: (values: any) => void; @@ -69,6 +71,51 @@ export const FormViewComponent: React.FC = (props) => { context.getPresenter().getFlowActionPresenter().setSubmitRecordIds(recordIds); } + const mockKey = useMockContext(); + + // 合并审批进入单条流程前保存的原始按钮/选人范围,返回合并列表时恢复 + const mergeOriginFlow = React.useRef(); + + /** + * 合并审批中查看单条流程。 + * + * 合并列表的按钮与候选人来自「打开详情的那条记录」,查看某一条流程时必须切换成 + * 该记录自己的 actions / currentNodeOperators,否则减签等按流程实例计算的动作无法操作。 + */ + const handleMergeRecordView = (recordId?: number) => { + const presenter = context.getPresenter(); + if (!recordId) { + if (mergeOriginFlow.current) { + presenter.updateState({ + flow: mergeOriginFlow.current, + mergeSingleRecordId: undefined, + }); + mergeOriginFlow.current = undefined; + } + return; + } + const currentFlow = presenter.getState().flow; + if (!mergeOriginFlow.current) { + mergeOriginFlow.current = currentFlow; + } + detail(recordId + '', mockKey).then((res) => { + if (res.success && res.data) { + const single = res.data as FlowContent; + const latestFlow = presenter.getState().flow || currentFlow; + presenter.updateState({ + mergeSingleRecordId: recordId, + flow: { + ...(latestFlow as FlowContent), + recordId: single.recordId, + actions: single.actions, + actionList: single.actionList, + currentNodeOperators: single.currentNodeOperators, + }, + }); + } + }); + } + if (ViewComponent && formMeta) { if (mergeable) { return ( @@ -81,6 +128,7 @@ export const FormViewComponent: React.FC = (props) => { formList={formList as any} onValuesChange={props.onValuesChange} onMergeRecordIdsSelected={handleMergeRecordIdsSelected} + onMergeRecordView={handleMergeRecordView} viewCode={viewCode} /> ) diff --git a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/layout/presenter.ts b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/layout/presenter.ts index 9dcf24b..1c6af46 100644 --- a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/layout/presenter.ts +++ b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/layout/presenter.ts @@ -11,8 +11,17 @@ export class LayoutPresenter { constructor(state: ApprovalState) { this.state = state; - this.actions = state.flow?.actions || []; - this.actionList = state.flow?.actionList || []; + // 合并列表(未进入单条流程)只保留支持批量的动作; + // 减签等按流程实例计算的动作需进入单条流程后操作 + const mergedList = (state.flow?.mergeable || false) && state.mergeSingleRecordId == null; + const filterActions = (items: FlowAction[]) => { + if (!mergedList) { + return items; + } + return items.filter(action => action.batchable !== false); + }; + this.actions = filterActions(state.flow?.actions || []); + this.actionList = filterActions(state.flow?.actionList || []); this.review = state.review || false; } diff --git a/packages/flow-mobile/flow-mobile-form/src/components/form/index.tsx b/packages/flow-mobile/flow-mobile-form/src/components/form/index.tsx index 321d889..a9e6b80 100644 --- a/packages/flow-mobile/flow-mobile-form/src/components/form/index.tsx +++ b/packages/flow-mobile/flow-mobile-form/src/components/form/index.tsx @@ -18,6 +18,7 @@ export const FlowFormView: React.FC = (props) => { review={props.review} fieldPermissions={props.fieldPermissions} onMergeRecordIdsSelected={props.onMergeRecordIdsSelected} + onMergeRecordView={props.onMergeRecordView} /> ); } diff --git a/packages/flow-mobile/flow-mobile-form/src/components/list/components/single-list.tsx b/packages/flow-mobile/flow-mobile-form/src/components/list/components/single-list.tsx index 72e64e3..ab18481 100644 --- a/packages/flow-mobile/flow-mobile-form/src/components/list/components/single-list.tsx +++ b/packages/flow-mobile/flow-mobile-form/src/components/list/components/single-list.tsx @@ -37,6 +37,7 @@ export const FlowSingleList: React.FC = (props) => { color="default" size="small" onClick={() => { + props.onMergeRecordView?.(undefined); setCurrentForm(undefined); }} > @@ -49,6 +50,8 @@ export const FlowSingleList: React.FC = (props) => { {!currentForm && ( { + // 切回批量模式,按钮/选人范围恢复为合并待办口径 + props.onMergeRecordView?.(undefined); props.onChangeMode?.(); }} @@ -76,6 +79,8 @@ export const FlowSingleList: React.FC = (props) => { return ( { + // 通知宿主当前查看的单条流程,按钮/选人范围需要切换到这条记录 + props.onMergeRecordView?.(item.recordId); const form = presenter.getFormDataByRecordId(item.recordId); if (form) { setCurrentForm(form); diff --git a/packages/flow-mobile/flow-mobile-form/src/components/list/types.ts b/packages/flow-mobile/flow-mobile-form/src/components/list/types.ts index 075a8c6..ac1e797 100644 --- a/packages/flow-mobile/flow-mobile-form/src/components/list/types.ts +++ b/packages/flow-mobile/flow-mobile-form/src/components/list/types.ts @@ -15,4 +15,6 @@ export interface FlowListProps { review: boolean; /** 当合并流程选中了流程记录的回掉 **/ onMergeRecordIdsSelected?: (recordIds: number[]) => void; + /** 合并审批中查看单条流程记录(recordId 为空表示返回合并列表) **/ + onMergeRecordView?: (recordId?: number) => void; } \ No newline at end of file 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 a3cf10d..13769fa 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 @@ -10,7 +10,13 @@ import {CloseAction} from "@/components/flow-approval/components/action/close"; export const FlowApprovalActions = () => { const {state, context} = useApprovalContext() - const actionList = state.flow?.actionList || []; + const mergeable = state.flow?.mergeable || false; + // 已从合并列表进入单条流程:按钮与提交目标都按该条记录计算 + const singleRecordView = state.mergeSingleRecordId != null; + // 合并列表状态下只保留支持批量的动作(减签等按流程实例计算的动作需进入单条流程后操作) + const actionList = (state.flow?.actionList || []).filter((action) => { + return !(mergeable && !singleRecordView && action.batchable === false); + }); const visibleActions = state.flow?.actions || []; const review = state?.review || false; @@ -20,8 +26,8 @@ export const FlowApprovalActions = () => { // 合并待办(多条记录合并成一条 todo)必须先显式选择要处理的流程记录。 // 不能以「表单已有数据」代替选择:表单数据只代表当前展示的记录, // 未选择时提交会落到默认记录上(issue-72 测试反馈) - // 不支持批量的动作(如减签)只作用于当前记录,不要求勾选合并流程 - if (state.flow?.mergeable && actionPresenter.isBatchable(id)) { + // 单条流程查看状态与不支持批量的动作(如减签)都不要求勾选合并流程 + if (state.flow?.mergeable && !singleRecordView && actionPresenter.isBatchable(id)) { const todoCount = state.flow?.todos?.length ?? 0; const selectRecordIds = actionPresenter.getSubmitRecordIds(); if (todoCount > 1 && selectRecordIds.length == 0) { diff --git a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx index 152a29b..84a6124 100644 --- a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx +++ b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx @@ -1,8 +1,10 @@ import React from "react"; -import {useApprovalContext} from "@coding-flow/flow-approval-presenter"; +import {useApprovalContext, useMockContext} from "@coding-flow/flow-approval-presenter"; import {ViewBindPlugin} from "@coding-flow/flow-core"; import {FlowFormView} from "@coding-flow/flow-pc-form"; import {createFormInstance} from "@coding-form/form-engine"; +import {detail} from "@/api/record"; +import type {FlowContent} from "@coding-flow/flow-types"; interface FormViewComponentProps { onValuesChange?: (values: any) => void; @@ -71,6 +73,51 @@ export const FormViewComponent: React.FC = (props) => { context.getPresenter().getFlowActionPresenter().setSubmitRecordIds(recordIds); } + const mockKey = useMockContext(); + + // 合并审批进入单条流程前保存的原始按钮/选人范围,返回合并列表时恢复 + const mergeOriginFlow = React.useRef(); + + /** + * 合并审批中查看单条流程。 + * + * 合并列表的按钮与候选人来自「打开详情的那条记录」,查看某一条流程时必须切换成 + * 该记录自己的 actions / currentNodeOperators,否则减签等按流程实例计算的动作无法操作。 + */ + const handleMergeRecordView = (recordId?: number) => { + const presenter = context.getPresenter(); + if (!recordId) { + if (mergeOriginFlow.current) { + presenter.updateState({ + flow: mergeOriginFlow.current, + mergeSingleRecordId: undefined, + }); + mergeOriginFlow.current = undefined; + } + return; + } + const currentFlow = presenter.getState().flow; + if (!mergeOriginFlow.current) { + mergeOriginFlow.current = currentFlow; + } + detail(recordId + '', mockKey).then((res) => { + if (res.success && res.data) { + const single = res.data as FlowContent; + const latestFlow = presenter.getState().flow || currentFlow; + presenter.updateState({ + mergeSingleRecordId: recordId, + flow: { + ...(latestFlow as FlowContent), + recordId: single.recordId, + actions: single.actions, + actionList: single.actionList, + currentNodeOperators: single.currentNodeOperators, + }, + }); + } + }); + } + if (ViewComponent && formMeta) { if (mergeable) { return ( @@ -83,6 +130,7 @@ export const FormViewComponent: React.FC = (props) => { formList={formList as any} onValuesChange={props.onValuesChange} onMergeRecordIdsSelected={handleMergeRecordIdsSelected} + onMergeRecordView={handleMergeRecordView} viewCode={viewCode} /> ) diff --git a/packages/flow-pc/flow-pc-form/src/components/form/index.tsx b/packages/flow-pc/flow-pc-form/src/components/form/index.tsx index 25ab496..e104589 100644 --- a/packages/flow-pc/flow-pc-form/src/components/form/index.tsx +++ b/packages/flow-pc/flow-pc-form/src/components/form/index.tsx @@ -19,6 +19,7 @@ export const FlowFormView: React.FC = (props) => { review={props.review} fieldPermissions={props.fieldPermissions} onMergeRecordIdsSelected={props.onMergeRecordIdsSelected} + onMergeRecordView={props.onMergeRecordView} /> ) } 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 39d099e..40e09ea 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 @@ -24,6 +24,8 @@ export const FlowTable: React.FC = (props) => { return ( { + // 通知宿主当前查看的单条流程,按钮/选人范围需要切换到这条记录 + props.onMergeRecordView?.(record.recordId); const formData = presenter.getFormDataByRecordId(record.recordId); if (formData) { setCurrentForm(formData); @@ -86,6 +88,8 @@ export const FlowTable: React.FC = (props) => { diff --git a/packages/flow-pc/flow-pc-form/src/components/table/types.ts b/packages/flow-pc/flow-pc-form/src/components/table/types.ts index 42d3977..fb560b6 100644 --- a/packages/flow-pc/flow-pc-form/src/components/table/types.ts +++ b/packages/flow-pc/flow-pc-form/src/components/table/types.ts @@ -15,4 +15,6 @@ export interface FlowTableProps { review: boolean; /** 当合并流程选中了流程记录的回掉 **/ onMergeRecordIdsSelected?: (recordIds: number[]) => void; + /** 合并审批中查看单条流程记录(recordId 为空表示返回合并列表) **/ + onMergeRecordView?: (recordId?: number) => void; } \ No newline at end of file diff --git a/packages/flow-types/src/types/form-view.ts b/packages/flow-types/src/types/form-view.ts index 5d56c9a..639e4b0 100644 --- a/packages/flow-types/src/types/form-view.ts +++ b/packages/flow-types/src/types/form-view.ts @@ -31,6 +31,8 @@ export interface FormViewProps { onValuesChange?: (values: any) => void; /** 当合并流程选中了流程记录的回掉 **/ onMergeRecordIdsSelected?: (recordIds: number[]) => void; + /** 合并审批中查看单条流程记录(recordId 为空表示返回合并列表) **/ + onMergeRecordView?: (recordId?: number) => void; /** 表单元数据对象 */ meta: FlowForm; /** 表单字段权限,为空时全部可写*/ From d8cb075ffb74810b4287a8e9ee6277f490f7edcd Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Thu, 12 Nov 2026 12:00:53 +0800 Subject: [PATCH 08/12] =?UTF-8?q?fix(approval):=20=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E5=BC=80=E5=90=AF=E4=BD=86=E5=8F=AA=E6=9C=89?= =?UTF-8?q?=E5=8D=95=E6=9D=A1=E8=AE=B0=E5=BD=95=E6=97=B6=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=87=8F=E7=AD=BE=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 隐藏条件由 mergeable 改为「确有多条流程合并」(todos.length > 1) - mergeable 只是节点记录合并策略开关,单条记录时同样为 true,此前会误隐藏 batchable=false 的动作 - PC/移动端同步修正,补充移动端 LayoutPresenter 用例 --- .../components/flow-approval-actions.tsx | 6 ++- .../flow-approval/layout/presenter.ts | 9 ++-- .../tests/layout-presenter-batchable.test.ts | 48 +++++++++++++++++++ .../components/flow-approval-actions.tsx | 10 +++- 4 files changed, 66 insertions(+), 7 deletions(-) create mode 100644 packages/flow-mobile/flow-mobile-approval/tests/layout-presenter-batchable.test.ts 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 e639607..fba7073 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 @@ -17,8 +17,10 @@ export const FlowApprovalActions = () => { const actionPresenter = context.getPresenter().getFlowActionPresenter(); const actionLoading = state.actionLoading ?? false; - // 合并列表(未进入单条流程)只保留支持批量的动作 - const mergedList = (state.flow?.mergeable || false) && state.mergeSingleRecordId == null; + // 合并列表(确实有多条流程合并、且未进入单条流程)只保留支持批量的动作 + const mergedList = (state.flow?.mergeable || false) + && state.mergeSingleRecordId == null + && (state.flow?.todos?.length ?? 0) > 1; const actionList = (state.flow?.actionList || []).filter(action => { return !(mergedList && action.batchable === false); }); diff --git a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/layout/presenter.ts b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/layout/presenter.ts index 1c6af46..3f6fa24 100644 --- a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/layout/presenter.ts +++ b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/layout/presenter.ts @@ -11,9 +11,12 @@ export class LayoutPresenter { constructor(state: ApprovalState) { this.state = state; - // 合并列表(未进入单条流程)只保留支持批量的动作; - // 减签等按流程实例计算的动作需进入单条流程后操作 - const mergedList = (state.flow?.mergeable || false) && state.mergeSingleRecordId == null; + // 合并列表(确实有多条流程合并、且未进入单条流程)只保留支持批量的动作; + // 减签等按流程实例计算的动作需进入单条流程后操作。 + // mergeable 只是节点合并策略开关,单条记录时同样为 true,不能作为隐藏依据。 + const mergedList = (state.flow?.mergeable || false) + && state.mergeSingleRecordId == null + && (state.flow?.todos?.length ?? 0) > 1; const filterActions = (items: FlowAction[]) => { if (!mergedList) { return items; diff --git a/packages/flow-mobile/flow-mobile-approval/tests/layout-presenter-batchable.test.ts b/packages/flow-mobile/flow-mobile-approval/tests/layout-presenter-batchable.test.ts new file mode 100644 index 0000000..0bd3c59 --- /dev/null +++ b/packages/flow-mobile/flow-mobile-approval/tests/layout-presenter-batchable.test.ts @@ -0,0 +1,48 @@ +import { describe, expect, it } from "@rstest/core"; +import { LayoutPresenter } from "@/components/flow-approval/layout/presenter"; +import type { ApprovalState } from "@coding-flow/flow-approval-presenter"; +import type { FlowAction } from "@coding-flow/flow-types"; + +const passAction = { id: 'pass-1', type: 'PASS', batchable: true } as FlowAction; +const reduceAction = { id: 'reduce-1', type: 'REDUCE_AUDIT', batchable: false } as FlowAction; + +/** + * 构造审批状态。 + * + * @param mergeable 节点是否开启记录合并策略(单条记录时也可能是 true) + * @param todoCount 合并组内的流程记录数 + * @param singleRecordId 当前查看的单条流程记录id(为空表示仍在合并列表) + */ +const buildState = (mergeable: boolean, todoCount: number, singleRecordId?: number) => ({ + flow: { + mergeable, + todos: Array.from({ length: todoCount }, (_, index) => ({ recordId: index + 1 })), + actions: [passAction, reduceAction], + actionList: [passAction, reduceAction], + }, + mergeSingleRecordId: singleRecordId, +} as unknown as ApprovalState); + +const optionIds = (state: ApprovalState) => { + return new LayoutPresenter(state).getFooterOptions().map(action => action.id); +}; + +describe.sequential('移动端合并审批动作批量能力', () => { + + it('多条流程合并成一条待办时,隐藏不支持批量的减签按钮', () => { + expect(optionIds(buildState(true, 2))).toEqual(['pass-1']); + }); + + it('开启合并策略但只有一条流程记录时,减签按钮应正常展示', () => { + // mergeable 只是策略开关,单条记录不存在批量语义 + expect(optionIds(buildState(true, 1))).toEqual(['pass-1', 'reduce-1']); + }); + + it('未开启记录合并时,减签按钮应正常展示', () => { + expect(optionIds(buildState(false, 1))).toEqual(['pass-1', 'reduce-1']); + }); + + it('从合并列表进入单条流程后,减签按钮应正常展示', () => { + expect(optionIds(buildState(true, 2, 1))).toEqual(['pass-1', 'reduce-1']); + }); +}); 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 13769fa..0aebb8c 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 @@ -13,9 +13,15 @@ export const FlowApprovalActions = () => { const mergeable = state.flow?.mergeable || false; // 已从合并列表进入单条流程:按钮与提交目标都按该条记录计算 const singleRecordView = state.mergeSingleRecordId != null; - // 合并列表状态下只保留支持批量的动作(减签等按流程实例计算的动作需进入单条流程后操作) + /** + * 合并待办列表:确实有多条流程合并成一条 todo 时才隐藏不支持批量的动作(如减签)。 + * + * 注意 mergeable 只是节点的记录合并策略开关,单条记录时同样为 true,此时不存在批量语义, + * 所有动作都应正常展示。 + */ + const mergedTodoList = mergeable && !singleRecordView && (state.flow?.todos?.length ?? 0) > 1; const actionList = (state.flow?.actionList || []).filter((action) => { - return !(mergeable && !singleRecordView && action.batchable === false); + return !(mergedTodoList && action.batchable === false); }); const visibleActions = state.flow?.actions || []; const review = state?.review || false; From 17070e436a18369c5a57594da79a0ebda6157539 Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Thu, 12 Nov 2026 12:02:16 +0800 Subject: [PATCH 09/12] =?UTF-8?q?fix(mobile-approval):=20=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E9=80=90=E6=9D=A1/=E6=89=B9=E9=87=8F=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=97=B6=E6=B8=85=E7=A9=BA=E5=8B=BE=E9=80=89=E5=B9=B6?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=8C=89=E9=92=AE=E5=8F=A3=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 批量模式勾选残留会导致逐条模式下点通过仍按旧勾选批量提交 - 进入逐条模式时恢复合并列表口径的按钮与选人范围 --- .../src/components/list/index.tsx | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/packages/flow-mobile/flow-mobile-form/src/components/list/index.tsx b/packages/flow-mobile/flow-mobile-form/src/components/list/index.tsx index 88fc936..1fd7919 100644 --- a/packages/flow-mobile/flow-mobile-form/src/components/list/index.tsx +++ b/packages/flow-mobile/flow-mobile-form/src/components/list/index.tsx @@ -8,12 +8,27 @@ export const FlowList: React.FC = (props) => { const [multiple,setMultiple] = React.useState(true); + /** + * 切换逐条/批量模式。 + * + * 必须清空上一模式的勾选:批量勾选的记录残留在 presenter 中时, + * 切到逐条模式后未重新选择就点通过,会按旧勾选批量提交。 + * 进入逐条模式同时恢复合并列表口径的按钮/选人范围。 + */ + const changeMode = (toMultiple: boolean) => { + props.onMergeRecordIdsSelected?.([]); + if (!toMultiple) { + props.onMergeRecordView?.(undefined); + } + setMultiple(toMultiple); + }; + if (multiple) { return ( { - setMultiple(false); + changeMode(false); }} onSelect={(recordIds)=>{ props.onMergeRecordIdsSelected?.(recordIds); @@ -25,7 +40,7 @@ export const FlowList: React.FC = (props) => { { - setMultiple(true); + changeMode(true); }} /> ) From 6c0f253ecb413282e88187d08ea618d174ad2ef1 Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Thu, 12 Nov 2026 12:09:49 +0800 Subject: [PATCH 10/12] =?UTF-8?q?docs:=20=E5=AF=B9=E9=BD=90=E5=87=8F?= =?UTF-8?q?=E7=AD=BE=E4=B8=8E=E5=90=88=E5=B9=B6=E5=AE=A1=E6=89=B9=E8=83=BD?= =?UTF-8?q?=E5=8A=9B=EF=BC=8C=E7=B2=BE=E7=AE=80=E9=95=BF=E6=AE=B5=E8=90=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 动作工厂/插件文档补充 REDUCE_AUDIT、9 种动作、8 个子视图插件 - 补充 FlowApprovalApi.resetSubProcess、ApprovalState.mergeSingleRecordId、FlowAction.batchable、currentNodeOperators - 新增合并审批(合并列表/单条流程)说明,表格化替代长段落 - 补充减签消息键、按钮 key、拦截器范围 --- .../flow-approval-presenter/action-factory.md | 42 +++++++------ .../flow-core/message-registry.md | 1 + docs/capabilities/index.md | 2 +- docs/integration/index.md | 8 +-- docs/integration/message-customization.md | 1 + docs/integration/plugin-customization.md | 61 ++++++++++++++++--- 6 files changed, 81 insertions(+), 34 deletions(-) diff --git a/docs/capabilities/flow-approval-presenter/action-factory.md b/docs/capabilities/flow-approval-presenter/action-factory.md index 462e4bb..547e446 100644 --- a/docs/capabilities/flow-approval-presenter/action-factory.md +++ b/docs/capabilities/flow-approval-presenter/action-factory.md @@ -1,7 +1,7 @@ --- name: flow-approval-presenter/action-factory module: flow-pc-approval / flow-mobile-approval / flow-design(跨包能力) -description: 动作工厂(单例模式),按 ActionType 注册并渲染对应的审批动作组件(Pass/Reject/Save/AddAudit/Delegate/Return/Transfer/Custom) +description: 动作工厂(单例模式),按 ActionType 注册并渲染审批动作组件(9 种,含减签) status: 已实现 scope: 前端 source: 项目自有 @@ -13,40 +13,33 @@ content_hash: f7a515768b1b96d57764e598af53346093fa715a56a151c9bef9474c9846aaeb ## 解决什么问题 -流程审批支持 8 种动作类型(Pass、Reject、Save、AddAudit、Delegate、Return、Transfer、Custom),每种动作对应不同的 UI 组件和交互逻辑。ActionFactory 通过工厂模式实现: +审批动作按类型映射到不同 React 组件,三端各自注册: -- 按动作类型动态获取对应的 React 组件 -- PC 端和移动端各自注册不同的组件实现 -- 设计器中也有独立的 ActionFactory 用于配置表单 +- 按 `action.type` 动态取组件; +- PC 与移动端组件实现不同; +- 设计器用另一份工厂渲染动作配置表单。 ## 如何使用 -### 1. PC 端 / 移动端审批组件 +### 1. 审批端(PC / 移动端) ```typescript import { ActionFactory } from "@/components/flow-approval/components/action/factory"; const factory = ActionFactory.getInstance(); - -// PC 端:获取组件类型 -const Component = factory.getFlowActionComponent(action); -// 渲染: - -// 移动端:直接渲染 -factory.render(action); // 返回 JSX +const Component = factory.getFlowActionComponent(action); // PC +factory.render(action); // 移动端 ``` -### 2. 设计器中的动作表单工厂 +### 2. 设计器动作表单 ```typescript import { ActionFactory } from "@/script-components/components/action/components/factory"; -const factory = ActionFactory.getInstance(); -const FormComponent = factory.getActionForm(actionType); -// 渲染: +const FormComponent = ActionFactory.getInstance().getActionForm(actionType); ``` -### 3. 支持的动作类型 +### 3. 支持的动作类型(9 种) | ActionType | PC 组件 | 移动端组件 | 设计器表单 | |------------|---------|-----------|-----------| @@ -54,12 +47,21 @@ const FormComponent = factory.getActionForm(actionType); | REJECT | RejectAction | RejectAction | RejectActionForm | | SAVE | SaveAction | SaveAction | - | | ADD_AUDIT | AddAuditAction | AddAuditAction | AddAuditActionForm | +| REDUCE_AUDIT | ReduceAuditAction | ReduceAuditAction | ReduceAuditActionForm | | DELEGATE | DelegateAction | DelegateAction | DelegateActionForm | | RETURN | ReturnAction | ReturnAction | - | | TRANSFER | TransferAction | TransferAction | TransferActionForm | | CUSTOM | CustomAction | CustomAction | CustomActionForm | +### 4. 批量能力 + +| 项 | 说明 | +|---|---| +| 服务端标记 | `actions[].batchable`,缺省视为 `true` | +| 当前为 `false` | `REDUCE_AUDIT`(候选人/目标按流程实例隔离) | +| 前端行为 | 合并列表(`todos.length > 1`)不展示 `batchable=false` 的动作;进入单条流程后展示 | + ## 使用实例 -- `FlowApprovalActions` 组件通过 ActionFactory 遍历流程节点的动作列表,逐个渲染对应的动作组件 -- `CustomAction` 组件通过 ActionFactory(`getFlowActionComponent`)获取 `triggerType` 对应的动作组件 +- `FlowApprovalActions` 遍历动作列表,逐个用工厂渲染; +- `CustomAction` 通过 `getFlowActionComponent` 渲染 `triggerType` 对应组件。 diff --git a/docs/capabilities/flow-core/message-registry.md b/docs/capabilities/flow-core/message-registry.md index 1887644..900e960 100644 --- a/docs/capabilities/flow-core/message-registry.md +++ b/docs/capabilities/flow-core/message-registry.md @@ -175,6 +175,7 @@ Toast.show(registry.get(FlowMessageKey.APPROVAL_SAVE, actionCtx)); | `approval.reject` | `操作成功` | 审批驳回 | | `approval.delegate` | `操作成功` | 委托 | | `approval.add_audit` | `操作成功` | 加签 | +| `approval.reduce_audit` | `操作成功` | 减签 | | `approval.transfer` | `操作成功` | 转交 | | `approval.return` | `操作成功` | 退回 | | `approval.revoke` | `流程已撤回` | 撤回 | diff --git a/docs/capabilities/index.md b/docs/capabilities/index.md index fce7822..ea49cb7 100644 --- a/docs/capabilities/index.md +++ b/docs/capabilities/index.md @@ -8,7 +8,7 @@ |------|------|------|------|------| | [antd/antd](./antd/antd.md) | antd | Ant Design (PC) / Ant Design Mobile (移动端) UI 组件库,提供丰富的预置组件 | 前端 | 框架:Ant Design | | [flow-approval/sub-process-record](./flow-approval/sub-process-record.md) | flow-approval | PC 与移动端审批时间线中的子流程聚合状态、完成进度和实例明细展示 | 前端 | 项目自有 | -| [flow-approval-presenter/action-factory](./flow-approval-presenter/action-factory.md) | flow-approval-presenter | 动作工厂(单例模式),按 ActionType 注册并渲染对应的审批动作组件(Pass/Reject/Save/AddAudit/Delegate/Ret... | 前端 | 项目自有 | +| [flow-approval-presenter/action-factory](./flow-approval-presenter/action-factory.md) | flow-approval-presenter | 动作工厂(单例模式),按 ActionType 注册并渲染审批动作组件(9 种,含减签) | 前端 | 项目自有 | | [flow-core/event-bus](./flow-core/event-bus.md) | flow-core | 全局事件总线(单例模式),提供 on/emit/off 发布订阅通信能力 | 前端 | 项目自有 | | [flow-core/groovy-formatter](./flow-core/groovy-formatter.md) | flow-core | Groovy 脚本格式化与转换工具,提供脚本格式化、标记管理、元数据提取、return 表达式解析等能力 | 前端 | 项目自有 | | [flow-core/http-client](./flow-core/http-client.md) | flow-core | 基于 axios 封装的 HTTP 客户端,提供请求/响应拦截器、token 自动管理、分页查询、文件下载等能力 | 前端 | 项目自有 | diff --git a/docs/integration/index.md b/docs/integration/index.md index caafd3b..b7572e2 100644 --- a/docs/integration/index.md +++ b/docs/integration/index.md @@ -4,7 +4,7 @@ ## 指南列表 -| 文档 | 说明 | -|------|------| -| [插件定制机制](./plugin-customization.md) | 框架的全部扩展点与插件体系:内核层(ViewBindPlugin / EventBus / Presenter / HttpClient / FlowMessageRegistry / GroovyScriptConvertorUtil)、审批领域层(FlowApprovalApi / 子视图插件 / ActionInterceptor / DialogContentProvider / AdvicePolicyProvider 审批意见策略 / FormActionContext / maxOperatorCount 选人数限制 / Mock 模式)、PC/移动审批层(布局与动作 key / APPROVAL_ADVICE_VIEW_KEY / ActionFactory / 样式定制)、流程设计器层(FlowNodeRegistry / 设计器视图插件 / 策略机制) | -| [消息提示定制](./message-customization.md) | 如何自定义框架中所有消息提示的文案,包括审批动作、流程设计器、系统消息等 | +| 文档 | 说明 | 主要内容 | +|------|------|----------| +| [插件定制机制](./plugin-customization.md) | 全部扩展点与插件体系 | 内核层:ViewBindPlugin / EventBus / Presenter / HttpClient / FlowMessageRegistry
审批层:FlowApprovalApi / 8 个子视图插件 / ActionInterceptor / DialogContentProvider / AdvicePolicyProvider / 合并审批 / Mock
PC/移动层:布局与动作 key / ActionFactory / 样式
设计器层:FlowNodeRegistry / 视图插件 / 策略 | +| [消息提示定制](./message-customization.md) | 自定义全部消息文案 | 审批动作 / 流程设计器 / 系统消息 | diff --git a/docs/integration/message-customization.md b/docs/integration/message-customization.md index 17b57af..b39222d 100644 --- a/docs/integration/message-customization.md +++ b/docs/integration/message-customization.md @@ -149,6 +149,7 @@ registry.register(FlowMessageKey.DESIGN_SCRIPT_COMPILE_FAILED, (data) => | `approval.reject` | `操作成功` | 审批驳回 | | `approval.delegate` | `操作成功` | 委托 | | `approval.add_audit` | `操作成功` | 加签 | +| `approval.reduce_audit` | `操作成功` | 减签 | | `approval.transfer` | `操作成功` | 转交 | | `approval.return` | `操作成功` | 退回 | | `approval.revoke` | `流程已撤回` | 撤回 | diff --git a/docs/integration/plugin-customization.md b/docs/integration/plugin-customization.md index 2d3d9ca..dacd646 100644 --- a/docs/integration/plugin-customization.md +++ b/docs/integration/plugin-customization.md @@ -25,7 +25,7 @@ | 内核层 | flow-core | FlowMessageRegistry / FlowMessageKey | 全局消息文案 | | 内核层 | flow-core | GroovyScriptConvertorUtil | Groovy 脚本解析工具 | | 审批领域层 | flow-approval-presenter | FlowApprovalApi 接口 | 替换审批后端 API 实现 | -| 审批领域层 | flow-approval-presenter | 7 个子视图插件 | 替换选人/签名/节点选择视图 | +| 审批领域层 | flow-approval-presenter | 8 个子视图插件 | 替换选人/减签/签名/节点选择视图 | | 审批领域层 | flow-approval-presenter | ActionInterceptor | 审批动作拦截器(提交前拦截) | | 审批领域层 | flow-approval-presenter | DialogContentProvider | 审批弹框标题与中间内容自定义 | | 审批领域层 | flow-approval-presenter | AdvicePolicyProvider | 审批意见策略(按动作隐藏/必填/默认意见/快捷模板) | @@ -229,7 +229,7 @@ httpClient.setMessageBox(myMessageBox); **源码**:`packages/flow-core/src/message.ts` -框架所有消息提示(HTTP 错误、审批成功/失败、设计器编译等)的文案都通过 `FlowMessageRegistry` 管理。`FlowMessageKey` 约 27 个常量,如: +框架所有消息提示(HTTP 错误、审批成功/失败、设计器编译等)的文案都通过 `FlowMessageRegistry` 管理。`FlowMessageKey` 共 29 个常量,如: - `FlowMessageKey.HTTP_TOKEN_EXPIRED`(`'http.token.expired'`) - `FlowMessageKey.APPROVAL_PASS`(`'approval.pass'`) @@ -300,6 +300,7 @@ export interface FlowApprovalApi { action(body: Record, mockKey: string): Promise; revoke(id: any, mockKey: string): Promise; urge(id: any, mockKey: string): Promise; + resetSubProcess(body: Record, mockKey: string): Promise; } ``` @@ -314,6 +315,7 @@ const myApi: FlowApprovalApi = { action: async (body, mockKey) => { /* ... */ }, revoke: async (id, mockKey) => { /* ... */ }, urge: async (id, mockKey) => { /* ... */ }, + resetSubProcess: async (body, mockKey) => { /* 子流程数据重置 */ }, }; // 在 React 组件中(不能脱离组件调用): @@ -332,7 +334,7 @@ const { state, context } = createApprovalContext(props, myApi); // 审批上下文:state 为 Redux 响应式状态,context 为 ContextScope(含 Presenter 访问入口) export const useApprovalContext = () => { // 返回 { state, context } - // state: ApprovalState = { flow?: FlowContent; review?: boolean; actionLoading?: boolean } + // state: ApprovalState = { flow?: FlowContent; review?: boolean; actionLoading?: boolean; mergeSingleRecordId?: number } // context.getPresenter().getFlowActionPresenter() / getFormActionContext() 等 } @@ -354,7 +356,7 @@ const MyCustomView = () => { }; ``` -### 3.3 审批子视图插件(7 个) +### 3.3 审批子视图插件(8 个) **源码**:`packages/flow-approval-presenter/src/plugins/*-type.ts`(key 常量与 Props 接口)、`flow-pc-approval/src/plugins/view/*.tsx` 与 `flow-mobile-approval/src/plugins/view/*.tsx`(默认实现) @@ -363,6 +365,7 @@ const MyCustomView = () => { | key 常量(导出名) | key 值 | 默认 UI(PC) | 默认 UI(移动端) | 使用位置 | |---|---|---|---|---| | `AddAuditViewPluginKey` | `'AddAuditViewPlugin'` | antd Select | antd-mobile Selector | 加签动作 | +| `ReduceAuditViewPluginKey` | `'ReduceAuditViewPlugin'` | antd Select(候选人来自 `currentNodeOperators`) | antd-mobile Selector | 减签动作 | | `DelegateViewPluginKey` | `'DelegateViewPlugin'` | antd Select | Selector | 委托动作 | | `TransferViewPluginKey` | `'TransferViewPlugin'` | antd Select | Selector | 转办动作 | | `ReturnViewPluginKey` | `'ReturnViewPlugin'` | antd Select(退回节点) | Selector | 退回动作 | @@ -381,6 +384,13 @@ interface AddAuditViewPlugin { // DelegateViewPlugin / TransferViewPlugin 同 maxOperatorCount?: number; // 最大可选人数,-1/缺省=不限制 } +// 减签(候选人为详情响应的 currentNodeOperators) +interface ReduceAuditViewPlugin { + onChange?: (value: string | string[]) => void; + value?: string | string[]; + action?: React.Ref; +} + // 退回节点选择(无 maxOperatorCount) interface ReturnViewPlugin { onChange?: (value: string | string[]) => void; @@ -492,7 +502,7 @@ const MyUserSelect: React.FC = (props) => { **源码**:`packages/flow-approval-presenter/src/interceptor/action-interceptor.ts`、`packages/flow-approval-presenter/src/presenters/action.ts` -所有审批操作按钮(通过/驳回/暂存/加签/委托/退回/转办/自定义)点击后、真正提交前会按订阅顺序执行拦截器。**任一拦截器返回 `false` 即短路**,终止本次操作。 +所有审批操作按钮(通过/驳回/暂存/加签/减签/委托/退回/转办/自定义)点击后、真正提交前会按订阅顺序执行拦截器。**任一拦截器返回 `false` 即短路**,终止本次操作。 ```typescript export interface ActionInterceptorContext { @@ -519,6 +529,9 @@ public removeActionInterceptor(interceptor: ActionInterceptor): void; // public async interceptAction(actionId: string, params?: any): Promise; // 手动触发拦截 public async validateActionForm(actionId: string): Promise; // 手动触发通过动作的业务表单校验 public async action(actionId: string, params?: any): Promise; // 提交(自动先拦截) +public setSubmitRecordIds(recordIds: number[]): void; // 合并审批:勾选的流程记录 +public getSubmitRecordIds(): number[]; // 合并审批:读取勾选 +public isBatchable(actionId: string): boolean; // 动作是否支持合并批量提交 ``` - `action()` 提交前自动调用 `interceptAction(actionId, params)`,被拦截时返回 `{ success: false, intercepted: true }`。 @@ -789,6 +802,34 @@ ViewBindPlugin.getInstance().register(APPROVAL_ADVICE_VIEW_KEY, AdviceInput); > > 需要在组件内区分流程时,可直接使用上下文:`const { state } = useApprovalContext(); state.flow?.workCode / state.flow?.workTitle`,按流程编码加载不同模板集合(示例见 `apps/app-pc/src/components/flow-view/advice-view.tsx`)。 +### 3.11 合并审批 — 多记录与单条流程 + +**源码**:`flow-approval-presenter/src/presenters/action.ts`、`flow-pc-approval/.../form-view-component.tsx`、`flow-mobile-approval/.../form-view-component.tsx` + +`detail` 返回 `mergeable=true` 表示该待办属于记录合并组,`todos` 为组内流程记录;`todos.length > 1` 才是真正的批量场景。 + +| 场景 | 判定 | 按钮 | 提交目标 | +|---|---|---|---| +| 合并列表 | `mergeable && todos.length > 1` | 隐藏 `batchable=false` 的动作(减签) | 勾选的记录逐条提交 | +| 进入单条流程 | 已设置 `mergeSingleRecordId` | 按该记录的 `actions` 展示(含减签) | 固定为该记录 | +| 普通待办 | `todos.length <= 1` | 全量动作 | 当前记录 | + +| 交互入口 | PC | 移动端 | +|---|---|---| +| 查看单条 | 合并表格「查看」 | 单条列表点击条目 | +| 返回合并 | 「返回」 | 「返回列表」/「批量审批」 | +| 回调 | `FormViewProps.onMergeRecordView(recordId?)` | 同左 | +| 勾选回调 | `FormViewProps.onMergeRecordIdsSelected(recordIds)` | 同左 | + +| 关键状态/方法 | 说明 | +|---|---| +| `ApprovalState.mergeSingleRecordId` | 当前查看的单条流程记录 id | +| `ApprovalPresenter.getState()/updateState(partial)` | 读取/局部更新审批状态(进入/返回单条流程) | +| `FlowContent.currentNodeOperators` | 当前节点待审批人,减签候选人来源 | +| `FlowAction.batchable` | 动作是否支持合并批量提交 | + +> 切换逐条/批量模式时会清空勾选,避免旧勾选被带到下一次提交。 + --- ## 4. PC / 移动端审批扩展点 @@ -868,6 +909,7 @@ import { ApprovalPanel } from "@coding-flow/flow-mobile-approval"; | `APPROVAL_ACTION_REJECT_KEY` | ✅ | ✅ | 驳回 | | `APPROVAL_ACTION_SAVE_KEY` | ✅ | ✅ | 保存 | | `APPROVAL_ACTION_ADD_AUDIT_KEY` | ✅ | ✅ | 加签 | +| `APPROVAL_ACTION_REDUCE_AUDIT_KEY` | ✅ | ✅ | 减签 | | `APPROVAL_ACTION_DELEGATE_KEY` | ✅ | ✅ | 委托 | | `APPROVAL_ACTION_RETURN_KEY` | ✅ | ✅ | 退回 | | `APPROVAL_ACTION_TRANSFER_KEY` | ✅ | ✅ | 转办 | @@ -884,14 +926,14 @@ import { ApprovalPanel } from "@coding-flow/flow-mobile-approval"; **源码**:`flow-pc-approval/src/components/flow-approval/components/action/factory.tsx`、`flow-mobile-approval/.../action/factory.tsx` -`ActionFactory` 是单例,按 `ActionType` 注册 8 种动作组件。**注意:工厂没有公开的 register 方法**,动作替换一律通过 ViewBindPlugin 的 key 完成(见 §4.3)。 +`ActionFactory` 是单例,按 `ActionType` 注册 9 种动作组件。**注意:工厂没有公开的 register 方法**,动作替换一律通过 ViewBindPlugin 的 key 完成(见 §4.3)。 ```typescript // ActionType(flow-types/src/types/flow-design.ts) -type ActionType = 'SAVE' | 'PASS' | 'REJECT' | 'ADD_AUDIT' | 'DELEGATE' | 'RETURN' | 'TRANSFER' | 'CUSTOM'; +type ActionType = 'SAVE' | 'PASS' | 'REJECT' | 'ADD_AUDIT' | 'REDUCE_AUDIT' | 'DELEGATE' | 'RETURN' | 'TRANSFER' | 'CUSTOM'; // 工厂内部注册表(两包一致) -// ADD_AUDIT → AddAuditAction、CUSTOM → CustomAction、DELEGATE → DelegateAction、 +// ADD_AUDIT → AddAuditAction、REDUCE_AUDIT → ReduceAuditAction、CUSTOM → CustomAction、DELEGATE → DelegateAction、 // PASS → PassAction、REJECT → RejectAction、RETURN → ReturnAction、 // SAVE → SaveAction、TRANSFER → TransferAction @@ -1000,6 +1042,7 @@ export interface FlowAction { maxOperatorCount?: number; // 最大可选人数,-1=不限制,正整数=上限(转办/委托/加签选人时使用) triggerType?: string; // 触发类型,自定义脚本使用(转发为其他动作类型) triggerFrontEvent?: string; // 前端触发事件(点击时 EventBus.emit) + batchable?: boolean; // 是否支持合并批量提交,缺省 true;减签为 false } ``` @@ -1113,7 +1156,7 @@ export interface DesignViewPluginAction { export class ActionFactory { public static getInstance(): ActionFactory; public getActionForm(type: ActionType): React.ComponentType | undefined; - // 内部注册:ADD_AUDIT / CUSTOM / DELEGATE / REJECT / TRANSFER(SAVE/PASS/RETURN 无专属表单) + // 内部注册:ADD_AUDIT / REDUCE_AUDIT / CUSTOM / DELEGATE / REJECT / TRANSFER(SAVE/PASS/RETURN 无专属表单) } ``` From 843e236f05390c47e5702241f1025c5e24ee0569 Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Thu, 12 Nov 2026 14:34:23 +0800 Subject: [PATCH 11/12] =?UTF-8?q?fix(approval):=20=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=9F=A5=E7=9C=8B=E9=9D=9E=E9=A6=96=E6=9D=A1?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=90=8E=E6=8F=90=E4=BA=A4=E7=A9=BA=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 场景:合并审批中查看第二条流程再执行减签,请求体携带 formData: {}, 被服务端 validation.field.required(Required field formData cannot be empty) 拒绝,减签等动作无法提交。 原因:表单动作固定以 key view-form 注册,FormActionContext 按 key 去重, 只保留了第一条记录的表单实例;查看第二条记录时挂载的是另一实例, 被注册的实例未挂载字段,getFieldsValue() 返回 {}。 - 新增 ActiveFormAction(flow-approval-presenter):只注册一个表单动作, 保存/校验跟随「当前查看或提交的记录」切换,实例未挂载时用记录初始数据兜底 - PC / 移动端审批表单视图改为按待办记录记忆化表单实例,避免重渲染丢失初始数据 - 合并审批查看单条流程时同步切换表单实例,详情刷新期间提交也不会落到上一条记录 --- .changeset/merge-approval-active-form.md | 11 ++ packages/flow-approval-presenter/src/index.ts | 1 + .../src/utils/active-form.ts | 107 ++++++++++++++++++ .../tests/active-form.test.ts | 97 ++++++++++++++++ .../components/form-view-component.tsx | 90 +++++++++------ .../components/form-view-component.tsx | 92 ++++++++------- 6 files changed, 324 insertions(+), 74 deletions(-) create mode 100644 .changeset/merge-approval-active-form.md create mode 100644 packages/flow-approval-presenter/src/utils/active-form.ts create mode 100644 packages/flow-approval-presenter/tests/active-form.test.ts diff --git a/.changeset/merge-approval-active-form.md b/.changeset/merge-approval-active-form.md new file mode 100644 index 0000000..48c4f31 --- /dev/null +++ b/.changeset/merge-approval-active-form.md @@ -0,0 +1,11 @@ +--- +"@coding-flow/flow-approval-presenter": patch +"@coding-flow/flow-pc-approval": patch +"@coding-flow/flow-mobile-approval": patch +--- + +fix: 合并审批查看非首条流程后提交表单数据为空(减签被 formData 必填校验拦截) + +- 新增 `ActiveFormAction`(`@coding-flow/flow-approval-presenter`):表单保存/校验动作跟随「当前查看或提交的记录」切换,表单实例未挂载时用记录初始数据兜底,不再提交空 `formData`。 +- PC / 移动端审批表单视图改为只注册一个表单动作,并按待办记录记忆化表单实例;此前固定 key 只保留第一条记录的表单实例,查看第二条记录后 `getFieldsValue()` 返回 `{}`,请求被服务端 `Required field formData cannot be empty` 拒绝(减签等动作在合并审批中无法提交)。 +- 合并审批查看单条流程时同步切换表单实例,详情接口尚未返回期间提交也不会落到上一条记录的表单上。 diff --git a/packages/flow-approval-presenter/src/index.ts b/packages/flow-approval-presenter/src/index.ts index 8b94de3..cf2a0b5 100644 --- a/packages/flow-approval-presenter/src/index.ts +++ b/packages/flow-approval-presenter/src/index.ts @@ -5,4 +5,5 @@ export * from '@/store'; export * from '@/hooks'; export * from '@/interceptor'; export * from '@/utils/operator-count'; +export * from '@/utils/active-form'; export { FlowActionPresenter } from '@/presenters/action'; \ No newline at end of file diff --git a/packages/flow-approval-presenter/src/utils/active-form.ts b/packages/flow-approval-presenter/src/utils/active-form.ts new file mode 100644 index 0000000..4b3126b --- /dev/null +++ b/packages/flow-approval-presenter/src/utils/active-form.ts @@ -0,0 +1,107 @@ +import {FormActionContext} from "@coding-flow/flow-types"; + +/** + * 审批表单动作的固定 key。 + * + * 与各端表单视图注册的 key 保持一致,切换记录时通过该 key 移除旧动作, + * 避免 {@link FormActionContext#addAction} 因 key 重复而丢弃新的表单实例。 + */ +export const VIEW_FORM_ACTION_KEY = 'view-form'; + +/** + * 单条流程记录对应的表单实例。 + * + * 合并审批中每条待办记录各有一个表单实例,`values` 为该记录下发的表单数据, + * 用于表单实例尚未挂载(合并列表未「查看」该记录)或已卸载时兜底, + * 避免提交空 formData 被服务端以必填校验拒绝。 + */ +export interface ApprovalFormItem { + /** 表单实例 */ + form: { + getFieldsValue(): Record; + + validateFields(): Promise>; + }; + /** 记录对应的表单初始数据 */ + values: Record; +} + +/** + * 审批表单动作(保存 / 校验)的当前记录跟随器。 + * + *

背景:`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({}); + } + return item.form.validateFields() + .then(values => ({...item.values, ...values})); + } +} 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 0000000..8463433 --- /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-mobile/flow-mobile-approval/src/components/flow-approval/components/form-view-component.tsx b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/form-view-component.tsx index 20f59e8..d9cc303 100644 --- a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/form-view-component.tsx +++ b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/form-view-component.tsx @@ -1,10 +1,10 @@ import React from "react"; -import { useApprovalContext, useMockContext } from "@coding-flow/flow-approval-presenter"; +import { ActiveFormAction, useApprovalContext, useMockContext } from "@coding-flow/flow-approval-presenter"; import { ViewBindPlugin } from "@coding-flow/flow-core"; import { FlowFormView } from "@coding-flow/flow-mobile-form"; import { createFormInstance } from "@coding-form/form-engine"; import { detail } from "@/api/record"; -import type { FlowContent } from "@coding-flow/flow-types"; +import type { FlowContent, FlowTodo } from "@coding-flow/flow-types"; interface FormViewComponentProps { onValuesChange?: (values: any) => void; @@ -26,45 +26,61 @@ export const FormViewComponent: React.FC = (props) => { // 是否可合并审批 const mergeable = state.flow?.mergeable || false; const todos = state.flow?.todos || []; - const formList = todos.length > 0 ? todos.map(item => { - return { - form: createFormInstance(flowForm as any), - data: item, - } - }) : [ - { - form: createFormInstance(flowForm as any), - data: undefined, + + /** + * 每条待办记录对应一个表单实例。 + * + * 必须按待办记录记忆化:合并审批查看单条流程会刷新按钮/候选人并触发重渲染, + * 若每次渲染都重建表单实例,被查看记录的表单初始数据会丢失(初始值只写入一次), + * 提交时取到的是空表单。 + */ + const formList = React.useMemo(() => { + const createItem = (item?: FlowTodo) => { + const values = { + ...context.getInitData(), + ...item?.data, + recordId: item?.recordId, + }; + return { + form: createFormInstance(flowForm as any), + data: item, + values, + initialized: false, + } } - ] + return todos.length > 0 ? todos.map(item => createItem(item)) : [createItem(undefined)]; + }, [flowForm, todos]); + + /** + * 表单动作(保存/校验)跟随「当前查看或提交的记录」。 + * + * FormActionContext 以固定 key 只保留一个动作,不能逐条记录注册(后注册的会被丢弃), + * 也不能恒定读取第一条记录的表单实例:合并审批查看第二条记录时,第一条记录的表单已卸载, + * getFieldsValue() 返回 {},提交会因 formData 为空被服务端拒绝。 + */ + const activeForm = React.useRef(); + + React.useEffect(() => { + const formAction = new ActiveFormAction(context.getPresenter().getFormActionContext()); + activeForm.current = formAction; + formAction.register(); + return () => formAction.unregister(); + }, []); React.useEffect(() => { formList.forEach(item => { - const formInstance = item.form; - const formRecord = item.data?.data; - context.getPresenter().getFormActionContext().addAction({ - save: () => { - return formInstance.getFieldsValue(); - }, - key: () => { - return 'view-form' - }, - validate: () => { - return new Promise((resolve, reject) => { - formInstance.validateFields() - .then(resolve) - .catch(reject) - }) - } - }); - formInstance.resetFields(); - formInstance.setFieldsValue({ - ...context.getInitData(), - ...formRecord, - recordId: item.data?.recordId, - }); + if (item.initialized) { + return; + } + item.initialized = true; + item.form.resetFields(); + item.form.setFieldsValue(item.values); }); - }, []); + // 默认提交「打开详情的那条记录」;合并审批查看单条流程时由 handleMergeRecordView 切换 + activeForm.current?.switchTo( + formList.find(item => item.data?.recordId === state.flow?.recordId) || formList[0] + ); + }, [formList, state.flow?.recordId]); const handleMergeRecordIdsSelected = (recordIds: number[]) => { // 提交所选的流程记录Ids @@ -94,6 +110,8 @@ export const FormViewComponent: React.FC = (props) => { } return; } + // 同步切换提交所用的表单实例(详情刷新是异步的,期间提交不能落到上一条记录的表单上) + activeForm.current?.switchTo(formList.find(item => item.data?.recordId === recordId)); const currentFlow = presenter.getState().flow; if (!mergeOriginFlow.current) { mergeOriginFlow.current = currentFlow; diff --git a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx index 84a6124..e3ba2d4 100644 --- a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx +++ b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx @@ -1,10 +1,10 @@ import React from "react"; -import {useApprovalContext, useMockContext} from "@coding-flow/flow-approval-presenter"; +import {ActiveFormAction, useApprovalContext, useMockContext} from "@coding-flow/flow-approval-presenter"; import {ViewBindPlugin} from "@coding-flow/flow-core"; import {FlowFormView} from "@coding-flow/flow-pc-form"; import {createFormInstance} from "@coding-form/form-engine"; import {detail} from "@/api/record"; -import type {FlowContent} from "@coding-flow/flow-types"; +import type {FlowContent, FlowTodo} from "@coding-flow/flow-types"; interface FormViewComponentProps { onValuesChange?: (values: any) => void; @@ -26,47 +26,61 @@ export const FormViewComponent: React.FC = (props) => { // 是否可合并审批 const mergeable = state.flow?.mergeable || false; const todos = state.flow?.todos || []; - const formList = todos.length > 0 ? todos.map(item => { - return { - form: createFormInstance(flowForm as any), - data: item, - } - }) : [ - { - form: createFormInstance(flowForm as any), - data: undefined, + + /** + * 每条待办记录对应一个表单实例。 + * + * 必须按待办记录记忆化:合并审批查看单条流程会刷新按钮/候选人并触发重渲染, + * 若每次渲染都重建表单实例,被查看记录的表单初始数据会丢失(初始值只写入一次), + * 提交时取到的是空表单。 + */ + const formList = React.useMemo(() => { + const createItem = (item?: FlowTodo) => { + const values = { + ...context.getInitData(), + ...item?.data, + recordId: item?.recordId, + }; + return { + form: createFormInstance(flowForm as any), + data: item, + values, + initialized: false, + } } - ] + return todos.length > 0 ? todos.map(item => createItem(item)) : [createItem(undefined)]; + }, [flowForm, todos]); + + /** + * 表单动作(保存/校验)跟随「当前查看或提交的记录」。 + * + * FormActionContext 以固定 key 只保留一个动作,不能逐条记录注册(后注册的会被丢弃), + * 也不能恒定读取第一条记录的表单实例:合并审批查看第二条记录时,第一条记录的表单已卸载, + * getFieldsValue() 返回 {},提交会因 formData 为空被服务端拒绝。 + */ + const activeForm = React.useRef(); + + React.useEffect(() => { + const formAction = new ActiveFormAction(context.getPresenter().getFormActionContext()); + activeForm.current = formAction; + formAction.register(); + return () => formAction.unregister(); + }, []); React.useEffect(() => { formList.forEach(item => { - const formInstance = item.form; - const formRecord = item.data?.data; - context.getPresenter().getFormActionContext().addAction({ - save: () => { - const data = formInstance.getFieldsValue(); - console.log('save:', data); - return data; - }, - key: () => { - return 'view-form' - }, - validate: () => { - return new Promise((resolve, reject) => { - formInstance.validateFields() - .then(resolve) - .catch(reject) - }) - } - }); - formInstance.resetFields(); - formInstance.setFieldsValue({ - ...context.getInitData(), - ...formRecord, - recordId: item.data?.recordId, - }); + if (item.initialized) { + return; + } + item.initialized = true; + item.form.resetFields(); + item.form.setFieldsValue(item.values); }); - }, []); + // 默认提交「打开详情的那条记录」;合并审批查看单条流程时由 handleMergeRecordView 切换 + activeForm.current?.switchTo( + formList.find(item => item.data?.recordId === state.flow?.recordId) || formList[0] + ); + }, [formList, state.flow?.recordId]); const handleMergeRecordIdsSelected = (recordIds: number[]) => { // 提交所选的流程记录Ids @@ -96,6 +110,8 @@ export const FormViewComponent: React.FC = (props) => { } return; } + // 同步切换提交所用的表单实例(详情刷新是异步的,期间提交不能落到上一条记录的表单上) + activeForm.current?.switchTo(formList.find(item => item.data?.recordId === recordId)); const currentFlow = presenter.getState().flow; if (!mergeOriginFlow.current) { mergeOriginFlow.current = currentFlow; From d32ae6330a7fe576c6b51e3f53a6239104a3e96b Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Thu, 12 Nov 2026 15:00:33 +0800 Subject: [PATCH 12/12] =?UTF-8?q?fix(approval):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=AE=A1=E6=89=B9=E8=A1=A8=E5=8D=95=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E9=87=8D=E6=B8=B2=E6=9F=93=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit createFormInstance 内部执行 Form.useForm(),本质是 hook 工厂,每次调用都会向 当前组件注册 hook(useRef/useState/useMemo)。上一版按待办记录用 useMemo 缓存 表单实例,导致重渲染时 hook 数量减少,直接抛 `Cannot read properties of undefined (reading 'length')`(areHookInputsEqual), 审批页面崩溃。 - 每次渲染按待办记录调用一次 createFormInstance,维持 hook 调用次数 - 实例通过 useRef 按 recordId 缓存,保证表单实例身份稳定(编辑值、校验依赖同一实例) - 表单初始值在创建实例时写入,不再依赖挂载后的 resetFields - 补充回归测试:模拟合并审批状态更新触发重渲染(旧实现可复现崩溃), 并断言提交的 formData 为当前记录数据而不是空对象 --- .changeset/merge-approval-active-form.md | 1 + .../src/utils/active-form.ts | 10 +- .../components/form-view-component.tsx | 71 ++++---- .../components/form-view-component.tsx | 71 ++++---- .../tests/form-view-component.test.tsx | 151 ++++++++++++++++++ 5 files changed, 243 insertions(+), 61 deletions(-) create mode 100644 packages/flow-pc/flow-pc-approval/tests/form-view-component.test.tsx diff --git a/.changeset/merge-approval-active-form.md b/.changeset/merge-approval-active-form.md index 48c4f31..06b5297 100644 --- a/.changeset/merge-approval-active-form.md +++ b/.changeset/merge-approval-active-form.md @@ -9,3 +9,4 @@ fix: 合并审批查看非首条流程后提交表单数据为空(减签被 fo - 新增 `ActiveFormAction`(`@coding-flow/flow-approval-presenter`):表单保存/校验动作跟随「当前查看或提交的记录」切换,表单实例未挂载时用记录初始数据兜底,不再提交空 `formData`。 - PC / 移动端审批表单视图改为只注册一个表单动作,并按待办记录记忆化表单实例;此前固定 key 只保留第一条记录的表单实例,查看第二条记录后 `getFieldsValue()` 返回 `{}`,请求被服务端 `Required field formData cannot be empty` 拒绝(减签等动作在合并审批中无法提交)。 - 合并审批查看单条流程时同步切换表单实例,详情接口尚未返回期间提交也不会落到上一条记录的表单上。 +- 修复按待办记录缓存表单实例引入的崩溃:`createFormInstance` 内部调用 `Form.useForm()`,本质是 hook 工厂,每次渲染必须按相同顺序、相同次数调用;改为每次渲染都按待办记录调用一次并复用首次创建的实例,避免重渲染时 hook 数量变化抛 `Cannot read properties of undefined (reading 'length')`(`areHookInputsEqual`)。 diff --git a/packages/flow-approval-presenter/src/utils/active-form.ts b/packages/flow-approval-presenter/src/utils/active-form.ts index 4b3126b..fbf5d2e 100644 --- a/packages/flow-approval-presenter/src/utils/active-form.ts +++ b/packages/flow-approval-presenter/src/utils/active-form.ts @@ -16,11 +16,11 @@ export const VIEW_FORM_ACTION_KEY = 'view-form'; * 避免提交空 formData 被服务端以必填校验拒绝。 */ export interface ApprovalFormItem { - /** 表单实例 */ + /** 表单实例(validateFields 在部分表单实例类型定义中未声明,运行时存在) */ form: { - getFieldsValue(): Record; + getFieldsValue(): any; - validateFields(): Promise>; + validateFields?(): Promise; }; /** 记录对应的表单初始数据 */ values: Record; @@ -101,6 +101,10 @@ export class ActiveFormAction { 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-mobile/flow-mobile-approval/src/components/flow-approval/components/form-view-component.tsx b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/form-view-component.tsx index d9cc303..4ba633a 100644 --- a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/form-view-component.tsx +++ b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/form-view-component.tsx @@ -1,15 +1,26 @@ import React from "react"; -import { ActiveFormAction, useApprovalContext, useMockContext } from "@coding-flow/flow-approval-presenter"; +import { + ActiveFormAction, + useApprovalContext, + useMockContext, + type ApprovalFormItem, +} from "@coding-flow/flow-approval-presenter"; import { ViewBindPlugin } from "@coding-flow/flow-core"; import { FlowFormView } from "@coding-flow/flow-mobile-form"; import { createFormInstance } from "@coding-form/form-engine"; import { detail } from "@/api/record"; -import type { FlowContent, FlowTodo } from "@coding-flow/flow-types"; +import type { FlowContent, FlowTodo, FormInstance } from "@coding-flow/flow-types"; interface FormViewComponentProps { onValuesChange?: (values: any) => void; } +/** 合并审批中一条待办记录对应的表单实例 */ +interface MergeFormItem extends ApprovalFormItem { + form: FormInstance; + data?: FlowTodo; +} + export const FormViewComponent: React.FC = (props) => { const { state, context } = useApprovalContext(); const review = state.review || false; @@ -28,28 +39,38 @@ export const FormViewComponent: React.FC = (props) => { const todos = state.flow?.todos || []; /** - * 每条待办记录对应一个表单实例。 + * 每条待办记录对应一个表单实例(合并审批可逐条查看)。 * - * 必须按待办记录记忆化:合并审批查看单条流程会刷新按钮/候选人并触发重渲染, - * 若每次渲染都重建表单实例,被查看记录的表单初始数据会丢失(初始值只写入一次), - * 提交时取到的是空表单。 + * 注意:createFormInstance 内部执行 Form.useForm(),本质是 hook 工厂,每次调用都会向当前 + * 组件注册 hook(useRef/useMemo 等)。因此每次渲染必须按相同顺序、相同次数调用, + * 不能用 useMemo 缓存或跳过调用,否则 hook 数量变化会抛 + * `Cannot read properties of undefined (reading 'length')`(areHookInputsEqual)。 + * 这里每次渲染都按待办记录调用一次,仅保留首次创建的实例,保证实例身份稳定 + * (合并审批查看单条时的编辑值与校验都依赖同一个实例)。 */ - const formList = React.useMemo(() => { - const createItem = (item?: FlowTodo) => { - const values = { - ...context.getInitData(), - ...item?.data, - recordId: item?.recordId, - }; - return { - form: createFormInstance(flowForm as any), - data: item, - values, - initialized: false, - } + const formItemCache = React.useRef>(new Map()); + const formList: MergeFormItem[] = (todos.length > 0 ? todos : [undefined]).map(item => { + // 占位调用:维持 hook 调用次数(实例命中缓存时该实例不会被使用) + const createdForm = createFormInstance(flowForm as any); + const recordId = item?.recordId; + const cached = formItemCache.current.get(recordId); + if (cached) { + return cached; } - return todos.length > 0 ? todos.map(item => createItem(item)) : [createItem(undefined)]; - }, [flowForm, todos]); + const values = { + ...context.getInitData(), + ...item?.data, + recordId, + }; + createdForm.setFieldsValue(values); + const formItem: MergeFormItem = { + form: createdForm, + data: item, + values, + }; + formItemCache.current.set(recordId, formItem); + return formItem; + }); /** * 表单动作(保存/校验)跟随「当前查看或提交的记录」。 @@ -68,14 +89,6 @@ export const FormViewComponent: React.FC = (props) => { }, []); React.useEffect(() => { - formList.forEach(item => { - if (item.initialized) { - return; - } - item.initialized = true; - item.form.resetFields(); - item.form.setFieldsValue(item.values); - }); // 默认提交「打开详情的那条记录」;合并审批查看单条流程时由 handleMergeRecordView 切换 activeForm.current?.switchTo( formList.find(item => item.data?.recordId === state.flow?.recordId) || formList[0] diff --git a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx index e3ba2d4..25a18a0 100644 --- a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx +++ b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/form-view-component.tsx @@ -1,15 +1,26 @@ import React from "react"; -import {ActiveFormAction, useApprovalContext, useMockContext} from "@coding-flow/flow-approval-presenter"; +import { + ActiveFormAction, + useApprovalContext, + useMockContext, + type ApprovalFormItem, +} from "@coding-flow/flow-approval-presenter"; import {ViewBindPlugin} from "@coding-flow/flow-core"; import {FlowFormView} from "@coding-flow/flow-pc-form"; import {createFormInstance} from "@coding-form/form-engine"; import {detail} from "@/api/record"; -import type {FlowContent, FlowTodo} from "@coding-flow/flow-types"; +import type {FlowContent, FlowTodo, FormInstance} from "@coding-flow/flow-types"; interface FormViewComponentProps { onValuesChange?: (values: any) => void; } +/** 合并审批中一条待办记录对应的表单实例 */ +interface MergeFormItem extends ApprovalFormItem { + form: FormInstance; + data?: FlowTodo; +} + export const FormViewComponent: React.FC = (props) => { const {state, context} = useApprovalContext(); const review = state.review || false; @@ -28,28 +39,38 @@ export const FormViewComponent: React.FC = (props) => { const todos = state.flow?.todos || []; /** - * 每条待办记录对应一个表单实例。 + * 每条待办记录对应一个表单实例(合并审批可逐条查看)。 * - * 必须按待办记录记忆化:合并审批查看单条流程会刷新按钮/候选人并触发重渲染, - * 若每次渲染都重建表单实例,被查看记录的表单初始数据会丢失(初始值只写入一次), - * 提交时取到的是空表单。 + * 注意:createFormInstance 内部执行 Form.useForm(),本质是 hook 工厂,每次调用都会向当前 + * 组件注册 hook(useRef/useMemo 等)。因此每次渲染必须按相同顺序、相同次数调用, + * 不能用 useMemo 缓存或跳过调用,否则 hook 数量变化会抛 + * `Cannot read properties of undefined (reading 'length')`(areHookInputsEqual)。 + * 这里每次渲染都按待办记录调用一次,仅保留首次创建的实例,保证实例身份稳定 + * (合并审批查看单条时的编辑值与校验都依赖同一个实例)。 */ - const formList = React.useMemo(() => { - const createItem = (item?: FlowTodo) => { - const values = { - ...context.getInitData(), - ...item?.data, - recordId: item?.recordId, - }; - return { - form: createFormInstance(flowForm as any), - data: item, - values, - initialized: false, - } + const formItemCache = React.useRef>(new Map()); + const formList: MergeFormItem[] = (todos.length > 0 ? todos : [undefined]).map(item => { + // 占位调用:维持 hook 调用次数(实例命中缓存时该实例不会被使用) + const createdForm = createFormInstance(flowForm as any); + const recordId = item?.recordId; + const cached = formItemCache.current.get(recordId); + if (cached) { + return cached; } - return todos.length > 0 ? todos.map(item => createItem(item)) : [createItem(undefined)]; - }, [flowForm, todos]); + const values = { + ...context.getInitData(), + ...item?.data, + recordId, + }; + createdForm.setFieldsValue(values); + const formItem: MergeFormItem = { + form: createdForm, + data: item, + values, + }; + formItemCache.current.set(recordId, formItem); + return formItem; + }); /** * 表单动作(保存/校验)跟随「当前查看或提交的记录」。 @@ -68,14 +89,6 @@ export const FormViewComponent: React.FC = (props) => { }, []); React.useEffect(() => { - formList.forEach(item => { - if (item.initialized) { - return; - } - item.initialized = true; - item.form.resetFields(); - item.form.setFieldsValue(item.values); - }); // 默认提交「打开详情的那条记录」;合并审批查看单条流程时由 handleMergeRecordView 切换 activeForm.current?.switchTo( formList.find(item => item.data?.recordId === state.flow?.recordId) || formList[0] diff --git a/packages/flow-pc/flow-pc-approval/tests/form-view-component.test.tsx b/packages/flow-pc/flow-pc-approval/tests/form-view-component.test.tsx new file mode 100644 index 0000000..0e34d8c --- /dev/null +++ b/packages/flow-pc/flow-pc-approval/tests/form-view-component.test.tsx @@ -0,0 +1,151 @@ +import {beforeEach, describe, expect, it, rs} from "@rstest/core"; +import React from "react"; +import {act, render} from "@testing-library/react"; +import {Provider} from "react-redux"; +import {Form} from "antd"; +import {registerFormItems} from "@coding-form/form-engine"; +import { + ApprovalContext, + ApprovalContextScope, + approvalStore, + updateState, +} from "@coding-flow/flow-approval-presenter"; +import {FormActionContext} from "@coding-flow/flow-types"; +import {FormViewComponent} from "@/components/flow-approval/components/form-view-component"; + +/** + * 审批表单视图(合并审批) + * + * 回归场景:合并审批中查看第二条流程后提交,formData 不能为空,且组件在重渲染时 + * 不能因为 hook 数量变化而崩溃(createFormInstance 内部是 hook 工厂)。 + */ + +// jsdom 未实现 matchMedia,antd Table 的响应式列依赖它 +if (!window.matchMedia) { + window.matchMedia = ((query: string) => ({ + matches: false, + media: query, + onchange: null, + addListener: rs.fn(), + removeListener: rs.fn(), + addEventListener: rs.fn(), + removeEventListener: rs.fn(), + dispatchEvent: rs.fn(), + })) as any; +} + +/** 注册表单组件必须在渲染期执行(registerFormItems 内部调用了 hook) */ +const Registrations: React.FC<{ children: React.ReactNode }> = ({children}) => { + registerFormItems(Form, []); + return <>{children}; +}; + +const buildFlow = () => ({ + recordId: 3658, + view: 'default', + mergeable: true, + form: { + code: 'leave', + name: '请假单', + fields: [], + subForms: null, + }, + fieldPermissions: [], + currentNodeOperators: [{id: 2, name: 'lorne'}], + todos: [ + { + recordId: 3655, + processId: 'p1', + workTitle: '请假测试', + nodeId: 'n1', + nodeName: '审批节点', + nodeType: 'APPROVAL', + title: '你有一条待办', + createTime: 0, + recordState: 0, + flowState: 0, + submitOperator: {id: 1, name: 'admin'}, + createdOperator: {id: 1, name: 'admin'}, + data: {days: 11, desc: '22'}, + }, + { + recordId: 3658, + processId: 'p2', + workTitle: '请假测试', + nodeId: 'n1', + nodeName: '审批节点', + nodeType: 'APPROVAL', + title: '你有一条待办', + createTime: 0, + recordState: 0, + flowState: 0, + submitOperator: {id: 1, name: 'admin'}, + createdOperator: {id: 1, name: 'admin'}, + data: {days: 22, desc: '33'}, + }, + ], +} as any); + +describe('审批表单视图(合并审批)', () => { + + let formActionContext: FormActionContext; + let flow: any; + + const buildWrapper = () => { + const presenter = { + getFormActionContext: () => formActionContext, + getFlowActionPresenter: () => ({setSubmitRecordIds: rs.fn()}), + updateState: rs.fn(), + getState: () => ({flow}), + syncState: rs.fn(), + } as any; + const scope = new ApprovalContextScope(presenter, {content: flow, initData: {}} as any); + return ( + + + + + + + + ); + }; + + beforeEach(() => { + formActionContext = new FormActionContext(); + flow = buildFlow(); + approvalStore.dispatch(updateState({flow})); + }); + + it('重渲染不会因 hook 数量变化崩溃', () => { + // given + const view = render(buildWrapper()); + + // when 合并审批查看单条流程会触发状态更新与重渲染 + act(() => { + approvalStore.dispatch(updateState({recordState: 1})); + }); + act(() => { + approvalStore.dispatch(updateState({recordState: 0})); + }); + + // then + expect(view.container).toBeTruthy(); + }); + + it('提交的是打开详情那条记录的表单数据,不是空 formData', () => { + // given + const view = render(buildWrapper()); + + // when + const formData = formActionContext.save(); + + // then 合并列表默认提交打开详情的那条记录(recordId 3658) + expect(formData).toEqual({ + days: 22, + desc: '33', + recordId: 3658, + }); + view.unmount(); + }); +});