From 74f68ef6a4e3d91979e1830356e00046f2cab8b1 Mon Sep 17 00:00:00 2001
From: cs1707 <lost1q84@gmail.com>
Date: Sat, 9 Oct 2021 17:13:48 +0800
Subject: [PATCH] Button: fix disabled priority

---
 packages/button/src/button.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/button/src/button.vue b/packages/button/src/button.vue
index 3a9c72b910..c54a677a06 100644
--- a/packages/button/src/button.vue
+++ b/packages/button/src/button.vue
@@ -2,14 +2,14 @@
   <button
     class="el-button"
     @click="handleClick"
-    :disabled="buttonDisabled || loading"
+    :disabled="disabled || loading"
     :autofocus="autofocus"
     :type="nativeType"
     :class="[
       type ? 'el-button--' + type : '',
       buttonSize ? 'el-button--' + buttonSize : '',
       {
-        'is-disabled': buttonDisabled,
+        'is-disabled': disabled,
         'is-loading': loading,
         'is-plain': plain,
         'is-round': round,
@@ -50,7 +50,12 @@
         default: 'button'
       },
       loading: Boolean,
-      disabled: Boolean,
+      disabled: {
+        type: Boolean,
+        default() {
+          return (this.elForm || {}).disabled;
+        }
+      },
       plain: Boolean,
       autofocus: Boolean,
       round: Boolean,
@@ -63,9 +68,6 @@
       },
       buttonSize() {
         return this.size || this._elFormItemSize || (this.$ELEMENT || {}).size;
-      },
-      buttonDisabled() {
-        return this.disabled || (this.elForm || {}).disabled;
       }
     },