From 4b786cdba3369ca68be9c1ffa12a46e07c4fa4c4 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Sun, 14 Jun 2020 20:49:53 +0800
Subject: [PATCH] feat(Form): rule message can be empty (#6536)

---
 src/field/index.js           | 10 +++++++---
 src/form/test/events.spec.js | 27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/field/index.js b/src/field/index.js
index bba232839..539d0ad59 100644
--- a/src/field/index.js
+++ b/src/field/index.js
@@ -74,6 +74,7 @@ export default createComponent({
   data() {
     return {
       focused: false,
+      validateFailed: false,
       validateMessage: '',
     };
   },
@@ -117,7 +118,7 @@ export default createComponent({
       if (this.error !== null) {
         return this.error;
       }
-      if (this.vanForm && this.vanForm.showError && this.validateMessage) {
+      if (this.vanForm && this.vanForm.showError && this.validateFailed) {
         return true;
       }
     },
@@ -208,7 +209,7 @@ export default createComponent({
       return rules.reduce(
         (promise, rule) =>
           promise.then(() => {
-            if (this.validateMessage) {
+            if (this.validateFailed) {
               return;
             }
 
@@ -219,6 +220,7 @@ export default createComponent({
             }
 
             if (!this.runSyncRule(value, rule)) {
+              this.validateFailed = true;
               this.validateMessage = this.getRuleMessage(value, rule);
               return;
             }
@@ -226,6 +228,7 @@ export default createComponent({
             if (rule.validator) {
               return this.runValidator(value, rule).then((result) => {
                 if (result === false) {
+                  this.validateFailed = true;
                   this.validateMessage = this.getRuleMessage(value, rule);
                 }
               });
@@ -242,7 +245,7 @@ export default createComponent({
         }
 
         this.runRules(rules).then(() => {
-          if (this.validateMessage) {
+          if (this.validateFailed) {
             resolve({
               name: this.name,
               message: this.validateMessage,
@@ -271,6 +274,7 @@ export default createComponent({
 
     resetValidation() {
       if (this.validateMessage) {
+        this.validateFailed = false;
         this.validateMessage = '';
       }
     },
diff --git a/src/form/test/events.spec.js b/src/form/test/events.spec.js
index 9c28e69f0..a97beb100 100644
--- a/src/form/test/events.spec.js
+++ b/src/form/test/events.spec.js
@@ -38,3 +38,30 @@ test('failed event', async () => {
     values: { A: '', B: '' },
   });
 });
+
+test('failed event when rule message is empty', async () => {
+  const onFailed = jest.fn();
+  const wrapper = mountForm({
+    template: `
+      <van-form ref="form" @failed="onFailed">
+        <van-field name="A" :rules="rulesA" value="" />
+        <van-button native-type="submit" />
+      </van-form>
+    `,
+    data() {
+      return {
+        rulesA: [{ required: true }],
+      };
+    },
+    methods: {
+      onFailed,
+    },
+  });
+
+  await submitForm(wrapper);
+
+  expect(onFailed).toHaveBeenCalledWith({
+    errors: [{ name: 'A' }],
+    values: { A: '' },
+  });
+});