diff --git a/docs/capabilities/flow-design/sub-process-config.md b/docs/capabilities/flow-design/sub-process-config.md index 074d23d..1ec75ca 100644 --- a/docs/capabilities/flow-design/sub-process-config.md +++ b/docs/capabilities/flow-design/sub-process-config.md @@ -20,7 +20,8 @@ symbols: - 保留“创建后并提交”选项，不提供等待开关，子流程节点始终等待结果。 - 提供结果判定 Groovy 脚本编辑器，默认在全部子流程结束时放行。 - 提供结果失败后的异常配置，子流程场景仅显示节点跳转。 -- 提供“展示主流程记录”开关，默认关闭；开启后子流程参与人可以查看进入当前子流程前的主流程实际历史、审批人和审批意见。 +- 提供”展示主流程记录”开关，默认关闭；开启后子流程参与人可以查看进入当前子流程前的主流程实际历史、审批人和审批意见。 +- 提供”允许重置子流程”开关（`resettable`），默认关闭；开启后子流程汇聚完成且主流程停在下游时，可在锁定合并节点的待办上重置选中的子流程实例并从头重走（后端能力见 flow-engine 子流程能力文档）。历史节点未配置该字段时按关闭处理。 - 兼容历史单子流程的 `@SCRIPT_META` 结构，编辑时自动转换为列表。 ## 脚本输出 diff --git a/packages/flow-approval-presenter/CHANGELOG.md b/packages/flow-approval-presenter/CHANGELOG.md index 37e672a..9f745f3 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.6 + +### Patch Changes + +- 版本升级至 0.2.6（仅版本号升级，无功能变更） + ## 0.2.5 ### Patch Changes diff --git a/packages/flow-approval-presenter/package.json b/packages/flow-approval-presenter/package.json index 43167f4..9c99c6f 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.5", + "version": "0.2.6", "description": "flow-engine approval presenter framework ", "type": "module", "sideEffects": [ diff --git a/packages/flow-core/CHANGELOG.md b/packages/flow-core/CHANGELOG.md index 4e2e9b5..781f584 100644 --- a/packages/flow-core/CHANGELOG.md +++ b/packages/flow-core/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-core +## 0.2.6 + +### Patch Changes + +- 版本升级至 0.2.6（仅版本号升级，无功能变更） + ## 0.2.5 ### Patch Changes diff --git a/packages/flow-core/package.json b/packages/flow-core/package.json index b0cf7ae..ddf80c6 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.5", + "version": "0.2.6", "description": "flow-engine core lib framework ", "type": "module", "sideEffects": [ diff --git a/packages/flow-design/CHANGELOG.md b/packages/flow-design/CHANGELOG.md index b720e8a..217e952 100644 --- a/packages/flow-design/CHANGELOG.md +++ b/packages/flow-design/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-design +## 0.2.6 + +### Patch Changes + +- 子流程节点配置面板新增「允许重置子流程」开关（`SubProcessStrategy.resettable`，默认关闭），历史节点未配置时按关闭处理（codingapi/flow-engine#219） + ## 0.2.5 ### Patch Changes diff --git a/packages/flow-design/package.json b/packages/flow-design/package.json index 91cf6b5..f65bf2d 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.5", + "version": "0.2.6", "description": "flow-engine design components ", "type": "module", "sideEffects": [ diff --git a/packages/flow-design/src/components/design-editor/node-components/strategy/sub-process.tsx b/packages/flow-design/src/components/design-editor/node-components/strategy/sub-process.tsx index da04183..8a8835c 100644 --- a/packages/flow-design/src/components/design-editor/node-components/strategy/sub-process.tsx +++ b/packages/flow-design/src/components/design-editor/node-components/strategy/sub-process.tsx @@ -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 = (props) => { const [visible, setVisible] = React.useState(false); const value = props.value || ''; @@ -171,6 +173,26 @@ export const SubProcessStrategy: React.FC = () => { )} /> + + + } + name={["SubProcessStrategy", "resettable"]} + > + ) => ( + + )} + /> + ); }; diff --git a/packages/flow-design/tests/script/sub_process_strategy.test.ts b/packages/flow-design/tests/script/sub_process_strategy.test.ts index 2daf28e..e1f28a6 100644 --- a/packages/flow-design/tests/script/sub_process_strategy.test.ts +++ b/packages/flow-design/tests/script/sub_process_strategy.test.ts @@ -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('历史节点未配置时默认关闭主流程记录展示', () => { @@ -9,4 +12,12 @@ describe('SubProcessStrategy', () => { it('显式开启时允许展示主流程记录', () => { expect(normalizeShowParentProcessRecords(true)).toBe(true); }); + + it('历史节点未配置时默认关闭子流程重置能力', () => { + expect(normalizeResettable(undefined)).toBe(false); + }); + + it('显式开启时允许重置子流程', () => { + expect(normalizeResettable(true)).toBe(true); + }); }); diff --git a/packages/flow-icons/CHANGELOG.md b/packages/flow-icons/CHANGELOG.md index bdbd0de..057fbb3 100644 --- a/packages/flow-icons/CHANGELOG.md +++ b/packages/flow-icons/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-icons +## 0.2.6 + +### Patch Changes + +- 版本升级至 0.2.6（仅版本号升级，无功能变更） + ## 0.2.5 ### Patch Changes diff --git a/packages/flow-icons/package.json b/packages/flow-icons/package.json index 5af5eee..31d336d 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.5", + "version": "0.2.6", "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 b93e775..c16b2ad 100644 --- a/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md +++ b/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-mobile-approval +## 0.2.6 + +### Patch Changes + +- 版本升级至 0.2.6（仅版本号升级，无功能变更） + ## 0.2.5 ### Patch Changes diff --git a/packages/flow-mobile/flow-mobile-approval/package.json b/packages/flow-mobile/flow-mobile-approval/package.json index 5a88ef4..a01ac53 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.5", + "version": "0.2.6", "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 6f48ec5..7adc89f 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.6 + +### Patch Changes + +- 版本升级至 0.2.6（仅版本号升级，无功能变更） + ## 0.2.5 ### Patch Changes diff --git a/packages/flow-mobile/flow-mobile-form/package.json b/packages/flow-mobile/flow-mobile-form/package.json index b65e683..2273ac2 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.5", + "version": "0.2.6", "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 c9d8634..78c5a32 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.6 + +### Patch Changes + +- 版本升级至 0.2.6（仅版本号升级，无功能变更） + ## 0.2.5 ### Patch Changes diff --git a/packages/flow-mobile/flow-mobile-ui/package.json b/packages/flow-mobile/flow-mobile-ui/package.json index a3060ff..544bf69 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.5", + "version": "0.2.6", "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 48b69fc..b3a19ff 100644 --- a/packages/flow-pc/flow-pc-approval/CHANGELOG.md +++ b/packages/flow-pc/flow-pc-approval/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-pc-approval +## 0.2.6 + +### Patch Changes + +- 版本升级至 0.2.6（仅版本号升级，无功能变更） + ## 0.2.5 ### Patch Changes diff --git a/packages/flow-pc/flow-pc-approval/package.json b/packages/flow-pc/flow-pc-approval/package.json index 8f80c3d..e0cb87e 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.5", + "version": "0.2.6", "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 1307834..4b964cb 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.6 + +### Patch Changes + +- 版本升级至 0.2.6（仅版本号升级，无功能变更） + ## 0.2.5 ### Patch Changes diff --git a/packages/flow-pc/flow-pc-form/package.json b/packages/flow-pc/flow-pc-form/package.json index e80df1b..277251c 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.5", + "version": "0.2.6", "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 0741b73..96f8e47 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.6 + +### Patch Changes + +- 版本升级至 0.2.6（仅版本号升级，无功能变更） + ## 0.2.5 ### Patch Changes diff --git a/packages/flow-pc/flow-pc-ui/package.json b/packages/flow-pc/flow-pc-ui/package.json index 6e6193f..81e098b 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.5", + "version": "0.2.6", "description": "flow-engine pc ui components", "type": "module", "sideEffects": [ diff --git a/packages/flow-types/CHANGELOG.md b/packages/flow-types/CHANGELOG.md index ad7b29d..5305393 100644 --- a/packages/flow-types/CHANGELOG.md +++ b/packages/flow-types/CHANGELOG.md @@ -1,5 +1,11 @@ # @coding-flow/flow-types +## 0.2.6 + +### Patch Changes + +- 版本升级至 0.2.6（仅版本号升级，无功能变更） + ## 0.2.5 ### Patch Changes diff --git a/packages/flow-types/package.json b/packages/flow-types/package.json index 3171299..b54e136 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.5", + "version": "0.2.6", "description": "flow-engine types", "type": "module", "sideEffects": [