From 39b2b9b8722c8837d8f0820911595b69764bb080 Mon Sep 17 00:00:00 2001
From: MaYuanhai <414199639@qq.com>
Date: Mon, 4 May 2020 21:38:43 +0800
Subject: [PATCH 01/27] feat[Search]: route search supports pinyin (#2643)

---
 package.json                             |  1 +
 src/components/HeaderSearch/index.vue    | 37 +++++++++++++++++-------
 src/layout/components/Settings/index.vue | 19 ++++++++++++
 src/settings.js                          |  7 +++++
 src/store/modules/settings.js            | 11 +++----
 5 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 80f183a7..ec3ae6fa 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
+    "pinyin": "2.9.0",
     "screenfull": "4.2.0",
     "showdown": "1.9.0",
     "sortablejs": "1.8.4",
diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue
index 90eea067..0543b894 100644
--- a/src/components/HeaderSearch/index.vue
+++ b/src/components/HeaderSearch/index.vue
@@ -41,6 +41,9 @@ export default {
     },
     lang() {
       return this.$store.getters.language
+    },
+    supportPinyinSearch() {
+      return this.$store.state.settings.supportPinyinSearch
     }
   },
   watch: {
@@ -51,6 +54,10 @@ export default {
       this.searchPool = this.generateRoutes(this.routes)
     },
     searchPool(list) {
+      // Support pinyin search
+      if (this.lang === 'zh' && this.supportPinyinSearch) {
+        this.addPinyinField(list)
+      }
       this.initFuse(list)
     },
     show(value) {
@@ -65,6 +72,23 @@ export default {
     this.searchPool = this.generateRoutes(this.routes)
   },
   methods: {
+    async addPinyinField(list) {
+      const { default: pinyin } = await import('pinyin')
+      if (Array.isArray(list)) {
+        list.forEach(element => {
+          const title = element.title
+          if (Array.isArray(title)) {
+            title.forEach(v => {
+              v = pinyin(v, {
+                style: pinyin.STYLE_NORMAL
+              }).join('')
+              element.pinyinTitle = v
+            })
+          }
+        })
+        return list
+      }
+    },
     click() {
       this.show = !this.show
       if (this.show) {
@@ -95,6 +119,9 @@ export default {
         keys: [{
           name: 'title',
           weight: 0.7
+        }, {
+          name: 'pinyinTitle',
+          weight: 0.3
         }, {
           name: 'path',
           weight: 0.3
@@ -105,29 +132,23 @@ export default {
     // And generate the internationalized title
     generateRoutes(routes, basePath = '/', prefixTitle = []) {
       let res = []
-
       for (const router of routes) {
         // skip hidden router
         if (router.hidden) { continue }
-
         const data = {
           path: path.resolve(basePath, router.path),
           title: [...prefixTitle]
         }
-
         if (router.meta && router.meta.title) {
           // generate internationalized title
           const i18ntitle = i18n.t(`route.${router.meta.title}`)
-
           data.title = [...data.title, i18ntitle]
-
           if (router.redirect !== 'noRedirect') {
             // only push the routes with title
             // special case: need to exclude parent router without redirect
             res.push(data)
           }
         }
-
         // recursive child routes
         if (router.children) {
           const tempRoutes = this.generateRoutes(router.children, data.path, data.title)
@@ -152,13 +173,11 @@ export default {
 <style lang="scss" scoped>
 .header-search {
   font-size: 0 !important;
-
   .search-icon {
     cursor: pointer;
     font-size: 18px;
     vertical-align: middle;
   }
-
   .header-search-select {
     font-size: 18px;
     transition: width 0.2s;
@@ -168,7 +187,6 @@ export default {
     border-radius: 0;
     display: inline-block;
     vertical-align: middle;
-
     /deep/ .el-input__inner {
       border-radius: 0;
       border: 0;
@@ -179,7 +197,6 @@ export default {
       vertical-align: middle;
     }
   }
-
   &.show {
     .header-search-select {
       width: 210px;
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 8dab8cbf..119c6dff 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -30,6 +30,11 @@
         />
       </a>
 
+      <div v-if="lang === 'zh'" class="drawer-item">
+        <span>菜单支持拼音搜索</span>
+        <el-switch v-model="supportPinyinSearch" class="drawer-switch" />
+      </div>
+
     </div>
   </div>
 </template>
@@ -78,6 +83,20 @@ export default {
           value: val
         })
       }
+    },
+    supportPinyinSearch: {
+      get() {
+        return this.$store.state.settings.supportPinyinSearch
+      },
+      set(val) {
+        this.$store.dispatch('settings/changeSetting', {
+          key: 'supportPinyinSearch',
+          value: val
+        })
+      }
+    },
+    lang() {
+      return this.$store.getters.language
     }
   },
   methods: {
diff --git a/src/settings.js b/src/settings.js
index 1ebc7f29..1e4683f9 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -25,6 +25,13 @@ module.exports = {
    */
   sidebarLogo: false,
 
+  /**
+   * @type {boolean} true | false
+   * @description Whether support pinyin search in headerSearch
+   * Bundle size minified 47.3kb,minified + gzipped 63kb
+   */
+  supportPinyinSearch: true,
+
   /**
    * @type {string | array} 'production' | ['production', 'development']
    * @description Need show err logs component.
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index e389af79..e638a4c4 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -1,14 +1,15 @@
 import variables from '@/styles/element-variables.scss'
 import defaultSettings from '@/settings'
 
-const { showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings
+const { showSettings, tagsView, fixedHeader, sidebarLogo, supportPinyinSearch } = defaultSettings
 
 const state = {
   theme: variables.theme,
-  showSettings: showSettings,
-  tagsView: tagsView,
-  fixedHeader: fixedHeader,
-  sidebarLogo: sidebarLogo
+  showSettings,
+  tagsView,
+  fixedHeader,
+  sidebarLogo,
+  supportPinyinSearch
 }
 
 const mutations = {

From dc4832ad5b22aa5d10f353450e55211f3edd5553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=96=90?= <623536309@qq.com>
Date: Sat, 11 Jan 2020 10:25:59 +0800
Subject: [PATCH 02/27] fix: fixed redirect path regex (#2933)

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

diff --git a/src/router/index.js b/src/router/index.js
index 0d9d9b8b..c45af999 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -45,7 +45,7 @@ export const constantRoutes = [
     hidden: true,
     children: [
       {
-        path: '/redirect/:path*',
+        path: '/redirect/:path(.*)',
         component: () => import('@/views/redirect/index')
       }
     ]

From 4a2401b5741c2ea3efd8ee44fca9b14946da86bf Mon Sep 17 00:00:00 2001
From: RoBlues <robluesmail@gmail.com>
Date: Sun, 2 Feb 2020 19:39:41 +0800
Subject: [PATCH 03/27] perf[Mock]: set responseFake to mock-server.js(#2966)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* modify 把mock/index.js中与mock-server相关的代码转移到mock-server.js中去，实现两则功能分割
---
 mock/index.js       | 16 +---------------
 mock/mock-server.js | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/mock/index.js b/mock/index.js
index 217ee3d5..196e2927 100644
--- a/mock/index.js
+++ b/mock/index.js
@@ -54,18 +54,4 @@ export function mockXHR() {
   }
 }
 
-// for mock server
-const responseFake = (url, type, respond) => {
-  return {
-    url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`),
-    type: type || 'get',
-    response(req, res) {
-      console.log('request invoke:' + req.path)
-      res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
-    }
-  }
-}
-
-export default mocks.map(route => {
-  return responseFake(route.url, route.type, route.response)
-})
+export default mocks
diff --git a/mock/mock-server.js b/mock/mock-server.js
index 4c4cb2af..806fdacc 100644
--- a/mock/mock-server.js
+++ b/mock/mock-server.js
@@ -2,17 +2,21 @@ const chokidar = require('chokidar')
 const bodyParser = require('body-parser')
 const chalk = require('chalk')
 const path = require('path')
+const Mock = require('mockjs')
 
 const mockDir = path.join(process.cwd(), 'mock')
 
 function registerRoutes(app) {
   let mockLastIndex
   const { default: mocks } = require('./index.js')
-  for (const mock of mocks) {
+  const mocksForServer = mocks.map(route => {
+    return responseFake(route.url, route.type, route.response)
+  })
+  for (const mock of mocksForServer) {
     app[mock.type](mock.url, mock.response)
     mockLastIndex = app._router.stack.length
   }
-  const mockRoutesLength = Object.keys(mocks).length
+  const mockRoutesLength = Object.keys(mocksForServer).length
   return {
     mockRoutesLength: mockRoutesLength,
     mockStartIndex: mockLastIndex - mockRoutesLength
@@ -27,6 +31,18 @@ function unregisterRoutes() {
   })
 }
 
+// for mock server
+const responseFake = (url, type, respond) => {
+  return {
+    url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`),
+    type: type || 'get',
+    response(req, res) {
+      console.log('request invoke:' + req.path)
+      res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
+    }
+  }
+}
+
 module.exports = app => {
   // es6 polyfill
   require('@babel/register')

From 11bcb43326f3f145752f1644f8f5b8d90cafcfb7 Mon Sep 17 00:00:00 2001
From: Shota Aratono <195194+artn@users.noreply.github.com>
Date: Wed, 5 Feb 2020 10:51:43 +0900
Subject: [PATCH 04/27] docs: improve Japanese translation (#2970)

---
 README.ja.md | 58 ++++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/README.ja.md b/README.ja.md
index f0bc0ac1..6bab0e3a 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -30,7 +30,7 @@
 
 ## 概要
 
-[vue-element-admin](https://panjiachen.github.io/vue-element-admin) は管理画面のフロントエンドのインタフェース，[vue](https://github.com/vuejs/vue) と [element-ui](https://github.com/ElemeFE/element)を使っています。i18nの多言語対応、可変ルート、権限、典型的なビジネスアプリテンプレートであり、豊富なコンポーネントを提供しています、素早くビジネス用の管理画面の現型を構築に役立ちます。
+[vue-element-admin](https://panjiachen.github.io/vue-element-admin) は管理画面のフロントエンドのインタフェースで、[vue](https://github.com/vuejs/vue) と [element-ui](https://github.com/ElemeFE/element)を使っています。i18nの多言語対応、可変ルート、権限、典型的なビジネスアプリテンプレートであり、豊富なコンポーネントを提供しています。素早くビジネス用の管理画面の現型を構築に役立ちます。
 
 - [デモページ](https://panjiachen.github.io/vue-element-admin)
 
@@ -44,18 +44,18 @@
 
 - おすすめシンプルテンプレート: [vue-admin-template](https://github.com/PanJiaChen/vue-admin-template)
 - デスクトップバージョン: [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
-- Typescriptバージョン: [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (鸣谢: [@Armour](https://github.com/Armour))
+- Typescriptバージョン: [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (感謝: [@Armour](https://github.com/Armour))
 - [awesome-project](https://github.com/PanJiaChen/vue-element-admin/issues/2312)
 
-**After the `v4.1.0+` version, the default master branch will not support i18n. Please use [i18n Branch](https://github.com/PanJiaChen/vue-element-admin/tree/i18n), it will keep up with the master update**
+**バージョン`v4.1.0+`以降について、デフォルトのmasterブランチではi18nをサポートしていません。masterブランチと共にアップデートされる[i18n Branch](https://github.com/PanJiaChen/vue-element-admin/tree/i18n)を使用してください。 **
 
-**現在のバージョン `v4.0+` は `vue-cli` で構築，バグ報告は[issue](https://github.com/PanJiaChen/vue-element-admin/issues/new)のissueでお願いします。旧バージョン[tag/3.11.0](https://github.com/PanJiaChen/vue-element-admin/tree/tag/3.11.0)もあります。`vue-cli`に依存しないです。**
+**現在のバージョン `v4.0+` は `vue-cli` で構築していて、バグ報告は[issue](https://github.com/PanJiaChen/vue-element-admin/issues/new)のissueでお願いします。旧バージョン[tag/3.11.0](https://github.com/PanJiaChen/vue-element-admin/tree/tag/3.11.0)もあります。こちらは`vue-cli`に依存しないです。**
 
 **低いバージョンのブラウザはサーポートしないです(例えば ie)，必要があれば polyfill を追加してください。 [詳細はこちら](https://github.com/PanJiaChen/vue-element-admin/wiki#babel-polyfill)**
 
 ## 前準備
 
-ローカル環境に [node](http://nodejs.org/) と [git](https://git-scm.com/)をインストールが必要です。[ES2015+](http://es6.ruanyifeng.com/)、[vue](https://cn.vuejs.org/index.html)、[vuex](https://vuex.vuejs.org/zh-cn/)、[vue-router](https://router.vuejs.org/zh-cn/) 、[vue-cli](https://github.com/vuejs/vue-cli) 、[axios](https://github.com/axios/axios) 和 [element-ui](https://github.com/ElemeFE/element)で開発しています。Requestは[Mock.js](https://github.com/nuysoft/Mock)のモックデータを使っています。
+ローカル環境に [node](http://nodejs.org/) と [git](https://git-scm.com/)のインストールが必要です。[ES2015+](http://es6.ruanyifeng.com/)、[vue](https://cn.vuejs.org/index.html)、[vuex](https://vuex.vuejs.org/zh-cn/)、[vue-router](https://router.vuejs.org/zh-cn/) 、[vue-cli](https://github.com/vuejs/vue-cli) 、[axios](https://github.com/axios/axios) と [element-ui](https://github.com/ElemeFE/element)で開発しています。Requestは[Mock.js](https://github.com/nuysoft/Mock)のモックデータを使っています。
 
 **バグ修正や新規機能追加のissue と pull requestは大歓迎です。**
 
@@ -87,9 +87,9 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s
   - 多言語切替
   - テーマ切替
   - サイトメニュー（ルートから生成）
-  - Breadcrumb Navigation
-  - Tag Navigation
-  - Svg Sprite Icon
+  - パンくずリストナビゲーション
+  - タブナビゲーション
+  - Svg Sprite アイコン
   - ローカル/バックエンド モック データ
   - Screenfull
 
@@ -104,33 +104,33 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s
   - リード
   - Zip
 
-- Table
-  - Dynamic Table
-  - Drag And Drop Table
-  - Inline Edit Table
+- テーブル
+  - ダイナミックテーブル
+  - ドラッグアンドドロップテーブル
+  - インラインエディットテーブル
 
-- Error Page
+- エラーページ
   - 401
   - 404
 
 - コンポーネント
-  - Avatar Upload
-  - Back To Top
-  - Drag Dialog
-  - Drag Select
-  - Drag Kanban
-  - Drag List
-  - SplitPane
+  - アバターアップロード
+  - トップに戻る
+  - ドラッグダイアログ
+  - ドラッグ選択
+  - ドラッグKanban
+  - ドラッグリスト
+  - ペインの分割
   - Dropzone
-  - Sticky
+  - スティッキー
   - CountTo
 
-- Advanced Example
-- Error Log
-- Dashboard
-- Guide Page
+- 高度なサンプル
+- エラーログ
+- ダッシュボード
+- ガイドページ
 - ECharts
-- Clipboard
+- クリップボード
 - Markdown to html
 ```
 
@@ -150,7 +150,7 @@ npm install
 npm run dev
 ```
 
-This will automatically open http://localhost:9527
+http://localhost:9527 が自動的に開きます。
 
 ## Build
 
@@ -178,11 +178,11 @@ npm run lint
 npm run lint -- --fix
 ```
 
-Refer to [Documentation](https://panjiachen.github.io/vue-element-admin-site/guide/essentials/deploy.html) for more information
+詳細は [Documentation](https://panjiachen.github.io/vue-element-admin-site/guide/essentials/deploy.html) を参照してください。
 
 ## Changelog
 
-Detailed changes for each release are documented in the [release notes](https://github.com/PanJiaChen/vue-element-admin/releases).
+各リリースの詳細は [release notes](https://github.com/PanJiaChen/vue-element-admin/releases) にあります。
 
 ## Online Demo
 

From 8ad5c90f8f38e6caeb3047d19e7ad902d932bd16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Wed, 12 Feb 2020 10:01:27 +0800
Subject: [PATCH 05/27] perf: change script-loader to dependencies

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ec3ae6fa..8d54e105 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
     "path-to-regexp": "2.4.0",
     "pinyin": "2.9.0",
     "screenfull": "4.2.0",
+    "script-loader": "0.7.2",
     "showdown": "1.9.0",
     "sortablejs": "1.8.4",
     "tui-editor": "1.3.3",
@@ -98,7 +99,6 @@
     "runjs": "^4.3.2",
     "sass-loader": "^7.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",
-    "script-loader": "0.7.2",
     "serve-static": "^1.13.2",
     "svg-sprite-loader": "4.1.3",
     "svgo": "1.2.0",

From f788d681e6e161b6fa52bf1070ace85aa16ce363 Mon Sep 17 00:00:00 2001
From: echofly <36875450+echofly@users.noreply.github.com>
Date: Wed, 18 Mar 2020 19:22:38 +0800
Subject: [PATCH 06/27] fix[profile/UserCard]: fixed wrong key name (#3056)

roles => role
---
 src/views/profile/components/UserCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/profile/components/UserCard.vue b/src/views/profile/components/UserCard.vue
index b9a383d6..2476f04a 100644
--- a/src/views/profile/components/UserCard.vue
+++ b/src/views/profile/components/UserCard.vue
@@ -65,7 +65,7 @@ export default {
           name: '',
           email: '',
           avatar: '',
-          roles: ''
+          role: ''
         }
       }
     }

From 4597711d9d08f16cae1a388fa6305bdb9892d906 Mon Sep 17 00:00:00 2001
From: Aisen60 <1147319086@qq.com>
Date: Fri, 20 Mar 2020 21:24:31 +0800
Subject: [PATCH 07/27] fix:fixed parseTime bug in ie and safari(#3066)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* /src/utils/index.js parseTime 添加IE浏览器（版本10以下，包括版本10）兼容。

* perf: update

Co-authored-by: aisen60 <aisen60@qq.com>
Co-authored-by: 花裤衩 <panfree23@gmail.com>
---
 src/utils/index.js                 | 12 ++++++++++--
 tests/unit/utils/parseTime.spec.js |  5 +++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/utils/index.js b/src/utils/index.js
index 2684e3c2..eb760d5e 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -17,9 +17,17 @@ export function parseTime(time, cFormat) {
   if (typeof time === 'object') {
     date = time
   } else {
-    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
-      time = parseInt(time)
+    if ((typeof time === 'string')) {
+      if ((/^[0-9]+$/.test(time))) {
+        // support "1548221490638"
+        time = parseInt(time)
+      } else {
+        // support safari
+        // https://stackoverflow.com/questions/4310953/invalid-date-in-safari
+        time = time.replace(new RegExp(/-/gm), '/')
+      }
     }
+
     if ((typeof time === 'number') && (time.toString().length === 10)) {
       time = time * 1000
     }
diff --git a/tests/unit/utils/parseTime.spec.js b/tests/unit/utils/parseTime.spec.js
index 77ecb9d5..bc61d1ac 100644
--- a/tests/unit/utils/parseTime.spec.js
+++ b/tests/unit/utils/parseTime.spec.js
@@ -4,6 +4,11 @@ describe('Utils:parseTime', () => {
   it('timestamp', () => {
     expect(parseTime(d)).toBe('2018-07-13 17:54:01')
   })
+
+  it('timestamp string', () => {
+    expect(parseTime((d + ''))).toBe('2018-07-13 17:54:01')
+  })
+
   it('ten digits timestamp', () => {
     expect(parseTime((d / 1000).toFixed(0))).toBe('2018-07-13 17:54:01')
   })

From 43629c09c3b0c6d82ab3d195342b770134a551b2 Mon Sep 17 00:00:00 2001
From: echofly <36875450+echofly@users.noreply.github.com>
Date: Tue, 24 Mar 2020 10:17:18 +0800
Subject: [PATCH 08/27] perf: format component names as PascalCase (#3074)

format: component names should be PascalCase
---
 src/views/tab/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/tab/index.vue b/src/views/tab/index.vue
index 862a160f..2a35fa58 100644
--- a/src/views/tab/index.vue
+++ b/src/views/tab/index.vue
@@ -13,11 +13,11 @@
 </template>
 
 <script>
-import tabPane from './components/TabPane'
+import TabPane from './components/TabPane'
 
 export default {
   name: 'Tab',
-  components: { tabPane },
+  components: { TabPane },
   data() {
     return {
       tabMapOptions: [

From 348e1bbafd76fda3d6b18b1911b0bf9bd1b44829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Fri, 27 Mar 2020 11:57:40 +0800
Subject: [PATCH 09/27] docs: add smallsticker

---
 README.zh-CN.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.zh-CN.md b/README.zh-CN.md
index 78a88e4a..6ac72e46 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -221,6 +221,10 @@ Detailed changes for each release are documented in the [release notes](https://
 
 [Buy me a coffee](https://www.buymeacoffee.com/Pan)
 
+## 购买贴纸
+
+你也可以通过 购买[官方授权的贴纸](https://smallsticker.com/product/vue-element-admin) 的方式来支持 vue-element-admin - 每售出一张贴纸，我们将获得 2 元的捐赠。
+
 ## Browsers support
 
 Modern browsers and Internet Explorer 10+.

From cd404bc128cd33abfdf530f8e3f4e0635af0f624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Fri, 27 Mar 2020 12:32:30 +0800
Subject: [PATCH 10/27] Update README.zh-CN.md

---
 README.zh-CN.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.zh-CN.md b/README.zh-CN.md
index 6ac72e46..5aea88e8 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -223,7 +223,7 @@ Detailed changes for each release are documented in the [release notes](https://
 
 ## 购买贴纸
 
-你也可以通过 购买[官方授权的贴纸](https://smallsticker.com/product/vue-element-admin) 的方式来支持 vue-element-admin - 每售出一张贴纸，我们将获得 2 元的捐赠。
+你也可以通过 购买[官方授权的贴纸](https://smallsticker.com/product/vue-element-admin) 的方式来支持 vue-element-admin - 每售出一张贴纸，本项目将获得 2 元的捐赠。
 
 ## Browsers support
 

From 2975c4181a6ffde2b1a4461684bebea89fdca117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Sat, 28 Mar 2020 11:16:41 +0800
Subject: [PATCH 11/27] fix: svg support old broswer (#3085)

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

diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue
index 9a3318e5..b07ded2a 100644
--- a/src/components/SvgIcon/index.vue
+++ b/src/components/SvgIcon/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="isExternal" :style="styleExternalIcon" class="svg-external-icon svg-icon" v-on="$listeners" />
   <svg v-else :class="svgClass" aria-hidden="true" v-on="$listeners">
-    <use :href="iconName" />
+    <use :xlink:href="iconName" />
   </svg>
 </template>
 

From e29e5838bd3ed7d208b18aafbac1bb6057e69fb1 Mon Sep 17 00:00:00 2001
From: Alex S <50220345+sabatale@users.noreply.github.com>
Date: Sat, 4 Apr 2020 03:53:26 -0400
Subject: [PATCH 12/27] fixed typo (#3091)

---
 src/views/dashboard/admin/components/RaddarChart.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/dashboard/admin/components/RaddarChart.vue b/src/views/dashboard/admin/components/RaddarChart.vue
index 6823af31..52c8f9fb 100644
--- a/src/views/dashboard/admin/components/RaddarChart.vue
+++ b/src/views/dashboard/admin/components/RaddarChart.vue
@@ -70,7 +70,7 @@ export default {
           indicator: [
             { name: 'Sales', max: 10000 },
             { name: 'Administration', max: 20000 },
-            { name: 'Information Techology', max: 20000 },
+            { name: 'Information Technology', max: 20000 },
             { name: 'Customer Support', max: 20000 },
             { name: 'Development', max: 20000 },
             { name: 'Marketing', max: 20000 }

From c6266ea3968a86b4032cc2544d94d7834a4d1de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Wed, 22 Apr 2020 10:31:46 +0800
Subject: [PATCH 13/27] fix: use vue-cli default source-map (#3097)

cheap-module-eval-source-map
---
 vue.config.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 1ec990ea..ba5be418 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -80,12 +80,6 @@ module.exports = {
       })
       .end()
 
-    config
-      // https://webpack.js.org/configuration/devtool/#development
-      .when(process.env.NODE_ENV === 'development',
-        config => config.devtool('cheap-source-map')
-      )
-
     config
       .when(process.env.NODE_ENV !== 'development',
         config => {

From 2ffff40bfd31fe3f44f342e41fee33ad2ad2f970 Mon Sep 17 00:00:00 2001
From: Aisen <caixusheng60@gmail.com>
Date: Tue, 28 Apr 2020 10:10:58 +0800
Subject: [PATCH 14/27] perf[Tinymce]: editor try to keep these URLs intact
 (#3141)

---
 src/components/Tinymce/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
index 670a0e53..ddb30243 100644
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -154,7 +154,11 @@ export default {
           editor.on('FullscreenStateChanged', (e) => {
             _this.fullscreen = e.state
           })
-        }
+        },
+        //it will try to keep these URLs intact
+        //https://www.tiny.cloud/docs-3x/reference/configuration/Configuration3x@convert_urls/
+        //https://stackoverflow.com/questions/5196205/disable-tinymce-absolute-to-relative-url-conversions
+        convert_urls: false
         // 整合七牛上传
         // images_dataimg_filter(img) {
         //   setTimeout(() => {

From 5c6ddaad38c04f5713b7f4e9494de7aed42b36ca Mon Sep 17 00:00:00 2001
From: ntnyq <ntnyq13@gmail.com>
Date: Tue, 28 Apr 2020 18:26:34 +0800
Subject: [PATCH 15/27] fix[element-variables]: missing space in
 element-variables (#3144)

---
 src/styles/element-variables.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss
index 30a0e6bc..5bdc4dad 100644
--- a/src/styles/element-variables.scss
+++ b/src/styles/element-variables.scss
@@ -6,7 +6,7 @@
 /* theme color */
 $--color-primary: #1890ff;
 $--color-success: #13ce66;
-$--color-warning: #FFBA00;
+$--color-warning: #ffba00;
 $--color-danger: #ff4949;
 // $--color-info: #1E1E1E;
 
@@ -17,10 +17,10 @@ $--button-font-weight: 400;
 $--border-color-light: #dfe4ed;
 $--border-color-lighter: #e6ebf5;
 
-$--table-border:1px solid#dfe6ec;
+$--table-border: 1px solid #dfe6ec;
 
 /* icon font path, required */
-$--font-path: '~element-ui/lib/theme-chalk/fonts';
+$--font-path: "~element-ui/lib/theme-chalk/fonts";
 
 @import "~element-ui/packages/theme-chalk/src/index";
 

From 4fedd2e8d8ce9753667a4c7d740dfd37fdd8855a 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, 4 May 2020 21:30:58 +0800
Subject: [PATCH 16/27] fix: compatibility with vetur (#1700)

---
 src/components/Tinymce/index.vue       |  6 +++---
 src/layout/components/Sidebar/Link.vue | 25 ++++++++++++++++---------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
index ddb30243..8fb5cc8d 100644
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -155,9 +155,9 @@ export default {
             _this.fullscreen = e.state
           })
         },
-        //it will try to keep these URLs intact
-        //https://www.tiny.cloud/docs-3x/reference/configuration/Configuration3x@convert_urls/
-        //https://stackoverflow.com/questions/5196205/disable-tinymce-absolute-to-relative-url-conversions
+        // it will try to keep these URLs intact
+        // https://www.tiny.cloud/docs-3x/reference/configuration/Configuration3x@convert_urls/
+        // https://stackoverflow.com/questions/5196205/disable-tinymce-absolute-to-relative-url-conversions
         convert_urls: false
         // 整合七牛上传
         // images_dataimg_filter(img) {
diff --git a/src/layout/components/Sidebar/Link.vue b/src/layout/components/Sidebar/Link.vue
index eb4dd107..530b3d5b 100644
--- a/src/layout/components/Sidebar/Link.vue
+++ b/src/layout/components/Sidebar/Link.vue
@@ -1,7 +1,5 @@
-
 <template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
+  <component :is="type" v-bind="linkProps(to)">
     <slot />
   </component>
 </template>
@@ -16,19 +14,28 @@ export default {
       required: true
     }
   },
+  computed: {
+    isExternal() {
+      return isExternal(this.to)
+    },
+    type() {
+      if (this.isExternal) {
+        return 'a'
+      }
+      return 'router-link'
+    }
+  },
   methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
+    linkProps(to) {
+      if (this.isExternal) {
         return {
-          is: 'a',
-          href: url,
+          href: to,
           target: '_blank',
           rel: 'noopener'
         }
       }
       return {
-        is: 'router-link',
-        to: url
+        to: to
       }
     }
   }

From d17cfd067a7f44045e58ec115c83fc73c9bcb6a7 Mon Sep 17 00:00:00 2001
From: garethx <gareth.wilson@gmail.com>
Date: Mon, 4 May 2020 16:05:29 +0100
Subject: [PATCH 17/27] feat: add option to try project on CodeSandbox (#2976)

---
 README.es.md    | 2 ++
 README.ja.md    | 2 ++
 README.md       | 2 ++
 README.zh-CN.md | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/README.es.md b/README.es.md
index 396556f5..3e054ce9 100644
--- a/README.es.md
+++ b/README.es.md
@@ -62,6 +62,8 @@ Vue Element Admin es una solución práctica basada en la nueva plataforma de de
 Necesita instalar [node](https://nodejs.org/) y [git](https://git-scm.com/) localmente. El proyecto es basado en [ES2015+](https://es6.ruanyifeng.com/), [vue](https://cn.vuejs.org/index.html), [vuex](https://vuex.vuejs.org/zh-cn/), [vue-router](https://router.vuejs.org/zh-cn/), [vue-cli](https://github.com/vuejs/vue-cli) , [axios](https://github.com/axios/axios) and [element-ui](https://github.com/ElemeFE/element), toda la solicitud de datos simulada se realiza a través de [Mock.js](https://github.com/nuysoft/Mock).
 Entendiendo y aprendiendo esto pudiera ayudarle con su proyecto.
 
+[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox)
+
  <p align="center">
   <img width="900" src="https://wpimg.wallstcn.com/a5894c1b-f6af-456e-82df-1151da0839bf.png">
 </p>
diff --git a/README.ja.md b/README.ja.md
index 6bab0e3a..6857c32a 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -59,6 +59,8 @@
 
 **バグ修正や新規機能追加のissue と pull requestは大歓迎です。**
 
+[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox)
+
  <p align="center">
   <img width="900" src="https://wpimg.wallstcn.com/a5894c1b-f6af-456e-82df-1151da0839bf.png">
 </p>
diff --git a/README.md b/README.md
index 360407c9..649e7933 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,8 @@ English | [简体中文](./README.zh-CN.md) | [日本語](./README.ja.md) | [Spa
 You need to install [node](https://nodejs.org/) and [git](https://git-scm.com/) locally. The project is based on [ES2015+](https://es6.ruanyifeng.com/), [vue](https://cn.vuejs.org/index.html), [vuex](https://vuex.vuejs.org/zh-cn/), [vue-router](https://router.vuejs.org/zh-cn/), [vue-cli](https://github.com/vuejs/vue-cli) , [axios](https://github.com/axios/axios) and [element-ui](https://github.com/ElemeFE/element), all request data is simulated using [Mock.js](https://github.com/nuysoft/Mock).
 Understanding and learning this knowledge in advance will greatly help the use of this project.
 
+[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox)
+
  <p align="center">
   <img width="900" src="https://wpimg.wallstcn.com/a5894c1b-f6af-456e-82df-1151da0839bf.png">
 </p>
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 5aea88e8..6ac44ee1 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -77,6 +77,8 @@
 
 **如有问题请先看上述使用文档和文章，若不能满足，欢迎 issue 和 pr**
 
+[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox)
+
  <p align="center">
   <img width="900" src="https://wpimg.wallstcn.com/a5894c1b-f6af-456e-82df-1151da0839bf.png">
 </p>

From fe72cae1e5bfb401a867916094c7be25d9d9e45e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Tue, 5 May 2020 11:06:51 +0800
Subject: [PATCH 18/27] docs: add tips

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

diff --git a/src/permission.js b/src/permission.js
index 750aeab6..ff5eaad2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -24,7 +24,7 @@ router.beforeEach(async(to, from, next) => {
     if (to.path === '/login') {
       // if is logged in, redirect to the home page
       next({ path: '/' })
-      NProgress.done()
+      NProgress.done() // hack: https://github.com/PanJiaChen/vue-element-admin/pull/2939
     } else {
       // determine whether the user has obtained his permission roles through getInfo
       const hasRoles = store.getters.roles && store.getters.roles.length > 0

From b8c934c81a1064153f0892a923de6356fa257c69 Mon Sep 17 00:00:00 2001
From: AiMe1991 <sxd.08@163.com>
Date: Tue, 5 May 2020 12:55:22 +0800
Subject: [PATCH 19/27] perf: when tags-view scroll close the right-menu

---
 src/layout/components/TagsView/ScrollPane.vue | 9 +++++++++
 src/layout/components/TagsView/index.vue      | 5 ++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue
index 0ec76e72..34a7e55f 100644
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -19,12 +19,21 @@ export default {
       return this.$refs.scrollContainer.$refs.wrap
     }
   },
+  mounted() {
+    this.scrollWrapper.addEventListener('scroll', this.emitScroll, true)
+  },
+  beforeDestroy() {
+    this.scrollWrapper.removeEventListener('scroll', this.emitScroll)
+  },
   methods: {
     handleScroll(e) {
       const eventDelta = e.wheelDelta || -e.deltaY * 40
       const $scrollWrapper = this.scrollWrapper
       $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
     },
+    emitScroll() {
+      this.$emit('scroll')
+    },
     moveToTarget(currentTag) {
       const $container = this.$refs.scrollContainer.$el
       const $containerWidth = $container.offsetWidth
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 3c20275b..3929722a 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper">
+    <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
       <router-link
         v-for="tag in visitedViews"
         ref="tag"
@@ -191,6 +191,9 @@ export default {
     },
     closeMenu() {
       this.visible = false
+    },
+    handleScroll() {
+      this.closeMenu()
     }
   }
 }

From 2ed195135566dcc5369db5a10e60dadedd7d74dc Mon Sep 17 00:00:00 2001
From: cooper <1322849632@qq.com>
Date: Tue, 5 May 2020 13:21:51 +0800
Subject: [PATCH 20/27] fix[parseTime]: fixed when pass null (#3038)

---
 src/utils/index.js                 | 2 +-
 tests/unit/utils/parseTime.spec.js | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/utils/index.js b/src/utils/index.js
index eb760d5e..96ee6e7f 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -9,7 +9,7 @@
  * @returns {string | null}
  */
 export function parseTime(time, cFormat) {
-  if (arguments.length === 0) {
+  if (arguments.length === 0 || !time) {
     return null
   }
   const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
diff --git a/tests/unit/utils/parseTime.spec.js b/tests/unit/utils/parseTime.spec.js
index bc61d1ac..3e138d00 100644
--- a/tests/unit/utils/parseTime.spec.js
+++ b/tests/unit/utils/parseTime.spec.js
@@ -1,4 +1,5 @@
 import { parseTime } from '@/utils/index.js'
+
 describe('Utils:parseTime', () => {
   const d = new Date('2018-07-13 17:54:01') // "2018-07-13 17:54:01"
   it('timestamp', () => {
@@ -29,4 +30,8 @@ describe('Utils:parseTime', () => {
   it('empty argument', () => {
     expect(parseTime()).toBeNull()
   })
+
+  it('null', () => {
+    expect(parseTime(null)).toBeNull()
+  })
 })

From 7dc2c977a0c21119357be366318ae441213ee457 Mon Sep 17 00:00:00 2001
From: Nickbing Lao <giscafer@outlook.com>
Date: Fri, 8 May 2020 11:43:39 +0800
Subject: [PATCH 21/27] fix[css]: min btn width (#3164)

---
 src/styles/element-ui.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 955d3cab..49474de3 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -31,7 +31,7 @@
 .fixed-width {
   .el-button--mini {
     padding: 7px 10px;
-    width: 60px;
+    min-width: 60px;
   }
 }
 

From 0e194fea76fd23b9dbef7bfff8762f4a81503c6d Mon Sep 17 00:00:00 2001
From: Edwin Betancourt <EdwinBetanc0urt@hotmail.com>
Date: Fri, 5 Jun 2020 01:32:15 -0400
Subject: [PATCH 22/27] docs: Improve read me files and changes in Spanish.
 (#3234)

---
 README.es.md    | 27 +++++++++++++++------------
 README.ja.md    |  9 ++++++---
 README.md       |  9 ++++++---
 README.zh-CN.md |  9 ++++++---
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/README.es.md b/README.es.md
index 3e054ce9..472adb60 100644
--- a/README.es.md
+++ b/README.es.md
@@ -51,11 +51,11 @@ Vue Element Admin es una solución práctica basada en la nueva plataforma de de
 - Plantilla de Typescript: [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (Créditos: [@Armour](https://github.com/Armour))
 - [awesome-project](https://github.com/PanJiaChen/vue-element-admin/issues/2312)
 
-**Después de la versión `v4.1.0+`, la rama por defecto master no tendrá soporte para i18n. Por favor use [i18n](https://github.com/PanJiaChen/vue-element-admin/tree/i18n), los cambios serán incluidos en la rama master**
+**Después de la versión `v4.1.0+`, la rama por defecto master no tendrá soporte para i18n. Por favor utilice la rama [i18n](https://github.com/PanJiaChen/vue-element-admin/tree/i18n), los cambios serán incluidos en la rama master**
 
 **la versión actual es `v4.0+` construida con `vue-cli`. Si encuentra algún problema, por favor coloque un [issue](https://github.com/PanJiaChen/vue-element-admin/issues/new). Si desea usar la versión anterior, puede cambiar de rama a [tag/3.11.0](https://github.com/PanJiaChen/vue-element-admin/tree/tag/3.11.0), no relacionado con `vue-cli`**
 
-**Este proyecto no está soportado para versiones muy viejas de navegadores (e.g. IE).**
+**Este proyecto no está soportado para versiones antigüas de navegadores (ej. IE).**
 
 ## Preparación
 
@@ -64,13 +64,13 @@ Entendiendo y aprendiendo esto pudiera ayudarle con su proyecto.
 
 [![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox)
 
- <p align="center">
+<p align="center">
   <img width="900" src="https://wpimg.wallstcn.com/a5894c1b-f6af-456e-82df-1151da0839bf.png">
 </p>
 
 ## Patrocinantes
 
-Se un patrocinante y pon tu logo en nuestro README on GitHub con un enlace directo a tu sitio web. [[Se un Patrocinante]](https://www.patreon.com/panjiachen)
+Sea un patrocinante y coloque su logo en nuestro LEEME en GitHub con un enlace directo a su sitio web. [[Se un Patrocinante]](https://www.patreon.com/panjiachen)
 
 <a href="https://flatlogic.com/admin-dashboards?from=vue-element-admin"><img width="150px" src="https://wpimg.wallstcn.com/9c0b719b-5551-4c1e-b776-63994632d94a.png" /></a><p>Plantilla de Dashboard de administración hecha con Vue, React y Angular.</p>
 
@@ -79,25 +79,28 @@ Se un patrocinante y pon tu logo en nuestro README on GitHub con un enlace direc
 ```
 - Iniciar / Cerrar Sesión
 
-- Permisos de Authentication
+- Permisos de Autenticación
   - Página de Permisos
   - Directivas de permisos
   - Página de configuración de permisos
   - Autenticación por dos pasos
 
 - Construcción Multi-entorno
-  - dev sit stage  producción
+  - Desarrollo (dev)
+  - sit
+  - Escenario de pruebas (stage),
+  - Producción (prod)
 
 - Características Globales
   - I18n
   - Temas dinámicos
-  - Dynamic sidebar (soporte a rutas multi-nivel)
+  - Menu lateral dinámico (soporte a rutas multi-nivel)
   - Barra de rutas dinámica
-  - Tags-view (Tab page Support right-click operation)
+  - Tags-view (Pestañas de página, Soporta operación de clic derecho)
   - Svg Sprite
   - Datos de simulación con Mock
   - Pantalla completa
-  - Responsive Sidebar
+  - Menu lateral responsivo
 
 - Editor
   - Editor de Texto Enriquecido
@@ -108,7 +111,7 @@ Se un patrocinante y pon tu logo en nuestro README on GitHub con un enlace direc
   - Exportación a Excel
   - Carga de Excel
   - Visualización de Excel
-  - Exportación como zip
+  - Exportación como ZIP
 
 - Tabla
   - Tabla Dinámica
@@ -137,7 +140,7 @@ Se un patrocinante y pon tu logo en nuestro README on GitHub con un enlace direc
 - Página de Guías
 - ECharts (Gráficos)
 - Portapapeles
-- Convertidor de Markdown a html
+- Convertidor de Markdown a HTML
 ```
 
 ## Iniciando
@@ -210,7 +213,7 @@ Navegadores modernos e Internet Explorer 10+.
 
 | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Safari |
 | --------- | --------- | --------- | --------- |
-| IE10, IE11, Edge| últimas 2 versiones| últimas 2 versiones| últimas 2 versiones
+| IE10, IE11, Edge | últimas 2 versiones | últimas 2 versiones | últimas 2 versiones |
 
 ## Licencia
 
diff --git a/README.ja.md b/README.ja.md
index 6857c32a..7e23674b 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -61,7 +61,7 @@
 
 [![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox)
 
- <p align="center">
+<p align="center">
   <img width="900" src="https://wpimg.wallstcn.com/a5894c1b-f6af-456e-82df-1151da0839bf.png">
 </p>
 
@@ -83,7 +83,10 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s
   - 外部IDでログイン
 
 - 複数環境デプロイ
-  - dev sit stage prod
+  - dev
+  - sit
+  - stage
+  - prod
 
 - 共通機能
   - 多言語切替
@@ -206,7 +209,7 @@ Modern browsers and Internet Explorer 10+.
 
 | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Safari |
 | --------- | --------- | --------- | --------- |
-| IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions
+| IE10, IE11, Edge | last 2 versions | last 2 versions | last 2 versions |
 
 ## License
 
diff --git a/README.md b/README.md
index 649e7933..754c5963 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ Understanding and learning this knowledge in advance will greatly help the use o
 
 [![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox)
 
- <p align="center">
+<p align="center">
   <img width="900" src="https://wpimg.wallstcn.com/a5894c1b-f6af-456e-82df-1151da0839bf.png">
 </p>
 
@@ -86,7 +86,10 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s
   - Two-step login
 
 - Multi-environment build
-  - dev sit stage prod
+  - Develop (dev)
+  - sit
+  - Stage Test (stage)
+  - Production (prod)
 
 - Global Features
   - I18n
@@ -210,7 +213,7 @@ Modern browsers and Internet Explorer 10+.
 
 | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Safari |
 | --------- | --------- | --------- | --------- |
-| IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions
+| IE10, IE11, Edge | last 2 versions | last 2 versions | last 2 versions |
 
 ## License
 
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 6ac44ee1..cb6fd073 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -79,7 +79,7 @@
 
 [![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox)
 
- <p align="center">
+<p align="center">
   <img width="900" src="https://wpimg.wallstcn.com/a5894c1b-f6af-456e-82df-1151da0839bf.png">
 </p>
 
@@ -101,7 +101,10 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s
   - 二步登录
 
 - 多环境发布
-  - dev sit stage prod
+  - dev
+  - sit
+  - stage
+  - prod
 
 - 全局功能
   - 国际化多语言
@@ -233,7 +236,7 @@ Modern browsers and Internet Explorer 10+.
 
 | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Safari |
 | --------- | --------- | --------- | --------- |
-| IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions
+| IE10, IE11, Edge | last 2 versions | last 2 versions | last 2 versions |
 
 ## License
 

From 11e6e065d01e6c6ceac0a1eaa50ef826e9e92333 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 Jun 2020 19:38:55 +0800
Subject: [PATCH 23/27] [release] 4.2.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8d54e105..c3556c59 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-element-admin",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features",
   "author": "Pan <panfree23@gmail.com>",
   "license": "MIT",

From 9b7e60c16b5a38a99ce7df9c48a45914113f5eee Mon Sep 17 00:00:00 2001
From: Cat73 <Cat7373@users.noreply.github.com>
Date: Mon, 8 Jun 2020 20:41:46 +0800
Subject: [PATCH 24/27] chore: change node-sass to dart-sass (#3040)

---
 package.json                                      | 2 +-
 src/components/HeaderSearch/index.vue             | 3 ++-
 src/components/Tinymce/components/EditorImage.vue | 2 +-
 src/layout/components/TagsView/ScrollPane.vue     | 2 +-
 src/views/dashboard/admin/components/BoxCard.vue  | 2 +-
 src/views/example/components/ArticleDetail.vue    | 2 +-
 src/views/permission/directive.vue                | 6 +++---
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index c3556c59..d30ed85c 100644
--- a/package.json
+++ b/package.json
@@ -94,9 +94,9 @@
     "husky": "1.3.1",
     "lint-staged": "8.1.5",
     "mockjs": "1.0.1-beta3",
-    "node-sass": "^4.9.0",
     "plop": "2.3.0",
     "runjs": "^4.3.2",
+    "sass": "^1.26.2",
     "sass-loader": "^7.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",
     "serve-static": "^1.13.2",
diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue
index 0543b894..5d61ba37 100644
--- a/src/components/HeaderSearch/index.vue
+++ b/src/components/HeaderSearch/index.vue
@@ -187,7 +187,8 @@ export default {
     border-radius: 0;
     display: inline-block;
     vertical-align: middle;
-    /deep/ .el-input__inner {
+
+    ::v-deep .el-input__inner {
       border-radius: 0;
       border: 0;
       padding-left: 0;
diff --git a/src/components/Tinymce/components/EditorImage.vue b/src/components/Tinymce/components/EditorImage.vue
index d4a98e84..07d48e6c 100644
--- a/src/components/Tinymce/components/EditorImage.vue
+++ b/src/components/Tinymce/components/EditorImage.vue
@@ -104,7 +104,7 @@ export default {
 <style lang="scss" scoped>
 .editor-slide-upload {
   margin-bottom: 20px;
-  /deep/ .el-upload--picture-card {
+  ::v-deep .el-upload--picture-card {
     width: 100%;
   }
 }
diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue
index 34a7e55f..bb753a12 100644
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -82,7 +82,7 @@ export default {
   position: relative;
   overflow: hidden;
   width: 100%;
-  /deep/ {
+  ::v-deep {
     .el-scrollbar__bar {
       bottom: 0px;
     }
diff --git a/src/views/dashboard/admin/components/BoxCard.vue b/src/views/dashboard/admin/components/BoxCard.vue
index dff8462a..4bd0532d 100644
--- a/src/views/dashboard/admin/components/BoxCard.vue
+++ b/src/views/dashboard/admin/components/BoxCard.vue
@@ -101,7 +101,7 @@ export default {
     background-color: #fff;
     margin: auto;
     box-shadow: none!important;
-    /deep/ .pan-info {
+    ::v-deep .pan-info {
       box-shadow: none!important;
     }
   }
diff --git a/src/views/example/components/ArticleDetail.vue b/src/views/example/components/ArticleDetail.vue
index 616fd42b..5d74d1ce 100644
--- a/src/views/example/components/ArticleDetail.vue
+++ b/src/views/example/components/ArticleDetail.vue
@@ -279,7 +279,7 @@ export default {
   }
 }
 
-.article-textarea /deep/ {
+.article-textarea ::v-deep {
   textarea {
     padding-right: 40px;
     resize: none;
diff --git a/src/views/permission/directive.vue b/src/views/permission/directive.vue
index b3ef8c37..02e2ece4 100644
--- a/src/views/permission/directive.vue
+++ b/src/views/permission/directive.vue
@@ -91,7 +91,7 @@ export default {
 
 <style lang="scss" scoped>
 .app-container {
-  /deep/ .permission-alert {
+  ::v-deep .permission-alert {
     width: 320px;
     margin-top: 15px;
     background-color: #f0f9eb;
@@ -100,10 +100,10 @@ export default {
     border-radius: 4px;
     display: inline-block;
   }
-  /deep/ .permission-sourceCode {
+  ::v-deep .permission-sourceCode {
     margin-left: 15px;
   }
-  /deep/ .permission-tag {
+  ::v-deep .permission-tag {
     background-color: #ecf5ff;
   }
 }

From 41c210e8291a78f58cd32801217d08ce0372e9c7 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 Jun 2020 20:39:45 +0800
Subject: [PATCH 25/27] perf: change >>> ::v-deep

---
 src/components/DragSelect/index.vue | 20 ++++++++++++--------
 src/components/JsonEditor/index.vue | 29 +++++++++++++++++------------
 src/components/Tinymce/index.vue    | 15 ++++++++++++---
 3 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/src/components/DragSelect/index.vue b/src/components/DragSelect/index.vue
index 28256a8b..47f42474 100644
--- a/src/components/DragSelect/index.vue
+++ b/src/components/DragSelect/index.vue
@@ -48,14 +48,18 @@ export default {
 }
 </script>
 
-<style scoped>
-.drag-select >>> .sortable-ghost {
-  opacity: .8;
-  color: #fff!important;
-  background: #42b983!important;
-}
+<style lang="scss" scoped>
+.drag-select {
+  ::v-deep {
+    .sortable-ghost {
+      opacity: .8;
+      color: #fff !important;
+      background: #42b983 !important;
+    }
 
-.drag-select >>> .el-tag {
-  cursor: pointer;
+    .el-tag {
+      cursor: pointer;
+    }
+  }
 }
 </style>
diff --git a/src/components/JsonEditor/index.vue b/src/components/JsonEditor/index.vue
index 07b282e4..c05b090c 100644
--- a/src/components/JsonEditor/index.vue
+++ b/src/components/JsonEditor/index.vue
@@ -54,19 +54,24 @@ export default {
 }
 </script>
 
-<style scoped>
-.json-editor{
+<style lang="scss" scoped>
+.json-editor {
   height: 100%;
   position: relative;
-}
-.json-editor >>> .CodeMirror {
-  height: auto;
-  min-height: 300px;
-}
-.json-editor >>> .CodeMirror-scroll{
-  min-height: 300px;
-}
-.json-editor >>> .cm-s-rubyblue span.cm-string {
-  color: #F08047;
+
+  ::v-deep {
+    .CodeMirror {
+      height: auto;
+      min-height: 300px;
+    }
+
+    .CodeMirror-scroll {
+      min-height: 300px;
+    }
+
+    .cm-s-rubyblue span.cm-string {
+      color: #F08047;
+    }
+  }
 }
 </style>
diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
index 8fb5cc8d..bde7af50 100644
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -220,28 +220,37 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .tinymce-container {
   position: relative;
   line-height: normal;
 }
-.tinymce-container>>>.mce-fullscreen {
-  z-index: 10000;
+
+.tinymce-container {
+  ::v-deep {
+    .mce-fullscreen {
+      z-index: 10000;
+    }
+  }
 }
+
 .tinymce-textarea {
   visibility: hidden;
   z-index: -1;
 }
+
 .editor-custom-btn-container {
   position: absolute;
   right: 4px;
   top: 4px;
   /*z-index: 2005;*/
 }
+
 .fullscreen .editor-custom-btn-container {
   z-index: 10000;
   position: fixed;
 }
+
 .editor-upload-btn {
   display: inline-block;
 }

From 9d0bcf44cf003f1d165a0bdb95cbc650abda4e8b 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 Jun 2020 21:35:01 +0800
Subject: [PATCH 26/27] [release] 4.3.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d30ed85c..94cb788b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-element-admin",
-  "version": "4.2.2",
+  "version": "4.3.0",
   "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features",
   "author": "Pan <panfree23@gmail.com>",
   "license": "MIT",

From 9975a7a938fd20d11c4e8a8009a930aafd832678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Tue, 9 Jun 2020 10:51:27 +0800
Subject: [PATCH 27/27] docs: fix wrong link

---
 src/views/components-demo/tinymce.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/components-demo/tinymce.vue b/src/views/components-demo/tinymce.vue
index 7900a294..544219f5 100644
--- a/src/views/components-demo/tinymce.vue
+++ b/src/views/components-demo/tinymce.vue
@@ -2,7 +2,7 @@
   <div class="components-container">
     <aside>
       {{ $t('components.tinymceTips') }}
-      <a target="_blank" class="link-type" href="https://panjiachen.github.io/vue-element-admin-site/component/rich-editor.html"> {{ $t('components.documentation') }}</a>
+      <a target="_blank" class="link-type" href="https://panjiachen.github.io/vue-element-admin-site/feature/component/rich-editor.html"> {{ $t('components.documentation') }}</a>
     </aside>
     <div>
       <tinymce v-model="content" :height="300" />