doc: form add demo (#5070)

* doc: add form demo * fix: form dynamic error * doc: add form demo * revert: formitem auto validate #4955 * fix: input not update when set undefined * doc: add form demo * fix: form validate for number tyope, close #5064 * fix: form validateMessages not work * doc: add form demo
vueComponent · Dec 23, 2021 · 7aae6f6 · 7aae6f6
1 parent 1c9cfd1
commit 7aae6f6
Show file tree

Hide file tree

Showing 21 changed files with 1,662 additions and 298 deletions.
diff --git a/components/form/Form.tsx b/components/form/Form.tsx
@@ -93,7 +93,7 @@ export type FormExpose = {
   resetFields: (name?: NamePath) => void;
   clearValidate: (name?: NamePath) => void;
   validateFields: (
-    nameList?: NamePath[],
+    nameList?: NamePath[] | string,
     options?: ValidateOptions,
   ) => Promise<{
     [key: string]: any;
@@ -102,7 +102,7 @@ export type FormExpose = {
     [key: string]: any;
   };
   validate: (
-    nameList?: NamePath[],
+    nameList?: NamePath[] | string,
     options?: ValidateOptions,
   ) => Promise<{
     [key: string]: any;
@@ -145,7 +145,12 @@ const Form = defineComponent({
       }
       return true;
     });
-
+    const validateMessages = computed(() => {
+      return {
+        ...defaultValidateMessages,
+        ...props.validateMessages,
+      };
+    });
     const formClassName = computed(() =>
       classNames(prefixCls.value, {
         [`${prefixCls.value}-${props.layout}`]: true,
@@ -267,10 +272,7 @@ const Form = defineComponent({
         // Add field validate rule in to promise list
         if (!provideNameList || containsNamePath(namePathList, fieldNamePath)) {
           const promise = field.validateRules({
-            validateMessages: {
-              ...defaultValidateMessages,
-              ...props.validateMessages,
-            },
+            validateMessages: validateMessages.value,
             ...options,
           });
 
@@ -376,6 +378,7 @@ const Form = defineComponent({
       onValidate: (name, status, errors) => {
         emit('validate', name, status, errors);
       },
+      validateMessages,
     });
 
     watch(

diff --git a/components/form/FormItem.tsx b/components/form/FormItem.tsx
@@ -1,4 +1,4 @@
-import type { PropType, ExtractPropTypes, ComputedRef } from 'vue';
+import type { PropType, ExtractPropTypes, ComputedRef, Ref } from 'vue';
 import {
   watch,
   defineComponent,
@@ -32,7 +32,7 @@ const ValidateStatuses = tuple('success', 'warning', 'error', 'validating', '');
 export type ValidateStatus = typeof ValidateStatuses[number];
 
 export interface FieldExpose {
-  fieldValue: ComputedRef<any>;
+  fieldValue: Ref<any>;
   fieldId: ComputedRef<any>;
   fieldName: ComputedRef<any>;
   resetField: () => void;
@@ -132,13 +132,15 @@ export default defineComponent({
         return formName ? `${formName}_${mergedId}` : `${defaultItemNamePrefixCls}_${mergedId}`;
       }
     });
-    const fieldValue = computed(() => {
+    const getNewFieldValue = () => {
       const model = formContext.model.value;
       if (!model || !fieldName.value) {
         return;
+      } else {
+        return getPropByPath(model, namePath.value, true).v;
       }
-      return getPropByPath(model, namePath.value, true).v;
-    });
+    };
+    const fieldValue = computed(() => getNewFieldValue());
 
     const initialValue = ref(cloneDeep(fieldValue.value));
     const mergedValidateTrigger = computed(() => {
@@ -184,9 +186,20 @@ export default defineComponent({
     watchEffect(() => {
       validateState.value = props.validateStatus;
     });
-
+    const messageVariables = computed(() => {
+      let variables: Record<string, string> = {};
+      if (typeof props.label === 'string') {
+        variables.label = props.label;
+      } else if (props.name) {
+        variables.label = String(name);
+      }
+      if (props.messageVariables) {
+        variables = { ...variables, ...props.messageVariables };
+      }
+      return variables;
+    });
     const validateRules = (options: ValidateOptions) => {
-      const { validateFirst = false, messageVariables } = props;
+      const { validateFirst = false } = props;
       const { triggerName } = options || {};
 
       let filteredRules = rulesRef.value;
@@ -207,9 +220,12 @@ export default defineComponent({
         namePath.value,
         fieldValue.value,
         filteredRules as RuleObject[],
-        options,
+        {
+          validateMessages: formContext.validateMessages.value,
+          ...options,
+        },
         validateFirst,
-        messageVariables,
+        messageVariables.value,
       );
       validateState.value = 'validating';
       errors.value = [];
@@ -285,12 +301,6 @@ export default defineComponent({
       resetField,
     });
 
-    // instead useProvideFormItemContext onFieldChange
-    watch(fieldValue, () => {
-      if (props.autoLink) {
-        onFieldChange();
-      }
-    });
     useProvideFormItemContext(
       {
         id: fieldId,
@@ -300,9 +310,9 @@ export default defineComponent({
           }
         },
         onFieldChange: () => {
-          // if (props.autoLink) {
-          //   onFieldChange();
-          // }
+          if (props.autoLink) {
+            onFieldChange();
+          }
         },
         clearValidate,
       },