github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Button: inherit disabled from wrapping Form (#10275)

pull/10278/head
杨奕 2018-03-21 11:45:10 +08:00 committed by GitHub
parent 1362bae57d
commit 3934e8f3ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/button/src/button.vue
View File

@ -2,14 +2,14 @@
<button <button
class="el-button" class="el-button"
@click="handleClick" @click="handleClick"
:disabled="disabled || loading" :disabled="buttonDisabled || loading"
:autofocus="autofocus" :autofocus="autofocus"
:type="nativeType" :type="nativeType"
:class="[ :class="[
type ? 'el-button--' + type : '', type ? 'el-button--' + type : '',
buttonSize ? 'el-button--' + buttonSize : '', buttonSize ? 'el-button--' + buttonSize : '',
{ {
'is-disabled': disabled, 'is-disabled': buttonDisabled,
'is-loading': loading, 'is-loading': loading,
'is-plain': plain, 'is-plain': plain,
'is-round': round 'is-round': round
@ -26,6 +26,9 @@
name: 'ElButton', name: 'ElButton',
inject: { inject: {
elForm: {
default: ''
},
elFormItem: { elFormItem: {
default: '' default: ''
} }
@ -58,6 +61,9 @@
}, },
buttonSize() { buttonSize() {
return this.size || this._elFormItemSize || (this.$ELEMENT || {}).size; return this.size || this._elFormItemSize || (this.$ELEMENT || {}).size;
},
buttonDisabled() {
return this.disabled || (this.elForm || {}).disabled;
} }
}, },