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

Chore: misc updates (#10370)

pull/10371/head
杨奕 2018-03-26 17:38:17 +08:00 committed by GitHub
parent 39ba058d0d
commit e62c2f8b42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/app.vue
View File

@ -234,7 +234,9 @@
if (this.lang !== 'zh-CN') return;
this.$confirm('建议大陆用户访问部署在国内的站点，是否跳转？', '提示')
.then(() => {
location.href = location.href.replace('element.', 'element-cn.');
location.href = location.href
.replace('https:', 'http:')
.replace('element.', 'element-cn.');
})
.catch(() => {
localStorage.setItem('PREFER_GITHUB', 'true');

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

@ -7,26 +7,31 @@
@click.self="handleWrapperClick"
role="dialog"
aria-modal="true"
:aria-label="title || 'dialog'"
>
:aria-label="title || 'dialog'">
<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__title">
<div class="el-message-box__status" :class="[ typeClass ]" v-if="typeClass && center && message !== ''"></div>
<div
:class="['el-message-box__status', typeClass]"
v-if="typeClass && center">
</div>
<span>{{ title }}</span>
</div>
<button type="button"
class="el-message-box__headerbtn"
aria-label="Close"
v-if="showClose"
@click="handleAction('cancel')"
@keydown.enter="handleAction('cancel')"
>
<button
type="button"
class="el-message-box__headerbtn"
aria-label="Close"
v-if="showClose"
@click="handleAction('cancel')"
@keydown.enter="handleAction('cancel')">
<i class="el-message-box__close el-icon-close"></i>
</button>
</div>
<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', typeClass]"
v-if="typeClass && !center && message !== ''">
</div>
<div class="el-message-box__message" v-if="message !== ''">
<slot>
<p v-if="!dangerouslyUseHTMLString">{{ message }}</p>
@ -37,7 +42,7 @@
<el-input
v-model="inputValue"
:type="inputType"
@keydown.enter.native="handleInputEnter()"
@keydown.enter.native="handleInputEnter"
:placeholder="inputPlaceholder"
ref="input"></el-input>
<div class="el-message-box__errormsg" :style="{ visibility: !!editorErrorMessage ? 'visible' : 'hidden' }">{{ editorErrorMessage }}</div>
@ -47,12 +52,11 @@
<el-button
:loading="cancelButtonLoading"
:class="[ cancelButtonClasses ]"
v-show="showCancelButton"
v-if="showCancelButton"
:round="roundButton"
size="small"
@click.native="handleAction('cancel')"
@keydown.enter="handleAction('cancel')"
>
@keydown.enter="handleAction('cancel')">
{{ cancelButtonText || t('el.messagebox.cancel') }}
</el-button>
<el-button
@ -63,8 +67,7 @@
:round="roundButton"
size="small"
@click.native="handleAction('confirm')"
@keydown.enter="handleAction('confirm')"
>
@keydown.enter="handleAction('confirm')">
{{ confirmButtonText || t('el.messagebox.confirm') }}
</el-button>
</div>