fix: 若干警告信息

hug-sun · Sep 15, 2020 · d3e8952 · d3e8952
1 parent b488f89
commit d3e8952
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/packages/form-item/FormItem.vue b/packages/form-item/FormItem.vue
@@ -105,7 +105,7 @@ export default {
   setup(props) {
     const isNested = ref(false)
     const elForm = inject('elForm', {})
-    const elFormItem = inject('elFormItem')
+    const elFormItem = inject('elFormItem', null)
     isNested.value = !!elFormItem
 
     useDispatchFiled(props)

diff --git a/packages/form/Form.vue b/packages/form/Form.vue
@@ -226,17 +226,19 @@ const useValidate = (rules, model, fields, validateOnRuleChange) => {
     })
   }
 
-  watch(rules, () => {
-    // remove then add event listeners on form-item after form rules change
-    fields.forEach((field) => {
-      field.removeValidateEvents()
-      field.addValidateEvents()
-    })
+  if (rules) {
+    watch(rules, () => {
+      // remove then add event listeners on form-item after form rules change
+      fields.forEach((field) => {
+        field.removeValidateEvents()
+        field.addValidateEvents()
+      })
 
-    if (unref(validateOnRuleChange)) {
-      validate(() => {})
-    }
-  })
+      if (unref(validateOnRuleChange)) {
+        validate(() => {})
+      }
+    })
+  }
 
   return { validateField, validate, clearValidate }
 }