From 43115e5538533ca82ebc9044931127dce729f9b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Thu, 4 Apr 2019 12:58:37 +0800
Subject: [PATCH 01/12] perf: optimize page view name (#1835)

---
 mock/role/routes.js                                    | 2 +-
 src/router/index.js                                    | 2 +-
 src/views/login/{authredirect.vue => authRedirect.vue} | 2 +-
 src/views/login/index.vue                              | 2 +-
 src/views/login/{socialsignin.vue => socialSignin.vue} | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename src/views/login/{authredirect.vue => authRedirect.vue} (92%)
 rename src/views/login/{socialsignin.vue => socialSignin.vue} (100%)

diff --git a/mock/role/routes.js b/mock/role/routes.js
index d8eaf42a..14413d48 100644
--- a/mock/role/routes.js
+++ b/mock/role/routes.js
@@ -19,7 +19,7 @@ export const constantRoutes = [
   },
   {
     path: '/auth-redirect',
-    component: 'views/login/authredirect',
+    component: 'views/login/authRedirect',
     hidden: true
   },
   {
diff --git a/src/router/index.js b/src/router/index.js
index a883d398..22dad190 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,7 +57,7 @@ export const constantRoutes = [
   },
   {
     path: '/auth-redirect',
-    component: () => import('@/views/login/authredirect'),
+    component: () => import('@/views/login/authRedirect'),
     hidden: true
   },
   {
diff --git a/src/views/login/authredirect.vue b/src/views/login/authRedirect.vue
similarity index 92%
rename from src/views/login/authredirect.vue
rename to src/views/login/authRedirect.vue
index 69e15397..7df89342 100644
--- a/src/views/login/authredirect.vue
+++ b/src/views/login/authRedirect.vue
@@ -1,6 +1,6 @@
 <script>
 export default {
-  name: 'Authredirect',
+  name: 'AuthRedirect',
   created() {
     const hash = window.location.search.slice(1)
     if (window.localStorage) {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index ac467584..979cfcb4 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -77,7 +77,7 @@
 <script>
 import { validUsername } from '@/utils/validate'
 import LangSelect from '@/components/LangSelect'
-import SocialSign from './socialsignin'
+import SocialSign from './socialSignin'
 
 export default {
   name: 'Login',
diff --git a/src/views/login/socialsignin.vue b/src/views/login/socialSignin.vue
similarity index 100%
rename from src/views/login/socialsignin.vue
rename to src/views/login/socialSignin.vue

From c923726464505213608bd8e334b768a72777b612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Thu, 4 Apr 2019 13:07:18 +0800
Subject: [PATCH 02/12] fix[TagsView]: fixed z-index bug (#1836)

---
 src/layout/components/TagsView/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 2b6a77f3..f06f5156 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -243,7 +243,7 @@ export default {
   .contextmenu {
     margin: 0;
     background: #fff;
-    z-index: 100;
+    z-index: 3000;
     position: absolute;
     list-style-type: none;
     padding: 5px 0;

From e363c7a77b50036e8c22125a9a889a707a859cdc Mon Sep 17 00:00:00 2001
From: Estelle00 <530908773@qq.com>
Date: Thu, 4 Apr 2019 14:37:01 +0800
Subject: [PATCH 03/12] feature[Vuex]: auto import vuex modules(#1815)

---
 src/lang/index.js             | 15 ++++++++++++++-
 src/store/index.js            | 28 ++++++++++++++--------------
 src/store/modules/app.js      |  3 ++-
 src/store/modules/errorLog.js |  1 -
 src/store/modules/tagsView.js |  1 -
 5 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/lang/index.js b/src/lang/index.js
index 7c9c8af6..c443f41b 100644
--- a/src/lang/index.js
+++ b/src/lang/index.js
@@ -24,11 +24,24 @@ const messages = {
     ...elementEsLocale
   }
 }
+export function getLanguage() {
+  const chooseLanguage = Cookies.get('language')
+  if (chooseLanguage) return chooseLanguage
 
+  // if has not choose language
+  const language = (navigator.language || navigator.browserLanguage).toLowerCase()
+  const locales = Object.keys(messages)
+  for (const locale of locales) {
+    if (language.indexOf(locale) > -1) {
+      return locale
+    }
+  }
+  return 'en'
+}
 const i18n = new VueI18n({
   // set locale
   // options: en | zh | es
-  locale: Cookies.get('language') || 'en',
+  locale: getLanguage(),
   // set locale messages
   messages
 })
diff --git a/src/store/index.js b/src/store/index.js
index 4842ea7e..70736d3a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,24 +1,24 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import app from './modules/app'
-import errorLog from './modules/errorLog'
-import permission from './modules/permission'
-import tagsView from './modules/tagsView'
-import settings from './modules/settings'
-import user from './modules/user'
 import getters from './getters'
 
 Vue.use(Vuex)
 
+// https://webpack.js.org/guides/dependency-management/#requirecontext
+const modulesFiles = require.context('./modules', false, /\.js$/)
+
+// you do not need `import app from './modules/app'`
+// it will auto require all vuex module from modules file
+const modules = modulesFiles.keys().reduce((modules, modulePath) => {
+  // set './app.js' => 'app'
+  const moduleName = modulePath.replace(/^\.\/(.*)\.\w+$/, '$1')
+  const value = modulesFiles(modulePath)
+  modules[moduleName] = value.default
+  return modules
+}, {})
+
 const store = new Vuex.Store({
-  modules: {
-    app,
-    errorLog,
-    permission,
-    tagsView,
-    settings,
-    user
-  },
+  modules,
   getters
 })
 
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 84875dd6..73616469 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,4 +1,5 @@
 import Cookies from 'js-cookie'
+import { getLanguage } from '@/lang/index'
 
 const state = {
   sidebar: {
@@ -6,7 +7,7 @@ const state = {
     withoutAnimation: false
   },
   device: 'desktop',
-  language: Cookies.get('language') || 'en',
+  language: getLanguage(),
   size: Cookies.get('size') || 'medium'
 }
 
diff --git a/src/store/modules/errorLog.js b/src/store/modules/errorLog.js
index c97d452a..8e3db060 100644
--- a/src/store/modules/errorLog.js
+++ b/src/store/modules/errorLog.js
@@ -1,4 +1,3 @@
-
 const state = {
   logs: []
 }
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index 5cbe32f3..3e2c1703 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -1,4 +1,3 @@
-
 const state = {
   visitedViews: [],
   cachedViews: []

From 0d40222b6420a4b4177067345b50ed8140982061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Thu, 4 Apr 2019 16:21:45 +0800
Subject: [PATCH 04/12] fix[Drag]: fixed drag bug in firefox (#1841)

---
 src/components/DndList/index.vue | 7 ++++++-
 src/components/Kanban/index.vue  | 8 ++++++++
 src/views/table/dragTable.vue    | 2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/DndList/index.vue b/src/components/DndList/index.vue
index a4643c0a..23ca006e 100644
--- a/src/components/DndList/index.vue
+++ b/src/components/DndList/index.vue
@@ -2,7 +2,7 @@
   <div class="dndList">
     <div :style="{width:width1}" class="dndList-list">
       <h3>{{ list1Title }}</h3>
-      <draggable :list="list1" group="article" class="dragArea">
+      <draggable :set-data="setData" :list="list1" group="article" class="dragArea">
         <div v-for="element in list1" :key="element.id" class="list-complete-item">
           <div class="list-complete-item-handle">
             {{ element.id }}[{{ element.author }}] {{ element.title }}
@@ -94,6 +94,11 @@ export default {
       if (this.isNotInList1(ele)) {
         this.list1.push(ele)
       }
+    },
+    setData(dataTransfer) {
+      // to avoid Firefox bug
+      // Detail see : https://github.com/RubaXa/Sortable/issues/1012
+      dataTransfer.setData('Text', '')
     }
   }
 }
diff --git a/src/components/Kanban/index.vue b/src/components/Kanban/index.vue
index 1171b5b8..c2cb4691 100644
--- a/src/components/Kanban/index.vue
+++ b/src/components/Kanban/index.vue
@@ -7,6 +7,7 @@
       :list="list"
       v-bind="$attrs"
       class="board-column-content"
+      :set-data="setData"
     >
       <div v-for="element in list" :key="element.id" class="board-item">
         {{ element.name }} {{ element.id }}
@@ -39,6 +40,13 @@ export default {
         return []
       }
     }
+  },
+  methods: {
+    setData(dataTransfer) {
+      // to avoid Firefox bug
+      // Detail see : https://github.com/RubaXa/Sortable/issues/1012
+      dataTransfer.setData('Text', '')
+    }
   }
 }
 </script>
diff --git a/src/views/table/dragTable.vue b/src/views/table/dragTable.vue
index 50077c6c..7abbd932 100644
--- a/src/views/table/dragTable.vue
+++ b/src/views/table/dragTable.vue
@@ -113,9 +113,9 @@ export default {
       this.sortable = Sortable.create(el, {
         ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
         setData: function(dataTransfer) {
-          dataTransfer.setData('Text', '')
           // to avoid Firefox bug
           // Detail see : https://github.com/RubaXa/Sortable/issues/1012
+          dataTransfer.setData('Text', '')
         },
         onEnd: evt => {
           const targetRow = this.list.splice(evt.oldIndex, 1)[0]

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 05/12] 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 06/12] 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 07/12] 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">

From 90b7c2fbde8401f8f3f11d0d34128259f50a8767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Mon, 8 Apr 2019 11:01:24 +0800
Subject: [PATCH 08/12] feature[Mock]: mock-server support hot reload (#1850)

https://github.com/PanJiaChen/vue-element-admin/issues/1849
---
 mock/index.js       | 21 +++++++++---
 mock/mock-server.js | 79 +++++++++++++++++++++++++++++++++++++++++++++
 mock/mocks.js       | 12 -------
 package.json        |  1 +
 vue.config.js       | 17 +---------
 5 files changed, 98 insertions(+), 32 deletions(-)
 create mode 100644 mock/mock-server.js
 delete mode 100644 mock/mocks.js

diff --git a/mock/index.js b/mock/index.js
index 7d9609ab..08cdc471 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -1,11 +1,23 @@
 import Mock from 'mockjs'
-import mocks from './mocks'
 import { param2Obj } from '../src/utils'
 
-const MOCK_API_BASE = '/mock'
+import user from './user'
+import role from './role'
+import article from './article'
+import search from './remoteSearch'
 
+const mocks = [
+  ...user,
+  ...role,
+  ...article,
+  ...search
+]
+
+// for front mock
+// please use it cautiously, it will redefine XMLHttpRequest,
+// which will cause many of your third-party libraries to be invalidated(like progress event).
 export function mockXHR() {
-  // 修复在使用 MockJS 情况下，设置 withCredentials = true，且未被拦截的跨域请求丢失 Cookies 的问题
+  // mock patch
   // https://github.com/nuysoft/Mock/issues/300
   Mock.XHR.prototype.proxy_send = Mock.XHR.prototype.send
   Mock.XHR.prototype.send = function() {
@@ -42,9 +54,10 @@ export function mockXHR() {
   }
 }
 
+// for mock server
 const responseFake = (url, type, respond) => {
   return {
-    url: new RegExp(`${MOCK_API_BASE}${url}`),
+    url: new RegExp(`/mock${url}`),
     type: type || 'get',
     response(req, res) {
       res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
diff --git a/mock/mock-server.js b/mock/mock-server.js
new file mode 100644
index 00000000..99346afb
--- /dev/null
+++ b/mock/mock-server.js
@@ -0,0 +1,79 @@
+const chokidar = require('chokidar')
+const bodyParser = require('body-parser')
+const chalk = require('chalk')
+
+function registerRoutes(app) {
+  const { default: mocks } = require('./index.js')
+  for (const mock of mocks) {
+    app[mock.type](mock.url, mock.response)
+  }
+  return {
+    mockRoutesLength: Object.keys(mocks).length
+  }
+}
+
+function unregisterRoutes() {
+  Object.keys(require.cache).forEach(i => {
+    if (i.includes('/mock')) {
+      delete require.cache[require.resolve(i)]
+    }
+  })
+}
+
+function getPath(path) {
+  var match = path.toString()
+    .replace('\\/?', '')
+    .replace('(?=\\/|$)', '$')
+    .match(/^\/\^((?:\\[.*+?^${}()|[\]\\\/]|[^.*+?^${}()|[\]\\\/])*)\$\//)
+  return match
+    ? match[1].replace(/\\(.)/g, '$1').split('/')
+    : path.toString()
+}
+
+function getMockRoutesIndex(app) {
+  for (let index = 0; index <= app._router.stack.length; index++) {
+    const r = app._router.stack[index]
+    if (r.route && r.route.path) {
+      const path = getPath(r.route.path)
+      if (path.includes('mock')) {
+        return index
+      }
+    }
+  }
+}
+
+module.exports = app => {
+  // es6 polyfill
+  require('@babel/register')
+
+  // parse app.body
+  // http://expressjs.com/en/4x/api.html#req.body
+  app.use(bodyParser.json())
+  app.use(bodyParser.urlencoded({
+    extended: true
+  }))
+
+  const { mockRoutesLength } = registerRoutes(app)
+
+  // watch files, hot reload mock server
+  chokidar.watch(('./mock'), {
+    ignored: 'mock/mock-server.js',
+    persistent: true,
+    ignoreInitial: true
+  }).on('all', (event, path) => {
+    if (event === 'change' || event === 'add') {
+      // find mock routes stack index
+      const index = getMockRoutesIndex(app)
+
+      // remove mock routes stack
+      app._router.stack.splice(index, mockRoutesLength)
+
+      // clear routes cache
+      unregisterRoutes()
+
+      registerRoutes(app)
+
+      console.log(chalk.magentaBright(`\n > Mock Server hot reload success! changed  ${path}`))
+    }
+  })
+}
diff --git a/mock/mocks.js b/mock/mocks.js
deleted file mode 100644
index 84a25ddc..00000000
--- a/mock/mocks.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import user from './user'
-import role from './role'
-import article from './article'
-import search from './remoteSearch'
-
-export default [
-  ...user,
-  ...role,
-  ...article,
-  ...search
-]
-
diff --git a/package.json b/package.json
index 12bf3ffc..f8f98543 100644
--- a/package.json
+++ b/package.json
@@ -82,6 +82,7 @@
     "babel-eslint": "10.0.1",
     "babel-jest": "23.6.0",
     "chalk": "2.4.2",
+    "chokidar": "2.1.5",
     "connect": "3.6.6",
     "eslint": "5.15.3",
     "eslint-plugin-vue": "5.2.2",
diff --git a/vue.config.js b/vue.config.js
index 7b9d2dbb..d3a08991 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -41,22 +41,7 @@ module.exports = {
         }
       }
     },
-    after(app) {
-      require('@babel/register')
-      const bodyParser = require('body-parser')
-
-      // parse app.body
-      // http://expressjs.com/en/4x/api.html#req.body
-      app.use(bodyParser.json())
-      app.use(bodyParser.urlencoded({
-        extended: true
-      }))
-
-      const { default: mocks } = require('./mock')
-      for (const mock of mocks) {
-        app[mock.type](mock.url, mock.response)
-      }
-    }
+    after: require('./mock/mock-server.js')
   },
   configureWebpack: {
     // provide the app's title in webpack's name field, so that

From 083a4ada9db5fc9de9988d1b1a959dc17dd8bcd8 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Mon, 8 Apr 2019 11:08:06 +0800
Subject: [PATCH 09/12] perf[request.js]: optimize error message

---
 src/utils/request.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index b043c933..d2422c46 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -43,7 +43,7 @@ service.interceptors.response.use(
     const res = response.data
     if (res.code !== 20000) {
       Message({
-        message: res.message,
+        message: res.message || 'error',
         type: 'error',
         duration: 5 * 1000
       })
@@ -61,7 +61,7 @@ service.interceptors.response.use(
           })
         })
       }
-      return Promise.reject('error')
+      return Promise.reject(res.message || 'error')
     } else {
       return res
     }

From 79e2a604af37236b7aefa4ace8679b7aa424491b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Mon, 8 Apr 2019 12:58:33 +0800
Subject: [PATCH 10/12] feature[Sidebar]: add activeMenu option (#1833)

---
 src/layout/components/Sidebar/index.vue | 11 ++++++-
 src/router/index.js                     | 40 ++++++++++++-------------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index f02a4819..773cd5c8 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -3,7 +3,7 @@
     <logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <el-menu
-        :default-active="$route.path"
+        :default-active="activeMenu"
         :collapse="isCollapse"
         :background-color="variables.menuBg"
         :text-color="variables.menuText"
@@ -30,6 +30,15 @@ export default {
       'permission_routes',
       'sidebar'
     ]),
+    activeMenu() {
+      const route = this.$route
+      const { meta, path } = route
+      // if set path, the sidebar will highlight the path you set
+      if (meta.activeMenu) {
+        return meta.activeMenu
+      }
+      return path
+    },
     showLogo() {
       return this.$store.state.settings.sidebarLogo
     },
diff --git a/src/router/index.js b/src/router/index.js
index 22dad190..c9117e5b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -12,32 +12,32 @@ import chartsRouter from './modules/charts'
 import tableRouter from './modules/table'
 import nestedRouter from './modules/nested'
 
-/** note: sub-menu only appear when children.length>=1
- *  detail see  https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
- **/
-
 /**
-* hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
-* alwaysShow: true               if set true, will always show the root menu, whatever its child routes length
-*                                if not set alwaysShow, only more than one route under the children
-*                                it will becomes nested mode, otherwise not show the root menu
-* redirect: noredirect           if `redirect:noredirect` will no redirect in the breadcrumb
-* name:'router-name'             the name is used by <keep-alive> (must set!!!)
-* meta : {
-    roles: ['admin','editor']    will control the page roles (you can set multiple roles)
-    title: 'title'               the name show in sub-menu and breadcrumb (recommend set)
+ * Note: sub-menu only appear when route children.length >= 1
+ * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
+ *
+ * hidden: true                   if set true, item will not show in the sidebar(default is false)
+ * alwaysShow: true               if set true, will always show the root menu
+ *                                if not set alwaysShow, when item has more than one children route,
+ *                                it will becomes nested mode, otherwise not show the root menu
+ * redirect: noredirect           if `redirect:noredirect` will no redirect in the breadcrumb
+ * name:'router-name'             the name is used by <keep-alive> (must set!!!)
+ * meta : {
+    roles: ['admin','editor']    control the page roles (you can set multiple roles)
+    title: 'title'               the name show in sidebar and breadcrumb (recommend set)
     icon: 'svg-name'             the icon show in the sidebar
-    noCache: true                if true, the page will no be cached(default is false)
-    breadcrumb: false            if false, the item will hidden in breadcrumb(default is true)
-    affix: true                  if true, the tag will affix in the tags-view
+    noCache: true                if set true, the page will no be cached(default is false)
+    affix: true                  if set true, the tag will affix in the tags-view
+    breadcrumb: false            if set false, the item will hidden in breadcrumb(default is true)
+    activeMenu: '/example/list'  if set path, the sidebar will highlight the path you set
   }
-**/
+ */
 
 /**
  * constantRoutes
  * a base page that does not have permission requirements
  * all roles can be accessed
- * */
+ */
 export const constantRoutes = [
   {
     path: '/redirect',
@@ -113,7 +113,7 @@ export const constantRoutes = [
 /**
  * asyncRoutes
  * the routes that need to be dynamically loaded based on user roles
-*/
+ */
 export const asyncRoutes = [
   {
     path: '/permission',
@@ -195,7 +195,7 @@ export const asyncRoutes = [
         path: 'edit/:id(\\d+)',
         component: () => import('@/views/example/edit'),
         name: 'EditArticle',
-        meta: { title: 'editArticle', noCache: true },
+        meta: { title: 'editArticle', noCache: true, activeMenu: '/example/list' },
         hidden: true
       },
       {

From e3b6602bbf14503c98a79002ce0452f0833bfdaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Mon, 8 Apr 2019 13:02:41 +0800
Subject: [PATCH 11/12] fix[Sidebar]: fixed sidebar scrollbar bug (#1853)

---
 src/styles/sidebar.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index 5911eb85..e0accb83 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -28,10 +28,6 @@
 
     .scrollbar-wrapper {
       overflow-x: hidden !important;
-
-      .el-scrollbar__view {
-        height: 100%;
-      }
     }
 
     .el-scrollbar__bar.is-vertical {

From 0358667a736cf179baaf23a466f053df1d819ece Mon Sep 17 00:00:00 2001
From: MaYuanhai <414199639@qq.com>
Date: Mon, 8 Apr 2019 14:13:07 +0800
Subject: [PATCH 12/12] perf[Login]: password input add caps tooltip (#1845)

---
 src/views/login/index.vue | 53 ++++++++++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 979cfcb4..b9cba35f 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -23,24 +23,28 @@
         />
       </el-form-item>
 
-      <el-form-item prop="password">
-        <span class="svg-container">
-          <svg-icon icon-class="password" />
-        </span>
-        <el-input
-          :key="passwordType"
-          ref="password"
-          v-model="loginForm.password"
-          :type="passwordType"
-          :placeholder="$t('login.password')"
-          name="password"
-          auto-complete="on"
-          @keyup.enter.native="handleLogin"
-        />
-        <span class="show-pwd" @click="showPwd">
-          <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
-        </span>
-      </el-form-item>
+      <el-tooltip v-model="capsTooltip" content="Caps lock is On" placement="right" manual>
+        <el-form-item prop="password">
+          <span class="svg-container">
+            <svg-icon icon-class="password" />
+          </span>
+          <el-input
+            :key="passwordType"
+            ref="password"
+            v-model="loginForm.password"
+            :type="passwordType"
+            :placeholder="$t('login.password')"
+            name="password"
+            auto-complete="on"
+            @keyup.native="checkCapslock"
+            @blur="capsTooltip = false"
+            @keyup.enter.native="handleLogin"
+          />
+          <span class="show-pwd" @click="showPwd">
+            <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
+          </span>
+        </el-form-item>
+      </el-tooltip>
 
       <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">
         {{ $t('login.logIn') }}
@@ -107,6 +111,7 @@ export default {
         password: [{ required: true, trigger: 'blur', validator: validatePassword }]
       },
       passwordType: 'password',
+      capsTooltip: false,
       loading: false,
       showDialog: false,
       redirect: undefined
@@ -134,6 +139,18 @@ export default {
     // window.removeEventListener('storage', this.afterQRScan)
   },
   methods: {
+    checkCapslock({ shiftKey, key } = {}) {
+      if (key && key.length === 1) {
+        if (shiftKey && (key >= 'a' && key <= 'z') || !shiftKey && (key >= 'A' && key <= 'Z')) {
+          this.capsTooltip = true
+        } else {
+          this.capsTooltip = false
+        }
+      }
+      if (key === 'CapsLock' && this.capsTooltip === true) {
+        this.capsTooltip = false
+      }
+    },
     showPwd() {
       if (this.passwordType === 'password') {
         this.passwordType = ''