diff --git a/.changeset/merge-approval-active-form.md b/.changeset/merge-approval-active-form.md new file mode 100644 index 00000000..06b5297f --- /dev/null +++ b/.changeset/merge-approval-active-form.md @@ -0,0 +1,12 @@ +--- +"@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` 拒绝(减签等动作在合并审批中无法提交)。 +- 合并审批查看单条流程时同步切换表单实例,详情接口尚未返回期间提交也不会落到上一条记录的表单上。 +- 修复按待办记录缓存表单实例引入的崩溃:`createFormInstance` 内部调用 `Form.useForm()`,本质是 hook 工厂,每次渲染必须按相同顺序、相同次数调用;改为每次渲染都按待办记录调用一次并复用首次创建的实例,避免重渲染时 hook 数量变化抛 `Cannot read properties of undefined (reading 'length')`(`areHookInputsEqual`)。 diff --git a/.changeset/reduce-audit-action.md b/.changeset/reduce-audit-action.md new file mode 100644 index 00000000..283b206e --- /dev/null +++ b/.changeset/reduce-audit-action.md @@ -0,0 +1,22 @@ +--- +"@coding-flow/flow-types": patch +"@coding-flow/flow-core": patch +"@coding-flow/flow-approval-presenter": patch +"@coding-flow/flow-pc-form": patch +"@coding-flow/flow-pc-approval": patch +"@coding-flow/flow-mobile-approval": patch +"@coding-flow/flow-design": patch +--- + +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` 增加默认提示文案。 + +fix: 测试反馈问题(codingapi/flow-frontend#72) + +- 合并审批(记录合并)必须先勾选要处理的流程记录才能提交,取消勾选会同步清空选择;此前表单有数据即可绕过校验,导致未选择流程也能通过/拒绝/保存/转办。 +- 设计器「相同人员提交配置」未配置时默认展示「手动审批」,与后端未配置时的实际行为一致(issue #224 已移除默认策略,不再显示空值)。 diff --git a/AGENTS.md b/AGENTS.md index 0dc8053c..8a7b92bc 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 34259e71..68a58e51 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` 的合并一律由用户决定 +- 推送后保持分支可审核状态,由用户决定是否合并 ### 基本规范 diff --git a/docs/capabilities/flow-approval-presenter/action-factory.md b/docs/capabilities/flow-approval-presenter/action-factory.md index 462e4bbc..547e4464 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 18876446..900e960f 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 fce78221..ea49cb7a 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 caafd3b2..b7572e21 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 17b57af8..b39222d4 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 2d3d9ca1..dacd6464 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 无专属表单) } ``` diff --git a/packages/flow-approval-presenter/CHANGELOG.md b/packages/flow-approval-presenter/CHANGELOG.md index e739ea03..3884f7a9 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 c8cbebfb..ea7238dc 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-approval-presenter/src/index.ts b/packages/flow-approval-presenter/src/index.ts index 8b94de3f..cf2a0b55 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/plugins/index.ts b/packages/flow-approval-presenter/src/plugins/index.ts index 454c6e6a..8e765ec8 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 00000000..2e779f37 --- /dev/null +++ b/packages/flow-approval-presenter/src/plugins/reduce-audit-type.ts @@ -0,0 +1,20 @@ +import React from "react"; +import {ApprovalViewPluginAction} from "@/plugins/approval-view-plugin-action"; + +export const VIEW_KEY = 'ReduceAuditViewPlugin'; + +/** + * 减签人员选择视图(issue-72) + * + * 默认实现读取详情响应的 `currentNodeOperators`(当前节点待审批人,不含当前审批人), + * 真实项目可通过 ViewBindPlugin 注册该视图换成自己的选人组件。 + * 被减签人是否合法最终由服务端校验。 + */ +export interface ReduceAuditViewPlugin { + /** 返回用户 */ + onChange?: (value: string|string[]) => void; + /** 当前用户 */ + value?: string|string[]; + /** 动作控制 **/ + action?:React.Ref; +} diff --git a/packages/flow-approval-presenter/src/presenters/action.ts b/packages/flow-approval-presenter/src/presenters/action.ts index 78792eec..808794b7 100644 --- a/packages/flow-approval-presenter/src/presenters/action.ts +++ b/packages/flow-approval-presenter/src/presenters/action.ts @@ -188,10 +188,31 @@ 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)); } + /** + * 获取 presenter 内部的最新状态快照(用于异步回调中基于最新状态做更新)。 + */ + public getState(): ApprovalState { + return this.state; + } + /** * 判断某个动作按钮是否应隐藏(纯函数,单一事实来源)。 * @@ -283,8 +304,9 @@ 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 || this.state.mergeSingleRecordId || formData.recordId || this.createdRecordId || this.state.flow?.recordId; const workCode = this.state.flow?.workCode || ''; if (formData.recordId) { @@ -357,14 +379,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 +483,16 @@ export class FlowActionPresenter { try { // 流程合并审批 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); + } if (mergeable && submitRecordIds.length > 0) { const submitRecordIds = this.submitRecordIds; for (const recordId of submitRecordIds) { diff --git a/packages/flow-approval-presenter/src/presenters/index.ts b/packages/flow-approval-presenter/src/presenters/index.ts index 42d2167f..18648418 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 42cfec05..3c3f231c 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/src/utils/active-form.ts b/packages/flow-approval-presenter/src/utils/active-form.ts new file mode 100644 index 00000000..fbf5d2e1 --- /dev/null +++ b/packages/flow-approval-presenter/src/utils/active-form.ts @@ -0,0 +1,111 @@ +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 { + /** 表单实例(validateFields 在部分表单实例类型定义中未声明,运行时存在) */ + form: { + getFieldsValue(): any; + + 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({}); + } + if (!item.form.validateFields) { + // 表单实例类型未声明校验方法时退化为直接提交当前数据 + return Promise.resolve(this.save()); + } + return item.form.validateFields() + .then(values => ({...item.values, ...values})); + } +} diff --git a/packages/flow-approval-presenter/tests/action-batchable.test.ts b/packages/flow-approval-presenter/tests/action-batchable.test.ts new file mode 100644 index 00000000..14d0cd9a --- /dev/null +++ b/packages/flow-approval-presenter/tests/action-batchable.test.ts @@ -0,0 +1,135 @@ +import { describe, expect, it, rs } from "@rstest/core"; +import { FlowActionPresenter } from "@/presenters/action"; +import { ApprovalState, FlowApprovalApi } from "@/typings"; +import { FlowAction, FormActionContext } from "@coding-flow/flow-types"; + +const buildAction = (id: string, type: FlowAction['type'], batchable?: boolean): FlowAction => ({ + id, + title: id, + type, + display: 'BUTTON', + enable: true, + batchable, +} as FlowAction); + +/** 合并审批状态:当前详情记录为 1,合并组内还有记录 2 */ +const buildMergeState = (actions: FlowAction[]): ApprovalState => ({ + flow: { + recordId: 1, + mergeable: true, + actions, + todos: [ + { recordId: 1, data: { name: 'a' } }, + { recordId: 2, data: { name: 'b' } }, + ], + }, +} as unknown as ApprovalState); + +/** 表单上下文固定返回指定记录的表单数据,用于验证提交目标的优先级 */ +const buildFormContext = (recordId = 2) => { + const formContext = new FormActionContext(); + formContext.addAction({ + save: () => ({ recordId, name: 'b' }), + key: () => 'view-form', + validate: async () => ({ recordId, name: 'b' }), + }); + return formContext; +}; + +const buildApi = () => { + const api: FlowApprovalApi = { + create: rs.fn(async () => 100), + processNodes: rs.fn(async () => []), + action: rs.fn(async () => ({ success: true })), + revoke: rs.fn(async () => ({ success: true })), + urge: rs.fn(async () => ({ success: true })), + }; + return api; +}; + +describe.sequential('FlowActionPresenter 合并批量提交(batchable)', () => { + + it('支持批量的动作按勾选记录逐条提交', async () => { + const passAction = buildAction('pass-1', 'PASS'); + const api = buildApi(); + const presenter = new FlowActionPresenter( + buildMergeState([passAction]), + api, + buildFormContext(), + 'mockKey', + () => {}, + ); + presenter.setSubmitRecordIds([1, 2]); + + await presenter.action('pass-1'); + + expect(api.action).toHaveBeenCalledTimes(2); + const recordIds = api.action.mock.calls.map((call) => call[0].recordId); + expect(recordIds).toEqual([1, 2]); + // 提交完成后清空勾选,避免下一次动作重复提交 + expect(presenter.getSubmitRecordIds()).toEqual([]); + }); + + it('不支持批量的动作(减签)只提交当前详情记录,忽略合并勾选', async () => { + const reduceAction = buildAction('reduce-1', 'REDUCE_AUDIT', false); + const api = buildApi(); + const presenter = new FlowActionPresenter( + buildMergeState([reduceAction]), + api, + buildFormContext(), + 'mockKey', + () => {}, + ); + presenter.setSubmitRecordIds([1, 2]); + + await presenter.action('reduce-1', { forwardOperatorIds: [3] }); + + expect(presenter.isBatchable('reduce-1')).toBe(false); + expect(api.action).toHaveBeenCalledTimes(1); + const request = api.action.mock.calls[0][0]; + // 表单上下文返回的是记录 2,但非批量动作必须强制提交当前详情记录 1 + expect(request.recordId).toBe(1); + expect(request.advice.forwardOperatorIds).toEqual([3]); + // 勾选记录保持不变,用户仍可用于通过等其他批量动作 + expect(presenter.getSubmitRecordIds()).toEqual([1, 2]); + }); + + it('从合并列表进入单条流程后,所有动作只提交该条记录', async () => { + const passAction = buildAction('pass-1', 'PASS'); + const api = buildApi(); + const state = { + ...buildMergeState([passAction]), + mergeSingleRecordId: 2, + } as ApprovalState; + const presenter = new FlowActionPresenter( + state, + api, + buildFormContext(1), + 'mockKey', + () => {}, + ); + presenter.setSubmitRecordIds([1, 2]); + + await presenter.action('pass-1'); + + // 不再循环合并勾选,表单数据中的记录 1 也让位于当前查看的记录 2 + expect(api.action).toHaveBeenCalledTimes(1); + expect(api.action.mock.calls[0][0].recordId).toBe(2); + expect(presenter.getSubmitRecordIds()).toEqual([1, 2]); + }); + + it('缺少 batchable 标记时按支持批量处理(兼容旧服务端)', () => { + const passAction = buildAction('pass-1', 'PASS'); + const api = buildApi(); + const presenter = new FlowActionPresenter( + buildMergeState([passAction]), + api, + buildFormContext(), + 'mockKey', + () => {}, + ); + + expect(presenter.isBatchable('pass-1')).toBe(true); + expect(presenter.isBatchable('unknown')).toBe(true); + }); +}); diff --git a/packages/flow-approval-presenter/tests/active-form.test.ts b/packages/flow-approval-presenter/tests/active-form.test.ts new file mode 100644 index 00000000..84634336 --- /dev/null +++ b/packages/flow-approval-presenter/tests/active-form.test.ts @@ -0,0 +1,97 @@ +import {describe, expect, it, rs} from "@rstest/core"; +import {FormActionContext} from "@coding-flow/flow-types"; +import {ActiveFormAction, ApprovalFormItem, VIEW_FORM_ACTION_KEY} from "@/utils/active-form"; + +/** + * 合并审批表单取数(bug:查看第二条流程后减签提交 formData 为 {}) + * + * 合并审批中每条流程记录各有一个表单实例,而 FormActionContext 只允许一个同名动作, + * 因此必须跟随「当前正在查看/提交的记录」切换表单实例,否则会读到其它记录(或未挂载)的 + * 表单实例,取到 {},被服务端 `Required field formData cannot be empty` 拒绝。 + */ + +/** 构造一条记录的表单实例:live 模拟表单实例当前值(未挂载时为 {}) */ +const buildItem = (values: any, live: any = {}): ApprovalFormItem => ({ + form: { + getFieldsValue: rs.fn(() => live), + validateFields: rs.fn(async () => live), + }, + values, +}); + +describe('合并审批表单动作', () => { + + it('切换记录后保存的是当前记录的表单实例数据', () => { + // given 合并组内两条记录,表单一(记录1)已编辑,表单二(记录2)为原始数据 + const formActionContext = new FormActionContext(); + const activeForm = new ActiveFormAction(formActionContext); + activeForm.register(); + + const first = buildItem({recordId: 1, days: 22, desc: '22'}, {recordId: 1, days: 22, desc: '22'}); + const second = buildItem({recordId: 3658, days: 3, desc: '病假'}, {recordId: 3658, days: 3, desc: '病假'}); + + // when 默认第一条,随后查看第二条记录 + activeForm.switchTo(first); + activeForm.switchTo(second); + + // then 提交目标必须是第二条记录的表单数据 + expect(formActionContext.save()).toEqual({recordId: 3658, days: 3, desc: '病假'}); + }); + + it('表单实例未挂载时用记录初始数据兜底,不提交空 formData', () => { + // given 查看第二条记录后又返回合并列表,此时表单实例已卸载,getFieldsValue 返回 {} + const formActionContext = new FormActionContext(); + const activeForm = new ActiveFormAction(formActionContext); + activeForm.register(); + activeForm.switchTo(buildItem({recordId: 3658, days: 3, desc: '病假'}, {})); + + // when + const formData = formActionContext.save(); + + // then 不能用空对象提交(服务端会以 formData 必填拒绝) + expect(formData).toEqual({recordId: 3658, days: 3, desc: '病假'}); + }); + + it('表单实例已挂载时以表单最新值覆盖初始数据', () => { + // given 审批人改写了表单字段 + const activeForm = new ActiveFormAction(new FormActionContext()); + activeForm.register(); + activeForm.switchTo(buildItem({recordId: 3658, days: 3, desc: '病假'}, {recordId: 3658, days: 5})); + + // when + const formData = activeForm.save(); + + // then 以输入为准,未挂载字段保留初始数据 + expect(formData).toEqual({recordId: 3658, days: 5, desc: '病假'}); + }); + + it('校验动作同样跟随当前记录的表单实例', async () => { + // given + const formActionContext = new FormActionContext(); + const activeForm = new ActiveFormAction(formActionContext); + activeForm.register(); + const item = buildItem({recordId: 3658, days: 3}, {recordId: 3658, days: 3}); + activeForm.switchTo(item); + + // when + await formActionContext.validate(); + + // then + expect(item.form.validateFields).toHaveBeenCalledTimes(1); + }); + + it('重复注册与销毁后不残留重复动作', () => { + // given 组件重复挂载(热更新/重新打开详情) + const formActionContext = new FormActionContext(); + const activeForm = new ActiveFormAction(formActionContext); + + // when + activeForm.register(); + activeForm.register(); + activeForm.unregister(); + + // then + expect(formActionContext.save()).toEqual({}); + expect(VIEW_FORM_ACTION_KEY).toBe('view-form'); + }); +}); diff --git a/packages/flow-core/CHANGELOG.md b/packages/flow-core/CHANGELOG.md index 8f8c81ad..6bc966ed 100644 --- a/packages/flow-core/CHANGELOG.md +++ b/packages/flow-core/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-core +## 0.2.20 + +### Patch Changes + +- 版本升级至 0.2.20(配合 flow-engine 后端版本升级,本包无功能变更) + ## 0.2.17 ## 0.2.16 diff --git a/packages/flow-core/package.json b/packages/flow-core/package.json index a2edbaa8..79b0c682 100644 --- a/packages/flow-core/package.json +++ b/packages/flow-core/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-core", - "version": "0.2.17", + "version": "0.2.20", "description": "flow-engine core lib framework ", "type": "module", "sideEffects": [ diff --git a/packages/flow-core/src/message.ts b/packages/flow-core/src/message.ts index 3fb1809f..a7fa0ceb 100644 --- a/packages/flow-core/src/message.ts +++ b/packages/flow-core/src/message.ts @@ -29,6 +29,7 @@ export const FlowMessageKey = { APPROVAL_REJECT: 'approval.reject', APPROVAL_DELEGATE: 'approval.delegate', APPROVAL_ADD_AUDIT: 'approval.add_audit', + APPROVAL_REDUCE_AUDIT: 'approval.reduce_audit', APPROVAL_TRANSFER: 'approval.transfer', APPROVAL_RETURN: 'approval.return', APPROVAL_REVOKE: 'approval.revoke', @@ -143,6 +144,7 @@ function getDefaultMessages(): Record { [FlowMessageKey.APPROVAL_REJECT]: '操作成功', [FlowMessageKey.APPROVAL_DELEGATE]: '操作成功', [FlowMessageKey.APPROVAL_ADD_AUDIT]: '操作成功', + [FlowMessageKey.APPROVAL_REDUCE_AUDIT]: '操作成功', [FlowMessageKey.APPROVAL_TRANSFER]: '操作成功', [FlowMessageKey.APPROVAL_RETURN]: '操作成功', [FlowMessageKey.APPROVAL_REVOKE]: '流程已撤回', diff --git a/packages/flow-design/CHANGELOG.md b/packages/flow-design/CHANGELOG.md index ed406c6c..0ad67457 100644 --- a/packages/flow-design/CHANGELOG.md +++ b/packages/flow-design/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-design +## 0.2.20 + +### Patch Changes + +- 版本升级至 0.2.20(配合 flow-engine 后端版本升级,本包无功能变更) + ## 0.2.17 ### Patch Changes diff --git a/packages/flow-design/package.json b/packages/flow-design/package.json index 560b000d..a9bd3c38 100644 --- a/packages/flow-design/package.json +++ b/packages/flow-design/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-design", - "version": "0.2.17", + "version": "0.2.20", "description": "flow-engine design components ", "type": "module", "sideEffects": [ diff --git a/packages/flow-design/src/components/design-editor/node-components/strategy/same-operator-audit.tsx b/packages/flow-design/src/components/design-editor/node-components/strategy/same-operator-audit.tsx index 3e85a434..58ad7e5b 100644 --- a/packages/flow-design/src/components/design-editor/node-components/strategy/same-operator-audit.tsx +++ b/packages/flow-design/src/components/design-editor/node-components/strategy/same-operator-audit.tsx @@ -37,7 +37,9 @@ export const SameOperatorAuditStrategy:React.FC = () => { render={({field: {value, onChange}}: FieldRenderProps) => { return ( { + handleChange(value); + }} + options={options} + /> + ) +} 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 00000000..0e34d8cf --- /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(); + }); +}); diff --git a/packages/flow-pc/flow-pc-approval/tests/reduce-audit-action.test.tsx b/packages/flow-pc/flow-pc-approval/tests/reduce-audit-action.test.tsx new file mode 100644 index 00000000..b2b01f9e --- /dev/null +++ b/packages/flow-pc/flow-pc-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 component = ActionFactory.getInstance().getFlowActionComponent(action); + + // then + expect(component).toBeTruthy(); + }); + + it('未注册的动作类型应返回 undefined', () => { + // given + const action = { + id: 'unknown-1', + type: 'UNKNOWN_ACTION', + } as unknown as FlowAction; + + // when + const component = ActionFactory.getInstance().getFlowActionComponent(action); + + // then + expect(component).toBeUndefined(); + }); +}); diff --git a/packages/flow-pc/flow-pc-form/CHANGELOG.md b/packages/flow-pc/flow-pc-form/CHANGELOG.md index cfb95b3a..571a12b0 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 54bd5a26..3dc30a54 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-form/src/components/form/index.tsx b/packages/flow-pc/flow-pc-form/src/components/form/index.tsx index 25ab4962..e104589a 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 0b3e99b4..40e09ea1 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); @@ -38,11 +40,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]); // 切换是触发右侧节点列表的筛选 @@ -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 42d39777..fb560b60 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-pc/flow-pc-ui/CHANGELOG.md b/packages/flow-pc/flow-pc-ui/CHANGELOG.md index ba05688f..1c94946f 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 bf01c0e3..3fb258bd 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 6e03948c..0a3eca02 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 59541964..5f2d2f81 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": [ diff --git a/packages/flow-types/src/types/flow-approval.ts b/packages/flow-types/src/types/flow-approval.ts index 2b9515d1..ea5ea10d 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; // 前端触发事件,自定义脚本使用 @@ -367,6 +369,8 @@ export interface FlowContent { createOperator: FlowOperator; // 当前流程 currentOperator: FlowOperator; + // 当前节点待审批人员(不含当前操作人),减签等动作的候选人来源;按单条流程记录计算 + currentNodeOperators?: FlowOperator[]; // 流程状态 flowState: number; // 记录状态 diff --git a/packages/flow-types/src/types/flow-design.ts b/packages/flow-types/src/types/flow-design.ts index 6d9f6ce2..21d82652 100644 --- a/packages/flow-types/src/types/flow-design.ts +++ b/packages/flow-types/src/types/flow-design.ts @@ -53,6 +53,8 @@ export type ActionType = 'REJECT'| // 加签,指定给其他人一块审批,以会签模式来处理 'ADD_AUDIT'| + // 减签,把指定审批人从当前节点撤下,流程继续流转(仅循序/并签多人审批节点) + 'REDUCE_AUDIT'| // 委派,委派给其他人员来审批,当人员审批完成以后再流程给自己审批 'DELEGATE'| // 退回,退回时需要设置退回的节点 @@ -68,6 +70,7 @@ export const actionOptions = [ {label: '通过', value: 'PASS'}, {label: '拒绝', value: 'REJECT'}, {label: '加签', value: 'ADD_AUDIT'}, + {label: '减签', value: 'REDUCE_AUDIT'}, {label: '委派', value: 'DELEGATE'}, {label: '退回', value: 'RETURN'}, {label: '转办', value: 'TRANSFER'}, diff --git a/packages/flow-types/src/types/form-view.ts b/packages/flow-types/src/types/form-view.ts index 5d56c9aa..639e4b0b 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; /** 表单字段权限,为空时全部可写*/