From 770753eff2127cc3f67a4f42be761411763d2805 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Thu, 4 Apr 2019 17:43:12 +0800
Subject: [PATCH 1/3] fix[request.js]: fixed missing return

---
 src/utils/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index a9b8c18f..b043c933 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,7 +23,7 @@ service.interceptors.request.use(
   error => {
     // Do something with request error
     console.log(error) // for debug
-    Promise.reject(error)
+    return Promise.reject(error)
   }
 )
 

From 7492e2097f189897eab207f96a79bf5b665df53a Mon Sep 17 00:00:00 2001
From: anson <ansonhorse@users.noreply.github.com>
Date: Thu, 4 Apr 2019 17:51:45 +0800
Subject: [PATCH 2/3] fix[ErrorLog]: fixed error log dialog z-index bug (#1844)

https://github.com/PanJiaChen/vue-element-admin/issues/1830
---
 src/components/ErrorLog/index.vue | 2 +-
 src/settings.js                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/ErrorLog/index.vue b/src/components/ErrorLog/index.vue
index 9cc43886..7ffa573b 100644
--- a/src/components/ErrorLog/index.vue
+++ b/src/components/ErrorLog/index.vue
@@ -6,7 +6,7 @@
       </el-button>
     </el-badge>
 
-    <el-dialog :visible.sync="dialogTableVisible" title="Error Log" width="80%">
+    <el-dialog :visible.sync="dialogTableVisible" title="Error Log" width="80%" append-to-body>
       <el-table :data="errorLogs" border>
         <el-table-column label="Message">
           <template slot-scope="{row}">
diff --git a/src/settings.js b/src/settings.js
index d6300efc..e7ad4e1d 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -28,10 +28,10 @@ export default {
   sidebarLogo: false,
 
   /**
-   * @type {string | array} 'production' | ['production','development']
+   * @type {string | array} 'production' | ['production', 'development']
    * @description Need show err logs component.
    * The default is only used in the production env
-   * If you want to also use it in dev, you can pass ['production','development']
+   * If you want to also use it in dev, you can pass ['production', 'development']
    */
   errorLog: 'production'
 }

From f11839c8a480865a66b64812ecb49c6d02023da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Sun, 7 Apr 2019 23:10:14 +0800
Subject: [PATCH 3/3] docs: refine i18n (#1848)

---
 src/lang/en.js                                | 20 ++++++-------
 src/lang/es.js                                |  2 --
 src/lang/zh.js                                | 28 +++++++++----------
 src/views/excel/components/FilenameOption.vue |  2 +-
 src/views/excel/selectExcel.vue               |  2 +-
 .../permission/components/SwitchRoles.vue     |  4 +--
 src/views/table/dragTable.vue                 |  4 +--
 src/views/zip/index.vue                       |  2 +-
 8 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/src/lang/en.js b/src/lang/en.js
index ef4548e7..490ac206 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -1,7 +1,6 @@
 export default {
   route: {
     dashboard: 'Dashboard',
-    introduction: 'Introduction',
     documentation: 'Documentation',
     guide: 'Guide',
     permission: 'Permission',
@@ -10,7 +9,6 @@ export default {
     directivePermission: 'Directive Permission',
     icons: 'Icons',
     components: 'Components',
-    componentIndex: 'Introduction',
     tinymce: 'Tinymce',
     markdown: 'Markdown',
     jsonEditor: 'JSON Editor',
@@ -19,9 +17,9 @@ export default {
     avatarUpload: 'Avatar Upload',
     dropzone: 'Dropzone',
     sticky: 'Sticky',
-    countTo: 'CountTo',
+    countTo: 'Count To',
     componentMixin: 'Mixin',
-    backToTop: 'BackToTop',
+    backToTop: 'Back To Top',
     dragDialog: 'Drag Dialog',
     dragSelect: 'Drag Select',
     dragKanban: 'Drag Kanban',
@@ -74,7 +72,7 @@ export default {
   },
   login: {
     title: 'Login Form',
-    logIn: 'Log in',
+    logIn: 'Login',
     username: 'Username',
     password: 'Password',
     any: 'any',
@@ -87,10 +85,10 @@ export default {
   },
   permission: {
     addRole: 'New Role',
-    editPermission: 'Edit Permission',
+    editPermission: 'Edit',
     roles: 'Your roles',
     switchRoles: 'Switch roles',
-    tips: 'In some cases it is not suitable to use v-permission, such as element Tab component or el-table-column and other asynchronous rendering dom cases which can only be achieved by manually setting the v-if.',
+    tips: 'In some cases, using v-permission will have no effect. For example: Element-UI  el-tab or el-table-column and other scenes that dynamically render dom. You can only do this with v-if.',
     delete: 'Delete',
     confirm: 'Confirm',
     cancel: 'Cancel'
@@ -101,7 +99,7 @@ export default {
   },
   components: {
     documentation: 'Documentation',
-    tinymceTips: 'Rich text editor is a core part of management system, but at the same time is a place with lots of problems. In the process of selecting rich texts, I also walked a lot of detours. The common rich text editors in the market are basically used, and the finally chose Tinymce. See documentation for more detailed rich text editor comparisons and introductions.',
+    tinymceTips: 'Rich text is a core feature of the management backend, but at the same time it is a place with lots of pits. In the process of selecting rich texts, I also took a lot of detours. The common rich texts on the market have been basically used, and I finally chose Tinymce. See the more detailed rich text comparison and introduction.',
     dropzoneTips: 'Because my business has special needs, and has to upload images to qiniu, so instead of a third party, I chose encapsulate it by myself. It is very simple, you can see the detail code in @/components/Dropzone.',
     stickyTips: 'when the page is scrolled to the preset position will be sticky on the top.',
     backToTopTips1: 'When the page is scrolled to the specified position, the Back to Top button appears in the lower right corner',
@@ -142,14 +140,14 @@ export default {
   excel: {
     export: 'Export',
     selectedExport: 'Export Selected Items',
-    placeholder: 'Please enter the file name(default excel-list)'
+    placeholder: 'Please enter the file name (default excel-list)'
   },
   zip: {
     export: 'Export',
-    placeholder: 'Please enter the file name(default file)'
+    placeholder: 'Please enter the file name (default file)'
   },
   pdf: {
-    tips: 'Here we use window.print() to implement the feature of downloading pdf.'
+    tips: 'Here we use window.print() to implement the feature of downloading PDF.'
   },
   theme: {
     change: 'Change Theme',
diff --git a/src/lang/es.js b/src/lang/es.js
index 89a9e9d3..a8f69831 100755
--- a/src/lang/es.js
+++ b/src/lang/es.js
@@ -1,7 +1,6 @@
 export default {
   route: {
     dashboard: 'Panel de control',
-    introduction: 'Introducción',
     documentation: 'Documentación',
     guide: 'Guía',
     permission: 'Permisos',
@@ -10,7 +9,6 @@ export default {
     directivePermission: 'Permisos de la directiva',
     icons: 'Iconos',
     components: 'Componentes',
-    componentIndex: 'Introducción',
     tinymce: 'Tinymce',
     markdown: 'Markdown',
     jsonEditor: 'Editor JSON',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 702725cd..4394cc70 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -1,7 +1,6 @@
 export default {
   route: {
     dashboard: '首页',
-    introduction: '简述',
     documentation: '文档',
     guide: '引导页',
     permission: '权限测试页',
@@ -10,16 +9,15 @@ export default {
     directivePermission: '指令权限',
     icons: '图标',
     components: '组件',
-    componentIndex: '介绍',
     tinymce: '富文本编辑器',
     markdown: 'Markdown',
-    jsonEditor: 'JSON编辑器',
+    jsonEditor: 'JSON 编辑器',
     dndList: '列表拖拽',
     splitPane: 'Splitpane',
     avatarUpload: '头像上传',
     dropzone: 'Dropzone',
     sticky: 'Sticky',
-    countTo: 'CountTo',
+    countTo: 'Count To',
     componentMixin: '小组件',
     backToTop: '返回顶部',
     dragDialog: '拖拽 Dialog',
@@ -32,17 +30,17 @@ export default {
     example: '综合实例',
     nested: '路由嵌套',
     menu1: '菜单1',
-    'menu1-1': '菜单1-1',
-    'menu1-2': '菜单1-2',
-    'menu1-2-1': '菜单1-2-1',
-    'menu1-2-2': '菜单1-2-2',
-    'menu1-3': '菜单1-3',
-    menu2: '菜单2',
+    'menu1-1': '菜单 1-1',
+    'menu1-2': '菜单 1-2',
+    'menu1-2-1': '菜单 1-2-1',
+    'menu1-2-2': '菜单 1-2-2',
+    'menu1-3': '菜单 1-3',
+    menu2: '菜单 2',
     Table: 'Table',
-    dynamicTable: '动态Table',
-    dragTable: '拖拽Table',
-    inlineEditTable: 'Table内编辑',
-    complexTable: '综合Table',
+    dynamicTable: '动态 Table',
+    dragTable: '拖拽 Table',
+    inlineEditTable: 'Table 内编辑',
+    complexTable: '综合 Table',
     tab: 'Tab',
     form: '表单',
     createArticle: '创建文章',
@@ -90,7 +88,7 @@ export default {
     editPermission: '编辑权限',
     roles: '你的权限',
     switchRoles: '切换权限',
-    tips: '在某些情况下，不适合使用 v-permission。例如：Element-UI 的 Tab 组件或 el-table-column 以及其它动态渲染 dom 的场景。你只能通过手动设置 v-if 来实现。',
+    tips: '在某些情况下，不适合使用 v-permission。例如：Element-UI 的 el-tab 或 el-table-column 以及其它动态渲染 dom 的场景。你只能通过手动设置 v-if 来实现。',
     delete: '删除',
     confirm: '确定',
     cancel: '取消'
diff --git a/src/views/excel/components/FilenameOption.vue b/src/views/excel/components/FilenameOption.vue
index b578d65c..c8e0530d 100644
--- a/src/views/excel/components/FilenameOption.vue
+++ b/src/views/excel/components/FilenameOption.vue
@@ -2,7 +2,7 @@
   <div style="display:inline-block;">
     <!-- $t is vue-i18n global function to translate lang -->
     <label class="radio-label" style="padding-left:0;">Filename: </label>
-    <el-input v-model="filename" :placeholder="$t('excel.placeholder')" style="width:340px;" prefix-icon="el-icon-document" />
+    <el-input v-model="filename" :placeholder="$t('excel.placeholder')" style="width:350px;" prefix-icon="el-icon-document" />
   </div>
 </template>
 
diff --git a/src/views/excel/selectExcel.vue b/src/views/excel/selectExcel.vue
index 05c52f5f..09866e13 100644
--- a/src/views/excel/selectExcel.vue
+++ b/src/views/excel/selectExcel.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- $t is vue-i18n global function to translate lang -->
-    <el-input v-model="filename" :placeholder="$t('excel.placeholder')" style="width:340px;" prefix-icon="el-icon-document" />
+    <el-input v-model="filename" :placeholder="$t('excel.placeholder')" style="width:350px;" prefix-icon="el-icon-document" />
     <el-button :loading="downloadLoading" style="margin-bottom:20px" type="primary" icon="document" @click="handleDownload">
       {{ $t('excel.selectedExport') }}
     </el-button>
diff --git a/src/views/permission/components/SwitchRoles.vue b/src/views/permission/components/SwitchRoles.vue
index 55297d09..de1176ad 100644
--- a/src/views/permission/components/SwitchRoles.vue
+++ b/src/views/permission/components/SwitchRoles.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <div style="margin-bottom:15px;">
-      {{ $t('permission.roles') }}： {{ roles }}
+      {{ $t('permission.roles') }}: {{ roles }}
     </div>
-    {{ $t('permission.switchRoles') }}：
+    {{ $t('permission.switchRoles') }}:
     <el-radio-group v-model="switchRoles">
       <el-radio-button label="editor" />
       <el-radio-button label="admin" />
diff --git a/src/views/table/dragTable.vue b/src/views/table/dragTable.vue
index 7abbd932..56b0ae6d 100644
--- a/src/views/table/dragTable.vue
+++ b/src/views/table/dragTable.vue
@@ -54,10 +54,10 @@
     </el-table>
     <!-- $t is vue-i18n global function to translate lang (lang in @/lang)  -->
     <div class="show-d">
-      {{ $t('table.dragTips1') }} : &nbsp; {{ oldList }}
+      <el-tag style="margin-right:12px;">{{ $t('table.dragTips1') }} :</el-tag> {{ oldList }}
     </div>
     <div class="show-d">
-      {{ $t('table.dragTips2') }} : {{ newList }}
+      <el-tag>{{ $t('table.dragTips2') }} :</el-tag> {{ newList }}
     </div>
   </div>
 </template>
diff --git a/src/views/zip/index.vue b/src/views/zip/index.vue
index ed7e8af2..564d0407 100644
--- a/src/views/zip/index.vue
+++ b/src/views/zip/index.vue
@@ -3,7 +3,7 @@
     <!-- $t is vue-i18n global function to translate lang -->
     <el-input v-model="filename" :placeholder="$t('zip.placeholder')" style="width:300px;" prefix-icon="el-icon-document" />
     <el-button :loading="downloadLoading" style="margin-bottom:20px;" type="primary" icon="document" @click="handleDownload">
-      {{ $t('zip.export') }} zip
+      {{ $t('zip.export') }} Zip
     </el-button>
     <el-table v-loading="listLoading" :data="list" element-loading-text="拼命加载中" border fit highlight-current-row>
       <el-table-column align="center" label="ID" width="95">