diff --git a/apps/app-mobile/src/pages/todo.tsx b/apps/app-mobile/src/pages/todo.tsx index 397b485..f1cbfb5 100644 --- a/apps/app-mobile/src/pages/todo.tsx +++ b/apps/app-mobile/src/pages/todo.tsx @@ -66,7 +66,8 @@ const TodoList: React.FC = ({type}) => { )} description={( <> - {record.nodeName} {record.workTitle} +
{record.nodeName} {record.workTitle}
+
实例编码:{record.processId}
)} extra={ diff --git a/apps/app-pc/src/pages/todo.tsx b/apps/app-pc/src/pages/todo.tsx index b5b0a9b..092fedb 100644 --- a/apps/app-pc/src/pages/todo.tsx +++ b/apps/app-pc/src/pages/todo.tsx @@ -27,7 +27,7 @@ const TodoPage: React.FC = () => { }, { dataIndex: 'processId', - title: '流程编码', + title: '实例编码', }, { dataIndex: 'title', diff --git a/packages/flow-approval-presenter/CHANGELOG.md b/packages/flow-approval-presenter/CHANGELOG.md index d893dc4..5c75234 100644 --- a/packages/flow-approval-presenter/CHANGELOG.md +++ b/packages/flow-approval-presenter/CHANGELOG.md @@ -1,5 +1,12 @@ # @coding-flow/flow-approval-presenter +## 0.1.7 + +### Patch Changes + +- @coding-flow/flow-core@0.1.7 +- @coding-flow/flow-types@0.1.7 + ## 0.1.6 ### Patch Changes diff --git a/packages/flow-approval-presenter/package.json b/packages/flow-approval-presenter/package.json index aa67e8c..08f8c9e 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.1.6", + "version": "0.1.7", "description": "flow-engine approval presenter framework ", "type": "module", "sideEffects": [ diff --git a/packages/flow-core/CHANGELOG.md b/packages/flow-core/CHANGELOG.md index 26421c9..8d2ce8d 100644 --- a/packages/flow-core/CHANGELOG.md +++ b/packages/flow-core/CHANGELOG.md @@ -1,5 +1,7 @@ # @coding-flow/flow-core +## 0.1.7 + ## 0.1.6 ### Patch Changes diff --git a/packages/flow-core/package.json b/packages/flow-core/package.json index 73031c9..efbaee8 100644 --- a/packages/flow-core/package.json +++ b/packages/flow-core/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-core", - "version": "0.1.6", + "version": "0.1.7", "description": "flow-engine core lib framework ", "type": "module", "sideEffects": [ diff --git a/packages/flow-design/CHANGELOG.md b/packages/flow-design/CHANGELOG.md index 803b26c..f344240 100644 --- a/packages/flow-design/CHANGELOG.md +++ b/packages/flow-design/CHANGELOG.md @@ -1,5 +1,14 @@ # @coding-flow/flow-design +## 0.1.7 + +### Patch Changes + +- @coding-flow/flow-core@0.1.7 +- @coding-flow/flow-icons@0.1.7 +- @coding-flow/flow-pc-ui@0.1.7 +- @coding-flow/flow-types@0.1.7 + ## 0.1.6 ### Patch Changes diff --git a/packages/flow-design/package.json b/packages/flow-design/package.json index 2730b8f..f10b228 100644 --- a/packages/flow-design/package.json +++ b/packages/flow-design/package.json @@ -1,6 +1,6 @@ { "name": "@coding-flow/flow-design", - "version": "0.1.6", + "version": "0.1.7", "description": "flow-engine design components ", "type": "module", "sideEffects": [ diff --git a/packages/flow-design/src/components/design-editor/node-components/strategy/record-merge.tsx b/packages/flow-design/src/components/design-editor/node-components/strategy/record-merge.tsx index 25cc9d4..e5b13ec 100644 --- a/packages/flow-design/src/components/design-editor/node-components/strategy/record-merge.tsx +++ b/packages/flow-design/src/components/design-editor/node-components/strategy/record-merge.tsx @@ -1,5 +1,5 @@ import React from "react"; -import {Form, Switch} from "antd"; +import {Form, Select, Switch} from "antd"; import { Field, FieldRenderProps } from "@flowgram.ai/fixed-layout-editor"; import {FieldTip} from "@/components/field-tip"; @@ -9,9 +9,10 @@ import {FieldTip} from "@/components/field-tip"; */ export const RecordMergeStrategy:React.FC = () => { - const [form] = Form.useForm(); + const [mergeTypeVisible, setMergeTypeVisible] = React.useState(false); + return (
{ > ) => ( - <> - - - )} + render={({ field: { value, onChange } }: FieldRenderProps) => { + setMergeTypeVisible(value === true); + return ( + <> + + + ) + }} /> + + {mergeTypeVisible && ( + + } + name={["RecordMergeStrategy","mergeType"]} + > + ) => ( +