Button: fix disabled priority (#21375)

e39d4cb2 · 好多大米 · GitHub · d0ed7f94 · e39d4cb2
Commit e39d4cb2 authored Nov 17, 2021 by 好多大米 Committed by GitHub Nov 17, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

packages/button/src/button.vue packages/button/src/button.vue +1 -1

No files found.
--- 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;
      }
    },