From e39d4cb289e74aff2cbe78b3a858f7ebdfcc0bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=BD=E5=A4=9A=E5=A4=A7=E7=B1=B3?= <lost1q84@gmail.com>
Date: Wed, 17 Nov 2021 11:11:19 +0800
Subject: [PATCH] Button: fix disabled priority (#21375)

---
 packages/button/src/button.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/button/src/button.vue b/packages/button/src/button.vue
index 3a9c72b910..6ed8d23d63 100644
--- a/packages/button/src/button.vue
+++ b/packages/button/src/button.vue
@@ -65,7 +65,7 @@
         return this.size || this._elFormItemSize || (this.$ELEMENT || {}).size;
       },
       buttonDisabled() {
-        return this.disabled || (this.elForm || {}).disabled;
+        return this.$options.propsData.hasOwnProperty('disabled') ? this.disabled : (this.elForm || {}).disabled;
       }
     },