diff --git a/packages/flow-approval-presenter/CHANGELOG.md b/packages/flow-approval-presenter/CHANGELOG.md index 5c9299f..37e672a 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.5 + +### Patch Changes + +- FlowApprovalApi 审批接口新增 `resetSubProcess` 子流程数据重置方法（独立接口，非审批动作）（issue #219） + ## 0.2.4 ### Patch Changes diff --git a/packages/flow-approval-presenter/package.json b/packages/flow-approval-presenter/package.json index 20ba118..43167f4 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.4", + "version": "0.2.5", "description": "flow-engine approval presenter framework ", "type": "module", "sideEffects": [ diff --git a/packages/flow-approval-presenter/src/typings/index.ts b/packages/flow-approval-presenter/src/typings/index.ts index b17d24d..42cfec0 100644 --- a/packages/flow-approval-presenter/src/typings/index.ts +++ b/packages/flow-approval-presenter/src/typings/index.ts @@ -54,4 +54,11 @@ export interface FlowApprovalApi { revoke(id: any, mockKey: string): Promise; urge(id: any, mockKey: string): Promise; + + /** + * 子流程数据重置（独立接口，不属于常规审批动作）。 + * 仅当详情数据 resetSubProcess 标识为 true 时可调用， + * 请求体为 FlowSubProcessResetRequest（recordId + resetInstanceProcessIds + advice）。 + */ + resetSubProcess(body: Record, mockKey: string): Promise; } diff --git a/packages/flow-core/CHANGELOG.md b/packages/flow-core/CHANGELOG.md index 1c07fb1..4e2e9b5 100644 --- a/packages/flow-core/CHANGELOG.md +++ b/packages/flow-core/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-core +## 0.2.5 + +### Patch Changes + +- 版本升级至 0.2.5（配合子流程数据重置能力发布，本包无功能变更） + ## 0.2.4 ## 0.2.3 diff --git a/packages/flow-core/package.json b/packages/flow-core/package.json index 7d9e7ab..b0cf7ae 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.4", + "version": "0.2.5", "description": "flow-engine core lib framework ", "type": "module", "sideEffects": [ diff --git a/packages/flow-design/CHANGELOG.md b/packages/flow-design/CHANGELOG.md index 96fc255..b720e8a 100644 --- a/packages/flow-design/CHANGELOG.md +++ b/packages/flow-design/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-design +## 0.2.5 + +### Patch Changes + +- 版本升级至 0.2.5（配合子流程数据重置能力发布，本包无功能变更） + ## 0.2.4 ### Patch Changes diff --git a/packages/flow-design/package.json b/packages/flow-design/package.json index 3b59d77..91cf6b5 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.4", + "version": "0.2.5", "description": "flow-engine design components ", "type": "module", "sideEffects": [ diff --git a/packages/flow-icons/CHANGELOG.md b/packages/flow-icons/CHANGELOG.md index ba87852..bdbd0de 100644 --- a/packages/flow-icons/CHANGELOG.md +++ b/packages/flow-icons/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-icons +## 0.2.5 + +### Patch Changes + +- 版本升级至 0.2.5（配合子流程数据重置能力发布，本包无功能变更） + ## 0.2.4 ### Patch Changes diff --git a/packages/flow-icons/package.json b/packages/flow-icons/package.json index a0f3e37..5af5eee 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.4", + "version": "0.2.5", "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 02d8fef..b93e775 100644 --- a/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md +++ b/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md @@ -1,5 +1,13 @@ # @coding-flow/flow-mobile-approval +## 0.2.5 + +### Patch Changes + +- 新增子流程数据重置接口 `/api/cmd/record/subProcess/reset`，接入审批上下文（FlowApprovalApi 实现），可经上下文获取该能力（issue #219） +- @coding-flow/flow-approval-presenter@0.2.5 +- @coding-flow/flow-types@0.2.5 + ## 0.2.4 ### Patch Changes diff --git a/packages/flow-mobile/flow-mobile-approval/package.json b/packages/flow-mobile/flow-mobile-approval/package.json index f963a16..5a88ef4 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.4", + "version": "0.2.5", "description": "flow-engine pc mobile approval components", "type": "module", "sideEffects": [ 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 b6f45d3..aae9e11 100644 --- a/packages/flow-mobile/flow-mobile-approval/src/api/record.ts +++ b/packages/flow-mobile/flow-mobile-approval/src/api/record.ts @@ -30,6 +30,11 @@ export const urge = (id:any,mockKey?:string) => { return httpClient.post('/api/cmd/record/urge?mockKey='+key,{id}); } +export const resetSubProcess = (body:any,mockKey?:string) => { + const key = mockKey?mockKey:''; + return httpClient.post('/api/cmd/record/subProcess/reset?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/model/index.ts b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/model/index.ts index b22621c..1cc0376 100644 --- a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/model/index.ts +++ b/packages/flow-mobile/flow-mobile-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} from "@/api/record"; +import {action as actionRecord, create as createRecord, processNodes as postProcessNodes,revoke as revokeRecord,urge as urgeRecord,resetSubProcess as resetSubProcessRecord} from "@/api/record"; export class FlowApprovalApiImpl implements FlowApprovalApi { @@ -30,4 +30,8 @@ export class FlowApprovalApiImpl implements FlowApprovalApi { return await urgeRecord(id,mockKey); } + resetSubProcess =async (body:Record,mockKey:string)=> { + return await resetSubProcessRecord(body,mockKey); + } + } \ No newline at end of file diff --git a/packages/flow-mobile/flow-mobile-form/CHANGELOG.md b/packages/flow-mobile/flow-mobile-form/CHANGELOG.md index 6010720..6f48ec5 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.5 + +### Patch Changes + +- 版本升级至 0.2.5（配合子流程数据重置能力发布，本包无功能变更） + ## 0.2.4 ### Patch Changes diff --git a/packages/flow-mobile/flow-mobile-form/package.json b/packages/flow-mobile/flow-mobile-form/package.json index 00a343a..b65e683 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.4", + "version": "0.2.5", "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 41d123a..c9d8634 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.5 + +### Patch Changes + +- 版本升级至 0.2.5（配合子流程数据重置能力发布，本包无功能变更） + ## 0.2.4 ### Patch Changes diff --git a/packages/flow-mobile/flow-mobile-ui/package.json b/packages/flow-mobile/flow-mobile-ui/package.json index 40097c1..a3060ff 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.4", + "version": "0.2.5", "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 fb258bf..48b69fc 100644 --- a/packages/flow-pc/flow-pc-approval/CHANGELOG.md +++ b/packages/flow-pc/flow-pc-approval/CHANGELOG.md @@ -1,5 +1,13 @@ # @coding-flow/flow-pc-approval +## 0.2.5 + +### Patch Changes + +- 新增子流程数据重置接口 `/api/cmd/record/subProcess/reset`，接入审批上下文（FlowApprovalApi 实现），可经上下文获取该能力（issue #219） +- @coding-flow/flow-approval-presenter@0.2.5 +- @coding-flow/flow-types@0.2.5 + ## 0.2.4 ### Patch Changes diff --git a/packages/flow-pc/flow-pc-approval/package.json b/packages/flow-pc/flow-pc-approval/package.json index 6937121..8f80c3d 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.4", + "version": "0.2.5", "description": "flow-engine pc form approval components", "type": "module", "sideEffects": [ 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 b6f45d3..aae9e11 100644 --- a/packages/flow-pc/flow-pc-approval/src/api/record.ts +++ b/packages/flow-pc/flow-pc-approval/src/api/record.ts @@ -30,6 +30,11 @@ export const urge = (id:any,mockKey?:string) => { return httpClient.post('/api/cmd/record/urge?mockKey='+key,{id}); } +export const resetSubProcess = (body:any,mockKey?:string) => { + const key = mockKey?mockKey:''; + return httpClient.post('/api/cmd/record/subProcess/reset?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/model/index.ts b/packages/flow-pc/flow-pc-approval/src/components/flow-approval/model/index.ts index b22621c..1cc0376 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} from "@/api/record"; +import {action as actionRecord, create as createRecord, processNodes as postProcessNodes,revoke as revokeRecord,urge as urgeRecord,resetSubProcess as resetSubProcessRecord} from "@/api/record"; export class FlowApprovalApiImpl implements FlowApprovalApi { @@ -30,4 +30,8 @@ export class FlowApprovalApiImpl implements FlowApprovalApi { return await urgeRecord(id,mockKey); } + resetSubProcess =async (body:Record,mockKey:string)=> { + return await resetSubProcessRecord(body,mockKey); + } + } \ No newline at end of file diff --git a/packages/flow-pc/flow-pc-form/CHANGELOG.md b/packages/flow-pc/flow-pc-form/CHANGELOG.md index 242dbe7..1307834 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.5 + +### Patch Changes + +- 版本升级至 0.2.5（配合子流程数据重置能力发布，本包无功能变更） + ## 0.2.4 ### Patch Changes diff --git a/packages/flow-pc/flow-pc-form/package.json b/packages/flow-pc/flow-pc-form/package.json index d2c7b21..e80df1b 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.4", + "version": "0.2.5", "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 643e602..0741b73 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.5 + +### Patch Changes + +- 版本升级至 0.2.5（配合子流程数据重置能力发布，本包无功能变更） + ## 0.2.4 ### Patch Changes diff --git a/packages/flow-pc/flow-pc-ui/package.json b/packages/flow-pc/flow-pc-ui/package.json index bb48db1..6e6193f 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.4", + "version": "0.2.5", "description": "flow-engine pc ui components", "type": "module", "sideEffects": [ diff --git a/packages/flow-types/CHANGELOG.md b/packages/flow-types/CHANGELOG.md index 7fdb601..ad7b29d 100644 --- a/packages/flow-types/CHANGELOG.md +++ b/packages/flow-types/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-types +## 0.2.5 + +### Patch Changes + +- FlowContent 详情新增 `resetSubProcess` 子流程重置能力标识，新增 `FlowSubProcessResetRequest` 重置请求类型（issue #219） + ## 0.2.4 ### Patch Changes diff --git a/packages/flow-types/package.json b/packages/flow-types/package.json index bef12dc..3171299 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.4", + "version": "0.2.5", "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 b5e2c77..40eae2f 100644 --- a/packages/flow-types/src/types/flow-approval.ts +++ b/packages/flow-types/src/types/flow-approval.ts @@ -369,4 +369,20 @@ export interface FlowContent { revoke: boolean; // 支持催办 urge: boolean; + // 支持子流程数据重置（独立能力，非审批动作）： + // 当前待办位于开启重置能力、且已汇聚完成的子流程的锁定合并节点上时为 true， + // 可据此调用 /api/cmd/record/subProcess/reset 接口，呈现方式由使用方自行决定 + resetSubProcess: boolean; +} + +/** + * 子流程数据重置请求（独立接口，不属于常规审批动作） + */ +export interface FlowSubProcessResetRequest { + // 当前操作的主流程记录id（执行重置的待办记录） + recordId: number; + // 选中重建的子流程实例流程id列表（须同属一个已放行且未取代的聚合组） + resetInstanceProcessIds: string[]; + // 重置说明（可选，记录在被作废的当前记录上供审计追溯） + advice?: string; }