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
3 changes: 2 additions & 1 deletion docs/capabilities/flow-design/sub-process-config.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ symbols:
- 保留“创建后并提交”选项,不提供等待开关,子流程节点始终等待结果。
- 提供结果判定 Groovy 脚本编辑器,默认在全部子流程结束时放行。
- 提供结果失败后的异常配置,子流程场景仅显示节点跳转。
- 提供“展示主流程记录”开关,默认关闭;开启后子流程参与人可以查看进入当前子流程前的主流程实际历史、审批人和审批意见。
- 提供”展示主流程记录”开关,默认关闭;开启后子流程参与人可以查看进入当前子流程前的主流程实际历史、审批人和审批意见。
- 提供”允许重置子流程”开关(`resettable`),默认关闭;开启后子流程汇聚完成且主流程停在下游时,可在锁定合并节点的待办上重置选中的子流程实例并从头重走(后端能力见 flow-engine 子流程能力文档)。历史节点未配置该字段时按关闭处理。
- 兼容历史单子流程的 `@SCRIPT_META` 结构,编辑时自动转换为列表。

## 脚本输出
Expand Down
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.6

### Patch Changes

- 版本升级至 0.2.6(仅版本号升级,无功能变更)

## 0.2.5

### 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.5",
"version": "0.2.6",
"description": "flow-engine approval presenter framework ",
"type": "module",
"sideEffects": [
Expand Down
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.6

### Patch Changes

- 版本升级至 0.2.6(仅版本号升级,无功能变更)

## 0.2.5

### Patch Changes
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.5",
"version": "0.2.6",
"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.6

### Patch Changes

- 子流程节点配置面板新增「允许重置子流程」开关(`SubProcessStrategy.resettable`,默认关闭),历史节点未配置时按关闭处理(codingapi/flow-engine#219)

## 0.2.5

### 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.5",
"version": "0.2.6",
"description": "flow-engine design components ",
"type": "module",
"sideEffects": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ interface SubProcessStrategyContentProps {

export const normalizeShowParentProcessRecords = (value?: boolean): boolean => value === true;

export const normalizeResettable = (value?: boolean): boolean => value === true;

const SubProcessScriptContent: React.FC<SubProcessStrategyContentProps> = (props) => {
const [visible, setVisible] = React.useState(false);
const value = props.value || '';
Expand Down Expand Up @@ -171,6 +173,26 @@ export const SubProcessStrategy: React.FC = () => {
)}
/>
</Form.Item>

<Form.Item
label={
<FieldTip
label={"允许重置子流程"}
description={"开启后,子流程汇聚完成且主流程停在下游时,可在锁定合并节点的待办上重置选中的子流程实例并从头重走,主流程重新等待子流程结果;默认关闭。"}
/>
}
name={["SubProcessStrategy", "resettable"]}
>
<Field
name={"SubProcessStrategy.resettable"}
render={({ field: { value, onChange } }: FieldRenderProps<boolean | undefined>) => (
<Switch
value={normalizeResettable(value)}
onChange={onChange}
/>
)}
/>
</Form.Item>
</Form>
);
};
13 changes: 12 additions & 1 deletion packages/flow-design/tests/script/sub_process_strategy.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import {describe, expect, it} from '@rstest/core';
import {normalizeShowParentProcessRecords} from '@/components/design-editor/node-components/strategy/sub-process';
import {
normalizeResettable,
normalizeShowParentProcessRecords
} from '@/components/design-editor/node-components/strategy/sub-process';

describe('SubProcessStrategy', () => {
it('历史节点未配置时默认关闭主流程记录展示', () => {
Expand All @@ -9,4 +12,12 @@ describe('SubProcessStrategy', () => {
it('显式开启时允许展示主流程记录', () => {
expect(normalizeShowParentProcessRecords(true)).toBe(true);
});

it('历史节点未配置时默认关闭子流程重置能力', () => {
expect(normalizeResettable(undefined)).toBe(false);
});

it('显式开启时允许重置子流程', () => {
expect(normalizeResettable(true)).toBe(true);
});
});
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.6

### Patch Changes

- 版本升级至 0.2.6(仅版本号升级,无功能变更)

## 0.2.5

### 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.5",
"version": "0.2.6",
"description": "flow-engine icons ",
"type": "module",
"sideEffects": [
Expand Down
6 changes: 6 additions & 0 deletions packages/flow-mobile/flow-mobile-approval/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @coding-flow/flow-mobile-approval

## 0.2.6

### Patch Changes

- 版本升级至 0.2.6(仅版本号升级,无功能变更)

## 0.2.5

### 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.5",
"version": "0.2.6",
"description": "flow-engine pc mobile approval components",
"type": "module",
"sideEffects": [
Expand Down
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.6

### Patch Changes

- 版本升级至 0.2.6(仅版本号升级,无功能变更)

## 0.2.5

### 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.5",
"version": "0.2.6",
"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.6

### Patch Changes

- 版本升级至 0.2.6(仅版本号升级,无功能变更)

## 0.2.5

### 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.5",
"version": "0.2.6",
"description": "flow-engine mobile ui components",
"type": "module",
"sideEffects": [
Expand Down
6 changes: 6 additions & 0 deletions packages/flow-pc/flow-pc-approval/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @coding-flow/flow-pc-approval

## 0.2.6

### Patch Changes

- 版本升级至 0.2.6(仅版本号升级,无功能变更)

## 0.2.5

### 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.5",
"version": "0.2.6",
"description": "flow-engine pc form approval components",
"type": "module",
"sideEffects": [
Expand Down
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.6

### Patch Changes

- 版本升级至 0.2.6(仅版本号升级,无功能变更)

## 0.2.5

### 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.5",
"version": "0.2.6",
"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.6

### Patch Changes

- 版本升级至 0.2.6(仅版本号升级,无功能变更)

## 0.2.5

### 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.5",
"version": "0.2.6",
"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.6

### Patch Changes

- 版本升级至 0.2.6(仅版本号升级,无功能变更)

## 0.2.5

### 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.5",
"version": "0.2.6",
"description": "flow-engine types",
"type": "module",
"sideEffects": [
Expand Down
Loading