Skip to content

Commit af3ce62

Browse files
authored
Merge pull request #1690 from YangsonHung/fix/validateMessages-in-form-no-working
fix:修复 antd-mobile的ConfigProvider因为不支持form属性导致传递的validateMessages属性未在…
2 parents 839d250 + e830f2a commit af3ce62

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

packages/form-render-mobile/src/form-core/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ const FormCore = (props: any) => {
5151
logOnSubmit,
5252
className,
5353
id,
54+
validateMessages,
5455
} = transformProps({ ...props, ...schemaProps });
5556

5657
useEffect(() => {
@@ -117,7 +118,7 @@ const FormCore = (props: any) => {
117118
if (!isFunction(logOnSubmit)) {
118119
return;
119120
}
120-
121+
121122
const start = getSessionItem('FORM_START');
122123
const mount = getSessionItem('FORM_MOUNT_TIME');
123124

@@ -190,6 +191,7 @@ const FormCore = (props: any) => {
190191
onFinish={handleFinish}
191192
onFinishFailed={handleFinishFailed}
192193
onValuesChange={handleValuesChange}
194+
validateMessages={validateMessages}
193195
>
194196
<Grid columns={1}>
195197
<RenderCore schema={schema} />

packages/form-render-mobile/src/withProvider.tsx

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,20 @@ export default function withProvider<T>(Element: React.ComponentType<T>): React.
7171
<ConfigProvider
7272
{...configProvider}
7373
locale={langPack}
74-
form={{
75-
validateMessages: {
76-
...formValidateMessages,
77-
...validateMessages
78-
}
79-
}}
8074
>
8175
<ConfigContext.Provider value={configContext}>
8276
<FRContext.Provider value={store}>
83-
<Element form={form} {...otherProps} />
77+
<Element
78+
form={form}
79+
validateMessages={{
80+
...formValidateMessages,
81+
...validateMessages
82+
}}
83+
{...otherProps}
84+
/>
8485
</FRContext.Provider>
8586
</ConfigContext.Provider>
8687
</ConfigProvider>
8788
);
8889
};
89-
}
90+
}

0 commit comments

Comments
 (0)