diff --git a/packages/button/src/button.vue b/packages/button/src/button.vue index 6ed8d23d6..dd478ebac 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.$options.propsData.hasOwnProperty('disabled') ? this.disabled : (this.elForm || {}).disabled; + return this.elForm ? this.elForm.disabled ? this.elForm.disabled : this.disabled || {}.disabled : this.disabled || {}.disabled; } },