From 09e163623f8b9a8a9fecc8230603f329def45db4 Mon Sep 17 00:00:00 2001
From: yanxiangyang <1017633908@qq.com>
Date: Mon, 22 Jun 2026 22:19:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/form/index.tsx             | 65 +++++++++----------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/packages/flow-mobile/flow-mobile-form/src/components/form/index.tsx b/packages/flow-mobile/flow-mobile-form/src/components/form/index.tsx
index c31e0bf..321d889 100644
--- a/packages/flow-mobile/flow-mobile-form/src/components/form/index.tsx
+++ b/packages/flow-mobile/flow-mobile-form/src/components/form/index.tsx
@@ -1,39 +1,38 @@
+import { FlowList } from "@/components/list";
+import { FormViewProps } from "@coding-flow/flow-types";
 import React from "react";
-import {FormViewProps} from "@coding-flow/flow-types";
-import {FlowFormView as FormView} from "./view";
-import {FlowList} from "@/components/list";
+import { FlowFormView as FormView } from "./view";
 
 export const FlowFormView: React.FC<FormViewProps> = (props) => {
+  const form = props.form;
 
-    const form = props.form;
+  const formList = props.formList || [];
 
-    const formList = props.formList || [];
+  if (props.mergeable) {
+    return (
+      <FlowList
+        formList={formList}
+        initData={props.initData}
+        meta={props.meta}
+        onValuesChange={props.onValuesChange}
+        review={props.review}
+        fieldPermissions={props.fieldPermissions}
+        onMergeRecordIdsSelected={props.onMergeRecordIdsSelected}
+      />
+    );
+  }
 
-    if(props.mergeable){
-        return (
-            <FlowList
-                formList={formList}
-                initData={props.initData}
-                meta={props.meta}
-                onValuesChange={props.onValuesChange}
-                review={props.review}
-                fieldPermissions={props.fieldPermissions}
-                onMergeRecordIdsSelected={props.onMergeRecordIdsSelected}
-            />
-        )
-    }
-
-    if(form) {
-        return (
-            <FormView
-                form={form}
-                data={props.data}
-                meta={props.meta}
-                initData={props.initData}
-                onValuesChange={props.onValuesChange}
-                review={props.review}
-                fieldPermissions={props.fieldPermissions}
-            />
-        )
-    }
-};
\ No newline at end of file
+  if (form) {
+    return (
+      <FormView
+        form={form}
+        data={props.data}
+        meta={props.meta}
+        initData={props.initData}
+        onValuesChange={props.onValuesChange}
+        review={props.review}
+        fieldPermissions={props.fieldPermissions}
+      />
+    );
+  }
+};

From a87b149411e316fd5a22eeb6c08edbd710d34733 Mon Sep 17 00:00:00 2001
From: yanxiangyang <1017633908@qq.com>
Date: Tue, 23 Jun 2026 09:58:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB=E5=92=8C?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/app-mobile/package.json                                 | 3 ++-
 apps/app-mobile/src/components/form/boolean.tsx              | 2 +-
 apps/app-mobile/src/components/form/date.tsx                 | 2 +-
 apps/app-mobile/src/components/form/double.tsx               | 2 +-
 apps/app-mobile/src/components/form/integer.tsx              | 2 +-
 apps/app-mobile/src/components/form/long.tsx                 | 2 +-
 apps/app-mobile/src/components/form/string.tsx               | 2 +-
 packages/flow-mobile/flow-mobile-approval/package.json       | 5 +++--
 .../flow-approval/components/flow-approval-actions.tsx       | 2 ++
 packages/flow-mobile/flow-mobile-form/package.json           | 5 +++--
 packages/flow-pc/flow-pc-approval/package.json               | 2 +-
 11 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/apps/app-mobile/package.json b/apps/app-mobile/package.json
index 3d53d7a..23063a4 100644
--- a/apps/app-mobile/package.json
+++ b/apps/app-mobile/package.json
@@ -19,7 +19,8 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router": "^7.13.0",
-    "react-router-dom": "^7.13.0"
+    "react-router-dom": "^7.13.0",
+    "antd": "^6.2.1"
   },
   "devDependencies": {
     "@coding-flow/flow-core": "workspace:*",
diff --git a/apps/app-mobile/src/components/form/boolean.tsx b/apps/app-mobile/src/components/form/boolean.tsx
index 30b5293..3474811 100644
--- a/apps/app-mobile/src/components/form/boolean.tsx
+++ b/apps/app-mobile/src/components/form/boolean.tsx
@@ -24,7 +24,7 @@ export const FormBoolean: React.FC<FormItemProps> = (props) => {
     const rules = props.required ? [
         {
             required: props.required,
-            message: `${props.name}不能为空`
+            message: `${props.label}不能为空`
         }
     ] : [];
 
diff --git a/apps/app-mobile/src/components/form/date.tsx b/apps/app-mobile/src/components/form/date.tsx
index d2044e9..5de5e9e 100644
--- a/apps/app-mobile/src/components/form/date.tsx
+++ b/apps/app-mobile/src/components/form/date.tsx
@@ -39,7 +39,7 @@ export const FormDate: React.FC<FormItemProps> = (props) => {
     const rules = props.required ? [
         {
             required: props.required,
-            message: `${props.name}不能为空`
+            message: `${props.label}不能为空`
         }
     ] : [];
 
diff --git a/apps/app-mobile/src/components/form/double.tsx b/apps/app-mobile/src/components/form/double.tsx
index 2549c4a..1815b63 100644
--- a/apps/app-mobile/src/components/form/double.tsx
+++ b/apps/app-mobile/src/components/form/double.tsx
@@ -26,7 +26,7 @@ export const FormDouble:React.FC<FormItemProps> = (props)=>{
     const rules = props.required?[
         {
             required: props.required,
-            message: `${props.name}不能为空`
+            message: `${props.label}不能为空`
         }
     ]:[];
 
diff --git a/apps/app-mobile/src/components/form/integer.tsx b/apps/app-mobile/src/components/form/integer.tsx
index 4b45c02..c08ba80 100644
--- a/apps/app-mobile/src/components/form/integer.tsx
+++ b/apps/app-mobile/src/components/form/integer.tsx
@@ -26,7 +26,7 @@ export const FormInteger:React.FC<FormItemProps> = (props)=>{
     const rules = props.required?[
         {
             required: props.required,
-            message: `${props.name}不能为空`
+            message: `${props.label}不能为空`
         }
     ]:[];
 
diff --git a/apps/app-mobile/src/components/form/long.tsx b/apps/app-mobile/src/components/form/long.tsx
index 27202be..677d7a8 100644
--- a/apps/app-mobile/src/components/form/long.tsx
+++ b/apps/app-mobile/src/components/form/long.tsx
@@ -26,7 +26,7 @@ export const FormLong:React.FC<FormItemProps> = (props)=>{
     const rules = props.required?[
         {
             required: props.required,
-            message: `${props.name}不能为空`
+            message: `${props.label}不能为空`
         }
     ]:[];
 
diff --git a/apps/app-mobile/src/components/form/string.tsx b/apps/app-mobile/src/components/form/string.tsx
index 3ea5915..b013720 100644
--- a/apps/app-mobile/src/components/form/string.tsx
+++ b/apps/app-mobile/src/components/form/string.tsx
@@ -27,7 +27,7 @@ export const FormString: React.FC<FormItemProps> = (props) => {
     const rules = props.required ? [
         {
             required: props.required,
-            message: `${props.name}不能为空`
+            message: `${props.label}不能为空`
         }
     ] : [];
 
diff --git a/packages/flow-mobile/flow-mobile-approval/package.json b/packages/flow-mobile/flow-mobile-approval/package.json
index 2e5bca5..6f5c4bd 100644
--- a/packages/flow-mobile/flow-mobile-approval/package.json
+++ b/packages/flow-mobile/flow-mobile-approval/package.json
@@ -50,7 +50,8 @@
     "antd-mobile": "^5.42.3",
     "dayjs": "^1.11.19",
     "immer": "^11.1.3",
-    "react-redux": "^9.2.0"
+    "react-redux": "^9.2.0",
+    "antd": "^6.2.1"
   },
   "devDependencies": {
     "@coding-flow/flow-types": "workspace:*",
@@ -59,4 +60,4 @@
     "@coding-flow/flow-mobile-ui": "workspace:*",
     "@coding-flow/flow-mobile-form": "workspace:*"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/flow-approval-actions.tsx b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/flow-approval-actions.tsx
index d62dba0..6a219ef 100644
--- a/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/flow-approval-actions.tsx
+++ b/packages/flow-mobile/flow-mobile-approval/src/components/flow-approval/components/flow-approval-actions.tsx
@@ -31,6 +31,8 @@ export const FlowApprovalActions = () => {
             const triggerFrontEvent = action.triggerFrontEvent;
             if (triggerFrontEvent) {
                 EventBus.getInstance().emit(triggerFrontEvent);
+            } else {
+                EventBus.getInstance().emit(id);
             }
         } else {
             EventBus.getInstance().emit(id);
diff --git a/packages/flow-mobile/flow-mobile-form/package.json b/packages/flow-mobile/flow-mobile-form/package.json
index 76d5de6..1b60eef 100644
--- a/packages/flow-mobile/flow-mobile-form/package.json
+++ b/packages/flow-mobile/flow-mobile-form/package.json
@@ -43,9 +43,10 @@
     "@coding-flow/flow-core": "workspace:*",
     "@coding-flow/flow-types": "workspace:*",
     "antd-mobile": "^5.42.3",
-    "dayjs": "^1.11.19"
+    "dayjs": "^1.11.19",
+    "antd": "^6.2.1"
   },
   "devDependencies": {
     "@coding-flow/flow-types": "workspace:*"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/flow-pc/flow-pc-approval/package.json b/packages/flow-pc/flow-pc-approval/package.json
index ccbdb9e..b40d214 100644
--- a/packages/flow-pc/flow-pc-approval/package.json
+++ b/packages/flow-pc/flow-pc-approval/package.json
@@ -59,4 +59,4 @@
     "@coding-flow/flow-pc-ui": "workspace:*",
     "@coding-flow/flow-pc-form": "workspace:*"
   }
-}
\ No newline at end of file
+}
