github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: global form message not work, close #5693

pull/5702/head
tangjinzhou 2022-06-11 21:56:41 +08:00
parent 171b2b643f
commit e5b9308374
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/config-provider/context.ts
View File

@ -1,5 +1,5 @@
import type { ExtractPropTypes, InjectionKey, PropType, Ref } from 'vue'; import type { ExtractPropTypes, InjectionKey, PropType, Ref } from 'vue';
import { inject, provide } from 'vue'; import { computed, inject, provide } from 'vue';
import type { ValidateMessages } from '../form/interface'; import type { ValidateMessages } from '../form/interface';
import type { RequiredMark } from '../form/Form'; import type { RequiredMark } from '../form/Form';
import type { RenderEmptyHandler } from './renderEmpty'; import type { RenderEmptyHandler } from './renderEmpty';
@ -17,7 +17,7 @@ export const useProvideGlobalForm = (state: GlobalFormCOntextProps) => {
}; };
export const useInjectGlobalForm = () => { export const useInjectGlobalForm = () => {
return inject(GlobalFormContextKey, {}); return inject(GlobalFormContextKey, { validateMessages: computed(() => undefined) });
}; };
export const GlobalConfigContextKey: InjectionKey<GlobalFormCOntextProps> = export const GlobalConfigContextKey: InjectionKey<GlobalFormCOntextProps> =

4
components/form/Form.tsx
View File

@ -30,6 +30,7 @@ import useConfigInject from '../_util/hooks/useConfigInject';
import { useProvideForm } from './context'; import { useProvideForm } from './context';
import type { SizeType } from '../config-provider'; import type { SizeType } from '../config-provider';
import useForm from './useForm'; import useForm from './useForm';
import { useInjectGlobalForm } from '../config-provider/context';
export type RequiredMark = boolean | 'optional'; export type RequiredMark = boolean | 'optional';
export type FormLayout = 'horizontal' | 'inline' | 'vertical'; export type FormLayout = 'horizontal' | 'inline' | 'vertical';
@ -127,10 +128,11 @@ const Form = defineComponent({
return true; return true;
}); });
const mergedColon = computed(() => props.colon ?? contextForm.value?.colon); const mergedColon = computed(() => props.colon ?? contextForm.value?.colon);
const { validateMessages: globalValidateMessages } = useInjectGlobalForm();
const validateMessages = computed(() => { const validateMessages = computed(() => {
return { return {
...defaultValidateMessages, ...defaultValidateMessages,
...contextForm.value?.validateMessages, ...globalValidateMessages.value,
...props.validateMessages, ...props.validateMessages,
}; };
}); });