[release] 4.2.2

docs: Improve read me files and changes in Spanish. (#3234 )
fix[css]: min btn width (#3164 )
2020-06-08 19:38:55 +08:00 · 2020-06-05 13:32:15 +08:00 · 2020-05-08 11:43:39 +08:00 · 2020-05-05 13:21:51 +08:00 · 2020-05-05 12:55:22 +08:00 · 2020-05-05 11:06:51 +08:00
82 changed files with 512 additions and 1851 deletions
--- a/.env.development
+++ b/.env.development
@@ -3,3 +3,12 @@ ENV = 'development'

 # base api
 VUE_APP_BASE_API = '/dev-api'
+
+# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
+# to control whether the babel-plugin-dynamic-import-node plugin is enabled.
+# It only does one thing by converting all import() to require().
+# This configuration can significantly increase the speed of hot updates,
+# when you have a large number of pages.
+# Detail:  https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/babel-preset-app/index.js
+
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
--- a/README.es.md
+++ b/README.es.md
@@ -72,12 +72,7 @@ Entendiendo y aprendiendo esto pudiera ayudarle con su proyecto.

 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)

-### Akveo
-<a href="https://store.akveo.com/products/vue-java-admin-dashboard-spring?utm_campaign=akveo_store-Vue-Vue_demo%2Fgithub&utm_source=vue_admin&utm_medium=referral&utm_content=github_banner"><img width="500px" src="https://raw.githubusercontent.com/PanJiaChen/vue-element-admin-site/master/docs/.vuepress/public/images/vue-java-banner.png" /></a><p>Java backend integration</p>
-
-### Flatlogic
-
-<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>Admin Dashboard Templates made with Vue, React and Angular.</p>
+<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>

 ## Características

--- a/README.ja.md
+++ b/README.ja.md
@@ -69,11 +69,6 @@

 Become a sponsor and get your logo on our README on GitHub with a link to your site. [[Become a sponsor]](https://www.patreon.com/panjiachen)

-### Akveo
-<a href="https://store.akveo.com/products/vue-java-admin-dashboard-spring?utm_campaign=akveo_store-Vue-Vue_demo%2Fgithub&utm_source=vue_admin&utm_medium=referral&utm_content=github_banner"><img width="500px" src="https://raw.githubusercontent.com/PanJiaChen/vue-element-admin-site/master/docs/.vuepress/public/images/vue-java-banner.png" /></a><p>Java backend integration</p>
-
-### Flatlogic
-
 <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>Admin Dashboard Templates made with Vue, React and Angular.</p>

 ## 機能一覧
@@ -148,7 +143,7 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s

 ```bash
 # clone the project
-git clone -b i18n git@github.com:PanJiaChen/vue-element-admin.git
+git clone https://github.com/PanJiaChen/vue-element-admin.git

 # enter the project directory
 cd vue-element-admin
--- a/README.md
+++ b/README.md
@@ -72,11 +72,6 @@ Understanding and learning this knowledge in advance will greatly help the use o

 Become a sponsor and get your logo on our README on GitHub with a link to your site. [[Become a sponsor]](https://www.patreon.com/panjiachen)

-### Akveo
-<a href="https://store.akveo.com/products/vue-java-admin-dashboard-spring?utm_campaign=akveo_store-Vue-Vue_demo%2Fgithub&utm_source=vue_admin&utm_medium=referral&utm_content=github_banner"><img width="500px" src="https://raw.githubusercontent.com/PanJiaChen/vue-element-admin-site/master/docs/.vuepress/public/images/vue-java-banner.png" /></a><p>Java backend integration</p>
-
-### Flatlogic
-
 <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>Admin Dashboard Templates made with Vue, React and Angular.</p>

 ## Features
@@ -152,7 +147,7 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s

 ```bash
 # clone the project
-git clone -b i18n git@github.com:PanJiaChen/vue-element-admin.git
+git clone https://github.com/PanJiaChen/vue-element-admin.git

 # enter the project directory
 cd vue-element-admin
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -87,14 +87,8 @@

 Become a sponsor and get your logo on our README on GitHub with a link to your site. [[Become a sponsor]](https://www.patreon.com/panjiachen)

-### Akveo
-<a href="https://store.akveo.com/products/vue-java-admin-dashboard-spring?utm_campaign=akveo_store-Vue-Vue_demo%2Fgithub&utm_source=vue_admin&utm_medium=referral&utm_content=github_banner"><img width="500px" src="https://raw.githubusercontent.com/PanJiaChen/vue-element-admin-site/master/docs/.vuepress/public/images/vue-java-banner.png" /></a><p>Java 后端整合</p>
-
-### Flatlogic
-
 <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>Admin Dashboard Templates made with Vue, React and Angular.</p>

-
 ## 功能

 ```
@@ -168,7 +162,7 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s

 ```bash
 # 克隆项目
-git clone -b i18n git@github.com:PanJiaChen/vue-element-admin.git
+git clone https://github.com/PanJiaChen/vue-element-admin.git

 # 进入项目目录
 cd vue-element-admin
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,14 +1,5 @@
 module.exports = {
  presets: [
-    // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
-    '@vue/cli-plugin-babel/preset'
-  ],
-  'env': {
-    'development': {
-      // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require().
-      // This plugin can significantly increase the speed of hot updates, when you have a large number of pages.
-      // https://panjiachen.github.io/vue-element-admin-site/guide/advanced/lazy-loading.html
-      'plugins': ['dynamic-import-node']
-    }
-  }
+    '@vue/app'
+  ]
 }
--- a/mock/article.js
+++ b/mock/article.js
@@ -1,4 +1,4 @@
-const Mock = require('mockjs')
+import Mock from 'mockjs'

 const List = []
 const count = 100
@@ -27,7 +27,7 @@ for (let i = 0; i < count; i++) {
  }))
 }

-module.exports = [
+export default [
  {
    url: '/vue-element-admin/article/list',
    type: 'get',
--- a/mock/index.js
+++ b/mock/index.js
@@ -1,10 +1,10 @@
-const Mock = require('mockjs')
-const { param2Obj } = require('./utils')
+import Mock from 'mockjs'
+import { param2Obj } from '../src/utils'

-const user = require('./user')
-const role = require('./role')
-const article = require('./article')
-const search = require('./remote-search')
+import user from './user'
+import role from './role'
+import article from './article'
+import search from './remote-search'

 const mocks = [
  ...user,
@@ -16,7 +16,7 @@ const mocks = [
 // 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).
-function mockXHR() {
+export function mockXHR() {
  // mock patch
  // https://github.com/nuysoft/Mock/issues/300
  Mock.XHR.prototype.proxy_send = Mock.XHR.prototype.send
@@ -54,7 +54,4 @@ function mockXHR() {
  }
 }

-module.exports = {
-  mocks,
-  mockXHR
-}
+export default mocks
--- a/mock/mock-server.js
+++ b/mock/mock-server.js
@@ -8,7 +8,7 @@ const mockDir = path.join(process.cwd(), 'mock')

 function registerRoutes(app) {
  let mockLastIndex
-  const { mocks } = require('./index.js')
+  const { default: mocks } = require('./index.js')
  const mocksForServer = mocks.map(route => {
    return responseFake(route.url, route.type, route.response)
  })
@@ -44,6 +44,9 @@ const responseFake = (url, type, respond) => {
 }

 module.exports = app => {
+  // es6 polyfill
+  require('@babel/register')
+
  // parse app.body
  // https://expressjs.com/en/4x/api.html#req.body
  app.use(bodyParser.json())
--- a/mock/remote-search.js
+++ b/mock/remote-search.js
@@ -1,4 +1,4 @@
-const Mock = require('mockjs')
+import Mock from 'mockjs'

 const NameList = []
 const count = 100
@@ -10,7 +10,7 @@ for (let i = 0; i < count; i++) {
 }
 NameList.push({ name: 'mock-Pan' })

-module.exports = [
+export default [
  // username search
  {
    url: '/vue-element-admin/search/user',
--- a/mock/role/index.js
+++ b/mock/role/index.js
@@ -1,6 +1,6 @@
-const Mock = require('mockjs')
-const { deepClone } = require('../utils')
-const { asyncRoutes, constantRoutes } = require('./routes.js')
+import Mock from 'mockjs'
+import { deepClone } from '../../src/utils/index.js'
+import { asyncRoutes, constantRoutes } from './routes.js'

 const routes = deepClone([...constantRoutes, ...asyncRoutes])

@@ -35,7 +35,7 @@ const roles = [
  }
 ]

-module.exports = [
+export default [
  // mock get all routes form server
  {
    url: '/vue-element-admin/routes',
--- a/mock/role/routes.js
+++ b/mock/role/routes.js
@@ -1,6 +1,6 @@
 // Just a mock data

-const constantRoutes = [
+export const constantRoutes = [
  {
    path: '/redirect',
    component: 'layout/Layout',
@@ -41,7 +41,7 @@ const constantRoutes = [
        path: 'dashboard',
        component: 'views/dashboard/index',
        name: 'Dashboard',
-        meta: { title: 'dashboard', icon: 'dashboard', affix: true }
+        meta: { title: 'Dashboard', icon: 'dashboard', affix: true }
      }
    ]
  },
@@ -53,7 +53,7 @@ const constantRoutes = [
        path: 'index',
        component: 'views/documentation/index',
        name: 'Documentation',
-        meta: { title: 'documentation', icon: 'documentation', affix: true }
+        meta: { title: 'Documentation', icon: 'documentation', affix: true }
      }
    ]
  },
@@ -66,20 +66,20 @@ const constantRoutes = [
        path: 'index',
        component: 'views/guide/index',
        name: 'Guide',
-        meta: { title: 'guide', icon: 'guide', noCache: true }
+        meta: { title: 'Guide', icon: 'guide', noCache: true }
      }
    ]
  }
 ]

-const asyncRoutes = [
+export const asyncRoutes = [
  {
    path: '/permission',
    component: 'layout/Layout',
    redirect: '/permission/index',
    alwaysShow: true,
    meta: {
-      title: 'permission',
+      title: 'Permission',
      icon: 'lock',
      roles: ['admin', 'editor']
    },
@@ -89,7 +89,7 @@ const asyncRoutes = [
        component: 'views/permission/page',
        name: 'PagePermission',
        meta: {
-          title: 'pagePermission',
+          title: 'Page Permission',
          roles: ['admin']
        }
      },
@@ -98,7 +98,7 @@ const asyncRoutes = [
        component: 'views/permission/directive',
        name: 'DirectivePermission',
        meta: {
-          title: 'directivePermission'
+          title: 'Directive Permission'
        }
      },
      {
@@ -106,7 +106,7 @@ const asyncRoutes = [
        component: 'views/permission/role',
        name: 'RolePermission',
        meta: {
-          title: 'rolePermission',
+          title: 'Role Permission',
          roles: ['admin']
        }
      }
@@ -121,7 +121,7 @@ const asyncRoutes = [
        path: 'index',
        component: 'views/icons/index',
        name: 'Icons',
-        meta: { title: 'icons', icon: 'icon', noCache: true }
+        meta: { title: 'Icons', icon: 'icon', noCache: true }
      }
    ]
  },
@@ -132,7 +132,7 @@ const asyncRoutes = [
    redirect: 'noRedirect',
    name: 'ComponentDemo',
    meta: {
-      title: 'components',
+      title: 'Components',
      icon: 'component'
    },
    children: [
@@ -140,49 +140,49 @@ const asyncRoutes = [
        path: 'tinymce',
        component: 'views/components-demo/tinymce',
        name: 'TinymceDemo',
-        meta: { title: 'tinymce' }
+        meta: { title: 'Tinymce' }
      },
      {
        path: 'markdown',
        component: 'views/components-demo/markdown',
        name: 'MarkdownDemo',
-        meta: { title: 'markdown' }
+        meta: { title: 'Markdown' }
      },
      {
        path: 'json-editor',
        component: 'views/components-demo/json-editor',
        name: 'JsonEditorDemo',
-        meta: { title: 'jsonEditor' }
+        meta: { title: 'Json Editor' }
      },
      {
        path: 'split-pane',
        component: 'views/components-demo/split-pane',
        name: 'SplitpaneDemo',
-        meta: { title: 'splitPane' }
+        meta: { title: 'SplitPane' }
      },
      {
        path: 'avatar-upload',
        component: 'views/components-demo/avatar-upload',
        name: 'AvatarUploadDemo',
-        meta: { title: 'avatarUpload' }
+        meta: { title: 'Avatar Upload' }
      },
      {
        path: 'dropzone',
        component: 'views/components-demo/dropzone',
        name: 'DropzoneDemo',
-        meta: { title: 'dropzone' }
+        meta: { title: 'Dropzone' }
      },
      {
        path: 'sticky',
        component: 'views/components-demo/sticky',
        name: 'StickyDemo',
-        meta: { title: 'sticky' }
+        meta: { title: 'Sticky' }
      },
      {
        path: 'count-to',
        component: 'views/components-demo/count-to',
        name: 'CountToDemo',
-        meta: { title: 'countTo' }
+        meta: { title: 'Count To' }
      },
      {
        path: 'mixin',
@@ -194,31 +194,31 @@ const asyncRoutes = [
        path: 'back-to-top',
        component: 'views/components-demo/back-to-top',
        name: 'BackToTopDemo',
-        meta: { title: 'backToTop' }
+        meta: { title: 'Back To Top' }
      },
      {
        path: 'drag-dialog',
        component: 'views/components-demo/drag-dialog',
        name: 'DragDialogDemo',
-        meta: { title: 'dragDialog' }
+        meta: { title: 'Drag Dialog' }
      },
      {
        path: 'drag-select',
        component: 'views/components-demo/drag-select',
        name: 'DragSelectDemo',
-        meta: { title: 'dragSelect' }
+        meta: { title: 'Drag Select' }
      },
      {
        path: 'dnd-list',
        component: 'views/components-demo/dnd-list',
        name: 'DndListDemo',
-        meta: { title: 'dndList' }
+        meta: { title: 'Dnd List' }
      },
      {
        path: 'drag-kanban',
        component: 'views/components-demo/drag-kanban',
        name: 'DragKanbanDemo',
-        meta: { title: 'dragKanban' }
+        meta: { title: 'Drag Kanban' }
      }
    ]
  },
@@ -228,7 +228,7 @@ const asyncRoutes = [
    redirect: 'noRedirect',
    name: 'Charts',
    meta: {
-      title: 'charts',
+      title: 'Charts',
      icon: 'chart'
    },
    children: [
@@ -236,19 +236,19 @@ const asyncRoutes = [
        path: 'keyboard',
        component: 'views/charts/keyboard',
        name: 'KeyboardChart',
-        meta: { title: 'keyboardChart', noCache: true }
+        meta: { title: 'Keyboard Chart', noCache: true }
      },
      {
        path: 'line',
        component: 'views/charts/line',
        name: 'LineChart',
-        meta: { title: 'lineChart', noCache: true }
+        meta: { title: 'Line Chart', noCache: true }
      },
      {
        path: 'mixchart',
        component: 'views/charts/mixChart',
        name: 'MixChart',
-        meta: { title: 'mixChart', noCache: true }
+        meta: { title: 'Mix Chart', noCache: true }
      }
    ]
  },
@@ -258,7 +258,7 @@ const asyncRoutes = [
    redirect: '/nested/menu1/menu1-1',
    name: 'Nested',
    meta: {
-      title: 'nested',
+      title: 'Nested',
      icon: 'nested'
    },
    children: [
@@ -266,33 +266,33 @@ const asyncRoutes = [
        path: 'menu1',
        component: 'views/nested/menu1/index',
        name: 'Menu1',
-        meta: { title: 'menu1' },
+        meta: { title: 'Menu1' },
        redirect: '/nested/menu1/menu1-1',
        children: [
          {
            path: 'menu1-1',
            component: 'views/nested/menu1/menu1-1',
            name: 'Menu1-1',
-            meta: { title: 'menu1-1' }
+            meta: { title: 'Menu1-1' }
          },
          {
            path: 'menu1-2',
            component: 'views/nested/menu1/menu1-2',
            name: 'Menu1-2',
            redirect: '/nested/menu1/menu1-2/menu1-2-1',
-            meta: { title: 'menu1-2' },
+            meta: { title: 'Menu1-2' },
            children: [
              {
                path: 'menu1-2-1',
                component: 'views/nested/menu1/menu1-2/menu1-2-1',
                name: 'Menu1-2-1',
-                meta: { title: 'menu1-2-1' }
+                meta: { title: 'Menu1-2-1' }
              },
              {
                path: 'menu1-2-2',
                component: 'views/nested/menu1/menu1-2/menu1-2-2',
                name: 'Menu1-2-2',
-                meta: { title: 'menu1-2-2' }
+                meta: { title: 'Menu1-2-2' }
              }
            ]
          },
@@ -300,7 +300,7 @@ const asyncRoutes = [
            path: 'menu1-3',
            component: 'views/nested/menu1/menu1-3',
            name: 'Menu1-3',
-            meta: { title: 'menu1-3' }
+            meta: { title: 'Menu1-3' }
          }
        ]
      },
@@ -308,7 +308,7 @@ const asyncRoutes = [
        path: 'menu2',
        name: 'Menu2',
        component: 'views/nested/menu2/index',
-        meta: { title: 'menu2' }
+        meta: { title: 'Menu2' }
      }
    ]
  },
@@ -319,7 +319,7 @@ const asyncRoutes = [
    redirect: '/example/list',
    name: 'Example',
    meta: {
-      title: 'example',
+      title: 'Example',
      icon: 'example'
    },
    children: [
@@ -327,20 +327,20 @@ const asyncRoutes = [
        path: 'create',
        component: 'views/example/create',
        name: 'CreateArticle',
-        meta: { title: 'createArticle', icon: 'edit' }
+        meta: { title: 'Create Article', icon: 'edit' }
      },
      {
        path: 'edit/:id(\\d+)',
        component: 'views/example/edit',
        name: 'EditArticle',
-        meta: { title: 'editArticle', noCache: true },
+        meta: { title: 'Edit Article', noCache: true },
        hidden: true
      },
      {
        path: 'list',
        component: 'views/example/list',
        name: 'ArticleList',
-        meta: { title: 'articleList', icon: 'list' }
+        meta: { title: 'Article List', icon: 'list' }
      }
    ]
  },
@@ -353,7 +353,7 @@ const asyncRoutes = [
        path: 'index',
        component: 'views/tab/index',
        name: 'Tab',
-        meta: { title: 'tab', icon: 'tab' }
+        meta: { title: 'Tab', icon: 'tab' }
      }
    ]
  },
@@ -364,7 +364,7 @@ const asyncRoutes = [
    redirect: 'noRedirect',
    name: 'ErrorPages',
    meta: {
-      title: 'errorPages',
+      title: 'Error Pages',
      icon: '404'
    },
    children: [
@@ -372,13 +372,13 @@ const asyncRoutes = [
        path: '401',
        component: 'views/error-page/401',
        name: 'Page401',
-        meta: { title: 'page401', noCache: true }
+        meta: { title: 'Page 401', noCache: true }
      },
      {
        path: '404',
        component: 'views/error-page/404',
        name: 'Page404',
-        meta: { title: 'page404', noCache: true }
+        meta: { title: 'Page 404', noCache: true }
      }
    ]
  },
@@ -392,7 +392,7 @@ const asyncRoutes = [
        path: 'log',
        component: 'views/error-log/index',
        name: 'ErrorLog',
-        meta: { title: 'errorLog', icon: 'bug' }
+        meta: { title: 'Error Log', icon: 'bug' }
      }
    ]
  },
@@ -403,7 +403,7 @@ const asyncRoutes = [
    redirect: '/excel/export-excel',
    name: 'Excel',
    meta: {
-      title: 'excel',
+      title: 'Excel',
      icon: 'excel'
    },
    children: [
@@ -411,25 +411,25 @@ const asyncRoutes = [
        path: 'export-excel',
        component: 'views/excel/export-excel',
        name: 'ExportExcel',
-        meta: { title: 'exportExcel' }
+        meta: { title: 'Export Excel' }
      },
      {
        path: 'export-selected-excel',
        component: 'views/excel/select-excel',
        name: 'SelectExcel',
-        meta: { title: 'selectExcel' }
+        meta: { title: 'Select Excel' }
      },
      {
        path: 'export-merge-header',
        component: 'views/excel/merge-header',
        name: 'MergeHeader',
-        meta: { title: 'mergeHeader' }
+        meta: { title: 'Merge Header' }
      },
      {
        path: 'upload-excel',
        component: 'views/excel/upload-excel',
        name: 'UploadExcel',
-        meta: { title: 'uploadExcel' }
+        meta: { title: 'Upload Excel' }
      }
    ]
  },
@@ -439,13 +439,13 @@ const asyncRoutes = [
    component: 'layout/Layout',
    redirect: '/zip/download',
    alwaysShow: true,
-    meta: { title: 'zip', icon: 'zip' },
+    meta: { title: 'Zip', icon: 'zip' },
    children: [
      {
        path: 'download',
        component: 'views/zip/index',
        name: 'ExportZip',
-        meta: { title: 'exportZip' }
+        meta: { title: 'Export Zip' }
      }
    ]
  },
@@ -459,7 +459,7 @@ const asyncRoutes = [
        path: 'index',
        component: 'views/pdf/index',
        name: 'PDF',
-        meta: { title: 'pdf', icon: 'pdf' }
+        meta: { title: 'PDF', icon: 'pdf' }
      }
    ]
  },
@@ -478,7 +478,7 @@ const asyncRoutes = [
        path: 'index',
        component: 'views/theme/index',
        name: 'Theme',
-        meta: { title: 'theme', icon: 'theme' }
+        meta: { title: 'Theme', icon: 'theme' }
      }
    ]
  },
@@ -492,7 +492,7 @@ const asyncRoutes = [
        path: 'index',
        component: 'views/clipboard/index',
        name: 'ClipboardDemo',
-        meta: { title: 'clipboardDemo', icon: 'clipboard' }
+        meta: { title: 'Clipboard Demo', icon: 'clipboard' }
      }
    ]
  },
@@ -505,7 +505,7 @@ const asyncRoutes = [
        path: 'index',
        component: 'views/i18n-demo/index',
        name: 'I18n',
-        meta: { title: 'i18n', icon: 'international' }
+        meta: { title: 'I18n', icon: 'international' }
      }
    ]
  },
@@ -516,15 +516,10 @@ const asyncRoutes = [
    children: [
      {
        path: 'https://github.com/PanJiaChen/vue-element-admin',
-        meta: { title: 'externalLink', icon: 'link' }
+        meta: { title: 'External Link', icon: 'link' }
      }
    ]
  },

  { path: '*', redirect: '/404', hidden: true }
 ]
-
-module.exports = {
-  constantRoutes,
-  asyncRoutes
-}
--- a/mock/user.js
+++ b/mock/user.js
@@ -23,7 +23,7 @@ const users = {
  }
 }

-module.exports = [
+export default [
  // user login
  {
    url: '/vue-element-admin/user/login',
--- a/mock/utils.js
+++ b/mock/utils.js
@@ -1,48 +0,0 @@
-/**
- * @param {string} url
- * @returns {Object}
- */
-function param2Obj(url) {
-  const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
-  if (!search) {
-    return {}
-  }
-  const obj = {}
-  const searchArr = search.split('&')
-  searchArr.forEach(v => {
-    const index = v.indexOf('=')
-    if (index !== -1) {
-      const name = v.substring(0, index)
-      const val = v.substring(index + 1, v.length)
-      obj[name] = val
-    }
-  })
-  return obj
-}
-
-/**
- * This is just a simple version of deep copy
- * Has a lot of edge cases bug
- * If you want to use a perfect deep copy, use lodash's _.cloneDeep
- * @param {Object} source
- * @returns {Object}
- */
-function deepClone(source) {
-  if (!source && typeof source !== 'object') {
-    throw new Error('error arguments', 'deepClone')
-  }
-  const targetObj = source.constructor === Array ? [] : {}
-  Object.keys(source).forEach(keys => {
-    if (source[keys] && typeof source[keys] === 'object') {
-      targetObj[keys] = deepClone(source[keys])
-    } else {
-      targetObj[keys] = source[keys]
-    }
-  })
-  return targetObj
-}
-
-module.exports = {
-  param2Obj,
-  deepClone
-}
--- a/package.json
+++ b/package.json
@@ -1,89 +1,30 @@
 {
  "name": "vue-element-admin",
-  "version": "4.3.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",
  "scripts": {
    "dev": "vue-cli-service serve",
-    "lint": "eslint --ext .js,.vue src",
    "build:prod": "vue-cli-service build",
    "build:stage": "vue-cli-service build --mode staging",
    "preview": "node build/index.js --preview",
-    "new": "plop",
-    "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
+    "lint": "eslint --ext .js,.vue src",
    "test:unit": "jest --clearCache && vue-cli-service test:unit",
-    "test:ci": "npm run lint && npm run test:unit"
+    "test:ci": "npm run lint && npm run test:unit",
+    "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
+    "new": "plop"
  },
-  "dependencies": {
-    "axios": "0.18.1",
-    "clipboard": "2.0.4",
-    "codemirror": "5.45.0",
-    "core-js": "3.6.5",
-    "driver.js": "0.9.5",
-    "dropzone": "5.5.1",
-    "echarts": "4.2.1",
-    "element-ui": "2.13.2",
-    "file-saver": "2.0.1",
-    "fuse.js": "3.4.4",
-    "js-cookie": "2.2.0",
-    "jsonlint": "1.6.3",
-    "jszip": "3.2.1",
-    "normalize.css": "7.0.0",
-    "nprogress": "0.2.0",
-    "path-to-regexp": "2.4.0",
-    "pinyin": "2.9.0",
-    "screenfull": "4.2.0",
-    "script-loader": "0.7.2",
-    "sortablejs": "1.8.4",
-    "tui-editor": "1.3.3",
-    "vue": "2.6.10",
-    "vue-count-to": "1.0.13",
-    "vue-i18n": "7.3.2",
-    "vue-router": "3.0.2",
-    "vue-splitpane": "1.0.4",
-    "vuedraggable": "2.20.0",
-    "vuex": "3.1.0",
-    "xlsx": "0.14.1"
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "4.4.4",
-    "@vue/cli-plugin-eslint": "4.4.4",
-    "@vue/cli-plugin-unit-jest": "4.4.4",
-    "@vue/cli-service": "4.4.4",
-    "@vue/test-utils": "1.0.0-beta.29",
-    "autoprefixer": "9.5.1",
-    "babel-eslint": "10.1.0",
-    "babel-jest": "23.6.0",
-    "babel-plugin-dynamic-import-node": "2.3.3",
-    "chalk": "2.4.2",
-    "chokidar": "2.1.5",
-    "connect": "3.6.6",
-    "eslint": "6.7.2",
-    "eslint-plugin-vue": "6.2.2",
-    "html-webpack-plugin": "3.2.0",
-    "husky": "1.3.1",
-    "lint-staged": "8.1.5",
-    "mockjs": "1.0.1-beta3",
-    "plop": "2.3.0",
-    "runjs": "4.3.2",
-    "sass": "1.26.2",
-    "sass-loader": "8.0.2",
-    "script-ext-html-webpack-plugin": "2.1.3",
-    "serve-static": "1.13.2",
-    "svg-sprite-loader": "4.1.3",
-    "svgo": "1.2.0",
-    "vue-template-compiler": "2.6.10"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions"
-  ],
-  "bugs": {
-    "url": "https://github.com/PanJiaChen/vue-element-admin/issues"
-  },
-  "engines": {
-    "node": ">=8.9",
-    "npm": ">= 3.0.0"
+  "lint-staged": {
+    "src/**/*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ]
  },
  "keywords": [
    "vue",
@@ -94,20 +35,79 @@
    "admin-template",
    "management-system"
  ],
-  "license": "MIT",
-  "lint-staged": {
-    "src/**/*.{js,vue}": [
-      "eslint --fix",
-      "git add"
-    ]
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
  "repository": {
    "type": "git",
    "url": "git+https://github.com/PanJiaChen/vue-element-admin.git"
-  }
+  },
+  "bugs": {
+    "url": "https://github.com/PanJiaChen/vue-element-admin/issues"
+  },
+  "dependencies": {
+    "axios": "0.18.1",
+    "clipboard": "2.0.4",
+    "codemirror": "5.45.0",
+    "driver.js": "0.9.5",
+    "dropzone": "5.5.1",
+    "echarts": "4.2.1",
+    "element-ui": "2.13.0",
+    "file-saver": "2.0.1",
+    "fuse.js": "3.4.4",
+    "js-cookie": "2.2.0",
+    "jsonlint": "1.6.3",
+    "jszip": "3.2.1",
+    "normalize.css": "7.0.0",
+    "nprogress": "0.2.0",
+    "path-to-regexp": "2.4.0",
+    "screenfull": "4.2.0",
+    "script-loader": "0.7.2",
+    "showdown": "1.9.0",
+    "sortablejs": "1.8.4",
+    "tui-editor": "1.3.3",
+    "vue": "2.6.10",
+    "vue-count-to": "1.0.13",
+    "vue-router": "3.0.2",
+    "vue-splitpane": "1.0.4",
+    "vuedraggable": "2.20.0",
+    "vuex": "3.1.0",
+    "xlsx": "0.14.1"
+  },
+  "devDependencies": {
+    "@babel/core": "7.0.0",
+    "@babel/register": "7.0.0",
+    "@vue/cli-plugin-babel": "3.5.3",
+    "@vue/cli-plugin-eslint": "^3.9.1",
+    "@vue/cli-plugin-unit-jest": "3.5.3",
+    "@vue/cli-service": "3.5.3",
+    "@vue/test-utils": "1.0.0-beta.29",
+    "autoprefixer": "^9.5.1",
+    "babel-core": "7.0.0-bridge.0",
+    "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",
+    "html-webpack-plugin": "3.2.0",
+    "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-loader": "^7.1.0",
+    "script-ext-html-webpack-plugin": "2.1.3",
+    "serve-static": "^1.13.2",
+    "svg-sprite-loader": "4.1.3",
+    "svgo": "1.2.0",
+    "vue-template-compiler": "2.6.10"
+  },
+  "engines": {
+    "node": ">=8.9",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions"
+  ]
 }
--- a/plop-templates/utils.js
+++ b/plop-templates/utils.js
@@ -1,2 +1,9 @@
-exports.notEmpty = name => v =>
-  !v || v.trim() === '' ? `${name} is required` : true
+exports.notEmpty = name => {
+  return v => {
+    if (!v || v.trim === '') {
+      return `${name} is required`
+    } else {
+      return true
+    }
+  }
+}
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -2,17 +2,14 @@
  <el-breadcrumb class="app-breadcrumb" separator="/">
    <transition-group name="breadcrumb">
      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">
-          {{ generateTitle(item.meta.title) }}
-        </span>
-        <a v-else @click.prevent="handleLink(item)">{{ generateTitle(item.meta.title) }}</a>
+        <span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
+        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
      </el-breadcrumb-item>
    </transition-group>
  </el-breadcrumb>
 </template>

 <script>
-import { generateTitle } from '@/utils/i18n'
 import pathToRegexp from 'path-to-regexp'

 export default {
@@ -34,14 +31,13 @@ export default {
    this.getBreadcrumb()
  },
  methods: {
-    generateTitle,
    getBreadcrumb() {
      // only show routes with meta.title
      let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
      const first = matched[0]

      if (!this.isDashboard(first)) {
-        matched = [{ path: '/dashboard', meta: { title: 'dashboard' }}].concat(matched)
+        matched = [{ path: '/dashboard', meta: { title: 'Dashboard' }}].concat(matched)
      }

      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
--- a/src/components/DragSelect/index.vue
+++ b/src/components/DragSelect/index.vue
@@ -48,18 +48,14 @@ export default {
 }
 </script>

-<style lang="scss" scoped>
-.drag-select {
-  ::v-deep {
-    .sortable-ghost {
-      opacity: .8;
-      color: #fff !important;
-      background: #42b983 !important;
-    }
+<style scoped>
+.drag-select >>> .sortable-ghost {
+  opacity: .8;
+  color: #fff!important;
+  background: #42b983!important;
+}

-    .el-tag {
-      cursor: pointer;
-    }
-  }
+.drag-select >>> .el-tag {
+  cursor: pointer;
 }
 </style>
--- a/src/components/HeaderSearch/index.vue
+++ b/src/components/HeaderSearch/index.vue
@@ -22,7 +22,6 @@
 // make search results more in line with expectations
 import Fuse from 'fuse.js'
 import path from 'path'
-import i18n from '@/lang'

 export default {
  name: 'HeaderSearch',
@@ -38,26 +37,13 @@ export default {
  computed: {
    routes() {
      return this.$store.getters.permission_routes
-    },
-    lang() {
-      return this.$store.getters.language
-    },
-    supportPinyinSearch() {
-      return this.$store.state.settings.supportPinyinSearch
    }
  },
  watch: {
-    lang() {
-      this.searchPool = this.generateRoutes(this.routes)
-    },
    routes() {
      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) {
@@ -72,23 +58,6 @@ 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) {
@@ -119,9 +88,6 @@ export default {
        keys: [{
          name: 'title',
          weight: 0.7
-        }, {
-          name: 'pinyinTitle',
-          weight: 0.3
        }, {
          name: 'path',
          weight: 0.3
@@ -132,23 +98,26 @@ 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]
+          data.title = [...data.title, router.meta.title]
+
          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)
@@ -173,11 +142,13 @@ 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;
@@ -188,7 +159,7 @@ export default {
    display: inline-block;
    vertical-align: middle;

-    ::v-deep .el-input__inner {
+    /deep/ .el-input__inner {
      border-radius: 0;
      border: 0;
      padding-left: 0;
@@ -198,6 +169,7 @@ export default {
      vertical-align: middle;
    }
  }
+
  &.show {
    .header-search-select {
      width: 210px;
--- a/src/components/ImageCropper/index.vue
+++ b/src/components/ImageCropper/index.vue
@@ -248,7 +248,6 @@ export default {
      // 浏览器是否支持该控件
      isSupported,
      // 浏览器是否支持触屏事件
-      // eslint-disable-next-line no-prototype-builtins
      isSupportTouch: document.hasOwnProperty('ontouchstart'),
      // 步骤
      step: 1, // 1选择文件 2剪裁 3上传
--- a/src/components/JsonEditor/index.vue
+++ b/src/components/JsonEditor/index.vue
@@ -54,24 +54,19 @@ export default {
 }
 </script>

-<style lang="scss" scoped>
-.json-editor {
+<style scoped>
+.json-editor{
  height: 100%;
  position: relative;
-
-  ::v-deep {
-    .CodeMirror {
-      height: auto;
-      min-height: 300px;
-    }
-
-    .CodeMirror-scroll {
-      min-height: 300px;
-    }
-
-    .cm-s-rubyblue span.cm-string {
-      color: #F08047;
-    }
-  }
+}
+.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;
 }
 </style>
--- a/src/components/LangSelect/index.vue
+++ b/src/components/LangSelect/index.vue
@@ -1,41 +0,0 @@
-<template>
-  <el-dropdown trigger="click" class="international" @command="handleSetLanguage">
-    <div>
-      <svg-icon class-name="international-icon" icon-class="language" />
-    </div>
-    <el-dropdown-menu slot="dropdown">
-      <el-dropdown-item :disabled="language==='zh'" command="zh">
-        中文
-      </el-dropdown-item>
-      <el-dropdown-item :disabled="language==='en'" command="en">
-        English
-      </el-dropdown-item>
-      <el-dropdown-item :disabled="language==='es'" command="es">
-        Español
-      </el-dropdown-item>
-      <el-dropdown-item :disabled="language==='ja'" command="ja">
-        日本語
-      </el-dropdown-item>
-    </el-dropdown-menu>
-  </el-dropdown>
-</template>
-
-<script>
-export default {
-  computed: {
-    language() {
-      return this.$store.getters.language
-    }
-  },
-  methods: {
-    handleSetLanguage(lang) {
-      this.$i18n.locale = lang
-      this.$store.dispatch('app/setLanguage', lang)
-      this.$message({
-        message: 'Switch Language Success',
-        type: 'success'
-      })
-    }
-  }
-}
-</script>
--- 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;
-  ::v-deep .el-upload--picture-card {
+  /deep/ .el-upload--picture-card {
    width: 100%;
  }
 }
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -71,9 +71,6 @@ export default {
    }
  },
  computed: {
-    language() {
-      return this.languageTypeList[this.$store.getters.language]
-    },
    containerWidth() {
      const width = this.width
      if (/^[\d]+(\.[\d]+)?$/.test(width)) { // matches `100`, `'100'`
@@ -88,10 +85,6 @@ export default {
        this.$nextTick(() =>
          window.tinymce.get(this.tinymceId).setContent(val || ''))
      }
-    },
-    language() {
-      this.destroyTinymce()
-      this.$nextTick(() => this.initTinymce())
    }
  },
  mounted() {
@@ -122,8 +115,8 @@ export default {
    initTinymce() {
      const _this = this
      window.tinymce.init({
-        language: this.language,
        selector: `#${this.tinymceId}`,
+        language: this.languageTypeList['en'],
        height: this.height,
        body_class: 'panel-body ',
        object_resizing: false,
@@ -211,43 +204,37 @@ export default {
      window.tinymce.get(this.tinymceId).getContent()
    },
    imageSuccessCBK(arr) {
-      arr.forEach(v => window.tinymce.get(this.tinymceId).insertContent(`<img class="wscnph" src="${v.url}" >`))
+      const _this = this
+      arr.forEach(v => {
+        window.tinymce.get(_this.tinymceId).insertContent(`<img class="wscnph" src="${v.url}" >`)
+      })
    }
  }
 }
 </script>

-<style lang="scss" scoped>
+<style scoped>
 .tinymce-container {
  position: relative;
  line-height: normal;
 }
-
-.tinymce-container {
-  ::v-deep {
-    .mce-fullscreen {
-      z-index: 10000;
-    }
-  }
+.tinymce-container>>>.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;
 }
--- a/src/directive/permission/permission.js
+++ b/src/directive/permission/permission.js
@@ -1,11 +1,11 @@
 import store from '@/store'

-function checkPermission(el, binding) {
-  const { value } = binding
-  const roles = store.getters && store.getters.roles
+export default {
+  inserted(el, binding, vnode) {
+    const { value } = binding
+    const roles = store.getters && store.getters.roles

-  if (value && value instanceof Array) {
-    if (value.length > 0) {
+    if (value && value instanceof Array && value.length > 0) {
      const permissionRoles = value

      const hasPermission = roles.some(role => {
@@ -15,17 +15,8 @@ function checkPermission(el, binding) {
      if (!hasPermission) {
        el.parentNode && el.parentNode.removeChild(el)
      }
+    } else {
+      throw new Error(`need roles! Like v-permission="['admin','editor']"`)
    }
-  } else {
-    throw new Error(`need roles! Like v-permission="['admin','editor']"`)
-  }
-}
-
-export default {
-  inserted(el, binding) {
-    checkPermission(el, binding)
-  },
-  update(el, binding) {
-    checkPermission(el, binding)
  }
 }
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -1,175 +0,0 @@
-export default {
-  route: {
-    dashboard: 'Dashboard',
-    documentation: 'Documentation',
-    guide: 'Guide',
-    permission: 'Permission',
-    pagePermission: 'Page Permission',
-    rolePermission: 'Role Permission',
-    directivePermission: 'Directive Permission',
-    icons: 'Icons',
-    components: 'Components',
-    tinymce: 'Tinymce',
-    markdown: 'Markdown',
-    jsonEditor: 'JSON Editor',
-    dndList: 'Dnd List',
-    splitPane: 'SplitPane',
-    avatarUpload: 'Avatar Upload',
-    dropzone: 'Dropzone',
-    sticky: 'Sticky',
-    countTo: 'Count To',
-    componentMixin: 'Mixin',
-    backToTop: 'Back To Top',
-    dragDialog: 'Drag Dialog',
-    dragSelect: 'Drag Select',
-    dragKanban: 'Drag Kanban',
-    charts: 'Charts',
-    keyboardChart: 'Keyboard Chart',
-    lineChart: 'Line Chart',
-    mixChart: 'Mix Chart',
-    example: 'Example',
-    nested: 'Nested Routes',
-    menu1: 'Menu 1',
-    'menu1-1': 'Menu 1-1',
-    'menu1-2': 'Menu 1-2',
-    'menu1-2-1': 'Menu 1-2-1',
-    'menu1-2-2': 'Menu 1-2-2',
-    'menu1-3': 'Menu 1-3',
-    menu2: 'Menu 2',
-    Table: 'Table',
-    dynamicTable: 'Dynamic Table',
-    dragTable: 'Drag Table',
-    inlineEditTable: 'Inline Edit',
-    complexTable: 'Complex Table',
-    tab: 'Tab',
-    form: 'Form',
-    createArticle: 'Create Article',
-    editArticle: 'Edit Article',
-    articleList: 'Article List',
-    errorPages: 'Error Pages',
-    page401: '401',
-    page404: '404',
-    errorLog: 'Error Log',
-    excel: 'Excel',
-    exportExcel: 'Export Excel',
-    selectExcel: 'Export Selected',
-    mergeHeader: 'Merge Header',
-    uploadExcel: 'Upload Excel',
-    zip: 'Zip',
-    pdf: 'PDF',
-    exportZip: 'Export Zip',
-    theme: 'Theme',
-    clipboardDemo: 'Clipboard',
-    i18n: 'I18n',
-    externalLink: 'External Link',
-    profile: 'Profile'
-  },
-  navbar: {
-    dashboard: 'Dashboard',
-    github: 'Github',
-    logOut: 'Log Out',
-    profile: 'Profile',
-    theme: 'Theme',
-    size: 'Global Size'
-  },
-  login: {
-    title: 'Login Form',
-    logIn: 'Login',
-    username: 'Username',
-    password: 'Password',
-    any: 'any',
-    thirdparty: 'Or connect with',
-    thirdpartyTips: 'Can not be simulated on local, so please combine you own business simulation! ! !'
-  },
-  documentation: {
-    documentation: 'Documentation',
-    github: 'Github Repository'
-  },
-  permission: {
-    addRole: 'New Role',
-    editPermission: 'Edit',
-    roles: 'Your roles',
-    switchRoles: 'Switch roles',
-    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'
-  },
-  guide: {
-    description: 'The guide page is useful for some people who entered the project for the first time. You can briefly introduce the features of the project. Demo is based on ',
-    button: 'Show Guide'
-  },
-  components: {
-    documentation: 'Documentation',
-    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',
-    backToTopTips2: 'You can customize the style of the button, show / hide, height of appearance, height of the return. If you need a text prompt, you can use element-ui el-tooltip elements externally',
-    imageUploadTips: 'Since I was using only the vue@1 version, and it is not compatible with mockjs at the moment, I modified it myself, and if you are going to use it, it is better to use official version.'
-  },
-  table: {
-    dynamicTips1: 'Fixed header, sorted by header order',
-    dynamicTips2: 'Not fixed header, sorted by click order',
-    dragTips1: 'The default order',
-    dragTips2: 'The after dragging order',
-    title: 'Title',
-    importance: 'Imp',
-    type: 'Type',
-    remark: 'Remark',
-    search: 'Search',
-    add: 'Add',
-    export: 'Export',
-    reviewer: 'reviewer',
-    id: 'ID',
-    date: 'Date',
-    author: 'Author',
-    readings: 'Readings',
-    status: 'Status',
-    actions: 'Actions',
-    edit: 'Edit',
-    publish: 'Publish',
-    draft: 'Draft',
-    delete: 'Delete',
-    cancel: 'Cancel',
-    confirm: 'Confirm'
-  },
-  example: {
-    warning: 'Creating and editing pages cannot be cached by keep-alive because keep-alive include does not currently support caching based on routes, so it is currently cached based on component name. If you want to achieve a similar caching effect, you can use a browser caching scheme such as localStorage. Or do not use keep-alive include to cache all pages directly. See details'
-  },
-  errorLog: {
-    tips: 'Please click the bug icon in the upper right corner',
-    description: 'Now the management system are basically the form of the spa, it enhances the user experience, but it also increases the possibility of page problems, a small negligence may lead to the entire page deadlock. Fortunately Vue provides a way to catch handling exceptions, where you can handle errors or report exceptions.',
-    documentation: 'Document introduction'
-  },
-  excel: {
-    export: 'Export',
-    selectedExport: 'Export Selected Items',
-    placeholder: 'Please enter the file name (default excel-list)'
-  },
-  zip: {
-    export: 'Export',
-    placeholder: 'Please enter the file name (default file)'
-  },
-  pdf: {
-    tips: 'Here we use window.print() to implement the feature of downloading PDF.'
-  },
-  theme: {
-    change: 'Change Theme',
-    documentation: 'Theme documentation',
-    tips: 'Tips: It is different from the theme-pick on the navbar is two different skinning methods, each with different application scenarios. Refer to the documentation for details.'
-  },
-  tagsView: {
-    refresh: 'Refresh',
-    close: 'Close',
-    closeOthers: 'Close Others',
-    closeAll: 'Close All'
-  },
-  settings: {
-    title: 'Page style setting',
-    theme: 'Theme Color',
-    tagsView: 'Open Tags-View',
-    fixedHeader: 'Fixed Header',
-    sidebarLogo: 'Sidebar Logo'
-  }
-}
--- a/src/lang/es.js
+++ b/src/lang/es.js
@@ -1,175 +0,0 @@
-export default {
-  route: {
-    dashboard: 'Panel de control',
-    documentation: 'Documentación',
-    guide: 'Guía',
-    permission: 'Permisos',
-    rolePermission: 'Permisos de rol',
-    pagePermission: 'Permisos de la página',
-    directivePermission: 'Permisos de la directiva',
-    icons: 'Iconos',
-    components: 'Componentes',
-    tinymce: 'Tinymce',
-    markdown: 'Markdown',
-    jsonEditor: 'Editor JSON',
-    dndList: 'Lista Dnd',
-    splitPane: 'Panel dividido',
-    avatarUpload: 'Subir avatar',
-    dropzone: 'Subir ficheros',
-    sticky: 'Sticky',
-    countTo: 'CountTo',
-    componentMixin: 'Mixin',
-    backToTop: 'Ir arriba',
-    dragDialog: 'Drag Dialog',
-    dragSelect: 'Drag Select',
-    dragKanban: 'Drag Kanban',
-    charts: 'Gráficos',
-    keyboardChart: 'Keyboard Chart',
-    lineChart: 'Gráfico de líneas',
-    mixChart: 'Mix Chart',
-    example: 'Ejemplo',
-    nested: 'Rutas anidadass',
-    menu1: 'Menu 1',
-    'menu1-1': 'Menu 1-1',
-    'menu1-2': 'Menu 1-2',
-    'menu1-2-1': 'Menu 1-2-1',
-    'menu1-2-2': 'Menu 1-2-2',
-    'menu1-3': 'Menu 1-3',
-    menu2: 'Menu 2',
-    Table: 'Tabla',
-    dynamicTable: 'Tabla dinámica',
-    dragTable: 'Arrastrar tabla',
-    inlineEditTable: 'Editor',
-    complexTable: 'Complex Table',
-    tab: 'Pestaña',
-    form: 'Formulario',
-    createArticle: 'Crear artículo',
-    editArticle: 'Editar artículo',
-    articleList: 'Listado de artículos',
-    errorPages: 'Páginas de error',
-    page401: '401',
-    page404: '404',
-    errorLog: 'Registro de errores',
-    excel: 'Excel',
-    exportExcel: 'Exportar a Excel',
-    selectExcel: 'Export seleccionado',
-    mergeHeader: 'Merge Header',
-    uploadExcel: 'Subir Excel',
-    zip: 'Zip',
-    pdf: 'PDF',
-    exportZip: 'Exportar a Zip',
-    theme: 'Tema',
-    clipboardDemo: 'Clipboard',
-    i18n: 'I18n',
-    externalLink: 'Enlace externo',
-    profile: 'Profile'
-  },
-  navbar: {
-    logOut: 'Salir',
-    dashboard: 'Panel de control',
-    github: 'Github',
-    theme: 'Tema',
-    size: 'Tamaño global',
-    profile: 'Profile'
-  },
-  login: {
-    title: 'Formulario de acceso',
-    logIn: 'Acceso',
-    username: 'Usuario',
-    password: 'Contraseña',
-    any: 'nada',
-    thirdparty: 'Conectar con',
-    thirdpartyTips: 'No se puede simular en local, así que combine su propia simulación de negocios. ! !'
-  },
-  documentation: {
-    documentation: 'Documentación',
-    github: 'Repositorio Github'
-  },
-  permission: {
-    addRole: 'Nuevo rol',
-    editPermission: 'Permiso de edición',
-    roles: 'Tus permisos',
-    switchRoles: 'Cambiar permisos',
-    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.',
-    delete: 'Borrar',
-    confirm: 'Confirmar',
-    cancel: 'Cancelar'
-  },
-  guide: {
-    description: 'The guide page is useful for some people who entered the project for the first time. You can briefly introduce the features of the project. Demo is based on ',
-    button: 'Ver guía'
-  },
-  components: {
-    documentation: 'Documentación',
-    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.',
-    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',
-    backToTopTips2: 'You can customize the style of the button, show / hide, height of appearance, height of the return. If you need a text prompt, you can use element-ui el-tooltip elements externally',
-    imageUploadTips: 'Since I was using only the vue@1 version, and it is not compatible with mockjs at the moment, I modified it myself, and if you are going to use it, it is better to use official version.'
-  },
-  table: {
-    dynamicTips1: 'Fixed header, sorted by header order',
-    dynamicTips2: 'Not fixed header, sorted by click order',
-    dragTips1: 'Orden por defecto',
-    dragTips2: 'The after dragging order',
-    title: 'Título',
-    importance: 'Importancia',
-    type: 'Tipo',
-    remark: 'Remark',
-    search: 'Buscar',
-    add: 'Añadir',
-    export: 'Exportar',
-    reviewer: 'reviewer',
-    id: 'ID',
-    date: 'Fecha',
-    author: 'Autor',
-    readings: 'Lector',
-    status: 'Estado',
-    actions: 'Acciones',
-    edit: 'Editar',
-    publish: 'Publicar',
-    draft: 'Draft',
-    delete: 'Eliminar',
-    cancel: 'Cancelar',
-    confirm: 'Confirmar'
-  },
-  example: {
-    warning: 'Creating and editing pages cannot be cached by keep-alive because keep-alive include does not currently support caching based on routes, so it is currently cached based on component name. If you want to achieve a similar caching effect, you can use a browser caching scheme such as localStorage. Or do not use keep-alive include to cache all pages directly. See details'
-  },
-  errorLog: {
-    tips: 'Please click the bug icon in the upper right corner',
-    description: 'Now the management system are basically the form of the spa, it enhances the user experience, but it also increases the possibility of page problems, a small negligence may lead to the entire page deadlock. Fortunately Vue provides a way to catch handling exceptions, where you can handle errors or report exceptions.',
-    documentation: 'Documento de introducción'
-  },
-  excel: {
-    export: 'Exportar',
-    selectedExport: 'Exportar seleccionados',
-    placeholder: 'Por favor escribe un nombre de fichero'
-  },
-  zip: {
-    export: 'Exportar',
-    placeholder: 'Por favor escribe un nombre de fichero'
-  },
-  pdf: {
-    tips: 'Here we use window.print() to implement the feature of downloading pdf.'
-  },
-  theme: {
-    change: 'Cambiar tema',
-    documentation: 'Documentación del tema',
-    tips: 'Tips: It is different from the theme-pick on the navbar is two different skinning methods, each with different application scenarios. Refer to the documentation for details.'
-  },
-  tagsView: {
-    refresh: 'Actualizar',
-    close: 'Cerrar',
-    closeOthers: 'Cerrar otros',
-    closeAll: 'Cerrar todos'
-  },
-  settings: {
-    title: 'Page style setting',
-    theme: 'Theme Color',
-    tagsView: 'Open Tags-View',
-    fixedHeader: 'Fixed Header',
-    sidebarLogo: 'Sidebar Logo'
-  }
-}
--- a/src/lang/index.js
+++ b/src/lang/index.js
@@ -1,55 +0,0 @@
-import Vue from 'vue'
-import VueI18n from 'vue-i18n'
-import Cookies from 'js-cookie'
-import elementEnLocale from 'element-ui/lib/locale/lang/en' // element-ui lang
-import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN'// element-ui lang
-import elementEsLocale from 'element-ui/lib/locale/lang/es'// element-ui lang
-import elementJaLocale from 'element-ui/lib/locale/lang/ja'// element-ui lang
-import enLocale from './en'
-import zhLocale from './zh'
-import esLocale from './es'
-import jaLocale from './ja'
-
-Vue.use(VueI18n)
-
-const messages = {
-  en: {
-    ...enLocale,
-    ...elementEnLocale
-  },
-  zh: {
-    ...zhLocale,
-    ...elementZhLocale
-  },
-  es: {
-    ...esLocale,
-    ...elementEsLocale
-  },
-  ja: {
-    ...jaLocale,
-    ...elementJaLocale
-  }
-}
-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: getLanguage(),
-  // set locale messages
-  messages
-})
-
-export default i18n
--- a/src/lang/ja.js
+++ b/src/lang/ja.js
@@ -1,175 +0,0 @@
-export default {
-  route: {
-    dashboard: 'トップ',
-    documentation: 'ドキュメント',
-    guide: 'ガイド',
-    permission: '権限',
-    rolePermission: '権限ロール',
-    pagePermission: 'ページ権限',
-    directivePermission: 'ディレクティブ権限',
-    icons: 'アイコン',
-    components: 'コンポーネント',
-    tinymce: 'TinyMCE',
-    markdown: 'Markdown',
-    jsonEditor: 'JSON Editor',
-    dndList: 'Drag-And-Drop',
-    splitPane: 'パネル',
-    avatarUpload: 'アバターアップロード',
-    dropzone: 'Dropzone',
-    sticky: 'Sticky',
-    countTo: 'Count To',
-    componentMixin: 'コンポーネントMixin',
-    backToTop: 'BackToTop',
-    dragDialog: 'Drag Dialog',
-    dragSelect: 'Drag Select',
-    dragKanban: 'Drag 看板',
-    charts: 'チャート',
-    keyboardChart: 'Keyboardチャート',
-    lineChart: 'Lineチャート',
-    mixChart: 'Mixチャート',
-    example: 'Example',
-    nested: 'Nested Routes',
-    menu1: 'メニュー１',
-    '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: 'Drag Table',
-    inlineEditTable: 'Inline Edit Table',
-    complexTable: 'Complex Table',
-    tab: 'Tab',
-    form: 'フォーム',
-    createArticle: '投稿作成',
-    editArticle: '投稿編集',
-    articleList: '投稿リスト',
-    errorPages: 'エラーページ',
-    page401: '401',
-    page404: '404',
-    errorLog: 'エラーログ',
-    excel: 'Excel',
-    exportExcel: '一括エクスポート',
-    selectExcel: '複数選択エクスポート',
-    mergeHeader: 'ヘッダーマージ',
-    uploadExcel: 'アップロード',
-    zip: 'Zip',
-    pdf: 'PDF',
-    exportZip: 'Export Zip',
-    theme: 'テーマ変更',
-    clipboardDemo: 'Clipboard',
-    i18n: '多言語',
-    externalLink: '外部リンク',
-    profile: 'プロフィール'
-  },
-  navbar: {
-    dashboard: 'トップ',
-    github: 'GitHub',
-    logOut: 'ログアウト',
-    profile: 'プロフィール',
-    theme: 'テーマ変更',
-    size: '画面サイズ'
-  },
-  login: {
-    title: 'ユーザログイン',
-    logIn: 'ログイン',
-    username: 'ユーザ名',
-    password: 'パスワード',
-    any: 'password',
-    thirdparty: '外部IDでログイン',
-    thirdpartyTips: 'ローカル環境ではログインできません。実装が必要です。'
-  },
-  documentation: {
-    documentation: 'ドキュメント',
-    github: 'Github Link'
-  },
-  permission: {
-    addRole: 'ロール追加',
-    editPermission: 'ロール変更',
-    roles: 'ロール',
-    switchRoles: 'ロール切替',
-    tips: 'v-permissionは使えない時があります。例えば: Element-UI の el-tab、 el-table-column 及び他の dom。v-ifを使う必要があります。',
-    delete: '削除',
-    confirm: '確認',
-    cancel: 'キャンセル'
-  },
-  guide: {
-    description: 'ガイドは各機能の説明です。',
-    button: 'ガイドを見る'
-  },
-  components: {
-    documentation: 'ドキュメント',
-    tinymceTips: 'tinymceは管理画面に重要な機能ですが、その同時に落とし穴がありあす。tinymceを使う道のりが大変でした。Tinymceを使う時に各自のプロジェクト状況で判断が必要です。ドキュメントはこちら',
-    dropzoneTips: 'Third partyのパッケージを使わず、独自の実装しています。詳細は @/components/Dropzone',
-    stickyTips: 'ページの指定位置へスクロールした場合、表示されます。',
-    backToTopTips1: 'トップへスクロールが表示されます。',
-    backToTopTips2: 'ボタンのスタイルはカスタマイズできます。例えば、show/hide、height、position。 またはElementのel-tooltipを使って、ツールチップを実装できます。',
-    imageUploadTips: 'mockjsは使えないため、カスタマイズしています。公式の最新バージョンを使ってください。'
-  },
-  table: {
-    dynamicTips1: '先頭は固定、最後に追加',
-    dynamicTips2: '戦後に追加せず、指定列に追加',
-    dragTips1: 'デフォルト順番',
-    dragTips2: 'Drag後の順番',
-    title: 'タイトル',
-    importance: '重要',
-    type: 'タイプ',
-    remark: '評価',
-    search: '検索',
-    add: '追加',
-    export: 'エクスポート',
-    reviewer: 'レビュアー',
-    id: '番号',
-    date: '日時',
-    author: '作成者',
-    readings: '閲覧数',
-    status: 'ステータス',
-    actions: '操作',
-    edit: '編集',
-    publish: '公開',
-    draft: '下書き',
-    delete: 'キャンセル',
-    cancel: 'キャンセル',
-    confirm: '確認'
-  },
-  example: {
-    warning: '新規作成と編集画面は keep-alive を使えないです。keep-alive の include はrouteのキャッシュは使えないです。そのため、component name を使ってキャッシュさせるようにします。このようなキャッシュ機能を作りたい場合，localStorageを使う手があります。もしくは keep-alive の includeを使って、全ページキャッシュする方法はあります。'
-  },
-  errorLog: {
-    tips: '右上のbugアイコンをクリックしてください。',
-    description: '管理画面はspaを使う場合が多い、ユーザ体現向上はできますが、想定外エラーが発生する場合があります。Vueはそのエラーハンドリング機能を提供し、エラーレポートができます。',
-    documentation: 'ドキュメント'
-  },
-  excel: {
-    export: 'エクスポート',
-    selectedExport: 'エクスポート対象を選択してください。',
-    placeholder: 'ファイル名を入力してください。'
-  },
-  zip: {
-    export: 'エクスポート',
-    placeholder: 'ファイル名を入力してください。'
-  },
-  pdf: {
-    tips: 'window.print() を使ってPDFダウンロードしています。'
-  },
-  theme: {
-    change: 'テーマ切替',
-    documentation: 'ドキュメント',
-    tips: 'Tips: テーマの切り替え方法はnavbarのtheme-pickと異なります、使い方はドキュメントを確認してください。'
-  },
-  tagsView: {
-    refresh: '更新',
-    close: '閉じる',
-    closeOthers: 'その他閉じる',
-    closeAll: 'すべて閉じる'
-  },
-  settings: {
-    title: 'システムテーマ',
-    theme: 'テーマ色',
-    tagsView: 'Tags-View 開く',
-    fixedHeader: 'Fixed Header',
-    sidebarLogo: 'Sidebar Logo'
-  }
-}
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -1,175 +0,0 @@
-export default {
-  route: {
-    dashboard: '首页',
-    documentation: '文档',
-    guide: '引导页',
-    permission: '权限测试页',
-    rolePermission: '角色权限',
-    pagePermission: '页面权限',
-    directivePermission: '指令权限',
-    icons: '图标',
-    components: '组件',
-    tinymce: '富文本编辑器',
-    markdown: 'Markdown',
-    jsonEditor: 'JSON 编辑器',
-    dndList: '列表拖拽',
-    splitPane: 'Splitpane',
-    avatarUpload: '头像上传',
-    dropzone: 'Dropzone',
-    sticky: 'Sticky',
-    countTo: 'Count To',
-    componentMixin: '小组件',
-    backToTop: '返回顶部',
-    dragDialog: '拖拽 Dialog',
-    dragSelect: '拖拽 Select',
-    dragKanban: '可拖拽看板',
-    charts: '图表',
-    keyboardChart: '键盘图表',
-    lineChart: '折线图',
-    mixChart: '混合图表',
-    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',
-    Table: 'Table',
-    dynamicTable: '动态 Table',
-    dragTable: '拖拽 Table',
-    inlineEditTable: 'Table 内编辑',
-    complexTable: '综合 Table',
-    tab: 'Tab',
-    form: '表单',
-    createArticle: '创建文章',
-    editArticle: '编辑文章',
-    articleList: '文章列表',
-    errorPages: '错误页面',
-    page401: '401',
-    page404: '404',
-    errorLog: '错误日志',
-    excel: 'Excel',
-    exportExcel: '导出 Excel',
-    selectExcel: '导出 已选择项',
-    mergeHeader: '导出 多级表头',
-    uploadExcel: '上传 Excel',
-    zip: 'Zip',
-    pdf: 'PDF',
-    exportZip: 'Export Zip',
-    theme: '换肤',
-    clipboardDemo: 'Clipboard',
-    i18n: '国际化',
-    externalLink: '外链',
-    profile: '个人中心'
-  },
-  navbar: {
-    dashboard: '首页',
-    github: '项目地址',
-    logOut: '退出登录',
-    profile: '个人中心',
-    theme: '换肤',
-    size: '布局大小'
-  },
-  login: {
-    title: '系统登录',
-    logIn: '登录',
-    username: '账号',
-    password: '密码',
-    any: '随便填',
-    thirdparty: '第三方登录',
-    thirdpartyTips: '本地不能模拟，请结合自己业务进行模拟！！！'
-  },
-  documentation: {
-    documentation: '文档',
-    github: 'Github 地址'
-  },
-  permission: {
-    addRole: '新增角色',
-    editPermission: '编辑权限',
-    roles: '你的权限',
-    switchRoles: '切换权限',
-    tips: '在某些情况下，不适合使用 v-permission。例如：Element-UI 的 el-tab 或 el-table-column 以及其它动态渲染 dom 的场景。你只能通过手动设置 v-if 来实现。',
-    delete: '删除',
-    confirm: '确定',
-    cancel: '取消'
-  },
-  guide: {
-    description: '引导页对于一些第一次进入项目的人很有用，你可以简单介绍下项目的功能。本 Demo 是基于',
-    button: '打开引导'
-  },
-  components: {
-    documentation: '文档',
-    tinymceTips: '富文本是管理后台一个核心的功能，但同时又是一个有很多坑的地方。在选择富文本的过程中我也走了不少的弯路，市面上常见的富文本都基本用过了，最终权衡了一下选择了Tinymce。更详细的富文本比较和介绍见',
-    dropzoneTips: '由于我司业务有特殊需求，而且要传七牛 所以没用第三方，选择了自己封装。代码非常的简单，具体代码你可以在这里看到 @/components/Dropzone',
-    stickyTips: '当页面滚动到预设的位置会吸附在顶部',
-    backToTopTips1: '页面滚动到指定位置会在右下角出现返回顶部按钮',
-    backToTopTips2: '可自定义按钮的样式、show/hide、出现的高度、返回的位置 如需文字提示，可在外部使用Element的el-tooltip元素',
-    imageUploadTips: '由于我在使用时它只有vue@1版本，而且和mockjs不兼容，所以自己改造了一下，如果大家要使用的话，优先还是使用官方版本。'
-  },
-  table: {
-    dynamicTips1: '固定表头, 按照表头顺序排序',
-    dynamicTips2: '不固定表头, 按照点击顺序排序',
-    dragTips1: '默认顺序',
-    dragTips2: '拖拽后顺序',
-    title: '标题',
-    importance: '重要性',
-    type: '类型',
-    remark: '点评',
-    search: '搜索',
-    add: '添加',
-    export: '导出',
-    reviewer: '审核人',
-    id: '序号',
-    date: '时间',
-    author: '作者',
-    readings: '阅读数',
-    status: '状态',
-    actions: '操作',
-    edit: '编辑',
-    publish: '发布',
-    draft: '草稿',
-    delete: '删除',
-    cancel: '取 消',
-    confirm: '确 定'
-  },
-  example: {
-    warning: '创建和编辑页面是不能被 keep-alive 缓存的，因为keep-alive 的 include 目前不支持根据路由来缓存，所以目前都是基于 component name 来进行缓存的。如果你想类似的实现缓存效果，可以使用 localStorage 等浏览器缓存方案。或者不要使用 keep-alive 的 include，直接缓存所有页面。详情见'
-  },
-  errorLog: {
-    tips: '请点击右上角bug小图标',
-    description: '现在的管理后台基本都是spa的形式了，它增强了用户体验，但同时也会增加页面出问题的可能性，可能一个小小的疏忽就导致整个页面的死锁。好在 Vue 官网提供了一个方法来捕获处理异常，你可以在其中进行错误处理或者异常上报。',
-    documentation: '文档介绍'
-  },
-  excel: {
-    export: '导出',
-    selectedExport: '导出已选择项',
-    placeholder: '请输入文件名(默认excel-list)'
-  },
-  zip: {
-    export: '导出',
-    placeholder: '请输入文件名(默认file)'
-  },
-  pdf: {
-    tips: '这里使用   window.print() 来实现下载pdf的功能'
-  },
-  theme: {
-    change: '换肤',
-    documentation: '换肤文档',
-    tips: 'Tips: 它区别于 navbar 上的 theme-pick, 是两种不同的换肤方法，各自有不同的应用场景，具体请参考文档。'
-  },
-  tagsView: {
-    refresh: '刷新',
-    close: '关闭',
-    closeOthers: '关闭其它',
-    closeAll: '关闭所有'
-  },
-  settings: {
-    title: '系统布局配置',
-    theme: '主题色',
-    tagsView: '开启 Tags-View',
-    fixedHeader: '固定 Header',
-    sidebarLogo: '侧边栏 Logo'
-  }
-}
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -12,12 +12,10 @@

        <screenfull id="screenfull" class="right-menu-item hover-effect" />

-        <el-tooltip :content="$t('navbar.size')" effect="dark" placement="bottom">
+        <el-tooltip content="Global Size" effect="dark" placement="bottom">
          <size-select id="size-select" class="right-menu-item hover-effect" />
        </el-tooltip>

-        <lang-select class="right-menu-item hover-effect" />
-
      </template>

      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
@@ -27,25 +25,19 @@
        </div>
        <el-dropdown-menu slot="dropdown">
          <router-link to="/profile/index">
-            <el-dropdown-item>
-              {{ $t('navbar.profile') }}
-            </el-dropdown-item>
+            <el-dropdown-item>Profile</el-dropdown-item>
          </router-link>
          <router-link to="/">
-            <el-dropdown-item>
-              {{ $t('navbar.dashboard') }}
-            </el-dropdown-item>
+            <el-dropdown-item>Dashboard</el-dropdown-item>
          </router-link>
          <a target="_blank" href="https://github.com/PanJiaChen/vue-element-admin/">
-            <el-dropdown-item>
-              {{ $t('navbar.github') }}
-            </el-dropdown-item>
+            <el-dropdown-item>Github</el-dropdown-item>
          </a>
          <a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">
            <el-dropdown-item>Docs</el-dropdown-item>
          </a>
          <el-dropdown-item divided @click.native="logout">
-            <span style="display:block;">{{ $t('navbar.logOut') }}</span>
+            <span style="display:block;">Log Out</span>
          </el-dropdown-item>
        </el-dropdown-menu>
      </el-dropdown>
@@ -60,7 +52,6 @@ import Hamburger from '@/components/Hamburger'
 import ErrorLog from '@/components/ErrorLog'
 import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
-import LangSelect from '@/components/LangSelect'
 import Search from '@/components/HeaderSearch'

 export default {
@@ -70,7 +61,6 @@ export default {
    ErrorLog,
    Screenfull,
    SizeSelect,
-    LangSelect,
    Search
  },
  computed: {
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -1,39 +1,27 @@
 <template>
  <div class="drawer-container">
    <div>
-      <h3 class="drawer-title">{{ $t('settings.title') }}</h3>
+      <h3 class="drawer-title">Page style setting</h3>

      <div class="drawer-item">
-        <span>{{ $t('settings.theme') }}</span>
+        <span>Theme Color</span>
        <theme-picker style="float: right;height: 26px;margin: -3px 8px 0 0;" @change="themeChange" />
      </div>

      <div class="drawer-item">
-        <span>{{ $t('settings.tagsView') }}</span>
+        <span>Open Tags-View</span>
        <el-switch v-model="tagsView" class="drawer-switch" />
      </div>

      <div class="drawer-item">
-        <span>{{ $t('settings.fixedHeader') }}</span>
+        <span>Fixed Header</span>
        <el-switch v-model="fixedHeader" class="drawer-switch" />
      </div>

      <div class="drawer-item">
-        <span>{{ $t('settings.sidebarLogo') }}</span>
+        <span>Sidebar Logo</span>
        <el-switch v-model="sidebarLogo" class="drawer-switch" />
      </div>
-      <a v-if="isShowJob" href="https://panjiachen.github.io/vue-element-admin-site/zh/job/" target="_blank" class="job-link">
-        <el-alert
-          title="部门目前非常缺人！有兴趣的可以点击了解详情。坐标: 字节跳动"
-          type="success"
-          :closable="false"
-        />
-      </a>
-
-      <div v-if="lang === 'zh'" class="drawer-item">
-        <span>菜单支持拼音搜索</span>
-        <el-switch v-model="supportPinyinSearch" class="drawer-switch" />
-      </div>

    </div>
  </div>
@@ -48,9 +36,6 @@ export default {
    return {}
  },
  computed: {
-    isShowJob() {
-      return this.$store.getters.language === 'zh'
-    },
    fixedHeader: {
      get() {
        return this.$store.state.settings.fixedHeader
@@ -83,20 +68,6 @@ 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: {
@@ -133,13 +104,5 @@ export default {
  .drawer-switch {
    float: right
  }
-
-  .job-link{
-    display: block;
-    position: absolute;
-    width: 100%;
-    left: 0;
-    bottom: 0;
-  }
 }
 </style>
--- a/src/layout/components/Sidebar/Item.vue
+++ b/src/layout/components/Sidebar/Item.vue
@@ -17,11 +17,7 @@ export default {
    const vnodes = []

    if (icon) {
-      if (icon.includes('el-icon')) {
-        vnodes.push(<i class={[icon, 'sub-el-icon']} />)
-      } else {
-        vnodes.push(<svg-icon icon-class={icon}/>)
-      }
+      vnodes.push(<svg-icon icon-class={icon}/>)
    }

    if (title) {
@@ -31,11 +27,3 @@ export default {
  }
 }
 </script>
-
-<style scoped>
-.sub-el-icon {
-  color: currentColor;
-  width: 1em;
-  height: 1em;
-}
-</style>
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -3,14 +3,14 @@
    <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow">
      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
        <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
-          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="generateTitle(onlyOneChild.meta.title)" />
+          <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
        </el-menu-item>
      </app-link>
    </template>

    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
      <template slot="title">
-        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="generateTitle(item.meta.title)" />
+        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
      </template>
      <sidebar-item
        v-for="child in item.children"
@@ -26,7 +26,6 @@

 <script>
 import path from 'path'
-import { generateTitle } from '@/utils/i18n'
 import { isExternal } from '@/utils/validate'
 import Item from './Item'
 import AppLink from './Link'
@@ -90,9 +89,7 @@ export default {
        return this.basePath
      }
      return path.resolve(this.basePath, routePath)
-    },
-
-    generateTitle
+    }
  }
 }
 </script>
--- 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%;
-  ::v-deep {
+  /deep/ {
    .el-scrollbar__bar {
      bottom: 0px;
    }
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -12,22 +12,21 @@
        @click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
        @contextmenu.prevent.native="openMenu(tag,$event)"
      >
-        {{ generateTitle(tag.title) }}
+        {{ tag.title }}
        <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
      </router-link>
    </scroll-pane>
    <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
-      <li @click="refreshSelectedTag(selectedTag)">{{ $t('tagsView.refresh') }}</li>
-      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">{{ $t('tagsView.close') }}</li>
-      <li @click="closeOthersTags">{{ $t('tagsView.closeOthers') }}</li>
-      <li @click="closeAllTags(selectedTag)">{{ $t('tagsView.closeAll') }}</li>
+      <li @click="refreshSelectedTag(selectedTag)">Refresh</li>
+      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">Close</li>
+      <li @click="closeOthersTags">Close Others</li>
+      <li @click="closeAllTags(selectedTag)">Close All</li>
    </ul>
  </div>
 </template>

 <script>
 import ScrollPane from './ScrollPane'
-import { generateTitle } from '@/utils/i18n'
 import path from 'path'

 export default {
@@ -67,7 +66,6 @@ export default {
    this.addTags()
  },
  methods: {
-    generateTitle, // generateTitle by vue-i18n
    isActive(route) {
      return route.path === this.$route.path
    },
--- a/src/main.js
+++ b/src/main.js
@@ -6,6 +6,7 @@ import 'normalize.css/normalize.css' // a modern alternative to CSS resets

 import Element from 'element-ui'
 import './styles/element-variables.scss'
+import enLang from 'element-ui/lib/locale/lang/en'// 如果使用中文语言包请默认支持，无需额外引入，请删除该依赖

 import '@/styles/index.scss' // global css

@@ -13,7 +14,6 @@ import App from './App'
 import store from './store'
 import router from './router'

-import i18n from './lang' // internationalization
 import './icons' // icon
 import './permission' // permission control
 import './utils/error-log' // error log
@@ -35,7 +35,7 @@ if (process.env.NODE_ENV === 'production') {

 Vue.use(Element, {
  size: Cookies.get('size') || 'medium', // set element-ui default size
-  i18n: (key, value) => i18n.t(key, value)
+  locale: enLang // 如果使用中文，无需设置，请删除
 })

 // register global utility filters
@@ -49,6 +49,5 @@ new Vue({
  el: '#app',
  router,
  store,
-  i18n,
  render: h => h(App)
 })
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -25,7 +25,7 @@ import nestedRouter from './modules/nested'
 * 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'/'el-icon-x' the icon show in the sidebar
+    icon: 'svg-name'             the icon show in the sidebar
    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)
@@ -79,7 +79,7 @@ export const constantRoutes = [
        path: 'dashboard',
        component: () => import('@/views/dashboard/index'),
        name: 'Dashboard',
-        meta: { title: 'dashboard', icon: 'dashboard', affix: true }
+        meta: { title: 'Dashboard', icon: 'dashboard', affix: true }
      }
    ]
  },
@@ -91,7 +91,7 @@ export const constantRoutes = [
        path: 'index',
        component: () => import('@/views/documentation/index'),
        name: 'Documentation',
-        meta: { title: 'documentation', icon: 'documentation', affix: true }
+        meta: { title: 'Documentation', icon: 'documentation', affix: true }
      }
    ]
  },
@@ -104,7 +104,7 @@ export const constantRoutes = [
        path: 'index',
        component: () => import('@/views/guide/index'),
        name: 'Guide',
-        meta: { title: 'guide', icon: 'guide', noCache: true }
+        meta: { title: 'Guide', icon: 'guide', noCache: true }
      }
    ]
  },
@@ -118,7 +118,7 @@ export const constantRoutes = [
        path: 'index',
        component: () => import('@/views/profile/index'),
        name: 'Profile',
-        meta: { title: 'profile', icon: 'user', noCache: true }
+        meta: { title: 'Profile', icon: 'user', noCache: true }
      }
    ]
  }
@@ -136,7 +136,7 @@ export const asyncRoutes = [
    alwaysShow: true, // will always show the root menu
    name: 'Permission',
    meta: {
-      title: 'permission',
+      title: 'Permission',
      icon: 'lock',
      roles: ['admin', 'editor'] // you can set roles in root nav
    },
@@ -146,7 +146,7 @@ export const asyncRoutes = [
        component: () => import('@/views/permission/page'),
        name: 'PagePermission',
        meta: {
-          title: 'pagePermission',
+          title: 'Page Permission',
          roles: ['admin'] // or you can only set roles in sub nav
        }
      },
@@ -155,7 +155,7 @@ export const asyncRoutes = [
        component: () => import('@/views/permission/directive'),
        name: 'DirectivePermission',
        meta: {
-          title: 'directivePermission'
+          title: 'Directive Permission'
          // if do not set roles, means: this page does not require permission
        }
      },
@@ -164,7 +164,7 @@ export const asyncRoutes = [
        component: () => import('@/views/permission/role'),
        name: 'RolePermission',
        meta: {
-          title: 'rolePermission',
+          title: 'Role Permission',
          roles: ['admin']
        }
      }
@@ -179,7 +179,7 @@ export const asyncRoutes = [
        path: 'index',
        component: () => import('@/views/icons/index'),
        name: 'Icons',
-        meta: { title: 'icons', icon: 'icon', noCache: true }
+        meta: { title: 'Icons', icon: 'icon', noCache: true }
      }
    ]
  },
@@ -196,28 +196,28 @@ export const asyncRoutes = [
    redirect: '/example/list',
    name: 'Example',
    meta: {
-      title: 'example',
-      icon: 'el-icon-s-help'
+      title: 'Example',
+      icon: 'example'
    },
    children: [
      {
        path: 'create',
        component: () => import('@/views/example/create'),
        name: 'CreateArticle',
-        meta: { title: 'createArticle', icon: 'edit' }
+        meta: { title: 'Create Article', icon: 'edit' }
      },
      {
        path: 'edit/:id(\\d+)',
        component: () => import('@/views/example/edit'),
        name: 'EditArticle',
-        meta: { title: 'editArticle', noCache: true, activeMenu: '/example/list' },
+        meta: { title: 'Edit Article', noCache: true, activeMenu: '/example/list' },
        hidden: true
      },
      {
        path: 'list',
        component: () => import('@/views/example/list'),
        name: 'ArticleList',
-        meta: { title: 'articleList', icon: 'list' }
+        meta: { title: 'Article List', icon: 'list' }
      }
    ]
  },
@@ -230,7 +230,7 @@ export const asyncRoutes = [
        path: 'index',
        component: () => import('@/views/tab/index'),
        name: 'Tab',
-        meta: { title: 'tab', icon: 'tab' }
+        meta: { title: 'Tab', icon: 'tab' }
      }
    ]
  },
@@ -241,7 +241,7 @@ export const asyncRoutes = [
    redirect: 'noRedirect',
    name: 'ErrorPages',
    meta: {
-      title: 'errorPages',
+      title: 'Error Pages',
      icon: '404'
    },
    children: [
@@ -249,13 +249,13 @@ export const asyncRoutes = [
        path: '401',
        component: () => import('@/views/error-page/401'),
        name: 'Page401',
-        meta: { title: 'page401', noCache: true }
+        meta: { title: '401', noCache: true }
      },
      {
        path: '404',
        component: () => import('@/views/error-page/404'),
        name: 'Page404',
-        meta: { title: 'page404', noCache: true }
+        meta: { title: '404', noCache: true }
      }
    ]
  },
@@ -268,7 +268,7 @@ export const asyncRoutes = [
        path: 'log',
        component: () => import('@/views/error-log/index'),
        name: 'ErrorLog',
-        meta: { title: 'errorLog', icon: 'bug' }
+        meta: { title: 'Error Log', icon: 'bug' }
      }
    ]
  },
@@ -279,7 +279,7 @@ export const asyncRoutes = [
    redirect: '/excel/export-excel',
    name: 'Excel',
    meta: {
-      title: 'excel',
+      title: 'Excel',
      icon: 'excel'
    },
    children: [
@@ -287,25 +287,25 @@ export const asyncRoutes = [
        path: 'export-excel',
        component: () => import('@/views/excel/export-excel'),
        name: 'ExportExcel',
-        meta: { title: 'exportExcel' }
+        meta: { title: 'Export Excel' }
      },
      {
        path: 'export-selected-excel',
        component: () => import('@/views/excel/select-excel'),
        name: 'SelectExcel',
-        meta: { title: 'selectExcel' }
+        meta: { title: 'Export Selected' }
      },
      {
        path: 'export-merge-header',
        component: () => import('@/views/excel/merge-header'),
        name: 'MergeHeader',
-        meta: { title: 'mergeHeader' }
+        meta: { title: 'Merge Header' }
      },
      {
        path: 'upload-excel',
        component: () => import('@/views/excel/upload-excel'),
        name: 'UploadExcel',
-        meta: { title: 'uploadExcel' }
+        meta: { title: 'Upload Excel' }
      }
    ]
  },
@@ -316,13 +316,13 @@ export const asyncRoutes = [
    redirect: '/zip/download',
    alwaysShow: true,
    name: 'Zip',
-    meta: { title: 'zip', icon: 'zip' },
+    meta: { title: 'Zip', icon: 'zip' },
    children: [
      {
        path: 'download',
        component: () => import('@/views/zip/index'),
        name: 'ExportZip',
-        meta: { title: 'exportZip' }
+        meta: { title: 'Export Zip' }
      }
    ]
  },
@@ -336,7 +336,7 @@ export const asyncRoutes = [
        path: 'index',
        component: () => import('@/views/pdf/index'),
        name: 'PDF',
-        meta: { title: 'pdf', icon: 'pdf' }
+        meta: { title: 'PDF', icon: 'pdf' }
      }
    ]
  },
@@ -354,7 +354,7 @@ export const asyncRoutes = [
        path: 'index',
        component: () => import('@/views/theme/index'),
        name: 'Theme',
-        meta: { title: 'theme', icon: 'theme' }
+        meta: { title: 'Theme', icon: 'theme' }
      }
    ]
  },
@@ -367,20 +367,7 @@ export const asyncRoutes = [
        path: 'index',
        component: () => import('@/views/clipboard/index'),
        name: 'ClipboardDemo',
-        meta: { title: 'clipboardDemo', icon: 'clipboard' }
-      }
-    ]
-  },
-
-  {
-    path: '/i18n',
-    component: Layout,
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/i18n-demo/index'),
-        name: 'I18n',
-        meta: { title: 'i18n', icon: 'international' }
+        meta: { title: 'Clipboard', icon: 'clipboard' }
      }
    ]
  },
@@ -391,7 +378,7 @@ export const asyncRoutes = [
    children: [
      {
        path: 'https://github.com/PanJiaChen/vue-element-admin',
-        meta: { title: 'externalLink', icon: 'link' }
+        meta: { title: 'External Link', icon: 'link' }
      }
    ]
  },
--- a/src/router/modules/charts.js
+++ b/src/router/modules/charts.js
@@ -8,7 +8,7 @@ const chartsRouter = {
  redirect: 'noRedirect',
  name: 'Charts',
  meta: {
-    title: 'charts',
+    title: 'Charts',
    icon: 'chart'
  },
  children: [
@@ -16,19 +16,19 @@ const chartsRouter = {
      path: 'keyboard',
      component: () => import('@/views/charts/keyboard'),
      name: 'KeyboardChart',
-      meta: { title: 'keyboardChart', noCache: true }
+      meta: { title: 'Keyboard Chart', noCache: true }
    },
    {
      path: 'line',
      component: () => import('@/views/charts/line'),
      name: 'LineChart',
-      meta: { title: 'lineChart', noCache: true }
+      meta: { title: 'Line Chart', noCache: true }
    },
    {
      path: 'mix-chart',
      component: () => import('@/views/charts/mix-chart'),
      name: 'MixChart',
-      meta: { title: 'mixChart', noCache: true }
+      meta: { title: 'Mix Chart', noCache: true }
    }
  ]
 }
--- a/src/router/modules/components.js
+++ b/src/router/modules/components.js
@@ -8,7 +8,7 @@ const componentsRouter = {
  redirect: 'noRedirect',
  name: 'ComponentDemo',
  meta: {
-    title: 'components',
+    title: 'Components',
    icon: 'component'
  },
  children: [
@@ -16,85 +16,85 @@ const componentsRouter = {
      path: 'tinymce',
      component: () => import('@/views/components-demo/tinymce'),
      name: 'TinymceDemo',
-      meta: { title: 'tinymce' }
+      meta: { title: 'Tinymce' }
    },
    {
      path: 'markdown',
      component: () => import('@/views/components-demo/markdown'),
      name: 'MarkdownDemo',
-      meta: { title: 'markdown' }
+      meta: { title: 'Markdown' }
    },
    {
      path: 'json-editor',
      component: () => import('@/views/components-demo/json-editor'),
      name: 'JsonEditorDemo',
-      meta: { title: 'jsonEditor' }
+      meta: { title: 'JSON Editor' }
    },
    {
      path: 'split-pane',
      component: () => import('@/views/components-demo/split-pane'),
      name: 'SplitpaneDemo',
-      meta: { title: 'splitPane' }
+      meta: { title: 'SplitPane' }
    },
    {
      path: 'avatar-upload',
      component: () => import('@/views/components-demo/avatar-upload'),
      name: 'AvatarUploadDemo',
-      meta: { title: 'avatarUpload' }
+      meta: { title: 'Upload' }
    },
    {
      path: 'dropzone',
      component: () => import('@/views/components-demo/dropzone'),
      name: 'DropzoneDemo',
-      meta: { title: 'dropzone' }
+      meta: { title: 'Dropzone' }
    },
    {
      path: 'sticky',
      component: () => import('@/views/components-demo/sticky'),
      name: 'StickyDemo',
-      meta: { title: 'sticky' }
+      meta: { title: 'Sticky' }
    },
    {
      path: 'count-to',
      component: () => import('@/views/components-demo/count-to'),
      name: 'CountToDemo',
-      meta: { title: 'countTo' }
+      meta: { title: 'Count To' }
    },
    {
      path: 'mixin',
      component: () => import('@/views/components-demo/mixin'),
      name: 'ComponentMixinDemo',
-      meta: { title: 'componentMixin' }
+      meta: { title: 'Component Mixin' }
    },
    {
      path: 'back-to-top',
      component: () => import('@/views/components-demo/back-to-top'),
      name: 'BackToTopDemo',
-      meta: { title: 'backToTop' }
+      meta: { title: 'Back To Top' }
    },
    {
      path: 'drag-dialog',
      component: () => import('@/views/components-demo/drag-dialog'),
      name: 'DragDialogDemo',
-      meta: { title: 'dragDialog' }
+      meta: { title: 'Drag Dialog' }
    },
    {
      path: 'drag-select',
      component: () => import('@/views/components-demo/drag-select'),
      name: 'DragSelectDemo',
-      meta: { title: 'dragSelect' }
+      meta: { title: 'Drag Select' }
    },
    {
      path: 'dnd-list',
      component: () => import('@/views/components-demo/dnd-list'),
      name: 'DndListDemo',
-      meta: { title: 'dndList' }
+      meta: { title: 'Dnd List' }
    },
    {
      path: 'drag-kanban',
      component: () => import('@/views/components-demo/drag-kanban'),
      name: 'DragKanbanDemo',
-      meta: { title: 'dragKanban' }
+      meta: { title: 'Drag Kanban' }
    }
  ]
 }
--- a/src/router/modules/nested.js
+++ b/src/router/modules/nested.js
@@ -8,7 +8,7 @@ const nestedRouter = {
  redirect: '/nested/menu1/menu1-1',
  name: 'Nested',
  meta: {
-    title: 'nested',
+    title: 'Nested Routes',
    icon: 'nested'
  },
  children: [
@@ -16,33 +16,33 @@ const nestedRouter = {
      path: 'menu1',
      component: () => import('@/views/nested/menu1/index'), // Parent router-view
      name: 'Menu1',
-      meta: { title: 'menu1' },
+      meta: { title: 'Menu 1' },
      redirect: '/nested/menu1/menu1-1',
      children: [
        {
          path: 'menu1-1',
          component: () => import('@/views/nested/menu1/menu1-1'),
          name: 'Menu1-1',
-          meta: { title: 'menu1-1' }
+          meta: { title: 'Menu 1-1' }
        },
        {
          path: 'menu1-2',
          component: () => import('@/views/nested/menu1/menu1-2'),
          name: 'Menu1-2',
          redirect: '/nested/menu1/menu1-2/menu1-2-1',
-          meta: { title: 'menu1-2' },
+          meta: { title: 'Menu 1-2' },
          children: [
            {
              path: 'menu1-2-1',
              component: () => import('@/views/nested/menu1/menu1-2/menu1-2-1'),
              name: 'Menu1-2-1',
-              meta: { title: 'menu1-2-1' }
+              meta: { title: 'Menu 1-2-1' }
            },
            {
              path: 'menu1-2-2',
              component: () => import('@/views/nested/menu1/menu1-2/menu1-2-2'),
              name: 'Menu1-2-2',
-              meta: { title: 'menu1-2-2' }
+              meta: { title: 'Menu 1-2-2' }
            }
          ]
        },
@@ -50,7 +50,7 @@ const nestedRouter = {
          path: 'menu1-3',
          component: () => import('@/views/nested/menu1/menu1-3'),
          name: 'Menu1-3',
-          meta: { title: 'menu1-3' }
+          meta: { title: 'Menu 1-3' }
        }
      ]
    },
@@ -58,7 +58,7 @@ const nestedRouter = {
      path: 'menu2',
      name: 'Menu2',
      component: () => import('@/views/nested/menu2/index'),
-      meta: { title: 'menu2' }
+      meta: { title: 'Menu 2' }
    }
  ]
 }
--- a/src/router/modules/table.js
+++ b/src/router/modules/table.js
@@ -16,25 +16,25 @@ const tableRouter = {
      path: 'dynamic-table',
      component: () => import('@/views/table/dynamic-table/index'),
      name: 'DynamicTable',
-      meta: { title: 'dynamicTable' }
+      meta: { title: 'Dynamic Table' }
    },
    {
      path: 'drag-table',
      component: () => import('@/views/table/drag-table'),
      name: 'DragTable',
-      meta: { title: 'dragTable' }
+      meta: { title: 'Drag Table' }
    },
    {
      path: 'inline-edit-table',
      component: () => import('@/views/table/inline-edit-table'),
      name: 'InlineEditTable',
-      meta: { title: 'inlineEditTable' }
+      meta: { title: 'Inline Edit' }
    },
    {
      path: 'complex-table',
      component: () => import('@/views/table/complex-table'),
      name: 'ComplexTable',
-      meta: { title: 'complexTable' }
+      meta: { title: 'Complex Table' }
    }
  ]
 }
--- a/src/settings.js
+++ b/src/settings.js
@@ -25,13 +25,6 @@ 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.
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,6 +1,5 @@
 const getters = {
  sidebar: state => state.app.sidebar,
-  language: state => state.app.language,
  size: state => state.app.size,
  device: state => state.app.device,
  visitedViews: state => state.tagsView.visitedViews,
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,5 +1,4 @@
 import Cookies from 'js-cookie'
-import { getLanguage } from '@/lang/index'

 const state = {
  sidebar: {
@@ -7,7 +6,6 @@ const state = {
    withoutAnimation: false
  },
  device: 'desktop',
-  language: getLanguage(),
  size: Cookies.get('size') || 'medium'
 }

@@ -29,10 +27,6 @@ const mutations = {
  TOGGLE_DEVICE: (state, device) => {
    state.device = device
  },
-  SET_LANGUAGE: (state, language) => {
-    state.language = language
-    Cookies.set('language', language)
-  },
  SET_SIZE: (state, size) => {
    state.size = size
    Cookies.set('size', size)
@@ -49,9 +43,6 @@ const actions = {
  toggleDevice({ commit }, device) {
    commit('TOGGLE_DEVICE', device)
  },
-  setLanguage({ commit }, language) {
-    commit('SET_LANGUAGE', language)
-  },
  setSize({ commit }, size) {
    commit('SET_SIZE', size)
  }
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -1,20 +1,18 @@
 import variables from '@/styles/element-variables.scss'
 import defaultSettings from '@/settings'

-const { showSettings, tagsView, fixedHeader, sidebarLogo, supportPinyinSearch } = defaultSettings
+const { showSettings, tagsView, fixedHeader, sidebarLogo } = defaultSettings

 const state = {
  theme: variables.theme,
-  showSettings,
-  tagsView,
-  fixedHeader,
-  sidebarLogo,
-  supportPinyinSearch
+  showSettings: showSettings,
+  tagsView: tagsView,
+  fixedHeader: fixedHeader,
+  sidebarLogo: sidebarLogo
 }

 const mutations = {
  CHANGE_SETTING: (state, { key, value }) => {
-    // eslint-disable-next-line no-prototype-builtins
    if (state.hasOwnProperty(key)) {
      state[key] = value
    }
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -103,23 +103,28 @@ const actions = {
  },

  // dynamically modify permissions
-  async changeRoles({ commit, dispatch }, role) {
-    const token = role + '-token'
+  changeRoles({ commit, dispatch }, role) {
+    return new Promise(async resolve => {
+      const token = role + '-token'

-    commit('SET_TOKEN', token)
-    setToken(token)
+      commit('SET_TOKEN', token)
+      setToken(token)

-    const { roles } = await dispatch('getInfo')
+      const { roles } = await dispatch('getInfo')

-    resetRouter()
+      resetRouter()

-    // generate accessible routes map based on roles
-    const accessRoutes = await dispatch('permission/generateRoutes', roles, { root: true })
-    // dynamically add accessible routes
-    router.addRoutes(accessRoutes)
+      // generate accessible routes map based on roles
+      const accessRoutes = await dispatch('permission/generateRoutes', roles, { root: true })

-    // reset visited views and cached views
-    dispatch('tagsView/delAllViews', null, { root: true })
+      // dynamically add accessible routes
+      router.addRoutes(accessRoutes)
+
+      // reset visited views and cached views
+      dispatch('tagsView/delAllViews', null, { root: true })
+
+      resolve()
+    })
  }
 }

--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -57,11 +57,6 @@
      margin-right: 16px;
    }

-    .sub-el-icon {
-      margin-right: 12px;
-      margin-left: -2px;
-    }
-
    .el-menu {
      border: none;
      height: 100%;
@@ -110,10 +105,6 @@
        .svg-icon {
          margin-left: 20px;
        }
-
-        .sub-el-icon {
-          margin-left: 19px;
-        }
      }
    }

@@ -127,10 +118,6 @@
          margin-left: 20px;
        }

-        .sub-el-icon {
-          margin-left: 19px;
-        }
-
        .el-submenu__icon-arrow {
          display: none;
        }
@@ -191,10 +178,6 @@
    .svg-icon {
      margin-right: 16px;
    }
-    .sub-el-icon {
-      margin-right: 12px;
-      margin-left: -2px;
-    }
  }

  .nest-menu .el-submenu>.el-submenu__title,
--- a/src/utils/get-page-title.js
+++ b/src/utils/get-page-title.js
@@ -1,13 +1,10 @@
 import defaultSettings from '@/settings'
-import i18n from '@/lang'

 const title = defaultSettings.title || 'Vue Element Admin'

-export default function getPageTitle(key) {
-  const hasKey = i18n.te(`route.${key}`)
-  if (hasKey) {
-    const pageName = i18n.t(`route.${key}`)
-    return `${pageName} - ${title}`
+export default function getPageTitle(pageTitle) {
+  if (pageTitle) {
+    return `${pageTitle} - ${title}`
  }
  return `${title}`
 }
--- a/src/utils/i18n.js
+++ b/src/utils/i18n.js
@@ -1,12 +0,0 @@
-// translate router.meta.title, be used in breadcrumb sidebar tagsview
-export function generateTitle(title) {
-  const hasKey = this.$te('route.' + title)
-
-  if (hasKey) {
-    // $t :this method from vue-i18n, inject in @/lang/index.js
-    const translatedTitle = this.$t('route.' + title)
-
-    return translatedTitle
-  }
-  return title
-}
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -162,21 +162,19 @@ export function param(json) {
 * @returns {Object}
 */
 export function param2Obj(url) {
-  const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
+  const search = url.split('?')[1]
  if (!search) {
    return {}
  }
-  const obj = {}
-  const searchArr = search.split('&')
-  searchArr.forEach(v => {
-    const index = v.indexOf('=')
-    if (index !== -1) {
-      const name = v.substring(0, index)
-      const val = v.substring(index + 1, v.length)
-      obj[name] = val
-    }
-  })
-  return obj
+  return JSON.parse(
+    '{"' +
+      decodeURIComponent(search)
+        .replace(/"/g, '\\"')
+        .replace(/&/g, '","')
+        .replace(/=/g, '":"')
+        .replace(/\+/g, ' ') +
+      '"}'
+  )
 }

 /**
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -13,7 +13,11 @@ export default function checkPermission(value) {
    const hasPermission = roles.some(role => {
      return permissionRoles.includes(role)
    })
-    return hasPermission
+
+    if (!hasPermission) {
+      return false
+    }
+    return true
  } else {
    console.error(`need roles! Like v-permission="['admin','editor']"`)
    return false
--- a/src/views/components-demo/avatar-upload.vue
+++ b/src/views/components-demo/avatar-upload.vue
@@ -2,7 +2,7 @@
  <div class="components-container">
    <aside>This is based on
      <a class="link-type" href="//github.com/dai-siki/vue-image-crop-upload"> vue-image-crop-upload</a>.
-      {{ $t('components.imageUploadTips') }}
+      Since I was using only the vue@1 version, and it is not compatible with mockjs at the moment, I modified it myself, and if you are going to use it, it is better to use official version.
    </aside>

    <pan-thumb :image="image" />
--- a/src/views/components-demo/back-to-top.vue
+++ b/src/views/components-demo/back-to-top.vue
@@ -1,7 +1,11 @@
 <template>
  <div class="components-container">
-    <aside>{{ $t('components.backToTopTips1') }}</aside>
-    <aside>{{ $t('components.backToTopTips2') }}</aside>
+    <aside>
+      When the page is scrolled to the specified position, the Back to Top button appears in the lower right corner
+    </aside>
+    <aside>
+      You can customize the style of the button, show / hide, height of appearance, height of the return. If you need a text prompt, you can use element-ui el-tooltip elements externally
+    </aside>
    <div class="placeholder-container">
      <div>placeholder</div>
      <div>placeholder</div>
--- a/src/views/components-demo/dropzone.vue
+++ b/src/views/components-demo/dropzone.vue
@@ -2,7 +2,7 @@
  <div class="components-container">
    <aside>
      Based on <a class="link-type" href="https://github.com/rowanwins/vue-dropzone"> dropzone </a>.
-      {{ $t('components.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.
    </aside>
    <div class="editor-container">
      <dropzone id="myVueDropzone" url="https://httpbin.org/post" @dropzone-removedFile="dropzoneR" @dropzone-success="dropzoneS" />
--- a/src/views/components-demo/markdown.vue
+++ b/src/views/components-demo/markdown.vue
@@ -79,7 +79,7 @@ export default {
  },
  computed: {
    language() {
-      return this.languageTypeList[this.$store.getters.language]
+      return this.languageTypeList['en']
    }
  },
  methods: {
--- a/src/views/components-demo/sticky.vue
+++ b/src/views/components-demo/sticky.vue
@@ -37,7 +37,9 @@
    </sticky>

    <div class="components-container">
-      <aside>Sticky header, {{ $t('components.stickyTips') }}</aside>
+      <aside>
+        Sticky header, When the page is scrolled to the preset position will be sticky on the top.
+      </aside>
      <div>placeholder</div>
      <div>placeholder</div>
      <div>placeholder</div>
--- a/src/views/components-demo/tinymce.vue
+++ b/src/views/components-demo/tinymce.vue
@@ -1,8 +1,8 @@
 <template>
  <div class="components-container">
    <aside>
-      {{ $t('components.tinymceTips') }}
-      <a target="_blank" class="link-type" href="https://panjiachen.github.io/vue-element-admin-site/feature/component/rich-editor.html"> {{ $t('components.documentation') }}</a>
+      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.
+      <a target="_blank" class="link-type" href="https://panjiachen.github.io/vue-element-admin-site/component/rich-editor.html">Documentation</a>
    </aside>
    <div>
      <tinymce v-model="content" :height="300" />
--- a/src/views/dashboard/admin/components/BoxCard.vue
+++ b/src/views/dashboard/admin/components/BoxCard.vue
@@ -15,7 +15,7 @@
        <el-progress :percentage="18" />
      </div>
      <div class="progress-item">
-        <span>CSS</span>
+        <span>Css</span>
        <el-progress :percentage="12" />
      </div>
      <div class="progress-item">
@@ -101,7 +101,7 @@ export default {
    background-color: #fff;
    margin: auto;
    box-shadow: none!important;
-    ::v-deep .pan-info {
+    /deep/ .pan-info {
      box-shadow: none!important;
    }
  }
--- a/src/views/documentation/index.vue
+++ b/src/views/documentation/index.vue
@@ -1,6 +1,5 @@
 <template>
  <div class="app-container documentation-container">
-    <a class="document-btn" target="_blank" href="https://store.akveo.com/products/vue-java-admin-dashboard-spring?utm_campaign=akveo_store-Vue-Vue_demo%2Fgithub&utm_source=vue_admin&utm_medium=referral&utm_content=demo_English_button">Java backend integration</a>
    <a class="document-btn" target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/">Documentation</a>
    <a class="document-btn" target="_blank" href="https://github.com/PanJiaChen/vue-element-admin/">Github Repository</a>
    <a class="document-btn" target="_blank" href="https://panjiachen.gitee.io/vue-element-admin-site/zh/">国内文档</a>
@@ -38,7 +37,7 @@ export default {
  margin: 50px;
  display: flex;
  flex-wrap: wrap;
-  justify-content: flex-start;
+  justify-content: space-evenly;

  .document-btn {
    flex-shrink: 0;
@@ -47,8 +46,8 @@ export default {
    background: black;
    color: white;
    height: 60px;
-    padding: 0 16px;
-    margin: 16px;
+    width: 200px;
+    margin-bottom: 16px;
    line-height: 60px;
    font-size: 20px;
    text-align: center;
--- a/src/views/error-log/index.vue
+++ b/src/views/error-log/index.vue
@@ -2,12 +2,11 @@
  <div class="errPage-container">
    <ErrorA />
    <ErrorB />
-    <!-- $t is vue-i18n global function to translate lang -->
-    <h3>{{ $t('errorLog.tips') }}</h3>
+    <h3>Please click the bug icon in the upper right corner</h3>
    <aside>
-      {{ $t('errorLog.description') }}
+      Now the management system are basically the form of the spa, it enhances the user experience, but it also increases the possibility of page problems, a small negligence may lead to the entire page deadlock. Fortunately Vue provides a way to catch handling exceptions, where you can handle errors or report exceptions.
      <a target="_blank" class="link-type" href="https://panjiachen.github.io/vue-element-admin-site/guide/advanced/error.html">
-        {{ $t('errorLog.documentation') }}
+        Document introduction
      </a>
    </aside>
    <a href="#">
--- a/src/views/example/components/ArticleDetail.vue
+++ b/src/views/example/components/ArticleDetail.vue
@@ -1,6 +1,7 @@
 <template>
  <div class="createPost-container">
    <el-form ref="postForm" :model="postForm" :rules="rules" class="form-container">
+
      <sticky :z-index="10" :class-name="'sub-navbar '+postForm.status">
        <CommentDropdown v-model="postForm.comment_disabled" />
        <PlatformDropdown v-model="postForm.platforms" />
@@ -152,9 +153,6 @@ export default {
    contentShortLength() {
      return this.postForm.content_short.length
    },
-    lang() {
-      return this.$store.getters.language
-    },
    displayTime: {
      // set and get is useful when the data
      // returned by the back end api is different from the front end
@@ -198,7 +196,7 @@ export default {
      })
    },
    setTagsViewTitle() {
-      const title = this.lang === 'zh' ? '编辑文章' : 'Edit Article'
+      const title = 'Edit Article'
      const route = Object.assign({}, this.tempRoute, { title: `${title}-${this.postForm.id}` })
      this.$store.dispatch('tagsView/updateVisitedView', route)
    },
@@ -279,7 +277,7 @@ export default {
  }
 }

-.article-textarea ::v-deep {
+.article-textarea /deep/ {
  textarea {
    padding-right: 40px;
    resize: none;
--- a/src/views/example/components/Warning.vue
+++ b/src/views/example/components/Warning.vue
@@ -1,6 +1,9 @@
 <template>
  <aside>
-    {{ $t('example.warning') }}
+    Creating and editing pages cannot be cached by keep-alive because keep-alive include does not currently support
+    caching based on routes, so it is currently cached based on component name. If you want to achieve a similar caching
+    effect, you can use a browser caching scheme such as localStorage. Or do not use keep-alive include to cache all
+    pages directly. See details
    <a
      href="https://panjiachen.github.io/vue-element-admin-site/guide/essentials/tags-view.html"
      target="_blank"
--- a/src/views/excel/components/FilenameOption.vue
+++ b/src/views/excel/components/FilenameOption.vue
@@ -1,8 +1,7 @@
 <template>
  <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:350px;" prefix-icon="el-icon-document" />
+    <el-input v-model="filename" placeholder="Please enter the file name (default excel-list)" style="width:345px;" prefix-icon="el-icon-document" />
  </div>
 </template>

--- a/src/views/excel/export-excel.vue
+++ b/src/views/excel/export-excel.vue
@@ -1,12 +1,12 @@
 <template>
-  <!-- $t is vue-i18n global function to translate lang -->
  <div class="app-container">
+
    <div>
      <FilenameOption v-model="filename" />
      <AutoWidthOption v-model="autoWidth" />
      <BookTypeOption v-model="bookType" />
      <el-button :loading="downloadLoading" style="margin:0 0 20px 20px;" type="primary" icon="el-icon-document" @click="handleDownload">
-        {{ $t('excel.export') }} Excel
+        Export Excel
      </el-button>
      <a href="https://panjiachen.github.io/vue-element-admin-site/feature/component/excel.html" target="_blank" style="margin-left:15px;">
        <el-tag type="info">Documentation</el-tag>
@@ -51,6 +51,7 @@ import { parseTime } from '@/utils'
 import FilenameOption from './components/FilenameOption'
 import AutoWidthOption from './components/AutoWidthOption'
 import BookTypeOption from './components/BookTypeOption'
+
 export default {
  name: 'ExportExcel',
  components: { FilenameOption, AutoWidthOption, BookTypeOption },
--- a/src/views/excel/merge-header.vue
+++ b/src/views/excel/merge-header.vue
@@ -71,21 +71,21 @@ export default {
    },
    handleDownload() {
      this.downloadLoading = true
-      import('@/vendor/Export2Excel').then(excel => {
-        const multiHeader = [['Id', 'Main Information', '', '', 'Date']]
-        const header = ['', 'Title', 'Author', 'Readings', '']
-        const filterVal = ['id', 'title', 'author', 'pageviews', 'display_time']
-        const list = this.list
-        const data = this.formatJson(filterVal, list)
-        const merges = ['A1:A2', 'B1:D1', 'E1:E2']
-        excel.export_json_to_excel({
-          multiHeader,
-          header,
-          merges,
-          data
+        import('@/vendor/Export2Excel').then(excel => {
+          const multiHeader = [['Id', 'Main Information', '', '', 'Date']]
+          const header = ['', 'Title', 'Author', 'Readings', '']
+          const filterVal = ['id', 'title', 'author', 'pageviews', 'display_time']
+          const list = this.list
+          const data = this.formatJson(filterVal, list)
+          const merges = ['A1:A2', 'B1:D1', 'E1:E2']
+          excel.export_json_to_excel({
+            multiHeader,
+            header,
+            merges,
+            data
+          })
+          this.downloadLoading = false
        })
-        this.downloadLoading = false
-      })
    },
    formatJson(filterVal, jsonData) {
      return jsonData.map(v => filterVal.map(j => {
--- a/src/views/excel/select-excel.vue
+++ b/src/views/excel/select-excel.vue
@@ -1,9 +1,8 @@
 <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:350px;" prefix-icon="el-icon-document" />
+    <el-input v-model="filename" placeholder="Please enter the file name (default excel-list)" style="width:350px;" prefix-icon="el-icon-document" />
    <el-button :loading="downloadLoading" style="margin-bottom:20px" type="primary" icon="el-icon-document" @click="handleDownload">
-      {{ $t('excel.selectedExport') }}
+      Export Selected Items
    </el-button>
    <a href="https://panjiachen.github.io/vue-element-admin-site/feature/component/excel.html" target="_blank" style="margin-left:15px;">
      <el-tag type="info">Documentation</el-tag>
--- a/src/views/guide/index.vue
+++ b/src/views/guide/index.vue
@@ -1,11 +1,12 @@
 <template>
  <div class="app-container">
    <aside>
-      {{ $t('guide.description') }}
+      The guide page is useful for some people who entered the project for the first time. You can briefly introduce the
+      features of the project. Demo is based on
      <a href="https://github.com/kamranahmedse/driver.js" target="_blank">driver.js.</a>
    </aside>
    <el-button icon="el-icon-question" type="primary" @click.prevent.stop="guide">
-      {{ $t('guide.button') }}
+      Show Guide
    </el-button>
  </div>
 </template>
--- a/src/views/i18n-demo/index.vue
+++ b/src/views/i18n-demo/index.vue
@@ -1,168 +0,0 @@
-<template>
-  <div>
-    <el-card class="box-card" style="margin-top:40px;">
-      <div slot="header" class="clearfix">
-        <svg-icon icon-class="international" />
-        <span style="margin-left:10px;">{{ $t('i18nView.title') }}</span>
-      </div>
-      <div>
-        <el-radio-group v-model="lang" size="small">
-          <el-radio label="zh" border>
-            简体中文
-          </el-radio>
-          <el-radio label="en" border>
-            English
-          </el-radio>
-          <el-radio label="es" border>
-            Español
-          </el-radio>
-          <el-radio label="ja" border>
-            日本語
-          </el-radio>
-        </el-radio-group>
-        <el-tag style="margin-top:15px;display:block;" type="info">
-          {{ $t('i18nView.note') }}
-        </el-tag>
-      </div>
-    </el-card>
-
-    <el-row :gutter="20" style="margin:100px 15px 50px;">
-      <el-col :span="12" :xs="24">
-        <div class="block">
-          <el-date-picker v-model="date" :placeholder="$t('i18nView.datePlaceholder')" type="date" />
-        </div>
-        <div class="block">
-          <el-select v-model="value" :placeholder="$t('i18nView.selectPlaceholder')">
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </div>
-        <div class="block">
-          <el-button class="item-btn" size="small">
-            {{ $t('i18nView.default') }}
-          </el-button>
-          <el-button class="item-btn" size="small" type="primary">
-            {{ $t('i18nView.primary') }}
-          </el-button>
-          <el-button class="item-btn" size="small" type="success">
-            {{ $t('i18nView.success') }}
-          </el-button>
-          <el-button class="item-btn" size="small" type="info">
-            {{ $t('i18nView.info') }}
-          </el-button>
-          <el-button class="item-btn" size="small" type="warning">
-            {{ $t('i18nView.warning') }}
-          </el-button>
-          <el-button class="item-btn" size="small" type="danger">
-            {{ $t('i18nView.danger') }}
-          </el-button>
-        </div>
-      </el-col>
-      <el-col :span="12" :xs="24">
-        <el-table :data="tableData" fit highlight-current-row border style="width: 100%">
-          <el-table-column :label="$t('i18nView.tableName')" prop="name" width="100" align="center" />
-          <el-table-column :label="$t('i18nView.tableDate')" prop="date" width="120" align="center" />
-          <el-table-column :label="$t('i18nView.tableAddress')" prop="address" />
-        </el-table>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import local from './local'
-const viewName = 'i18nView'
-
-export default {
-  name: 'I18n',
-  data() {
-    return {
-      date: '',
-      tableData: [{
-        date: '2016-05-03',
-        name: 'Tom',
-        address: 'No. 189, Grove St, Los Angeles'
-      },
-      {
-        date: '2016-05-02',
-        name: 'Tom',
-        address: 'No. 189, Grove St, Los Angeles'
-      },
-      {
-        date: '2016-05-04',
-        name: 'Tom',
-        address: 'No. 189, Grove St, Los Angeles'
-      },
-      {
-        date: '2016-05-01',
-        name: 'Tom',
-        address: 'No. 189, Grove St, Los Angeles'
-      }],
-      options: [],
-      value: ''
-    }
-  },
-  computed: {
-    lang: {
-      get() {
-        return this.$store.state.app.language
-      },
-      set(lang) {
-        this.$i18n.locale = lang
-        this.$store.dispatch('app/setLanguage', lang)
-      }
-    }
-  },
-  watch: {
-    lang() {
-      this.setOptions()
-    }
-  },
-  created() {
-    if (!this.$i18n.getLocaleMessage('en')[viewName]) {
-      this.$i18n.mergeLocaleMessage('en', local.en)
-      this.$i18n.mergeLocaleMessage('zh', local.zh)
-      this.$i18n.mergeLocaleMessage('es', local.es)
-      this.$i18n.mergeLocaleMessage('ja', local.ja)
-    }
-    this.setOptions() // set default select options
-  },
-  methods: {
-    setOptions() {
-      this.options = [
-        {
-          value: '1',
-          label: this.$t('i18nView.one')
-        },
-        {
-          value: '2',
-          label: this.$t('i18nView.two')
-        },
-        {
-          value: '3',
-          label: this.$t('i18nView.three')
-        }
-      ]
-    }
-  }
-}
-</script>
-
-<style scoped>
-.box-card {
-  width: 600px;
-  max-width: 100%;
-  margin: 20px auto;
-}
-.item-btn{
-  margin-bottom: 15px;
-  margin-left: 0px;
-}
-.block {
-  padding: 25px;
-}
-</style>
--- a/src/views/i18n-demo/local.js
+++ b/src/views/i18n-demo/local.js
@@ -1,83 +0,0 @@
-
-export default {
-  zh: {
-    i18nView: {
-      title: '切换语言',
-      note: '本项目国际化基于 vue-i18n',
-      datePlaceholder: '请选择日期',
-      selectPlaceholder: '请选择',
-      tableDate: '日期',
-      tableName: '姓名',
-      tableAddress: '地址',
-      default: '默认按钮',
-      primary: '主要按钮',
-      success: '成功按钮',
-      info: '信息按钮',
-      warning: '警告按钮',
-      danger: '危险按钮',
-      one: '一',
-      two: '二',
-      three: '三'
-    }
-  },
-  en: {
-    i18nView: {
-      title: 'Switch Language',
-      note: 'The internationalization of this project is based on vue-i18n',
-      datePlaceholder: 'Pick a day',
-      selectPlaceholder: 'Select',
-      tableDate: 'tableDate',
-      tableName: 'tableName',
-      tableAddress: 'tableAddress',
-      default: 'default:',
-      primary: 'primary',
-      success: 'success',
-      info: 'info',
-      warning: 'warning',
-      danger: 'danger',
-      one: 'One',
-      two: 'Two',
-      three: 'Three'
-    }
-  },
-  es: {
-    i18nView: {
-      title: 'Switch Language',
-      note: 'The internationalization of this project is based on vue-i18n',
-      datePlaceholder: 'Pick a day',
-      selectPlaceholder: 'Select',
-      tableDate: 'tableDate',
-      tableName: 'tableName',
-      tableAddress: 'tableAddress',
-      default: 'default:',
-      primary: 'primary',
-      success: 'success',
-      info: 'info',
-      warning: 'warning',
-      danger: 'danger',
-      one: 'One',
-      two: 'Two',
-      three: 'Three'
-    }
-  },
-  ja: {
-    i18nView: {
-      title: '言語切替',
-      note: 'vue-i18nを使っています',
-      datePlaceholder: '日時選択',
-      selectPlaceholder: '選択してください',
-      tableDate: '日時',
-      tableName: '姓名',
-      tableAddress: '住所',
-      default: 'default',
-      primary: 'primary',
-      success: 'success',
-      info: 'info',
-      warning: 'warning',
-      danger: 'danger',
-      one: '1',
-      two: '2',
-      three: '3'
-    }
-  }
-}
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -3,10 +3,7 @@
    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" autocomplete="on" label-position="left">

      <div class="title-container">
-        <h3 class="title">
-          {{ $t('login.title') }}
-        </h3>
-        <lang-select class="set-language" />
+        <h3 class="title">Login Form</h3>
      </div>

      <el-form-item prop="username">
@@ -16,7 +13,7 @@
        <el-input
          ref="username"
          v-model="loginForm.username"
-          :placeholder="$t('login.username')"
+          placeholder="Username"
          name="username"
          type="text"
          tabindex="1"
@@ -34,7 +31,7 @@
            ref="password"
            v-model="loginForm.password"
            :type="passwordType"
-            :placeholder="$t('login.password')"
+            placeholder="Password"
            name="password"
            tabindex="2"
            autocomplete="on"
@@ -48,30 +45,26 @@
        </el-form-item>
      </el-tooltip>

-      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">
-        {{ $t('login.logIn') }}
-      </el-button>
+      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">Login</el-button>

      <div style="position:relative">
        <div class="tips">
-          <span>{{ $t('login.username') }} : admin</span>
-          <span>{{ $t('login.password') }} : {{ $t('login.any') }}</span>
+          <span>Username : admin</span>
+          <span>Password : any</span>
        </div>
        <div class="tips">
-          <span style="margin-right:18px;">
-            {{ $t('login.username') }} : editor
-          </span>
-          <span>{{ $t('login.password') }} : {{ $t('login.any') }}</span>
+          <span style="margin-right:18px;">Username : editor</span>
+          <span>Password : any</span>
        </div>

        <el-button class="thirdparty-button" type="primary" @click="showDialog=true">
-          {{ $t('login.thirdparty') }}
+          Or connect with
        </el-button>
      </div>
    </el-form>

-    <el-dialog :title="$t('login.thirdparty')" :visible.sync="showDialog">
-      {{ $t('login.thirdpartyTips') }}
+    <el-dialog title="Or connect with" :visible.sync="showDialog">
+      Can not be simulated on local, so please combine you own business simulation! ! !
      <br>
      <br>
      <br>
@@ -82,12 +75,11 @@

 <script>
 import { validUsername } from '@/utils/validate'
-import LangSelect from '@/components/LangSelect'
 import SocialSign from './components/SocialSignin'

 export default {
  name: 'Login',
-  components: { LangSelect, SocialSign },
+  components: { SocialSign },
  data() {
    const validateUsername = (rule, value, callback) => {
      if (!validUsername(value)) {
@@ -305,15 +297,6 @@ $light_gray:#eee;
      text-align: center;
      font-weight: bold;
    }
-
-    .set-language {
-      color: #fff;
-      position: absolute;
-      top: 3px;
-      font-size: 18px;
-      right: 0px;
-      cursor: pointer;
-    }
  }

  .show-pwd {
--- a/src/views/pdf/index.vue
+++ b/src/views/pdf/index.vue
@@ -1,6 +1,8 @@
 <template>
  <div class="app-container">
-    <aside style="margin-top:15px;">{{ $t('pdf.tips') }}</aside>
+    <aside style="margin-top:15px;">
+      Here we use window.print() to implement the feature of downloading PDF.
+    </aside>
    <router-link target="_blank" to="/pdf/download">
      <el-button type="primary">
        Click to download PDF
--- 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 }}
+      Your roles: {{ roles }}
    </div>
-    {{ $t('permission.switchRoles') }}:
+    Switch roles:
    <el-radio-group v-model="switchRoles">
      <el-radio-button label="editor" />
      <el-radio-button label="admin" />
--- a/src/views/permission/directive.vue
+++ b/src/views/permission/directive.vue
@@ -36,7 +36,7 @@

    <div :key="'checkPermission'+key" style="margin-top:60px;">
      <aside>
-        {{ $t('permission.tips') }}
+        In some cases, using v-permission will have no effect. For example: Element-UI's Tab component or el-table-column and other scenes that dynamically render dom. You can only do this with v-if.
        <br> e.g.
      </aside>

@@ -91,7 +91,7 @@ export default {

 <style lang="scss" scoped>
 .app-container {
-  ::v-deep .permission-alert {
+  /deep/ .permission-alert {
    width: 320px;
    margin-top: 15px;
    background-color: #f0f9eb;
@@ -100,10 +100,10 @@ export default {
    border-radius: 4px;
    display: inline-block;
  }
-  ::v-deep .permission-sourceCode {
+  /deep/ .permission-sourceCode {
    margin-left: 15px;
  }
-  ::v-deep .permission-tag {
+  /deep/ .permission-tag {
    background-color: #ecf5ff;
  }
 }
--- a/src/views/permission/role.vue
+++ b/src/views/permission/role.vue
@@ -1,8 +1,6 @@
 <template>
  <div class="app-container">
-    <el-button type="primary" @click="handleAddRole">
-      {{ $t('permission.addRole') }}
-    </el-button>
+    <el-button type="primary" @click="handleAddRole">New Role</el-button>

    <el-table :data="rolesList" style="width: 100%;margin-top:30px;" border>
      <el-table-column align="center" label="Role Key" width="220">
@@ -22,12 +20,8 @@
      </el-table-column>
      <el-table-column align="center" label="Operations">
        <template slot-scope="scope">
-          <el-button type="primary" size="small" @click="handleEdit(scope)">
-            {{ $t('permission.editPermission') }}
-          </el-button>
-          <el-button type="danger" size="small" @click="handleDelete(scope)">
-            {{ $t('permission.delete') }}
-          </el-button>
+          <el-button type="primary" size="small" @click="handleEdit(scope)">Edit</el-button>
+          <el-button type="danger" size="small" @click="handleDelete(scope)">Delete</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -46,16 +40,20 @@
          />
        </el-form-item>
        <el-form-item label="Menus">
-          <el-tree ref="tree" :check-strictly="checkStrictly" :data="routesData" :props="defaultProps" show-checkbox node-key="path" class="permission-tree" />
+          <el-tree
+            ref="tree"
+            :check-strictly="checkStrictly"
+            :data="routesData"
+            :props="defaultProps"
+            show-checkbox
+            node-key="path"
+            class="permission-tree"
+          />
        </el-form-item>
      </el-form>
      <div style="text-align:right;">
-        <el-button type="danger" @click="dialogVisible=false">
-          {{ $t('permission.cancel') }}
-        </el-button>
-        <el-button type="primary" @click="confirmRole">
-          {{ $t('permission.confirm') }}
-        </el-button>
+        <el-button type="danger" @click="dialogVisible=false">Cancel</el-button>
+        <el-button type="primary" @click="confirmRole">Confirm</el-button>
      </div>
    </el-dialog>
  </div>
@@ -65,7 +63,6 @@
 import path from 'path'
 import { deepClone } from '@/utils'
 import { getRoutes, getRoles, addRole, deleteRole, updateRole } from '@/api/role'
-import i18n from '@/lang'

 const defaultRole = {
  key: '',
@@ -103,23 +100,13 @@ export default {
    async getRoutes() {
      const res = await getRoutes()
      this.serviceRoutes = res.data
-      const routes = this.generateRoutes(res.data)
-      this.routes = this.i18n(routes)
+      this.routes = this.generateRoutes(res.data)
    },
    async getRoles() {
      const res = await getRoles()
      this.rolesList = res.data
    },
-    i18n(routes) {
-      const app = routes.map(route => {
-        route.title = i18n.t(`route.${route.title}`)
-        if (route.children) {
-          route.children = this.i18n(route.children)
-        }
-        return route
-      })
-      return app
-    },
+
    // Reshape the routes structure so that it looks the same as the sidebar
    generateRoutes(routes, basePath = '/') {
      const res = []
--- a/src/views/table/complex-table.vue
+++ b/src/views/table/complex-table.vue
@@ -1,27 +1,27 @@
 <template>
  <div class="app-container">
    <div class="filter-container">
-      <el-input v-model="listQuery.title" :placeholder="$t('table.title')" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
-      <el-select v-model="listQuery.importance" :placeholder="$t('table.importance')" clearable style="width: 90px" class="filter-item">
+      <el-input v-model="listQuery.title" placeholder="Title" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
+      <el-select v-model="listQuery.importance" placeholder="Imp" clearable style="width: 90px" class="filter-item">
        <el-option v-for="item in importanceOptions" :key="item" :label="item" :value="item" />
      </el-select>
-      <el-select v-model="listQuery.type" :placeholder="$t('table.type')" clearable class="filter-item" style="width: 130px">
+      <el-select v-model="listQuery.type" placeholder="Type" clearable class="filter-item" style="width: 130px">
        <el-option v-for="item in calendarTypeOptions" :key="item.key" :label="item.display_name+'('+item.key+')'" :value="item.key" />
      </el-select>
      <el-select v-model="listQuery.sort" style="width: 140px" class="filter-item" @change="handleFilter">
        <el-option v-for="item in sortOptions" :key="item.key" :label="item.label" :value="item.key" />
      </el-select>
      <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
-        {{ $t('table.search') }}
+        Search
      </el-button>
      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">
-        {{ $t('table.add') }}
+        Add
      </el-button>
      <el-button v-waves :loading="downloadLoading" class="filter-item" type="primary" icon="el-icon-download" @click="handleDownload">
-        {{ $t('table.export') }}
+        Export
      </el-button>
      <el-checkbox v-model="showReviewer" class="filter-item" style="margin-left:15px;" @change="tableKey=tableKey+1">
-        {{ $t('table.reviewer') }}
+        reviewer
      </el-checkbox>
    </div>

@@ -35,63 +35,63 @@
      style="width: 100%;"
      @sort-change="sortChange"
    >
-      <el-table-column :label="$t('table.id')" prop="id" sortable="custom" align="center" width="80" :class-name="getSortClass('id')">
+      <el-table-column label="ID" prop="id" sortable="custom" align="center" width="80" :class-name="getSortClass('id')">
        <template slot-scope="{row}">
          <span>{{ row.id }}</span>
        </template>
      </el-table-column>
-      <el-table-column :label="$t('table.date')" width="150px" align="center">
+      <el-table-column label="Date" width="150px" align="center">
        <template slot-scope="{row}">
          <span>{{ row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
        </template>
      </el-table-column>
-      <el-table-column :label="$t('table.title')" min-width="150px">
+      <el-table-column label="Title" min-width="150px">
        <template slot-scope="{row}">
          <span class="link-type" @click="handleUpdate(row)">{{ row.title }}</span>
          <el-tag>{{ row.type | typeFilter }}</el-tag>
        </template>
      </el-table-column>
-      <el-table-column :label="$t('table.author')" width="110px" align="center">
+      <el-table-column label="Author" width="110px" align="center">
        <template slot-scope="{row}">
          <span>{{ row.author }}</span>
        </template>
      </el-table-column>
-      <el-table-column v-if="showReviewer" :label="$t('table.reviewer')" width="110px" align="center">
+      <el-table-column v-if="showReviewer" label="Reviewer" width="110px" align="center">
        <template slot-scope="{row}">
          <span style="color:red;">{{ row.reviewer }}</span>
        </template>
      </el-table-column>
-      <el-table-column :label="$t('table.importance')" width="80px">
+      <el-table-column label="Imp" width="80px">
        <template slot-scope="{row}">
-          <svg-icon v-for="n in +row.importance" :key="n" icon-class="star" class="meta-item__icon" />
+          <svg-icon v-for="n in + row.importance" :key="n" icon-class="star" class="meta-item__icon" />
        </template>
      </el-table-column>
-      <el-table-column :label="$t('table.readings')" align="center" width="95">
+      <el-table-column label="Readings" align="center" width="95">
        <template slot-scope="{row}">
          <span v-if="row.pageviews" class="link-type" @click="handleFetchPv(row.pageviews)">{{ row.pageviews }}</span>
          <span v-else>0</span>
        </template>
      </el-table-column>
-      <el-table-column :label="$t('table.status')" class-name="status-col" width="100">
+      <el-table-column label="Status" class-name="status-col" width="100">
        <template slot-scope="{row}">
          <el-tag :type="row.status | statusFilter">
            {{ row.status }}
          </el-tag>
        </template>
      </el-table-column>
-      <el-table-column :label="$t('table.actions')" align="center" width="230" class-name="small-padding fixed-width">
+      <el-table-column label="Actions" align="center" width="230" class-name="small-padding fixed-width">
        <template slot-scope="{row,$index}">
          <el-button type="primary" size="mini" @click="handleUpdate(row)">
-            {{ $t('table.edit') }}
+            Edit
          </el-button>
          <el-button v-if="row.status!='published'" size="mini" type="success" @click="handleModifyStatus(row,'published')">
-            {{ $t('table.publish') }}
+            Publish
          </el-button>
          <el-button v-if="row.status!='draft'" size="mini" @click="handleModifyStatus(row,'draft')">
-            {{ $t('table.draft') }}
+            Draft
          </el-button>
          <el-button v-if="row.status!='deleted'" size="mini" type="danger" @click="handleDelete(row,$index)">
-            {{ $t('table.delete') }}
+            Delete
          </el-button>
        </template>
      </el-table-column>
@@ -101,35 +101,35 @@

    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
      <el-form ref="dataForm" :rules="rules" :model="temp" label-position="left" label-width="70px" style="width: 400px; margin-left:50px;">
-        <el-form-item :label="$t('table.type')" prop="type">
+        <el-form-item label="Type" prop="type">
          <el-select v-model="temp.type" class="filter-item" placeholder="Please select">
            <el-option v-for="item in calendarTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
          </el-select>
        </el-form-item>
-        <el-form-item :label="$t('table.date')" prop="timestamp">
+        <el-form-item label="Date" prop="timestamp">
          <el-date-picker v-model="temp.timestamp" type="datetime" placeholder="Please pick a date" />
        </el-form-item>
-        <el-form-item :label="$t('table.title')" prop="title">
+        <el-form-item label="Title" prop="title">
          <el-input v-model="temp.title" />
        </el-form-item>
-        <el-form-item :label="$t('table.status')">
+        <el-form-item label="Status">
          <el-select v-model="temp.status" class="filter-item" placeholder="Please select">
            <el-option v-for="item in statusOptions" :key="item" :label="item" :value="item" />
          </el-select>
        </el-form-item>
-        <el-form-item :label="$t('table.importance')">
+        <el-form-item label="Imp">
          <el-rate v-model="temp.importance" :colors="['#99A9BF', '#F7BA2A', '#FF9900']" :max="3" style="margin-top:8px;" />
        </el-form-item>
-        <el-form-item :label="$t('table.remark')">
+        <el-form-item label="Remark">
          <el-input v-model="temp.remark" :autosize="{ minRows: 2, maxRows: 4}" type="textarea" placeholder="Please input" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="dialogFormVisible = false">
-          {{ $t('table.cancel') }}
+          Cancel
        </el-button>
        <el-button type="primary" @click="dialogStatus==='create'?createData():updateData()">
-          {{ $t('table.confirm') }}
+          Confirm
        </el-button>
      </div>
    </el-dialog>
@@ -140,7 +140,7 @@
        <el-table-column prop="pv" label="Pv" />
      </el-table>
      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogPvVisible = false">{{ $t('table.confirm') }}</el-button>
+        <el-button type="primary" @click="dialogPvVisible = false">Confirm</el-button>
      </span>
    </el-dialog>
  </div>
@@ -248,7 +248,7 @@ export default {
    },
    handleModifyStatus(row, status) {
      this.$message({
-        message: '操作成功',
+        message: '操作Success',
        type: 'success'
      })
      row.status = status
@@ -295,8 +295,8 @@ export default {
            this.list.unshift(this.temp)
            this.dialogFormVisible = false
            this.$notify({
-              title: '成功',
-              message: '创建成功',
+              title: 'Success',
+              message: 'Created Successfully',
              type: 'success',
              duration: 2000
            })
@@ -323,8 +323,8 @@ export default {
            this.list.splice(index, 1, this.temp)
            this.dialogFormVisible = false
            this.$notify({
-              title: '成功',
-              message: '更新成功',
+              title: 'Success',
+              message: 'Update Successfully',
              type: 'success',
              duration: 2000
            })
@@ -334,8 +334,8 @@ export default {
    },
    handleDelete(row, index) {
      this.$notify({
-        title: '成功',
-        message: '删除成功',
+        title: 'Success',
+        message: 'Delete Successfully',
        type: 'success',
        duration: 2000
      })
--- a/src/views/table/drag-table.vue
+++ b/src/views/table/drag-table.vue
@@ -52,12 +52,11 @@
        </template>
      </el-table-column>
    </el-table>
-    <!-- $t is vue-i18n global function to translate lang (lang in @/lang)  -->
    <div class="show-d">
-      <el-tag style="margin-right:12px;">{{ $t('table.dragTips1') }} :</el-tag> {{ oldList }}
+      <el-tag>The default order :</el-tag> {{ oldList }}
    </div>
    <div class="show-d">
-      <el-tag>{{ $t('table.dragTips2') }} :</el-tag> {{ newList }}
+      <el-tag>The after dragging order :</el-tag> {{ newList }}
    </div>
  </div>
 </template>
--- a/src/views/table/dynamic-table/index.vue
+++ b/src/views/table/dynamic-table/index.vue
@@ -1,12 +1,12 @@
 <template>
  <div class="app-container">
    <div style="margin:0 0 5px 20px">
-      {{ $t('table.dynamicTips1') }}
+      Fixed header, sorted by header order,
    </div>
    <fixed-thead />

    <div style="margin:30px 0 5px 20px">
-      {{ $t('table.dynamicTips2') }}
+      Not fixed header, sorted by click order
    </div>
    <unfixed-thead />
  </div>
--- a/src/views/theme/index.vue
+++ b/src/views/theme/index.vue
@@ -3,13 +3,15 @@
    <el-card class="box-card">
      <div slot="header">
        <a class="link-type link-title" target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/guide/advanced/theme.html">
-          {{ $t('theme.documentation') }}
+          Theme documentation
        </a>
      </div>
      <div class="box-item">
-        <span class="field-label">{{ $t('theme.change') }} : </span>
+        <span class="field-label">Change Theme : </span>
        <el-switch v-model="theme" />
-        <aside style="margin-top:15px;">{{ $t('theme.tips') }}</aside>
+        <aside style="margin-top:15px;">
+          Tips: It is different from the theme-pick on the navbar is two different skinning methods, each with different application scenarios. Refer to the documentation for details.
+        </aside>
      </div>
    </el-card>

--- a/src/views/zip/index.vue
+++ b/src/views/zip/index.vue
@@ -1,9 +1,8 @@
 <template>
  <div class="app-container">
-    <!-- $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-input v-model="filename" placeholder="Please enter the file name (default file)" style="width:300px;" prefix-icon="el-icon-document" />
    <el-button :loading="downloadLoading" style="margin-bottom:20px;" type="primary" icon="el-icon-document" @click="handleDownload">
-      {{ $t('zip.export') }} 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">
--- a/tests/unit/utils/param2Obj.spec.js
+++ b/tests/unit/utils/param2Obj.spec.js
@@ -1,14 +0,0 @@
-import { param2Obj } from '@/utils/index.js'
-describe('Utils:param2Obj', () => {
-  const url = 'https://github.com/PanJiaChen/vue-element-admin?name=bill&age=29&sex=1&field=dGVzdA==&key=%E6%B5%8B%E8%AF%95'
-
-  it('param2Obj test', () => {
-    expect(param2Obj(url)).toEqual({
-      name: 'bill',
-      age: '29',
-      sex: '1',
-      field: window.btoa('test'),
-      key: '测试'
-    })
-  })
-})
--- a/vue.config.js
+++ b/vue.config.js
@@ -49,20 +49,8 @@ module.exports = {
    }
  },
  chainWebpack(config) {
-    // it can improve the speed of the first screen, it is recommended to turn on preload
-    // it can improve the speed of the first screen, it is recommended to turn on preload
-    config.plugin('preload').tap(() => [
-      {
-        rel: 'preload',
-        // to ignore runtime.js
-        // https://github.com/vuejs/vue-cli/blob/dev/packages/@vue/cli-service/lib/config/app.js#L171
-        fileBlacklist: [/\.map$/, /hot-update\.js$/, /runtime\..*\.js$/],
-        include: 'initial'
-      }
-    ])
-
-    // when there are many pages, it will cause too many meaningless requests
-    config.plugins.delete('prefetch')
+    config.plugins.delete('preload') // TODO: need test
+    config.plugins.delete('prefetch') // TODO: need test

    // set svg-sprite-loader
    config.module
@@ -81,6 +69,17 @@ module.exports = {
      })
      .end()

+    // set preserveWhitespace
+    config.module
+      .rule('vue')
+      .use('vue-loader')
+      .loader('vue-loader')
+      .tap(options => {
+        options.compilerOptions.preserveWhitespace = true
+        return options
+      })
+      .end()
+
    config
      .when(process.env.NODE_ENV !== 'development',
        config => {
@@ -116,7 +115,6 @@ module.exports = {
                }
              }
            })
-          // https:// webpack.js.org/configuration/optimization/#optimizationruntimechunk
          config.optimization.runtimeChunk('single')
        }
      )
Author	SHA1	Message	Date
花裤衩	f1feb2a86d	[release] 4.2.2	2020-06-08 19:38:55 +08:00
Edwin Betancourt	0ae5079b2a	docs: Improve read me files and changes in Spanish. (#3234 )	2020-06-05 13:32:15 +08:00
Nickbing Lao	6f80263b42	fix[css]: min btn width (#3164 )	2020-05-08 11:43:39 +08:00
cooper	5890499077	fix[parseTime]: fixed when pass null (#3038 )	2020-05-05 13:21:51 +08:00
AiMe1991	29b4ff636b	perf: when tags-view scroll close the right-menu	2020-05-05 12:55:22 +08:00
花裤衩	e692876c28	docs: add tips	2020-05-05 11:06:51 +08:00
garethx	6dacb783b2	feat: add option to try project on CodeSandbox (#2976 )	2020-05-04 23:05:29 +08:00
Phạm Ngọc Hòa	a2784dd6ef	perf: change default element-ui language to english (#2741 )	2020-05-04 21:51:21 +08:00
花裤衩	fc26c3106f	fix: compatibility with vetur (#1700 )	2020-05-04 21:30:58 +08:00
ntnyq	9580c43a8e	fix[element-variables]: missing space in element-variables (#3144 )	2020-04-28 18:26:34 +08:00
Aisen	1b8f726529	perf[Tinymce]: editor try to keep these URLs intact (#3141 )	2020-04-28 10:10:58 +08:00
花裤衩	d4405464ce	fix: use vue-cli default source-map (#3097 ) cheap-module-eval-source-map	2020-04-22 10:31:46 +08:00
Alex S	9d8c7edf91	fixed typo (#3091 )	2020-04-04 15:53:26 +08:00
花裤衩	6eccffeb2f	fix: svg support old broswer (#3085 )	2020-03-28 11:16:41 +08:00
花裤衩	f7a9d21109	Update README.zh-CN.md	2020-03-27 12:32:30 +08:00
花裤衩	993a6c72e8	docs: add smallsticker	2020-03-27 11:57:40 +08:00
echofly	9e0435ac85	perf: format component names as PascalCase (#3074 ) format: component names should be PascalCase	2020-03-24 10:17:18 +08:00
Aisen60	776f10e197	fix:fixed parseTime bug in ie and safari(#3066 ) * /src/utils/index.js parseTime 添加IE浏览器（版本10以下，包括版本10）兼容。 * perf: update Co-authored-by: aisen60 <aisen60@qq.com> Co-authored-by: 花裤衩 <panfree23@gmail.com>	2020-03-20 21:24:31 +08:00
echofly	c2a5a15956	fix[profile/UserCard]: fixed wrong key name (#3056 ) roles => role	2020-03-18 19:22:38 +08:00
花裤衩	a45e64fcb2	perf: change script-loader to dependencies	2020-02-12 10:01:27 +08:00
Shota Aratono	fec25fedba	docs: improve Japanese translation (#2970 )	2020-02-05 09:51:43 +08:00
RoBlues	d6816c547d	perf[Mock]: set responseFake to mock-server.js(#2966 ) * modify 把mock/index.js中与mock-server相关的代码转移到mock-server.js中去，实现两则功能分割	2020-02-02 19:39:40 +08:00
李小斐	6850312e89	fix: fixed redirect path regex (#2933 )	2020-01-11 10:25:59 +08:00
花裤衩	d634e2ae2f	fix: fixed require mock bug in production	2020-01-09 20:24:48 +08:00
花裤衩	b57f2008bd	bump: update element-ui version	2020-01-09 17:36:49 +08:00
花裤衩	c9affcf2ad	fix: fixed mock server (#2929 ) * init * refine * update	2020-01-09 17:21:36 +08:00
花裤衩	fbad7f481b	fix[Charts]: fix charts resize in keep-alive bug (#2922 ) * fix[Charts]: fix charts resize in keep-alive bug * refine	2020-01-09 16:49:57 +08:00
RussXD	088f64eecc	perf: optimize checkCapslock method (#2635 ) * optimize checkCapslock method * update Co-authored-by: 花裤衩 <panfree23@gmail.com>	2020-01-08 12:12:10 +08:00
AndyLZC/AndyLZC.github.io	55b1bbac99	perf[complex-table]:refine code (#2825 ) * 解决无法删除列表的bug;优化代码； * perf: refine Co-authored-by: 花裤衩 <panfree23@gmail.com>	2020-01-07 22:30:07 +08:00
Kaitian Xie	fd5a2e8da2	perf[Menu]: remove unused menu-wrapper (#2903 )	2020-01-06 22:34:14 +08:00
任羽飞	a0b39d5043	perf: import mockXHR only in production (#2910 ) * 自动排除mock 生产环境，使用webpack的条件编译自动排除mock数据 * perf: refine Co-authored-by: 花裤衩 <panfree23@gmail.com>	2020-01-06 22:22:37 +08:00
韬	4f563a7bfe	fix[Logout]: click blank area of dropDown able to logout (#2896 ) Fixed clicking blank area of drop-down unable to log out	2019-12-31 14:14:34 +08:00
花裤衩	262c0ba08e	perf[documentation]: refine css	2019-12-15 20:17:59 +08:00
flitrue	594fc58d0c	fix[icons]:fixed eslint 1 error and 2 warnings (#2835 )	2019-12-12 15:16:03 +08:00
monkeycf	65d8c451e8	feat: plop new generate store (#2805 )	2019-12-04 10:34:23 +08:00
xuanzai	e1554fdbd0	perf[views/icons]: use grid (#2803 )	2019-12-01 15:48:30 +08:00
Phạm Ngọc Hòa	53803d067d	perf: format pdf download (#2791 )	2019-11-27 10:06:28 +08:00
花裤衩	25dddbbce8	update 'MarkdownEditor' components name (#2743 )	2019-11-12 17:25:12 +08:00
Phạm Ngọc Hòa	683f68b838	format: space in user card (#2744 )	2019-11-12 17:24:30 +08:00
bbigcd	44203f88a7	update 'MarkdownEditor' components name	2019-11-12 12:08:45 +08:00
Phạm Ngọc Hòa	d5c013a48c	perf: text i18n (#2739 )	2019-11-11 19:39:59 +08:00
Phạm Ngọc Hòa	b11acb2171	perf: complex table (#2732 ) Move ont format `{row}`	2019-11-08 11:26:53 +08:00
Phạm Ngọc Hòa	b2dd7caee6	perf: format drag table (#2733 ) move one format `{row}`	2019-11-08 11:25:42 +08:00
Phạm Ngọc Hòa	a4fa1199ba	perf: format inline edit table (#2725 ) move one format `{row}`	2019-11-07 13:37:05 +08:00
Phạm Ngọc Hòa	6a194d1b4f	perf: format dropdown menu code (#2720 )	2019-11-05 14:26:24 +08:00
花裤衩	6739ab543b	style: fix el-date-picker css style	2019-10-25 19:45:21 +08:00
BradyBromley	6a214f0eac	docs: improved README.md (#2656 )	2019-10-14 10:25:30 +08:00