bump

perf: fix eslint warning
Merge branch 'master' into chore/update
2019-10-09 21:41:07 +08:00 · 2019-10-09 21:12:03 +08:00 · 2019-10-09 20:54:51 +08:00 · 2019-10-09 20:44:17 +08:00 · 2019-09-30 16:35:50 +08:00
70 changed files with 631 additions and 823 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
@@ -51,26 +51,24 @@ Vue Element Admin es una solución práctica basada en la nueva plataforma de de
 - Plantilla de Typescript: [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (Créditos: [@Armour](https://github.com/Armour))
 - [awesome-project](https://github.com/PanJiaChen/vue-element-admin/issues/2312)

-**Después de la versión `v4.1.0+`, la rama por defecto master no tendrá soporte para i18n. Por favor utilice la rama [i18n](https://github.com/PanJiaChen/vue-element-admin/tree/i18n), los cambios serán incluidos en la rama master**
+**Después de la versión `v4.1.0+`, la rama por defecto master no tendrá soporte para i18n. Por favor use [i18n](https://github.com/PanJiaChen/vue-element-admin/tree/i18n), los cambios serán incluidos en la rama master**

 **la versión actual es `v4.0+` construida con `vue-cli`. Si encuentra algún problema, por favor coloque un [issue](https://github.com/PanJiaChen/vue-element-admin/issues/new). Si desea usar la versión anterior, puede cambiar de rama a [tag/3.11.0](https://github.com/PanJiaChen/vue-element-admin/tree/tag/3.11.0), no relacionado con `vue-cli`**

-**Este proyecto no está soportado para versiones antigüas de navegadores (ej. IE).**
+**Este proyecto no está soportado para versiones muy viejas de navegadores (e.g. IE).**

 ## Preparación

 Necesita instalar [node](https://nodejs.org/) y [git](https://git-scm.com/) localmente. El proyecto es basado en [ES2015+](https://es6.ruanyifeng.com/), [vue](https://cn.vuejs.org/index.html), [vuex](https://vuex.vuejs.org/zh-cn/), [vue-router](https://router.vuejs.org/zh-cn/), [vue-cli](https://github.com/vuejs/vue-cli) , [axios](https://github.com/axios/axios) and [element-ui](https://github.com/ElemeFE/element), toda la solicitud de datos simulada se realiza a través de [Mock.js](https://github.com/nuysoft/Mock).
 Entendiendo y aprendiendo esto pudiera ayudarle con su proyecto.

-[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox)
-
-<p align="center">
+ <p align="center">
  <img width="900" src="https://wpimg.wallstcn.com/a5894c1b-f6af-456e-82df-1151da0839bf.png">
 </p>

 ## Patrocinantes

-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)
+Se un patrocinante y pon tu logo en nuestro README on GitHub con un enlace directo a tu sitio web. [[Se un Patrocinante]](https://www.patreon.com/panjiachen)

 <a href="https://flatlogic.com/admin-dashboards?from=vue-element-admin"><img width="150px" src="https://wpimg.wallstcn.com/9c0b719b-5551-4c1e-b776-63994632d94a.png" /></a><p>Plantilla de Dashboard de administración hecha con Vue, React y Angular.</p>

@@ -79,28 +77,25 @@ Sea un patrocinante y coloque su logo en nuestro LEEME en GitHub con un enlace d
 ```
 - Iniciar / Cerrar Sesión

- Permisos de Autenticación
+- Permisos de Authentication
  - Página de Permisos
  - Directivas de permisos
  - Página de configuración de permisos
  - Autenticación por dos pasos

 - Construcción Multi-entorno
-  - Desarrollo (dev)
-  - sit
-  - Escenario de pruebas (stage),
-  - Producción (prod)
+  - dev sit stage  producción

 - Características Globales
  - I18n
  - Temas dinámicos
-  - Menu lateral dinámico (soporte a rutas multi-nivel)
+  - Dynamic sidebar (soporte a rutas multi-nivel)
  - Barra de rutas dinámica
-  - Tags-view (Pestañas de página, Soporta operación de clic derecho)
+  - Tags-view (Tab page Support right-click operation)
  - Svg Sprite
  - Datos de simulación con Mock
  - Pantalla completa
-  - Menu lateral responsivo
+  - Responsive Sidebar

 - Editor
  - Editor de Texto Enriquecido
@@ -111,7 +106,7 @@ Sea un patrocinante y coloque su logo en nuestro LEEME en GitHub con un enlace d
  - Exportación a Excel
  - Carga de Excel
  - Visualización de Excel
-  - Exportación como ZIP
+  - Exportación como zip

 - Tabla
  - Tabla Dinámica
@@ -140,7 +135,7 @@ Sea un patrocinante y coloque su logo en nuestro LEEME en GitHub con un enlace d
 - Página de Guías
 - ECharts (Gráficos)
 - Portapapeles
- Convertidor de Markdown a HTML
+- Convertidor de Markdown a html
 ```

 ## Iniciando
@@ -213,7 +208,7 @@ Navegadores modernos e Internet Explorer 10+.

 | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Safari |
 | --------- | --------- | --------- | --------- |
-| IE10, IE11, Edge | últimas 2 versiones | últimas 2 versiones | últimas 2 versiones |
+| IE10, IE11, Edge| últimas 2 versiones| últimas 2 versiones| últimas 2 versiones

 ## Licencia

--- a/README.ja.md
+++ b/README.ja.md
@@ -30,7 +30,7 @@

 ## 概要

-[vue-element-admin](https://panjiachen.github.io/vue-element-admin) は管理画面のフロントエンドのインタフェースで、[vue](https://github.com/vuejs/vue) と [element-ui](https://github.com/ElemeFE/element)を使っています。i18nの多言語対応、可変ルート、権限、典型的なビジネスアプリテンプレートであり、豊富なコンポーネントを提供しています。素早くビジネス用の管理画面の現型を構築に役立ちます。
+[vue-element-admin](https://panjiachen.github.io/vue-element-admin) は管理画面のフロントエンドのインタフェース，[vue](https://github.com/vuejs/vue) と [element-ui](https://github.com/ElemeFE/element)を使っています。i18nの多言語対応、可変ルート、権限、典型的なビジネスアプリテンプレートであり、豊富なコンポーネントを提供しています、素早くビジネス用の管理画面の現型を構築に役立ちます。

 - [デモページ](https://panjiachen.github.io/vue-element-admin)

@@ -44,24 +44,22 @@

 - おすすめシンプルテンプレート: [vue-admin-template](https://github.com/PanJiaChen/vue-admin-template)
 - デスクトップバージョン: [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
- Typescriptバージョン: [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (感謝: [@Armour](https://github.com/Armour))
+- Typescriptバージョン: [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (鸣谢: [@Armour](https://github.com/Armour))
 - [awesome-project](https://github.com/PanJiaChen/vue-element-admin/issues/2312)

-**バージョン`v4.1.0+`以降について、デフォルトのmasterブランチではi18nをサポートしていません。masterブランチと共にアップデートされる[i18n Branch](https://github.com/PanJiaChen/vue-element-admin/tree/i18n)を使用してください。 **
+**After the `v4.1.0+` version, the default master branch will not support i18n. Please use [i18n Branch](https://github.com/PanJiaChen/vue-element-admin/tree/i18n), it will keep up with the master update**

-**現在のバージョン `v4.0+` は `vue-cli` で構築していて、バグ報告は[issue](https://github.com/PanJiaChen/vue-element-admin/issues/new)のissueでお願いします。旧バージョン[tag/3.11.0](https://github.com/PanJiaChen/vue-element-admin/tree/tag/3.11.0)もあります。こちらは`vue-cli`に依存しないです。**
+**現在のバージョン `v4.0+` は `vue-cli` で構築，バグ報告は[issue](https://github.com/PanJiaChen/vue-element-admin/issues/new)のissueでお願いします。旧バージョン[tag/3.11.0](https://github.com/PanJiaChen/vue-element-admin/tree/tag/3.11.0)もあります。`vue-cli`に依存しないです。**

 **低いバージョンのブラウザはサーポートしないです(例えば ie)，必要があれば polyfill を追加してください。 [詳細はこちら](https://github.com/PanJiaChen/vue-element-admin/wiki#babel-polyfill)**

 ## 前準備

-ローカル環境に [node](http://nodejs.org/) と [git](https://git-scm.com/)のインストールが必要です。[ES2015+](http://es6.ruanyifeng.com/)、[vue](https://cn.vuejs.org/index.html)、[vuex](https://vuex.vuejs.org/zh-cn/)、[vue-router](https://router.vuejs.org/zh-cn/) 、[vue-cli](https://github.com/vuejs/vue-cli) 、[axios](https://github.com/axios/axios) と [element-ui](https://github.com/ElemeFE/element)で開発しています。Requestは[Mock.js](https://github.com/nuysoft/Mock)のモックデータを使っています。
+ローカル環境に [node](http://nodejs.org/) と [git](https://git-scm.com/)をインストールが必要です。[ES2015+](http://es6.ruanyifeng.com/)、[vue](https://cn.vuejs.org/index.html)、[vuex](https://vuex.vuejs.org/zh-cn/)、[vue-router](https://router.vuejs.org/zh-cn/) 、[vue-cli](https://github.com/vuejs/vue-cli) 、[axios](https://github.com/axios/axios) 和 [element-ui](https://github.com/ElemeFE/element)で開発しています。Requestは[Mock.js](https://github.com/nuysoft/Mock)のモックデータを使っています。

 **バグ修正や新規機能追加のissue と pull requestは大歓迎です。**

-[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox)
-
-<p align="center">
+ <p align="center">
  <img width="900" src="https://wpimg.wallstcn.com/a5894c1b-f6af-456e-82df-1151da0839bf.png">
 </p>

@@ -83,18 +81,15 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s
  - 外部IDでログイン

 - 複数環境デプロイ
-  - dev
-  - sit
-  - stage
-  - prod
+  - dev sit stage prod

 - 共通機能
  - 多言語切替
  - テーマ切替
  - サイトメニュー（ルートから生成）
-  - パンくずリストナビゲーション
-  - タブナビゲーション
-  - Svg Sprite アイコン
+  - Breadcrumb Navigation
+  - Tag Navigation
+  - Svg Sprite Icon
  - ローカル/バックエンド モック データ
  - Screenfull

@@ -109,33 +104,33 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s
  - リード
  - Zip

- テーブル
-  - ダイナミックテーブル
-  - ドラッグアンドドロップテーブル
-  - インラインエディットテーブル
+- Table
+  - Dynamic Table
+  - Drag And Drop Table
+  - Inline Edit Table

- エラーページ
+- Error Page
  - 401
  - 404

 - コンポーネント
-  - アバターアップロード
-  - トップに戻る
-  - ドラッグダイアログ
-  - ドラッグ選択
-  - ドラッグKanban
-  - ドラッグリスト
-  - ペインの分割
+  - Avatar Upload
+  - Back To Top
+  - Drag Dialog
+  - Drag Select
+  - Drag Kanban
+  - Drag List
+  - SplitPane
  - Dropzone
-  - スティッキー
+  - Sticky
  - CountTo

- 高度なサンプル
- エラーログ
- ダッシュボード
- ガイドページ
+- Advanced Example
+- Error Log
+- Dashboard
+- Guide Page
 - ECharts
- クリップボード
+- Clipboard
 - Markdown to html
 ```

@@ -155,7 +150,7 @@ npm install
 npm run dev
 ```

-http://localhost:9527 が自動的に開きます。
+This will automatically open http://localhost:9527

 ## Build

@@ -183,11 +178,11 @@ npm run lint
 npm run lint -- --fix
 ```

-詳細は [Documentation](https://panjiachen.github.io/vue-element-admin-site/guide/essentials/deploy.html) を参照してください。
+Refer to [Documentation](https://panjiachen.github.io/vue-element-admin-site/guide/essentials/deploy.html) for more information

 ## Changelog

-各リリースの詳細は [release notes](https://github.com/PanJiaChen/vue-element-admin/releases) にあります。
+Detailed changes for each release are documented in the [release notes](https://github.com/PanJiaChen/vue-element-admin/releases).

 ## Online Demo

@@ -209,7 +204,7 @@ Modern browsers and Internet Explorer 10+.

 | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Safari |
 | --------- | --------- | --------- | --------- |
-| IE10, IE11, Edge | last 2 versions | last 2 versions | last 2 versions |
+| IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions

 ## License

--- a/README.md
+++ b/README.md
@@ -30,9 +30,9 @@ English | [简体中文](./README.zh-CN.md) | [日本語](./README.ja.md) | [Spa

 ## Introduction

-[vue-element-admin](https://panjiachen.github.io/vue-element-admin) is a production-ready front-end solution for admin interfaces. It is based on [vue](https://github.com/vuejs/vue) and uses the UI Toolkit [element-ui](https://github.com/ElemeFE/element).
+[vue-element-admin](https://panjiachen.github.io/vue-element-admin) is a production-ready front-end solution for admin interfaces. It based on [vue](https://github.com/vuejs/vue) and use the UI Toolkit [element-ui](https://github.com/ElemeFE/element).

-[vue-element-admin](https://panjiachen.github.io/vue-element-admin) is based on the newest development stack of vue and it has a built-in i18n solution, typical templates for enterprise applications, and lots of awesome features. It helps you build large and complex Single-Page Applications. I believe whatever your needs are, this project will help you.
+It is a magical vue admin based on the newest development stack of vue, built-in i18n solution, typical templates for enterprise applications, lots of awesome features. It helps you build a large complex Single-Page Applications. I believe whatever your needs are, this project will help you.

 - [Preview](https://panjiachen.github.io/vue-element-admin)

@@ -62,9 +62,7 @@ English | [简体中文](./README.zh-CN.md) | [日本語](./README.ja.md) | [Spa
 You need to install [node](https://nodejs.org/) and [git](https://git-scm.com/) locally. The project is based on [ES2015+](https://es6.ruanyifeng.com/), [vue](https://cn.vuejs.org/index.html), [vuex](https://vuex.vuejs.org/zh-cn/), [vue-router](https://router.vuejs.org/zh-cn/), [vue-cli](https://github.com/vuejs/vue-cli) , [axios](https://github.com/axios/axios) and [element-ui](https://github.com/ElemeFE/element), all request data is simulated using [Mock.js](https://github.com/nuysoft/Mock).
 Understanding and learning this knowledge in advance will greatly help the use of this project.

-[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox)
-
-<p align="center">
+ <p align="center">
  <img width="900" src="https://wpimg.wallstcn.com/a5894c1b-f6af-456e-82df-1151da0839bf.png">
 </p>

@@ -86,10 +84,7 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s
  - Two-step login

 - Multi-environment build
-  - Develop (dev)
-  - sit
-  - Stage Test (stage)
-  - Production (prod)
+  - dev sit stage prod

 - Global Features
  - I18n
@@ -213,7 +208,7 @@ Modern browsers and Internet Explorer 10+.

 | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Safari |
 | --------- | --------- | --------- | --------- |
-| IE10, IE11, Edge | last 2 versions | last 2 versions | last 2 versions |
+| IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions

 ## License

--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -77,9 +77,7 @@

 **如有问题请先看上述使用文档和文章，若不能满足，欢迎 issue 和 pr**

-[![Edit on CodeSandbox](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/PanJiaChen/vue-element-admin/tree/CodeSandbox)
-
-<p align="center">
+ <p align="center">
  <img width="900" src="https://wpimg.wallstcn.com/a5894c1b-f6af-456e-82df-1151da0839bf.png">
 </p>

@@ -101,10 +99,7 @@ Become a sponsor and get your logo on our README on GitHub with a link to your s
  - 二步登录

 - 多环境发布
-  - dev
-  - sit
-  - stage
-  - prod
+  - dev sit stage prod

 - 全局功能
  - 国际化多语言
@@ -226,17 +221,13 @@ Detailed changes for each release are documented in the [release notes](https://

 [Buy me a coffee](https://www.buymeacoffee.com/Pan)

-## 购买贴纸
-
-你也可以通过 购买[官方授权的贴纸](https://smallsticker.com/product/vue-element-admin) 的方式来支持 vue-element-admin - 每售出一张贴纸，本项目将获得 2 元的捐赠。
-
 ## Browsers support

 Modern browsers and Internet Explorer 10+.

 | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](https://godban.github.io/browsers-support-badges/)</br>Safari |
 | --------- | --------- | --------- | --------- |
-| IE10, IE11, Edge | last 2 versions | last 2 versions | last 2 versions |
+| IE10, IE11, Edge| last 2 versions| last 2 versions| last 2 versions

 ## License

--- 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/build/index.js
+++ b/build/index.js
@@ -1,4 +1,4 @@
-const { run } = require('runjs')
+const { sh } = require('tasksfile')
 const chalk = require('chalk')
 const config = require('../vue.config.js')
 const rawArgv = process.argv.slice(2)
@@ -7,7 +7,7 @@ const args = rawArgv.join(' ')
 if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
  const report = rawArgv.includes('--report')

-  run(`vue-cli-service build ${args}`)
+  sh(`vue-cli-service build ${args}`)

  const port = 9526
  const publicPath = config.publicPath
@@ -31,5 +31,5 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {

  })
 } else {
-  run(`vue-cli-service build ${args}`)
+  sh(`vue-cli-service build ${args}`)
 }
--- 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
@@ -18,7 +18,7 @@ for (let i = 0; i < count; i++) {
    forecast: '@float(0, 100, 2, 2)',
    importance: '@integer(1, 3)',
    'type|1': ['CN', 'US', 'JP', 'EU'],
-    'status|1': ['published', 'draft'],
+    'status|1': ['published', 'draft', 'deleted'],
    display_time: '@datetime',
    comment_disabled: true,
    pageviews: '@integer(300, 5000)',
@@ -27,9 +27,9 @@ for (let i = 0; i < count; i++) {
  }))
 }

-module.exports = [
+export default [
  {
-    url: '/vue-element-admin/article/list',
+    url: '/article/list',
    type: 'get',
    response: config => {
      const { importance, type, title, page = 1, limit = 20, sort } = config.query
@@ -58,7 +58,7 @@ module.exports = [
  },

  {
-    url: '/vue-element-admin/article/detail',
+    url: '/article/detail',
    type: 'get',
    response: config => {
      const { id } = config.query
@@ -74,7 +74,7 @@ module.exports = [
  },

  {
-    url: '/vue-element-admin/article/pv',
+    url: '/article/pv',
    type: 'get',
    response: _ => {
      return {
@@ -92,7 +92,7 @@ module.exports = [
  },

  {
-    url: '/vue-element-admin/article/create',
+    url: '/article/create',
    type: 'post',
    response: _ => {
      return {
@@ -103,7 +103,7 @@ module.exports = [
  },

  {
-    url: '/vue-element-admin/article/update',
+    url: '/article/update',
    type: 'post',
    response: _ => {
      return {
--- 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,17 @@ function mockXHR() {
  }
 }

-module.exports = {
-  mocks,
-  mockXHR
+// for mock server
+const responseFake = (url, type, respond) => {
+  return {
+    url: new RegExp(`/mock${url}`),
+    type: type || 'get',
+    response(req, res) {
+      res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
+    }
+  }
 }
+
+export default mocks.map(route => {
+  return responseFake(route.url, route.type, route.response)
+})
--- a/mock/mock-server.js
+++ b/mock/mock-server.js
@@ -2,21 +2,17 @@ const chokidar = require('chokidar')
 const bodyParser = require('body-parser')
 const chalk = require('chalk')
 const path = require('path')
-const Mock = require('mockjs')

 const mockDir = path.join(process.cwd(), 'mock')

 function registerRoutes(app) {
  let mockLastIndex
-  const { mocks } = require('./index.js')
-  const mocksForServer = mocks.map(route => {
-    return responseFake(route.url, route.type, route.response)
-  })
-  for (const mock of mocksForServer) {
+  const { default: mocks } = require('./index.js')
+  for (const mock of mocks) {
    app[mock.type](mock.url, mock.response)
    mockLastIndex = app._router.stack.length
  }
-  const mockRoutesLength = Object.keys(mocksForServer).length
+  const mockRoutesLength = Object.keys(mocks).length
  return {
    mockRoutesLength: mockRoutesLength,
    mockStartIndex: mockLastIndex - mockRoutesLength
@@ -31,19 +27,10 @@ function unregisterRoutes() {
  })
 }

-// for mock server
-const responseFake = (url, type, respond) => {
-  return {
-    url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`),
-    type: type || 'get',
-    response(req, res) {
-      console.log('request invoke:' + req.path)
-      res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
-    }
-  }
-}
-
 module.exports = app => {
+  // es6 polyfill
+  require('@babel/register')
+
  // 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,10 +10,10 @@ for (let i = 0; i < count; i++) {
 }
 NameList.push({ name: 'mock-Pan' })

-module.exports = [
+export default [
  // username search
  {
-    url: '/vue-element-admin/search/user',
+    url: '/search/user',
    type: 'get',
    response: config => {
      const { name } = config.query
@@ -30,7 +30,7 @@ module.exports = [

  // transaction list
  {
-    url: '/vue-element-admin/transaction/list',
+    url: '/transaction/list',
    type: 'get',
    response: _ => {
      return {
--- 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,10 +35,10 @@ const roles = [
  }
 ]

-module.exports = [
+export default [
  // mock get all routes form server
  {
-    url: '/vue-element-admin/routes',
+    url: '/routes',
    type: 'get',
    response: _ => {
      return {
@@ -50,7 +50,7 @@ module.exports = [

  // mock get all roles form server
  {
-    url: '/vue-element-admin/roles',
+    url: '/roles',
    type: 'get',
    response: _ => {
      return {
@@ -62,7 +62,7 @@ module.exports = [

  // add role
  {
-    url: '/vue-element-admin/role',
+    url: '/role',
    type: 'post',
    response: {
      code: 20000,
@@ -74,7 +74,7 @@ module.exports = [

  // update role
  {
-    url: '/vue-element-admin/role/[A-Za-z0-9]',
+    url: '/role/[A-Za-z0-9]',
    type: 'put',
    response: {
      code: 20000,
@@ -86,7 +86,7 @@ module.exports = [

  // delete role
  {
-    url: '/vue-element-admin/role/[A-Za-z0-9]',
+    url: '/role/[A-Za-z0-9]',
    type: 'delete',
    response: {
      code: 20000,
--- 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',
@@ -72,7 +72,7 @@ const constantRoutes = [
  }
 ]

-const asyncRoutes = [
+export const asyncRoutes = [
  {
    path: '/permission',
    component: 'layout/Layout',
@@ -523,8 +523,3 @@ const asyncRoutes = [

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

-module.exports = [
+export default [
  // user login
  {
-    url: '/vue-element-admin/user/login',
+    url: '/user/login',
    type: 'post',
    response: config => {
      const { username } = config.body
@@ -49,7 +49,7 @@ module.exports = [

  // get user info
  {
-    url: '/vue-element-admin/user/info\.*',
+    url: '/user/info\.*',
    type: 'get',
    response: config => {
      const { token } = config.query
@@ -72,7 +72,7 @@ module.exports = [

  // user logout
  {
-    url: '/vue-element-admin/user/logout',
+    url: '/user/logout',
    type: 'post',
    response: _ => {
      return {
--- 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,87 +1,30 @@
 {
  "name": "vue-element-admin",
-  "version": "4.4.0",
+  "version": "4.2.1",
  "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",
-    "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-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",
@@ -92,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.49.0",
+    "driver.js": "0.9.7",
+    "dropzone": "5.5.1",
+    "echarts": "4.3.0",
+    "element-ui": "2.12.0",
+    "file-saver": "2.0.2",
+    "fuse.js": "3.4.5",
+    "js-cookie": "2.2.1",
+    "jsonlint": "1.6.3",
+    "jszip": "3.2.2",
+    "normalize.css": "7.0.0",
+    "nprogress": "0.2.0",
+    "path-to-regexp": "2.4.0",
+    "screenfull": "5.0.0",
+    "showdown": "1.9.0",
+    "sortablejs": "1.10.1",
+    "tui-editor": "1.4.7",
+    "vue": "2.6.10",
+    "vue-count-to": "1.0.13",
+    "vue-router": "3.1.3",
+    "vue-splitpane": "1.0.4",
+    "vuedraggable": "2.23.2",
+    "vuex": "3.1.1",
+    "xlsx": "0.15.1"
+  },
+  "devDependencies": {
+    "@babel/core": "7.0.0",
+    "@babel/register": "7.0.0",
+    "@vue/cli-plugin-babel": "3.11.0",
+    "@vue/cli-plugin-eslint": "3.11.0",
+    "@vue/cli-plugin-unit-jest": "3.11.0",
+    "@vue/cli-service": "3.11.0",
+    "@vue/test-utils": "1.0.0-beta.29",
+    "autoprefixer": "^9.5.1",
+    "babel-core": "7.0.0-bridge.0",
+    "babel-eslint": "10.0.3",
+    "babel-jest": "24.9.0",
+    "chalk": "2.4.2",
+    "chokidar": "3.1.1",
+    "connect": "3.7.0",
+    "eslint": "6.5.1",
+    "eslint-plugin-vue": "5.2.3",
+    "html-webpack-plugin": "3.2.0",
+    "husky": "3.0.8",
+    "lint-staged": "9.4.2",
+    "mockjs": "1.0.1-beta3",
+    "node-sass": "^4.9.0",
+    "plop": "2.4.0",
+    "tasksfile": "5.1.0",
+    "sass-loader": "^7.1.0",
+    "script-ext-html-webpack-plugin": "2.1.4",
+    "script-loader": "0.7.2",
+    "serve-static": "^1.13.2",
+    "svg-sprite-loader": "4.1.6",
+    "svgo": "1.3.0",
+    "vue-template-compiler": "2.6.10"
+  },
+  "engines": {
+    "node": ">=8.9",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions"
+  ]
 }
--- a/plop-templates/store/index.hbs
+++ b/plop-templates/store/index.hbs
@@ -1,16 +0,0 @@
-{{#if state}}
-const state = {}
-{{/if}}
-
-{{#if mutations}}
-const mutations = {}
-{{/if}}
-
-{{#if actions}}
-const actions = {}
-{{/if}}
-
-export default {
-  namespaced: true,
-  {{options}}
-}
--- a/plop-templates/store/prompt.js
+++ b/plop-templates/store/prompt.js
@@ -1,62 +0,0 @@
-const { notEmpty } = require('../utils.js')
-
-module.exports = {
-  description: 'generate store',
-  prompts: [{
-    type: 'input',
-    name: 'name',
-    message: 'store name please',
-    validate: notEmpty('name')
-  },
-  {
-    type: 'checkbox',
-    name: 'blocks',
-    message: 'Blocks:',
-    choices: [{
-      name: 'state',
-      value: 'state',
-      checked: true
-    },
-    {
-      name: 'mutations',
-      value: 'mutations',
-      checked: true
-    },
-    {
-      name: 'actions',
-      value: 'actions',
-      checked: true
-    }
-    ],
-    validate(value) {
-      if (!value.includes('state') || !value.includes('mutations')) {
-        return 'store require at least state and mutations'
-      }
-      return true
-    }
-  }
-  ],
-  actions(data) {
-    const name = '{{name}}'
-    const { blocks } = data
-    const options = ['state', 'mutations']
-    const joinFlag = `,
-  `
-    if (blocks.length === 3) {
-      options.push('actions')
-    }
-
-    const actions = [{
-      type: 'add',
-      path: `src/store/modules/${name}.js`,
-      templateFile: 'plop-templates/store/index.hbs',
-      data: {
-        options: options.join(joinFlag),
-        state: blocks.includes('state'),
-        mutations: blocks.includes('mutations'),
-        actions: blocks.includes('actions')
-      }
-    }]
-    return actions
-  }
-}
--- 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/plopfile.js
+++ b/plopfile.js
@@ -1,9 +1,7 @@
 const viewGenerator = require('./plop-templates/view/prompt')
 const componentGenerator = require('./plop-templates/component/prompt')
-const storeGenerator = require('./plop-templates/store/prompt.js')

 module.exports = function(plop) {
  plop.setGenerator('view', viewGenerator)
  plop.setGenerator('component', componentGenerator)
-  plop.setGenerator('store', storeGenerator)
 }
--- a/src/api/article.js
+++ b/src/api/article.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'

 export function fetchList(query) {
  return request({
-    url: '/vue-element-admin/article/list',
+    url: '/article/list',
    method: 'get',
    params: query
  })
@@ -10,7 +10,7 @@ export function fetchList(query) {

 export function fetchArticle(id) {
  return request({
-    url: '/vue-element-admin/article/detail',
+    url: '/article/detail',
    method: 'get',
    params: { id }
  })
@@ -18,7 +18,7 @@ export function fetchArticle(id) {

 export function fetchPv(pv) {
  return request({
-    url: '/vue-element-admin/article/pv',
+    url: '/article/pv',
    method: 'get',
    params: { pv }
  })
@@ -26,7 +26,7 @@ export function fetchPv(pv) {

 export function createArticle(data) {
  return request({
-    url: '/vue-element-admin/article/create',
+    url: '/article/create',
    method: 'post',
    data
  })
@@ -34,7 +34,7 @@ export function createArticle(data) {

 export function updateArticle(data) {
  return request({
-    url: '/vue-element-admin/article/update',
+    url: '/article/update',
    method: 'post',
    data
  })
--- a/src/api/remote-search.js
+++ b/src/api/remote-search.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'

 export function searchUser(name) {
  return request({
-    url: '/vue-element-admin/search/user',
+    url: '/search/user',
    method: 'get',
    params: { name }
  })
@@ -10,7 +10,7 @@ export function searchUser(name) {

 export function transactionList(query) {
  return request({
-    url: '/vue-element-admin/transaction/list',
+    url: '/transaction/list',
    method: 'get',
    params: query
  })
--- a/src/api/role.js
+++ b/src/api/role.js
@@ -2,21 +2,21 @@ import request from '@/utils/request'

 export function getRoutes() {
  return request({
Author	SHA1	Message	Date
花裤衩	6ab5763591	bump	2019-10-09 21:41:07 +08:00
花裤衩	81a44a0284	perf: fix eslint warning	2019-10-09 21:12:03 +08:00
花裤衩	c1ce24081e	Merge branch 'master' into chore/update	2019-10-09 20:54:51 +08:00
花裤衩	459bef2d2f	refacor[screenfull]: 4.2.0=>5.0.0	2019-10-09 20:44:17 +08:00
花裤衩	8504f692df	bump	2019-09-30 16:35:50 +08:00