From 0b9b8d64b074ad412bb45241523c2bc773ed7b25 Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Mon, 16 Nov 2026 20:50:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(approval):=20=E9=80=80=E5=9B=9E?= =?UTF-8?q?=E5=80=99=E9=80=89=E8=8A=82=E7=82=B9=E6=94=B9=E7=94=A8=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E6=89=A7=E8=A1=8C=E5=8E=86=E5=8F=B2=E5=88=97=E8=A1=A8?= =?UTF-8?q?=20(issue=20#270)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PC / 移动端退回弹框此前从流程定义的全量节点(nodes)中截取到当前节点, 当前节点不在顶层节点列表时(条件/并行块内)会退化为全部节点,能选到 当前节点之后的节点,且顺序为定义顺序(A、B)而非最近优先(B、A)。 - flow-types 新增可选字段 backNodes(后端按执行历史下发,最近优先) - 新增 buildReturnNodeOptions(flow-approval-presenter):优先使用 backNodes;为空数组表示明确不可退回,不再回退;旧版后端缺失该字段时 保留原有按定义顺序截取的兼容逻辑 - PC / 移动端 return-view 改用该工具,不再自行截取流程定义节点 - 补充 return-nodes 单元测试与 changeset Closes #270 --- .changeset/issue-270-return-back-nodes.md | 12 ++++ packages/flow-approval-presenter/src/index.ts | 1 + .../src/utils/return-nodes.ts | 47 ++++++++++++++++ .../tests/return-nodes.test.ts | 55 +++++++++++++++++++ .../src/plugins/view/return-view.tsx | 27 +++------ .../src/plugins/view/return-view.tsx | 27 +++------ .../flow-types/src/types/flow-approval.ts | 3 + 7 files changed, 136 insertions(+), 36 deletions(-) create mode 100644 .changeset/issue-270-return-back-nodes.md create mode 100644 packages/flow-approval-presenter/src/utils/return-nodes.ts create mode 100644 packages/flow-approval-presenter/tests/return-nodes.test.ts diff --git a/.changeset/issue-270-return-back-nodes.md b/.changeset/issue-270-return-back-nodes.md new file mode 100644 index 0000000..26a3b70 --- /dev/null +++ b/.changeset/issue-270-return-back-nodes.md @@ -0,0 +1,12 @@ +--- +"@coding-flow/flow-approval-presenter": patch +"@coding-flow/flow-pc-approval": patch +"@coding-flow/flow-mobile-approval": patch +"@coding-flow/flow-types": patch +--- + +fix: 退回候选节点改为后端按执行历史下发(issue #270) + +- 详情响应新增 `backNodes`:只包含当前记录真实执行过的历史节点,按“最近优先”排序(例如停留在 C 节点时为 B、A),`nodes` 仍保留流程定义全量节点不受影响。 +- PC / 移动端退回弹框改用 `backNodes`(`buildReturnNodeOptions`),不再从流程定义节点中截取,避免列出未走过、甚至位于当前节点之后的节点;`backNodes` 为空时不展示退回入口。 +- 兼容旧版后端:缺少 `backNodes` 字段时回退到原有按定义顺序截取的逻辑。 diff --git a/packages/flow-approval-presenter/src/index.ts b/packages/flow-approval-presenter/src/index.ts index cf2a0b5..bb1b54b 100644 --- a/packages/flow-approval-presenter/src/index.ts +++ b/packages/flow-approval-presenter/src/index.ts @@ -6,4 +6,5 @@ export * from '@/hooks'; export * from '@/interceptor'; export * from '@/utils/operator-count'; export * from '@/utils/active-form'; +export * from '@/utils/return-nodes'; export { FlowActionPresenter } from '@/presenters/action'; \ No newline at end of file diff --git a/packages/flow-approval-presenter/src/utils/return-nodes.ts b/packages/flow-approval-presenter/src/utils/return-nodes.ts new file mode 100644 index 0000000..45dff25 --- /dev/null +++ b/packages/flow-approval-presenter/src/utils/return-nodes.ts @@ -0,0 +1,47 @@ +import { FlowContent } from "@coding-flow/flow-types"; + +/** + * 退回节点下拉选项 + */ +export interface ReturnNodeOption { + label: string; + value: string; +} + +/** + * 构建退回候选节点。 + * + *

优先使用后端 `backNodes`:它只包含当前记录真实执行过的历史节点,并已按“最近优先”排序 + * (例如停留在 C 节点时为 B、A),避免从流程定义的全量节点 `nodes` 中截取时把未走过、 + * 甚至位于当前节点之后的节点也列出来(issue #270)。

+ * + *

`backNodes` 为空数组表示明确没有可退回节点(如开始节点),此时不再回退; + * 只有旧版后端完全不下发该字段时才回退到原有“按定义顺序截取到当前节点”的兼容逻辑。

+ * + * @param flow 流程详情内容 + * @returns 退回候选节点选项,最近优先 + */ +export const buildReturnNodeOptions = (flow?: FlowContent): ReturnNodeOption[] => { + if (!flow) { + return []; + } + if (flow.backNodes) { + return flow.backNodes.map(node => ({ + label: node.name, + value: node.id, + })); + } + const options: ReturnNodeOption[] = []; + for (const node of flow.nodes || []) { + if (node.id === flow.nodeId) { + break; + } + if (node.display) { + options.push({ + label: node.name, + value: node.id, + }); + } + } + return options; +}; diff --git a/packages/flow-approval-presenter/tests/return-nodes.test.ts b/packages/flow-approval-presenter/tests/return-nodes.test.ts new file mode 100644 index 0000000..a0bcfde --- /dev/null +++ b/packages/flow-approval-presenter/tests/return-nodes.test.ts @@ -0,0 +1,55 @@ +import { describe, expect, it } from "@rstest/core"; +import { FlowContent, NodeOption } from "@coding-flow/flow-types"; +import { buildReturnNodeOptions } from "@/utils/return-nodes"; + +/** 构造最小可用的节点选项 */ +const buildNode = (id: string, name: string, display = true): NodeOption => ({ + id, + name, + type: 'APPROVAL', + display, +} as NodeOption); + +/** 构造仅包含退回相关字段的流程详情 */ +const buildFlow = (data: Partial): FlowContent => ({ + nodeId: 'C', + nodes: [buildNode('A', '开始节点'), buildNode('B', 'B审批'), buildNode('C', 'C审批'), buildNode('D', '结束节点')], + ...data, +} as FlowContent); + +describe('buildReturnNodeOptions(退回候选节点)', () => { + it('优先使用后端 backNodes,并按最近优先顺序输出', () => { + const flow = buildFlow({ + backNodes: [buildNode('B', 'B审批'), buildNode('A', '开始节点')], + }); + expect(buildReturnNodeOptions(flow)).toEqual([ + {label: 'B审批', value: 'B'}, + {label: '开始节点', value: 'A'}, + ]); + }); + + it('backNodes 为空数组时表示没有可退回节点,不再按 nodes 截取', () => { + const flow = buildFlow({backNodes: []}); + expect(buildReturnNodeOptions(flow)).toEqual([]); + }); + + it('旧版后端缺失 backNodes 时回退到按定义顺序截取到当前节点', () => { + const flow = buildFlow({}); + expect(buildReturnNodeOptions(flow)).toEqual([ + {label: '开始节点', value: 'A'}, + {label: 'B审批', value: 'B'}, + ]); + }); + + it('回退逻辑仍会跳过硬编码 display=false 的节点', () => { + const flow = buildFlow({ + nodes: [buildNode('A', '开始节点'), buildNode('X', '隐藏节点', false), buildNode('C', 'C审批')], + nodeId: 'C', + }); + expect(buildReturnNodeOptions(flow)).toEqual([{label: '开始节点', value: 'A'}]); + }); + + it('流程内容为空时返回空列表', () => { + expect(buildReturnNodeOptions(undefined)).toEqual([]); + }); +}); diff --git a/packages/flow-mobile/flow-mobile-approval/src/plugins/view/return-view.tsx b/packages/flow-mobile/flow-mobile-approval/src/plugins/view/return-view.tsx index 15ed73e..088c6cf 100644 --- a/packages/flow-mobile/flow-mobile-approval/src/plugins/view/return-view.tsx +++ b/packages/flow-mobile/flow-mobile-approval/src/plugins/view/return-view.tsx @@ -1,5 +1,9 @@ import React from "react"; -import {ReturnViewPlugin, ReturnViewPluginKey} from "@coding-flow/flow-approval-presenter"; +import { + buildReturnNodeOptions, + ReturnViewPlugin, + ReturnViewPluginKey +} 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"; @@ -20,23 +24,10 @@ export const ReturnView: React.FC = (props) => { return []; },[props.value]); + /** 候选节点由后端按执行历史下发(最近优先),不在前端从流程定义节点中截取 */ const nodeOptions = React.useMemo(() => { - const nodes = state.flow?.nodes || []; - const currentId = state.flow?.nodeId || ''; - const options:any[] = []; - for (const node of nodes) { - if (currentId === node.id) { - break; - } - if(node.display) { - options.push({ - label: node.name, - value: node.id, - }) - } - } - return options; - }, [state.flow?.nodes]) + return buildReturnNodeOptions(state.flow); + }, [state.flow?.backNodes, state.flow?.nodes, state.flow?.nodeId]) if (ReturnViewComponent) { @@ -58,4 +49,4 @@ export const ReturnView: React.FC = (props) => { options={nodeOptions} /> ) -} \ No newline at end of file +} diff --git a/packages/flow-pc/flow-pc-approval/src/plugins/view/return-view.tsx b/packages/flow-pc/flow-pc-approval/src/plugins/view/return-view.tsx index 6b21e28..4a76670 100644 --- a/packages/flow-pc/flow-pc-approval/src/plugins/view/return-view.tsx +++ b/packages/flow-pc/flow-pc-approval/src/plugins/view/return-view.tsx @@ -1,5 +1,9 @@ import React from "react"; -import {ReturnViewPlugin, ReturnViewPluginKey} from "@coding-flow/flow-approval-presenter"; +import { + buildReturnNodeOptions, + ReturnViewPlugin, + ReturnViewPluginKey +} 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"; @@ -9,23 +13,10 @@ export const ReturnView: React.FC = (props) => { const {state} = useApprovalContext(); + /** 候选节点由后端按执行历史下发(最近优先),不在前端从流程定义节点中截取 */ const nodeOptions = React.useMemo(() => { - const nodes = state.flow?.nodes || []; - const currentId = state.flow?.nodeId || ''; - const options:any[] = []; - for (const node of nodes) { - if (currentId === node.id) { - break; - } - if(node.display) { - options.push({ - label: node.name, - value: node.id, - }) - } - } - return options; - }, [state.flow?.nodes]) + return buildReturnNodeOptions(state.flow); + }, [state.flow?.backNodes, state.flow?.nodes, state.flow?.nodeId]) if (ReturnViewComponent) { @@ -48,4 +39,4 @@ export const ReturnView: React.FC = (props) => { options={nodeOptions} /> ) -} \ No newline at end of file +} diff --git a/packages/flow-types/src/types/flow-approval.ts b/packages/flow-types/src/types/flow-approval.ts index ea5ea10..32ca683 100644 --- a/packages/flow-types/src/types/flow-approval.ts +++ b/packages/flow-types/src/types/flow-approval.ts @@ -379,6 +379,9 @@ export interface FlowContent { histories: History[]; // 所有节点 nodes: NodeOption[]; + // 可退回节点:仅包含当前记录真实执行过的历史节点,按最近优先排序; + // 为空或缺失表示没有可退回节点(如开始节点),缺省时前端可回退到自行计算 + backNodes?: NodeOption[]; // 支持撤销 revoke: boolean; // 支持催办 From 5b6f9c3e813fd15f237ce691f61a2bfdd9c9b0a3 Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Mon, 16 Nov 2026 20:55:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?chore(release):=20=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7=E8=87=B3=200.2.21=20?= =?UTF-8?q?=E5=B9=B6=E6=B6=88=E8=B4=B9=20issue-270=20changeset=20(#270)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - changeset version:fixed 模式下全部 @coding-flow/* 包统一 0.2.20 -> 0.2.21 (flow-types / flow-core / flow-icons / flow-approval-presenter / flow-pc-ui / flow-pc-form / flow-pc-approval / flow-mobile-ui / flow-mobile-form / flow-mobile-approval / flow-design) - 生成各包 0.2.21 CHANGELOG(含 Updated dependencies 段) - 删除已消费的 .changeset/issue-270-return-back-nodes.md - 包间依赖使用 workspace:*,pnpm-lock.yaml 无需变更 --- .changeset/issue-270-return-back-nodes.md | 12 ------------ packages/flow-approval-presenter/CHANGELOG.md | 14 ++++++++++++++ packages/flow-approval-presenter/package.json | 2 +- packages/flow-core/CHANGELOG.md | 2 ++ packages/flow-core/package.json | 2 +- packages/flow-design/CHANGELOG.md | 10 ++++++++++ packages/flow-design/package.json | 2 +- packages/flow-icons/CHANGELOG.md | 6 ++++++ packages/flow-icons/package.json | 2 +- .../flow-mobile-approval/CHANGELOG.md | 18 ++++++++++++++++++ .../flow-mobile-approval/package.json | 2 +- .../flow-mobile/flow-mobile-form/CHANGELOG.md | 8 ++++++++ .../flow-mobile/flow-mobile-form/package.json | 2 +- .../flow-mobile/flow-mobile-ui/CHANGELOG.md | 6 ++++++ .../flow-mobile/flow-mobile-ui/package.json | 2 +- packages/flow-pc/flow-pc-approval/CHANGELOG.md | 18 ++++++++++++++++++ packages/flow-pc/flow-pc-approval/package.json | 2 +- packages/flow-pc/flow-pc-form/CHANGELOG.md | 8 ++++++++ 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 | 11 +++++++++++ packages/flow-types/package.json | 2 +- 23 files changed, 118 insertions(+), 23 deletions(-) delete mode 100644 .changeset/issue-270-return-back-nodes.md diff --git a/.changeset/issue-270-return-back-nodes.md b/.changeset/issue-270-return-back-nodes.md deleted file mode 100644 index 26a3b70..0000000 --- a/.changeset/issue-270-return-back-nodes.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -"@coding-flow/flow-approval-presenter": patch -"@coding-flow/flow-pc-approval": patch -"@coding-flow/flow-mobile-approval": patch -"@coding-flow/flow-types": patch ---- - -fix: 退回候选节点改为后端按执行历史下发(issue #270) - -- 详情响应新增 `backNodes`:只包含当前记录真实执行过的历史节点,按“最近优先”排序(例如停留在 C 节点时为 B、A),`nodes` 仍保留流程定义全量节点不受影响。 -- PC / 移动端退回弹框改用 `backNodes`(`buildReturnNodeOptions`),不再从流程定义节点中截取,避免列出未走过、甚至位于当前节点之后的节点;`backNodes` 为空时不展示退回入口。 -- 兼容旧版后端:缺少 `backNodes` 字段时回退到原有按定义顺序截取的逻辑。 diff --git a/packages/flow-approval-presenter/CHANGELOG.md b/packages/flow-approval-presenter/CHANGELOG.md index 32113eb..7e87025 100644 --- a/packages/flow-approval-presenter/CHANGELOG.md +++ b/packages/flow-approval-presenter/CHANGELOG.md @@ -1,5 +1,19 @@ # @coding-flow/flow-approval-presenter +## 0.2.21 + +### Patch Changes + +- 0b9b8d6: fix: 退回候选节点改为后端按执行历史下发(issue #270) + + - 详情响应新增 `backNodes`:只包含当前记录真实执行过的历史节点,按“最近优先”排序(例如停留在 C 节点时为 B、A),`nodes` 仍保留流程定义全量节点不受影响。 + - PC / 移动端退回弹框改用 `backNodes`(`buildReturnNodeOptions`),不再从流程定义节点中截取,避免列出未走过、甚至位于当前节点之后的节点;`backNodes` 为空时不展示退回入口。 + - 兼容旧版后端:缺少 `backNodes` 字段时回退到原有按定义顺序截取的逻辑。 + +- Updated dependencies [0b9b8d6] + - @coding-flow/flow-types@0.2.21 + - @coding-flow/flow-core@0.2.21 + ## 0.2.20 ### Patch Changes diff --git a/packages/flow-approval-presenter/package.json b/packages/flow-approval-presenter/package.json index ea7238d..f20d734 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.20", + "version": "0.2.21", "description": "flow-engine approval presenter framework ", "type": "module", "sideEffects": [ diff --git a/packages/flow-core/CHANGELOG.md b/packages/flow-core/CHANGELOG.md index 8a3bcc9..fb6286f 100644 --- a/packages/flow-core/CHANGELOG.md +++ b/packages/flow-core/CHANGELOG.md @@ -1,5 +1,7 @@ # @coding-flow/flow-core +## 0.2.21 + ## 0.2.20 ### Patch Changes diff --git a/packages/flow-core/package.json b/packages/flow-core/package.json index 79b0c68..ebcffcd 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.20", + "version": "0.2.21", "description": "flow-engine core lib framework ", "type": "module", "sideEffects": [ diff --git a/packages/flow-design/CHANGELOG.md b/packages/flow-design/CHANGELOG.md index 23e82cc..b2d75d8 100644 --- a/packages/flow-design/CHANGELOG.md +++ b/packages/flow-design/CHANGELOG.md @@ -1,5 +1,15 @@ # @coding-flow/flow-design +## 0.2.21 + +### Patch Changes + +- Updated dependencies [0b9b8d6] + - @coding-flow/flow-types@0.2.21 + - @coding-flow/flow-core@0.2.21 + - @coding-flow/flow-icons@0.2.21 + - @coding-flow/flow-pc-ui@0.2.21 + ## 0.2.20 ### Patch Changes diff --git a/packages/flow-design/package.json b/packages/flow-design/package.json index a9bd3c3..568668d 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.20", + "version": "0.2.21", "description": "flow-engine design components ", "type": "module", "sideEffects": [ diff --git a/packages/flow-icons/CHANGELOG.md b/packages/flow-icons/CHANGELOG.md index ad5ad37..a836e0d 100644 --- a/packages/flow-icons/CHANGELOG.md +++ b/packages/flow-icons/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-icons +## 0.2.21 + +### Patch Changes + +- @coding-flow/flow-core@0.2.21 + ## 0.2.20 ### Patch Changes diff --git a/packages/flow-icons/package.json b/packages/flow-icons/package.json index 44ca4ff..938b4cd 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.20", + "version": "0.2.21", "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 b4df06f..593857c 100644 --- a/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md +++ b/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md @@ -1,5 +1,23 @@ # @coding-flow/flow-mobile-approval +## 0.2.21 + +### Patch Changes + +- 0b9b8d6: fix: 退回候选节点改为后端按执行历史下发(issue #270) + + - 详情响应新增 `backNodes`:只包含当前记录真实执行过的历史节点,按“最近优先”排序(例如停留在 C 节点时为 B、A),`nodes` 仍保留流程定义全量节点不受影响。 + - PC / 移动端退回弹框改用 `backNodes`(`buildReturnNodeOptions`),不再从流程定义节点中截取,避免列出未走过、甚至位于当前节点之后的节点;`backNodes` 为空时不展示退回入口。 + - 兼容旧版后端:缺少 `backNodes` 字段时回退到原有按定义顺序截取的逻辑。 + +- Updated dependencies [0b9b8d6] + - @coding-flow/flow-approval-presenter@0.2.21 + - @coding-flow/flow-types@0.2.21 + - @coding-flow/flow-mobile-form@0.2.21 + - @coding-flow/flow-core@0.2.21 + - @coding-flow/flow-icons@0.2.21 + - @coding-flow/flow-mobile-ui@0.2.21 + ## 0.2.20 ### Patch Changes diff --git a/packages/flow-mobile/flow-mobile-approval/package.json b/packages/flow-mobile/flow-mobile-approval/package.json index be5f960..3d90b9c 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.20", + "version": "0.2.21", "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 514eec1..dce5cde 100644 --- a/packages/flow-mobile/flow-mobile-form/CHANGELOG.md +++ b/packages/flow-mobile/flow-mobile-form/CHANGELOG.md @@ -1,5 +1,13 @@ # @coding-flow/flow-mobile-form +## 0.2.21 + +### Patch Changes + +- Updated dependencies [0b9b8d6] + - @coding-flow/flow-types@0.2.21 + - @coding-flow/flow-core@0.2.21 + ## 0.2.20 ### Patch Changes diff --git a/packages/flow-mobile/flow-mobile-form/package.json b/packages/flow-mobile/flow-mobile-form/package.json index b68c023..851e44d 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.20", + "version": "0.2.21", "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 d8d3668..47f044f 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.21 + +### Patch Changes + +- @coding-flow/flow-core@0.2.21 + ## 0.2.20 ### Patch Changes diff --git a/packages/flow-mobile/flow-mobile-ui/package.json b/packages/flow-mobile/flow-mobile-ui/package.json index 184a3e3..5f674ab 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.20", + "version": "0.2.21", "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 6a3b940..c0ded18 100644 --- a/packages/flow-pc/flow-pc-approval/CHANGELOG.md +++ b/packages/flow-pc/flow-pc-approval/CHANGELOG.md @@ -1,5 +1,23 @@ # @coding-flow/flow-pc-approval +## 0.2.21 + +### Patch Changes + +- 0b9b8d6: fix: 退回候选节点改为后端按执行历史下发(issue #270) + + - 详情响应新增 `backNodes`:只包含当前记录真实执行过的历史节点,按“最近优先”排序(例如停留在 C 节点时为 B、A),`nodes` 仍保留流程定义全量节点不受影响。 + - PC / 移动端退回弹框改用 `backNodes`(`buildReturnNodeOptions`),不再从流程定义节点中截取,避免列出未走过、甚至位于当前节点之后的节点;`backNodes` 为空时不展示退回入口。 + - 兼容旧版后端:缺少 `backNodes` 字段时回退到原有按定义顺序截取的逻辑。 + +- Updated dependencies [0b9b8d6] + - @coding-flow/flow-approval-presenter@0.2.21 + - @coding-flow/flow-types@0.2.21 + - @coding-flow/flow-pc-form@0.2.21 + - @coding-flow/flow-core@0.2.21 + - @coding-flow/flow-icons@0.2.21 + - @coding-flow/flow-pc-ui@0.2.21 + ## 0.2.20 ### Patch Changes diff --git a/packages/flow-pc/flow-pc-approval/package.json b/packages/flow-pc/flow-pc-approval/package.json index 74224db..c5adb86 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.20", + "version": "0.2.21", "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 291163b..ee2058a 100644 --- a/packages/flow-pc/flow-pc-form/CHANGELOG.md +++ b/packages/flow-pc/flow-pc-form/CHANGELOG.md @@ -1,5 +1,13 @@ # @coding-flow/flow-pc-form +## 0.2.21 + +### Patch Changes + +- Updated dependencies [0b9b8d6] + - @coding-flow/flow-types@0.2.21 + - @coding-flow/flow-core@0.2.21 + ## 0.2.20 ### Patch Changes diff --git a/packages/flow-pc/flow-pc-form/package.json b/packages/flow-pc/flow-pc-form/package.json index 3dc30a5..d9c27e6 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.20", + "version": "0.2.21", "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 1c94946..40a923c 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.21 + +### Patch Changes + +- @coding-flow/flow-core@0.2.21 + ## 0.2.20 ### Patch Changes diff --git a/packages/flow-pc/flow-pc-ui/package.json b/packages/flow-pc/flow-pc-ui/package.json index 3fb258b..a0000bf 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.20", + "version": "0.2.21", "description": "flow-engine pc ui components", "type": "module", "sideEffects": [ diff --git a/packages/flow-types/CHANGELOG.md b/packages/flow-types/CHANGELOG.md index 8f3c8fe..bf9813d 100644 --- a/packages/flow-types/CHANGELOG.md +++ b/packages/flow-types/CHANGELOG.md @@ -1,5 +1,16 @@ # @coding-flow/flow-types +## 0.2.21 + +### Patch Changes + +- 0b9b8d6: fix: 退回候选节点改为后端按执行历史下发(issue #270) + + - 详情响应新增 `backNodes`:只包含当前记录真实执行过的历史节点,按“最近优先”排序(例如停留在 C 节点时为 B、A),`nodes` 仍保留流程定义全量节点不受影响。 + - PC / 移动端退回弹框改用 `backNodes`(`buildReturnNodeOptions`),不再从流程定义节点中截取,避免列出未走过、甚至位于当前节点之后的节点;`backNodes` 为空时不展示退回入口。 + - 兼容旧版后端:缺少 `backNodes` 字段时回退到原有按定义顺序截取的逻辑。 + - @coding-flow/flow-core@0.2.21 + ## 0.2.20 ### Patch Changes diff --git a/packages/flow-types/package.json b/packages/flow-types/package.json index 5f2d2f8..d2d4f3d 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.20", + "version": "0.2.21", "description": "flow-engine types", "type": "module", "sideEffects": [ From 1fbf2d36041b55f6cf09bbaeb46f405ecbd75bdc Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Mon, 16 Nov 2026 22:15:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E5=B7=B2=E5=8A=9E=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=94=AF=E6=8C=81=E5=B7=B2=E5=AE=8C=E6=88=90=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=BA=8C=E6=AC=A1=E5=8F=91=E8=B5=B7=20(flow-pc-approv?= =?UTF-8?q?al=20+=20flow-mobile-approval)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 详情类型 FlowContent 新增 reissue 标识,FlowReissueRequest 请求类型 - presenter 新增 reissue(),PC / 移动端补充 /api/cmd/record/reissue 接口封装 - PC 与移动端已办详情新增「重新发起」按钮(由 reissue 标识驱动,支持插件替换) - 新增 APPROVAL_REISSUE 提示文案与 APPROVAL_ACTION_REISSUE_KEY 插件点 - 补充 presenter 单元测试 Closes #272 --- .../src/presenters/action.ts | 24 ++++++- .../src/typings/index.ts | 7 ++ .../tests/reissue.test.ts | 72 +++++++++++++++++++ packages/flow-core/src/message.ts | 3 + .../flow-mobile-approval/src/api/record.ts | 5 ++ .../components/action/reissue.tsx | 63 ++++++++++++++++ .../components/flow-approval-actions.tsx | 2 + .../components/flow-approval/model/index.ts | 6 +- .../flow-approval/typings/plugin-type.ts | 1 + .../flow-pc-approval/src/api/record.ts | 5 ++ .../components/action/reissue.tsx | 58 +++++++++++++++ .../components/flow-approval-actions.tsx | 2 + .../components/flow-approval/model/index.ts | 6 +- .../flow-approval/typings/plugin-type.ts | 1 + .../flow-types/src/types/flow-approval.ts | 19 +++++ 15 files changed, 271 insertions(+), 3 deletions(-) create mode 100644 packages/flow-approval-presenter/tests/reissue.test.ts create mode 100644 packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/action/reissue.tsx create mode 100644 packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/reissue.tsx diff --git a/packages/flow-approval-presenter/src/presenters/action.ts b/packages/flow-approval-presenter/src/presenters/action.ts index 808794b..12b02fc 100644 --- a/packages/flow-approval-presenter/src/presenters/action.ts +++ b/packages/flow-approval-presenter/src/presenters/action.ts @@ -1,5 +1,5 @@ import { ApprovalState, FlowApprovalApi } from "@/typings"; -import { FormActionContext, FlowAction, FlowSubProcessResetRequest } from "@coding-flow/flow-types"; +import { FormActionContext, FlowAction, FlowReissueRequest, FlowSubProcessResetRequest } from "@coding-flow/flow-types"; import { ActionInterceptor, ActionInterceptorManager, @@ -449,6 +449,28 @@ export class FlowActionPresenter { } } + /** + * 已完成流程二次发起(独立能力,非审批动作)。 + * + * 仅当详情数据 `reissue` 标识为 true 时可调用:复制当前已完成流程的表单数据 + * 创建一条新流程,新流程停在开始节点成为发起人的待办,源流程记录不做改写。 + * + * @param advice 二次发起说明(可选) + * @param formData 覆盖复制的表单数据(可选,缺省时复制源流程数据) + */ + public async reissue(advice?: string, formData?: Record) { + this.setLoading(true); + try { + const recordId = this.state.flow?.recordId; + if (recordId) { + const body: FlowReissueRequest = { sourceRecordId: recordId, advice, formData }; + return await this.api.reissue(body, this.mockKey); + } + } finally { + this.setLoading(false); + } + } + /** * 执行已订阅的审批操作拦截器。 * diff --git a/packages/flow-approval-presenter/src/typings/index.ts b/packages/flow-approval-presenter/src/typings/index.ts index 3c3f231..d3d1d09 100644 --- a/packages/flow-approval-presenter/src/typings/index.ts +++ b/packages/flow-approval-presenter/src/typings/index.ts @@ -68,4 +68,11 @@ export interface FlowApprovalApi { * 请求体为 FlowSubProcessResetRequest(recordId + resetInstanceProcessIds + advice)。 */ resetSubProcess(body: Record, mockKey: string): Promise; + + /** + * 已完成流程二次发起(独立接口,不属于常规审批动作)。 + * 仅当详情数据 reissue 标识为 true 时可调用, + * 请求体为 FlowReissueRequest(sourceRecordId + 可选的 formData / advice)。 + */ + reissue(body: Record, mockKey: string): Promise; } diff --git a/packages/flow-approval-presenter/tests/reissue.test.ts b/packages/flow-approval-presenter/tests/reissue.test.ts new file mode 100644 index 0000000..f4e93ed --- /dev/null +++ b/packages/flow-approval-presenter/tests/reissue.test.ts @@ -0,0 +1,72 @@ +import { describe, expect, it, rs } from "@rstest/core"; +import { FlowActionPresenter } from "@/presenters/action"; +import { ApprovalState, FlowApprovalApi } from "@/typings"; +import { FormActionContext } from "@coding-flow/flow-types"; + +/** 已完成的流程记录详情:仅用于验证二次发起的请求参数 */ +const buildFinishedState = (): ApprovalState => ({ + flow: { + recordId: 88, + reissue: true, + }, +} as unknown as ApprovalState); + +interface ReissueMock { + mock: { calls: any[][] }; +} + +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 })), + resetSubProcess: rs.fn(async () => ({ success: true })), + reissue: rs.fn(async () => ({ success: true, data: 99 })), + }; + return api; +}; + +describe('FlowActionPresenter 二次发起(reissue)', () => { + + it('以当前详情记录作为源记录调用二次发起接口', async () => { + const api = buildApi(); + const presenter = new FlowActionPresenter( + buildFinishedState(), + api, + new FormActionContext(), + 'mockKey', + () => {}, + ); + + const res = await presenter.reissue('业务数据有误,重新发起'); + + const reissueMock = api.reissue as unknown as ReissueMock; + expect(reissueMock.mock.calls.length).toBe(1); + const [body, mockKey] = reissueMock.mock.calls[0]; + expect(body.sourceRecordId).toBe(88); + expect(body.advice).toBe('业务数据有误,重新发起'); + expect(mockKey).toBe('mockKey'); + expect(res.success).toBe(true); + expect(res.data).toBe(99); + }); + + it('未提供数据时只提交源记录 id,由服务端复制源流程表单数据', async () => { + const api = buildApi(); + const presenter = new FlowActionPresenter( + buildFinishedState(), + api, + new FormActionContext(), + 'mockKey', + () => {}, + ); + + await presenter.reissue(); + + const body = (api.reissue as unknown as ReissueMock).mock.calls[0][0]; + expect(body.sourceRecordId).toBe(88); + expect(body.advice).toBeUndefined(); + expect(body.formData).toBeUndefined(); + }); +}); diff --git a/packages/flow-core/src/message.ts b/packages/flow-core/src/message.ts index a7fa0ce..1e97c40 100644 --- a/packages/flow-core/src/message.ts +++ b/packages/flow-core/src/message.ts @@ -34,6 +34,8 @@ export const FlowMessageKey = { APPROVAL_RETURN: 'approval.return', APPROVAL_REVOKE: 'approval.revoke', APPROVAL_URGE: 'approval.urge', + /** 已完成流程二次发起(复制流程重新执行) */ + APPROVAL_REISSUE: 'approval.reissue', APPROVAL_CUSTOM: 'approval.custom', /** 保存 — 上下文包含 isStartNode,下游可自行区分 */ APPROVAL_SAVE: 'approval.save', @@ -149,6 +151,7 @@ function getDefaultMessages(): Record { [FlowMessageKey.APPROVAL_RETURN]: '操作成功', [FlowMessageKey.APPROVAL_REVOKE]: '流程已撤回', [FlowMessageKey.APPROVAL_URGE]: '已发送催办提醒.', + [FlowMessageKey.APPROVAL_REISSUE]: '已重新发起,新流程已回到发起人待办', [FlowMessageKey.APPROVAL_CUSTOM]: '操作成功', [FlowMessageKey.APPROVAL_NO_SELECTED]: '请先选择审批流程.', diff --git a/packages/flow-mobile/flow-mobile-approval/src/api/record.ts b/packages/flow-mobile/flow-mobile-approval/src/api/record.ts index aae9e11..e483222 100644 --- a/packages/flow-mobile/flow-mobile-approval/src/api/record.ts +++ b/packages/flow-mobile/flow-mobile-approval/src/api/record.ts @@ -35,6 +35,11 @@ export const resetSubProcess = (body:any,mockKey?:string) => { return httpClient.post('/api/cmd/record/subProcess/reset?mockKey='+key,body); } +export const reissue = (body:any,mockKey?:string) => { + const key = mockKey?mockKey:''; + return httpClient.post('/api/cmd/record/reissue?mockKey='+key,body); +} + export const list = (request: any,mockKey?:string) => { const key = mockKey?mockKey:''; return httpClient.page('/api/query/record/list?mockKey='+key, request, {}, {}, []); diff --git a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/action/reissue.tsx b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/action/reissue.tsx new file mode 100644 index 0000000..d9216a4 --- /dev/null +++ b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/action/reissue.tsx @@ -0,0 +1,63 @@ +import React from "react"; +import {Button, Toast} from "antd-mobile"; +import {Popconfirm} from "@coding-flow/flow-mobile-ui"; +import {useApprovalContext} from "@coding-flow/flow-approval-presenter"; +import {APPROVAL_ACTION_REISSUE_KEY} from "@/components/flow-approval"; +import {ViewBindPlugin, FlowMessageKey, FlowMessageRegistry} from "@coding-flow/flow-core"; + +/** + * 已完成流程的二次发起(独立能力,非审批动作)。 + * + * 仅当详情数据 reissue 标识为 true(已正常完成 + 流程管理员)时展示: + * 复制当前流程的表单数据重新发起一条新流程,新流程停在开始节点成为发起人的待办, + * 原流程记录不做任何改写(issue #272)。 + */ +export const ReissueAction = () => { + + const {state, context} = useApprovalContext(); + + const presenter = context.getPresenter().getFlowActionPresenter(); + + const reissue = state.flow?.reissue || false; + + const ActionView = ViewBindPlugin.getInstance().get(APPROVAL_ACTION_REISSUE_KEY); + + if (ActionView) { + return ( + + ) + } + + return ( + <> + {reissue && ( + { + const res = await presenter.reissue(); + if (res?.success) { + Toast.show( + FlowMessageRegistry.getInstance().get( + FlowMessageKey.APPROVAL_REISSUE, + presenter.buildActionContext() + ) + ) + context.close(); + } + }} + > + + + )} + + ) +} 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 fba7073..9401f89 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 @@ -4,6 +4,7 @@ import { CustomStyleButton } from "@/components/flow-approval/components/custom- import { useLayoutPresenter } from "@/components/flow-approval/layout/hooks/use-layout-presenter"; import { ActionSheet, Button, Space, Toast } from "antd-mobile"; import { RevokeAction } from "@/components/flow-approval/components/action/revoke"; +import { ReissueAction } from "@/components/flow-approval/components/action/reissue"; import { UrgeAction } from "@/components/flow-approval/components/action/urge"; import { ActionFactory } from "@/components/flow-approval/components/action/factory"; import { dispatchApprovalFrontEvent } from "@/components/flow-approval/components/action-front-event"; @@ -109,6 +110,7 @@ export const FlowApprovalActions = () => { + ,mockKey:string)=> { + return await reissueRecord(body,mockKey); + } + } \ No newline at end of file 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 49349be..eebf4bf 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 @@ -13,6 +13,7 @@ export const APPROVAL_ACTION_REVOKE_KEY = 'APPROVAL_ACTION_REVOKE_KEY'; export const APPROVAL_ACTION_SAVE_KEY = 'APPROVAL_ACTION_SAVE_KEY'; export const APPROVAL_ACTION_TRANSFER_KEY = 'APPROVAL_ACTION_TRANSFER_KEY'; export const APPROVAL_ACTION_URGE_KEY = 'APPROVAL_ACTION_URGE_KEY'; +export const APPROVAL_ACTION_REISSUE_KEY = 'APPROVAL_ACTION_REISSUE_KEY'; /** * 审批意见输入框视图(PC / 移动端通用)。 diff --git a/packages/flow-pc/flow-pc-approval/src/api/record.ts b/packages/flow-pc/flow-pc-approval/src/api/record.ts index aae9e11..e483222 100644 --- a/packages/flow-pc/flow-pc-approval/src/api/record.ts +++ b/packages/flow-pc/flow-pc-approval/src/api/record.ts @@ -35,6 +35,11 @@ export const resetSubProcess = (body:any,mockKey?:string) => { return httpClient.post('/api/cmd/record/subProcess/reset?mockKey='+key,body); } +export const reissue = (body:any,mockKey?:string) => { + const key = mockKey?mockKey:''; + return httpClient.post('/api/cmd/record/reissue?mockKey='+key,body); +} + export const list = (request: any,mockKey?:string) => { const key = mockKey?mockKey:''; return httpClient.page('/api/query/record/list?mockKey='+key, request, {}, {}, []); diff --git a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/reissue.tsx b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/reissue.tsx new file mode 100644 index 0000000..6f037d0 --- /dev/null +++ b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/components/action/reissue.tsx @@ -0,0 +1,58 @@ +import React from "react"; +import {Button, message, Popconfirm} from "antd"; +import {useApprovalContext} from "@coding-flow/flow-approval-presenter"; +import {APPROVAL_ACTION_REISSUE_KEY} from "@/components/flow-approval"; +import {ViewBindPlugin, FlowMessageKey, FlowMessageRegistry} from "@coding-flow/flow-core"; + +/** + * 已完成流程的二次发起(独立能力,非审批动作)。 + * + * 仅当详情数据 reissue 标识为 true(已正常完成 + 流程管理员)时展示: + * 复制当前流程的表单数据重新发起一条新流程,新流程停在开始节点成为发起人的待办, + * 原流程记录不做任何改写(issue #272)。 + */ +export const ReissueAction = () => { + + const {state, context} = useApprovalContext(); + + const presenter = context.getPresenter().getFlowActionPresenter(); + + const reissue = state.flow?.reissue || false; + const actionLoading = state.actionLoading ?? false; + + const ActionView = ViewBindPlugin.getInstance().get(APPROVAL_ACTION_REISSUE_KEY); + + if (ActionView) { + return ( + + ) + } + + return ( + <> + {reissue && ( + { + const res = await presenter.reissue(); + if (res?.success) { + message.success( + FlowMessageRegistry.getInstance().get( + FlowMessageKey.APPROVAL_REISSUE, + presenter.buildActionContext() + ) + ); + context.close(); + } + }} + > + + + )} + + ) +} 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 0aebb8c..c4e565e 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 @@ -5,6 +5,7 @@ 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"; +import {ReissueAction} from "@/components/flow-approval/components/action/reissue"; import {CloseAction} from "@/components/flow-approval/components/action/close"; export const FlowApprovalActions = () => { @@ -67,6 +68,7 @@ export const FlowApprovalActions = () => { + diff --git a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/model/index.ts b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/model/index.ts index 1cc0376..138b36e 100644 --- a/packages/flow-pc/flow-pc-approval/src/components/flow-approval/model/index.ts +++ b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/model/index.ts @@ -1,5 +1,5 @@ import {FlowApprovalApi} from "@coding-flow/flow-approval-presenter"; -import {action as actionRecord, create as createRecord, processNodes as postProcessNodes,revoke as revokeRecord,urge as urgeRecord,resetSubProcess as resetSubProcessRecord} from "@/api/record"; +import {action as actionRecord, create as createRecord, processNodes as postProcessNodes,revoke as revokeRecord,urge as urgeRecord,resetSubProcess as resetSubProcessRecord,reissue as reissueRecord} from "@/api/record"; export class FlowApprovalApiImpl implements FlowApprovalApi { @@ -34,4 +34,8 @@ export class FlowApprovalApiImpl implements FlowApprovalApi { return await resetSubProcessRecord(body,mockKey); } + reissue =async (body:Record,mockKey:string)=> { + return await reissueRecord(body,mockKey); + } + } \ No newline at end of file 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 a410386..42b900c 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 @@ -16,6 +16,7 @@ export const APPROVAL_ACTION_REVOKE_KEY = 'APPROVAL_ACTION_REVOKE_KEY'; export const APPROVAL_ACTION_SAVE_KEY = 'APPROVAL_ACTION_SAVE_KEY'; export const APPROVAL_ACTION_TRANSFER_KEY = 'APPROVAL_ACTION_TRANSFER_KEY'; export const APPROVAL_ACTION_URGE_KEY = 'APPROVAL_ACTION_URGE_KEY'; +export const APPROVAL_ACTION_REISSUE_KEY = 'APPROVAL_ACTION_REISSUE_KEY'; /** * 审批意见输入框视图(PC / 移动端通用)。 diff --git a/packages/flow-types/src/types/flow-approval.ts b/packages/flow-types/src/types/flow-approval.ts index ea5ea10..a098157 100644 --- a/packages/flow-types/src/types/flow-approval.ts +++ b/packages/flow-types/src/types/flow-approval.ts @@ -387,6 +387,10 @@ export interface FlowContent { // 当前待办位于开启重置能力、且已汇聚完成的子流程的锁定合并节点上时为 true, // 可据此调用 /api/cmd/record/subProcess/reset 接口,呈现方式由使用方自行决定 resetSubProcess: boolean; + // 支持二次发起(独立能力,非审批动作): + // 当前记录已正常完成、且当前操作人为流程管理员时为 true, + // 可据此调用 /api/cmd/record/reissue 接口复制该流程重新发起 + reissue: boolean; } /** @@ -400,3 +404,18 @@ export interface FlowSubProcessResetRequest { // 重置说明(可选,记录在被作废的当前记录上供审计追溯) advice?: string; } + +/** + * 已完成流程二次发起请求(独立接口,不属于常规审批动作) + * + * 复制源流程的表单数据创建一条新流程,新流程停在开始节点成为发起人的待办, + * 源流程记录不做任何改写。 + */ +export interface FlowReissueRequest { + // 被二次发起的源流程记录id(必须是已正常完成的流程记录) + sourceRecordId: number; + // 二次发起时使用的表单数据(可选,缺省时复制源流程记录的表单数据) + formData?: Record; + // 二次发起说明(可选) + advice?: string; +} From 535e7f49d7a9dff3367ddc42033d325addee3ad7 Mon Sep 17 00:00:00 2001 From: lorne <1991wangliang@gmail.com> Date: Mon, 16 Nov 2026 23:04:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?chore(changeset):=20=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E6=B5=81=E7=A8=8B=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E5=8F=91=E8=B5=B7=EF=BC=88issue=20#272=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/issue-272-reissue-finished-flow.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .changeset/issue-272-reissue-finished-flow.md diff --git a/.changeset/issue-272-reissue-finished-flow.md b/.changeset/issue-272-reissue-finished-flow.md new file mode 100644 index 0000000..dbf2442 --- /dev/null +++ b/.changeset/issue-272-reissue-finished-flow.md @@ -0,0 +1,9 @@ +--- +"@coding-flow/flow-types": minor +"@coding-flow/flow-core": minor +"@coding-flow/flow-approval-presenter": minor +"@coding-flow/flow-pc-approval": minor +"@coding-flow/flow-mobile-approval": minor +--- + +已办详情支持已完成流程「重新发起」(issue #272):由详情 `reissue` 标识驱动,复制原流程表单数据创建新流程并回到发起人待办,原流程记录保持不变。