Skip to content

Commit

Permalink
Button: fix disabled priority (#21375)
Browse files Browse the repository at this point in the history
  • Loading branch information
cs1707 committed Nov 17, 2021
1 parent d0ed7f9 commit e39d4cb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion packages/button/src/button.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
},
Expand Down

0 comments on commit e39d4cb

Please sign in to comment.