Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/flow-approval-presenter/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @coding-flow/flow-approval-presenter

## 0.2.5

### Patch Changes

- FlowApprovalApi 审批接口新增 `resetSubProcess` 子流程数据重置方法(独立接口,非审批动作)(issue #219)

## 0.2.4

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-approval-presenter/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
7 changes: 7 additions & 0 deletions packages/flow-approval-presenter/src/typings/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,11 @@ export interface FlowApprovalApi {
revoke(id: any, mockKey: string): Promise<any>;

urge(id: any, mockKey: string): Promise<any>;

/**
* 子流程数据重置(独立接口,不属于常规审批动作)。
* 仅当详情数据 resetSubProcess 标识为 true 时可调用,
* 请求体为 FlowSubProcessResetRequest(recordId + resetInstanceProcessIds + advice)。
*/
resetSubProcess(body: Record<string, any>, mockKey: string): Promise<any>;
}
6 changes: 6 additions & 0 deletions packages/flow-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @coding-flow/flow-core

## 0.2.5

### Patch Changes

- 版本升级至 0.2.5(配合子流程数据重置能力发布,本包无功能变更)

## 0.2.4

## 0.2.3
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-core/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
6 changes: 6 additions & 0 deletions packages/flow-design/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @coding-flow/flow-design

## 0.2.5

### Patch Changes

- 版本升级至 0.2.5(配合子流程数据重置能力发布,本包无功能变更)

## 0.2.4

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-design/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
6 changes: 6 additions & 0 deletions packages/flow-icons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @coding-flow/flow-icons

## 0.2.5

### Patch Changes

- 版本升级至 0.2.5(配合子流程数据重置能力发布,本包无功能变更)

## 0.2.4

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-icons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coding-flow/flow-icons",
"version": "0.2.4",
"version": "0.2.5",
"description": "flow-engine icons ",
"type": "module",
"sideEffects": [
Expand Down
8 changes: 8 additions & 0 deletions packages/flow-mobile/flow-mobile-approval/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-mobile/flow-mobile-approval/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
5 changes: 5 additions & 0 deletions packages/flow-mobile/flow-mobile-approval/src/api/record.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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, {}, {}, []);
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down Expand Up @@ -30,4 +30,8 @@ export class FlowApprovalApiImpl implements FlowApprovalApi {
return await urgeRecord(id,mockKey);
}

resetSubProcess =async (body:Record<string, any>,mockKey:string)=> {
return await resetSubProcessRecord(body,mockKey);
}

}
6 changes: 6 additions & 0 deletions packages/flow-mobile/flow-mobile-form/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @coding-flow/flow-mobile-form

## 0.2.5

### Patch Changes

- 版本升级至 0.2.5(配合子流程数据重置能力发布,本包无功能变更)

## 0.2.4

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-mobile/flow-mobile-form/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
6 changes: 6 additions & 0 deletions packages/flow-mobile/flow-mobile-ui/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @coding-flow/flow-mobile-ui

## 0.2.5

### Patch Changes

- 版本升级至 0.2.5(配合子流程数据重置能力发布,本包无功能变更)

## 0.2.4

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-mobile/flow-mobile-ui/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
8 changes: 8 additions & 0 deletions packages/flow-pc/flow-pc-approval/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-pc/flow-pc-approval/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
5 changes: 5 additions & 0 deletions packages/flow-pc/flow-pc-approval/src/api/record.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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, {}, {}, []);
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down Expand Up @@ -30,4 +30,8 @@ export class FlowApprovalApiImpl implements FlowApprovalApi {
return await urgeRecord(id,mockKey);
}

resetSubProcess =async (body:Record<string, any>,mockKey:string)=> {
return await resetSubProcessRecord(body,mockKey);
}

}
6 changes: 6 additions & 0 deletions packages/flow-pc/flow-pc-form/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @coding-flow/flow-pc-form

## 0.2.5

### Patch Changes

- 版本升级至 0.2.5(配合子流程数据重置能力发布,本包无功能变更)

## 0.2.4

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-pc/flow-pc-form/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
6 changes: 6 additions & 0 deletions packages/flow-pc/flow-pc-ui/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @coding-flow/flow-pc-ui

## 0.2.5

### Patch Changes

- 版本升级至 0.2.5(配合子流程数据重置能力发布,本包无功能变更)

## 0.2.4

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-pc/flow-pc-ui/package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
6 changes: 6 additions & 0 deletions packages/flow-types/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @coding-flow/flow-types

## 0.2.5

### Patch Changes

- FlowContent 详情新增 `resetSubProcess` 子流程重置能力标识,新增 `FlowSubProcessResetRequest` 重置请求类型(issue #219)

## 0.2.4

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/flow-types/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coding-flow/flow-types",
"version": "0.2.4",
"version": "0.2.5",
"description": "flow-engine types",
"type": "module",
"sideEffects": [
Expand Down
16 changes: 16 additions & 0 deletions packages/flow-types/src/types/flow-approval.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Loading