From ae161596a62c93a901d970ad3277744647d0de7f Mon Sep 17 00:00:00 2001
From: lorne <1991wangliang@gmail.com>
Date: Wed, 12 Aug 2026 10:30:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=90=88=E5=B9=B6=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E6=94=AF=E6=8C=81=E5=90=88=E5=B9=B6=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=EF=BC=88=E5=AE=A1=E6=89=B9=E4=BA=BA/=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E4=BA=BA/=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=89issue=20#202?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../node-components/strategy/record-merge.tsx | 59 ++++++++++++++++---
 1 file changed, 52 insertions(+), 7 deletions(-)

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 (
         <Form
             form={form}
@@ -31,13 +32,57 @@ export const RecordMergeStrategy:React.FC = () => {
             >
                 <Field
                     name="RecordMergeStrategy.enable"
-                    render={({ field: { value, onChange } }: FieldRenderProps<any>) => (
-                        <>
-                            <Switch value={value} onChange={onChange} />
-                        </>
-                    )}
+                    render={({ field: { value, onChange } }: FieldRenderProps<any>) => {
+                        setMergeTypeVisible(value === true);
+                        return (
+                            <>
+                                <Switch value={value} onChange={onChange} />
+                            </>
+                        )
+                    }}
                 />
             </Form.Item>
+
+            {mergeTypeVisible && (
+                <Form.Item
+                    label={
+                        <FieldTip
+                            label={"合并类型"}
+                            description={"选择合并审批的合并依据：按审批人、发起人或提交人合并。"}
+                            items={[
+                                {label: "审批人合并", detail: "同一审批人（当前审批人）的多条记录合并为一条待办。"},
+                                {label: "发起人合并", detail: "同一发起人的多条记录合并为一条待办。"},
+                                {label: "提交人合并", detail: "同一提交人的多条记录合并为一条待办。"},
+                            ]}
+                        />
+                    }
+                    name={["RecordMergeStrategy","mergeType"]}
+                >
+                    <Field
+                        name="RecordMergeStrategy.mergeType"
+                        render={({ field: { value, onChange } }: FieldRenderProps<any>) => (
+                            <Select
+                                value={value}
+                                onChange={onChange}
+                                options={[
+                                    {
+                                        label: '审批人合并',
+                                        value: 'APPROVER'
+                                    },
+                                    {
+                                        label: '发起人合并',
+                                        value: 'CREATOR'
+                                    },
+                                    {
+                                        label: '提交人合并',
+                                        value: 'SUBMITTER'
+                                    }
+                                ]}
+                            />
+                        )}
+                    />
+                </Form.Item>
+            )}
         </Form>
     )
 }
\ No newline at end of file

From 65c05746fe7235b4a3ebce392116296222c255ef Mon Sep 17 00:00:00 2001
From: lorne <1991wangliang@gmail.com>
Date: Wed, 12 Aug 2026 10:51:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E5=BE=85=E5=8A=9E=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B5=81=E7=A8=8B=E7=BC=96=E7=A0=81=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=AE=9E=E4=BE=8B=E7=BC=96=E7=A0=81=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E8=AF=AF=E5=AF=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- app-pc 与 flow-pc mock：processId 列标题由「流程编码」改为「实例编码」
- app-mobile：待办/已办/抄送/全部列表项新增展示实例编码（processId）
- 流程设计列表（workflow-list）展示的 code 是真正的流程编码，保持不变

#204

Co-Authored-By: Claude <noreply@anthropic.com>
---
 apps/app-mobile/src/pages/todo.tsx                             | 3 ++-
 apps/app-pc/src/pages/todo.tsx                                 | 2 +-
 .../src/components/flow-mock/components/todo.tsx               | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

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<TodoListProps> = ({type}) => {
                     )}
                     description={(
                         <>
-                            {record.nodeName} {record.workTitle}
+                            <div>{record.nodeName} {record.workTitle}</div>
+                            <div>实例编码：{record.processId}</div>
                         </>
                     )}
                     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-pc/flow-pc-approval/src/components/flow-mock/components/todo.tsx b/packages/flow-pc/flow-pc-approval/src/components/flow-mock/components/todo.tsx
index 89fab03..741085c 100644
--- a/packages/flow-pc/flow-pc-approval/src/components/flow-mock/components/todo.tsx
+++ b/packages/flow-pc/flow-pc-approval/src/components/flow-mock/components/todo.tsx
@@ -36,7 +36,7 @@ export const MockTodoPage: React.FC<MockTodoPageProps> = (props) => {
         },
         {
             dataIndex: 'processId',
-            title: '流程编码',
+            title: '实例编码',
         },
         {
             dataIndex: 'title',

From 21d7e663a60dceff7394cb9bb601f468a7524632 Mon Sep 17 00:00:00 2001
From: lorne <1991wangliang@gmail.com>
Date: Wed, 12 Aug 2026 10:55:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E7=89=88=E6=9C=AC=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E8=87=B3=200.1.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- changeset version 将各 @coding-flow/* 包从 0.1.6 升级至 0.1.7（patch），
  并更新各包 CHANGELOG.md 与内部依赖版本
- 本次变更内容：待办记录列表流程编码改为实例编码，避免误导（issue #204）

#204

Co-Authored-By: Claude <noreply@anthropic.com>
---
 packages/flow-approval-presenter/CHANGELOG.md        |  7 +++++++
 packages/flow-approval-presenter/package.json        |  2 +-
 packages/flow-core/CHANGELOG.md                      |  2 ++
 packages/flow-core/package.json                      |  2 +-
 packages/flow-design/CHANGELOG.md                    |  9 +++++++++
 packages/flow-design/package.json                    |  2 +-
 packages/flow-icons/CHANGELOG.md                     |  6 ++++++
 packages/flow-icons/package.json                     |  2 +-
 .../flow-mobile/flow-mobile-approval/CHANGELOG.md    | 11 +++++++++++
 .../flow-mobile/flow-mobile-approval/package.json    |  2 +-
 packages/flow-mobile/flow-mobile-form/CHANGELOG.md   |  7 +++++++
 packages/flow-mobile/flow-mobile-form/package.json   |  2 +-
 packages/flow-mobile/flow-mobile-ui/CHANGELOG.md     |  6 ++++++
 packages/flow-mobile/flow-mobile-ui/package.json     |  2 +-
 packages/flow-pc/flow-pc-approval/CHANGELOG.md       | 12 ++++++++++++
 packages/flow-pc/flow-pc-approval/package.json       |  2 +-
 packages/flow-pc/flow-pc-form/CHANGELOG.md           |  7 +++++++
 packages/flow-pc/flow-pc-form/package.json           |  2 +-
 packages/flow-pc/flow-pc-ui/CHANGELOG.md             |  6 ++++++
 packages/flow-pc/flow-pc-ui/package.json             |  2 +-
 packages/flow-types/CHANGELOG.md                     |  6 ++++++
 packages/flow-types/package.json                     |  2 +-
 22 files changed, 90 insertions(+), 11 deletions(-)

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-icons/CHANGELOG.md b/packages/flow-icons/CHANGELOG.md
index 76c6ee4..eeb771a 100644
--- a/packages/flow-icons/CHANGELOG.md
+++ b/packages/flow-icons/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @coding-flow/flow-icons
 
+## 0.1.7
+
+### Patch Changes
+
+- @coding-flow/flow-core@0.1.7
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/flow-icons/package.json b/packages/flow-icons/package.json
index 049b893..f2fc3b4 100644
--- a/packages/flow-icons/package.json
+++ b/packages/flow-icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coding-flow/flow-icons",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "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 be44c18..7d0a8a6 100644
--- a/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md
+++ b/packages/flow-mobile/flow-mobile-approval/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @coding-flow/flow-mobile-approval
 
+## 0.1.7
+
+### Patch Changes
+
+- @coding-flow/flow-approval-presenter@0.1.7
+- @coding-flow/flow-core@0.1.7
+- @coding-flow/flow-icons@0.1.7
+- @coding-flow/flow-mobile-form@0.1.7
+- @coding-flow/flow-mobile-ui@0.1.7
+- @coding-flow/flow-types@0.1.7
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/flow-mobile/flow-mobile-approval/package.json b/packages/flow-mobile/flow-mobile-approval/package.json
index ee698f1..59c01a7 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.1.6",
+  "version": "0.1.7",
   "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 2acca80..887713d 100644
--- a/packages/flow-mobile/flow-mobile-form/CHANGELOG.md
+++ b/packages/flow-mobile/flow-mobile-form/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @coding-flow/flow-mobile-form
 
+## 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-mobile/flow-mobile-form/package.json b/packages/flow-mobile/flow-mobile-form/package.json
index 31fe3b9..7459dbd 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.1.6",
+  "version": "0.1.7",
   "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 be46d32..469523e 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.1.7
+
+### Patch Changes
+
+- @coding-flow/flow-core@0.1.7
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/flow-mobile/flow-mobile-ui/package.json b/packages/flow-mobile/flow-mobile-ui/package.json
index a7ba8a5..f574bee 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.1.6",
+  "version": "0.1.7",
   "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 5cc50d9..87aee00 100644
--- a/packages/flow-pc/flow-pc-approval/CHANGELOG.md
+++ b/packages/flow-pc/flow-pc-approval/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @coding-flow/flow-pc-approval
 
+## 0.1.7
+
+### Patch Changes
+
+- **fix**: 待办记录列表将流程编码改为实例编码，避免误导。app-pc 与 flow-pc mock 的 processId 列标题由「流程编码」改为「实例编码」，app-mobile 待办列表新增展示实例编码（processId）。流程设计列表展示的 code 为真正的流程编码，保持不变。
+  - @coding-flow/flow-approval-presenter@0.1.7
+  - @coding-flow/flow-core@0.1.7
+  - @coding-flow/flow-icons@0.1.7
+  - @coding-flow/flow-pc-form@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-pc/flow-pc-approval/package.json b/packages/flow-pc/flow-pc-approval/package.json
index f2d01c1..d5e9a97 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.1.6",
+  "version": "0.1.7",
   "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 67e1012..43c8d43 100644
--- a/packages/flow-pc/flow-pc-form/CHANGELOG.md
+++ b/packages/flow-pc/flow-pc-form/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @coding-flow/flow-pc-form
 
+## 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-pc/flow-pc-form/package.json b/packages/flow-pc/flow-pc-form/package.json
index 2c1a8fc..ac607e0 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.1.6",
+  "version": "0.1.7",
   "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 3e91b88..75e70df 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.1.7
+
+### Patch Changes
+
+- @coding-flow/flow-core@0.1.7
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/flow-pc/flow-pc-ui/package.json b/packages/flow-pc/flow-pc-ui/package.json
index 9175abe..6447317 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.1.6",
+  "version": "0.1.7",
   "description": "flow-engine pc ui components",
   "type": "module",
   "sideEffects": [
diff --git a/packages/flow-types/CHANGELOG.md b/packages/flow-types/CHANGELOG.md
index 5ca1115..bdc0f12 100644
--- a/packages/flow-types/CHANGELOG.md
+++ b/packages/flow-types/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @coding-flow/flow-types
 
+## 0.1.7
+
+### Patch Changes
+
+- @coding-flow/flow-core@0.1.7
+
 ## 0.1.6
 
 ### Patch Changes
diff --git a/packages/flow-types/package.json b/packages/flow-types/package.json
index c95f5b3..3b0c463 100644
--- a/packages/flow-types/package.json
+++ b/packages/flow-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coding-flow/flow-types",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "flow-engine types",
   "type": "module",
   "sideEffects": [