From 126f2124a206b298708652c176087cbd433d3dbc Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Tue, 26 May 2020 19:41:00 +0800
Subject: [PATCH] fix(Field): can not disable error in form (#6382)

---
 src/field/index.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/field/index.js b/src/field/index.js
index 6c4db0f03..acc2d6d2c 100644
--- a/src/field/index.js
+++ b/src/field/index.js
@@ -37,7 +37,6 @@ export default createComponent({
     ...cellProps,
     name: String,
     rules: Array,
-    error: Boolean,
     disabled: Boolean,
     readonly: Boolean,
     autosize: [Boolean, Object],
@@ -58,6 +57,10 @@ export default createComponent({
       type: String,
       default: 'text',
     },
+    error: {
+      type: Boolean,
+      default: null,
+    },
     colon: {
       type: Boolean,
       default: null,
@@ -106,10 +109,12 @@ export default createComponent({
     },
 
     showError() {
+      if (this.error !== null) {
+        return this.error;
+      }
       if (this.vanForm && this.vanForm.showError && this.validateMessage) {
         return true;
       }
-      return this.error;
     },
 
     listeners() {