修改流程操作按钮点击和表单校验问题

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:*",

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}不能为空`
         }
     ] : [];
 

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}不能为空`
         }
     ] : [];
 

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}不能为空`
         }
     ]:[];
 

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}不能为空`
         }
     ]:[];
 

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}不能为空`
         }
     ]:[];
 

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}不能为空`
         }
     ] : [];
 

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:*"
   }
-}
+}

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);

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:*"
   }
-}
+}

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}
-            />
-        )
-    }
-};
+  if (form) {
+    return (
+      <FormView
+        form={form}
+        data={props.data}
+        meta={props.meta}
+        initData={props.initData}
+        onValuesChange={props.onValuesChange}
+        review={props.review}
+        fieldPermissions={props.fieldPermissions}
+      />
+    );
+  }
+};

packages/flow-pc/flow-pc-approval/package.json

@@ -59,4 +59,4 @@
     "@coding-flow/flow-pc-ui": "workspace:*",
     "@coding-flow/flow-pc-form": "workspace:*"
   }
-}
+}