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

MessageBox: allow showInput when message is empty (#10337) 

* MessageBox: should allow showInput when message is empty

* MessageBox: no confirm when inputType === 'textarea'

* MessageBox: hide status when message is empty
pull/10370/head
fisker Cheung 2018-03-26 17:16:11 +08:00 committed by 杨奕
parent a8abe07f3e
commit 39ba058d0d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/message-box/src/main.vue
View File

@ -12,7 +12,7 @@
<div class="el-message-box" :class="[customClass, center && 'el-message-box--center']"> <div class="el-message-box" :class="[customClass, center && 'el-message-box--center']">
<div class="el-message-box__header" v-if="title !== null"> <div class="el-message-box__header" v-if="title !== null">
<div class="el-message-box__title"> <div class="el-message-box__title">
<div class="el-message-box__status" :class="[ typeClass ]" v-if="typeClass && center"></div> <div class="el-message-box__status" :class="[ typeClass ]" v-if="typeClass && center && message !== ''"></div>
<span>{{ title }}</span> <span>{{ title }}</span>
</div> </div>
<button type="button" <button type="button"
@ -25,9 +25,9 @@
<i class="el-message-box__close el-icon-close"></i> <i class="el-message-box__close el-icon-close"></i>
</button> </button>
</div> </div>
<div class="el-message-box__content" v-if="message !== ''"> <div class="el-message-box__content">
<div class="el-message-box__status" :class="[ typeClass ]" v-if="typeClass && !center"></div> <div class="el-message-box__status" :class="[ typeClass ]" v-if="typeClass && !center"></div>
<div class="el-message-box__message"> <div class="el-message-box__message" v-if="message !== ''">
<slot> <slot>
<p v-if="!dangerouslyUseHTMLString">{{ message }}</p> <p v-if="!dangerouslyUseHTMLString">{{ message }}</p>
<p v-else v-html="message"></p> <p v-else v-html="message"></p>
@ -37,7 +37,7 @@
<el-input <el-input
v-model="inputValue" v-model="inputValue"
:type="inputType" :type="inputType"
@keydown.enter.native="handleAction('confirm')" @keydown.enter.native="handleInputEnter()"
:placeholder="inputPlaceholder" :placeholder="inputPlaceholder"
ref="input"></el-input> ref="input"></el-input>
<div class="el-message-box__errormsg" :style="{ visibility: !!editorErrorMessage ? 'visible' : 'hidden' }">{{ editorErrorMessage }}</div> <div class="el-message-box__errormsg" :style="{ visibility: !!editorErrorMessage ? 'visible' : 'hidden' }">{{ editorErrorMessage }}</div>
@ -183,6 +183,12 @@
} }
}, },
handleInputEnter() {
if (this.inputType !== 'textarea') {
return this.handleAction('confirm');
}
},
handleAction(action) { handleAction(action) {
if (this.$type === 'prompt' && action === 'confirm' && !this.validate()) { if (this.$type === 'prompt' && action === 'confirm' && !this.validate()) {
return; return;