瀏覽代碼

Chore: misc updates (#10370)

杨奕 7 年之前
父節點
當前提交
e62c2f8b42
共有 2 個文件被更改,包括 23 次插入18 次删除
  1. 3 1
      examples/app.vue
  2. 20 17
      packages/message-box/src/main.vue

+ 3 - 1
examples/app.vue

@@ -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');

+ 20 - 17
packages/message-box/src/main.vue

@@ -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>