feature:新增富文本编辑器插件功能入口,提供导出图片功能,全局loading配置

.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

README.es.md

@@ -72,13 +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://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>
-<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>Get Java backend for Vue admin with 20% discount for 39$ use coupon code SWB0RAZPZR1M
-</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>
 
 ## Características
 

README.ja.md

@@ -69,12 +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>Get Java backend for Vue admin with 20% discount for 39$ use coupon code SWB0RAZPZR1M
-</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>
 
 ## 機能一覧

README.md

@@ -28,28 +28,6 @@
 
 English | [简体中文](./README.zh-CN.md) | [日本語](./README.ja.md) | [Spanish](./README.es.md)
 
-<p align="center">
-  <b>SPONSORED BY</b>
-</p>
-<table align="center" cellspacing="0" cellpadding="0">
-  <tbody>
-    <tr>
-      <td align="center" valign="middle" width="250">
-        <a href="https://www.duohui.cn/?utm_source=vue-element-admin&utm_medium=web&utm_campaign=vue-element-admin_github" title="多会" target="_blank">
-          <img height="60px" src="https://qiniu.cdn.duohui.co/brand/duohui.png" title="多会 - 活动服务销售平台">
-          <p>活动服务销售平台</p>
-        </a>
-      </td>
-      <td align="center" valign="middle" width="250">
-        <a href="https://youke.co/?utm_source=vue-element-admin&utm_medium=web&utm_campaign=vue-element-admin_github" title="有客" target="_blank">
-          <img height="60px" src="https://qiniu.cdn.duohui.co/brand/youke.png" title="有客 - 客户消息直达工作群">
-          <p>客户消息直达工作群</p>
-        </a>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
 ## 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).
@@ -94,12 +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>Get Java backend for Vue admin with 20% discount for 39$ use coupon code SWB0RAZPZR1M
-</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

README.zh-CN.md

@@ -28,28 +28,6 @@
 
 简体中文 | [English](./README.md) | [日本語](./README.ja.md) | [Spanish](./README.es.md)
 
-<p align="center">
-  <b>SPONSORED BY</b>
-</p>
-<table align="center" cellspacing="0" cellpadding="0">
-  <tbody>
-    <tr>
-      <td align="center" valign="middle" width="250">
-        <a href="https://www.duohui.cn/?utm_source=vue-element-admin&utm_medium=web&utm_campaign=vue-element-admin_github" title="多会" target="_blank">
-          <img height="60px" src="https://qiniu.cdn.duohui.co/brand/duohui.png" title="多会 - 活动服务销售平台">
-          <p>活动服务销售平台</p>
-        </a>
-      </td>
-      <td align="center" valign="middle" width="250">
-        <a href="https://youke.co/?utm_source=vue-element-admin&utm_medium=web&utm_campaign=vue-element-admin_github" title="有客" target="_blank">
-          <img height="60px" src="https://qiniu.cdn.duohui.co/brand/youke.png" title="有客 - 客户消息直达工作群">
-          <p>客户消息直达工作群</p>
-        </a>
-      </td>
-    </tr>
-  </tbody>
-</table>
-
 ## 简介
 
 [vue-element-admin](https://panjiachen.github.io/vue-element-admin) 是一个后台前端解决方案，它基于 [vue](https://github.com/vuejs/vue) 和 [element-ui](https://github.com/ElemeFE/element)实现。它使用了最新的前端技术栈，内置了 i18n 国际化解决方案，动态路由，权限验证，提炼了典型的业务模型，提供了丰富的功能组件，它可以帮助你快速搭建企业级中后台产品原型。相信不管你的需求是什么，本项目都能帮助到你。
@@ -109,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 后端整合，可以使用优惠码：SWB0RAZPZR1M，获得20%的价格优化</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>
 
-
 ## 功能
 
 ```

babel.config.js

@@ -1,14 +1,5 @@
 module.exports = {
   presets: [
-    // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app
+    '@vue/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']
-    }
-  }
 }

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',

mock/index.js

@@ -1,10 +1,10 @@
-const Mock = require('mockjs')
+import Mock from 'mockjs'
-const { param2Obj } = require('./utils')
+import { param2Obj } from '../src/utils'
 
-const user = require('./user')
+import user from './user'
-const role = require('./role')
+import role from './role'
-const article = require('./article')
+import article from './article'
-const search = require('./remote-search')
+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 = {
+export default mocks
-  mocks,
-  mockXHR
-}

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())

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',

mock/role/index.js

@@ -1,6 +1,6 @@
-const Mock = require('mockjs')
+import Mock from 'mockjs'
-const { deepClone } = require('../utils')
+import { deepClone } from '../../src/utils/index.js'
-const { asyncRoutes, constantRoutes } = require('./routes.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',

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
-}

mock/user.js

@@ -23,7 +23,7 @@ const users = {
   }
 }
 
-module.exports = [
+export default [
   // user login
   {
     url: '/vue-element-admin/user/login',

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
-}

package.json

@@ -1,28 +1,55 @@
 {
   "name": "vue-element-admin",
-  "version": "4.4.0",
+  "version": "4.3.0",
   "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features",
   "author": "Pan <panfree23@gmail.com>",
+  "license": "MIT",
   "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",
+    "lint": "eslint --ext .js,.vue src",
-    "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
     "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"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "src/**/*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ]
+  },
+  "keywords": [
+    "vue",
+    "admin",
+    "dashboard",
+    "element-ui",
+    "boilerplate",
+    "admin-template",
+    "management-system"
+  ],
+  "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",
-    "core-js": "3.6.5",
     "driver.js": "0.9.5",
     "dropzone": "5.5.1",
     "echarts": "4.2.1",
-    "element-ui": "2.13.2",
+    "element-ui": "2.13.0",
     "file-saver": "2.0.1",
     "fuse.js": "3.4.4",
     "js-cookie": "2.2.0",
@@ -33,6 +60,7 @@
     "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",
@@ -44,68 +72,43 @@
     "xlsx": "0.14.1"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "4.4.4",
+    "@babel/core": "7.0.0",
-    "@vue/cli-plugin-eslint": "4.4.4",
+    "@babel/register": "7.0.0",
-    "@vue/cli-plugin-unit-jest": "4.4.4",
+    "@vue/cli-plugin-babel": "3.5.3",
-    "@vue/cli-service": "4.4.4",
+    "@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",
+    "autoprefixer": "^9.5.1",
-    "babel-eslint": "10.1.0",
+    "babel-core": "7.0.0-bridge.0",
+    "babel-eslint": "10.0.1",
     "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": "5.15.3",
-    "eslint-plugin-vue": "6.2.2",
+    "eslint-plugin-vue": "5.2.2",
     "html-webpack-plugin": "3.2.0",
+    "html2canvas": "^1.0.0-rc.5",
     "husky": "1.3.1",
     "lint-staged": "8.1.5",
     "mockjs": "1.0.1-beta3",
     "plop": "2.3.0",
-    "runjs": "4.3.2",
+    "runjs": "^4.3.2",
-    "sass": "1.26.2",
+    "sass": "^1.26.2",
-    "sass-loader": "8.0.2",
+    "sass-loader": "^7.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",
-    "serve-static": "1.13.2",
+    "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"
   },
-  "keywords": [
+  "browserslist": [
-    "vue",
+    "> 1%",
-    "admin",
+    "last 2 versions"
-    "dashboard",
-    "element-ui",
-    "boilerplate",
-    "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"
-  }
 }

plop-templates/utils.js

@@ -1,2 +1,9 @@
-exports.notEmpty = name => v =>
+exports.notEmpty = name => {
-  !v || v.trim() === '' ? `${name} is required` : true
+  return v => {
+    if (!v || v.trim === '') {
+      return `${name} is required`
+    } else {
+      return true
+    }
+  }
+}

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上传

src/components/Tinymce/components/EditorImage.vue

@@ -1,6 +1,12 @@
 <template>
   <div class="upload-container">
-    <el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
+    <el-button
+      :style="{background:color,borderColor:color}"
+      icon="el-icon-upload"
+      size="mini"
+      type="primary"
+      @click=" dialogVisible=true"
+    >
       upload
     </el-button>
     <el-dialog :visible.sync="dialogVisible">
@@ -15,14 +21,20 @@
         action="https://httpbin.org/post"
         list-type="picture-card"
       >
-        <el-button size="small" type="primary">
+        <el-button
+          size="small"
+          type="primary"
+        >
           Click upload
         </el-button>
       </el-upload>
       <el-button @click="dialogVisible = false">
         Cancel
       </el-button>
-      <el-button type="primary" @click="handleSubmit">
+      <el-button
+        type="primary"
+        @click="handleSubmit"
+      >
         Confirm
       </el-button>
     </el-dialog>
@@ -49,12 +61,16 @@ export default {
   },
   methods: {
     checkAllSuccess() {
-      return Object.keys(this.listObj).every(item => this.listObj[item].hasSuccess)
+      return Object.keys(this.listObj).every(
+        item => this.listObj[item].hasSuccess
+      )
     },
     handleSubmit() {
       const arr = Object.keys(this.listObj).map(v => this.listObj[v])
       if (!this.checkAllSuccess()) {
-        this.$message('Please wait for all images to be uploaded successfully. If there is a network problem, please refresh the page and upload again!')
+        this.$message(
+          'Please wait for all images to be uploaded successfully. If there is a network problem, please refresh the page and upload again!'
+        )
         return
       }
       this.$emit('successCBK', arr)
@@ -92,7 +108,12 @@ export default {
         const img = new Image()
         img.src = _URL.createObjectURL(file)
         img.onload = function() {
-          _self.listObj[fileName] = { hasSuccess: false, uid: file.uid, width: this.width, height: this.height }
+          _self.listObj[fileName] = {
+            hasSuccess: false,
+            uid: file.uid,
+            width: this.width,
+            height: this.height
+          }
         }
         resolve(true)
       })

src/components/Tinymce/example.vue

@@ -0,0 +1,234 @@
+<template>
+  <div class="layout-container">
+    <div ref="list" class="layout-body">
+      <tinymce
+        v-model="content"
+        :menu="menu"
+        :height="height"
+        :new-event-list="eventList"
+      />
+    </div>
+    <div class="util-component" style="display:none;">
+      <el-upload
+        :multiple="true"
+        :file-list="dataList.list"
+        :on-progress="uploadProgress"
+        :on-success="handleSuccess"
+        class="editor-slide-upload"
+        action="https://httpbin.org/post"
+        list-type="picture-card"
+      >
+        <el-button id="editorUploader" size="small" type="primary">
+          Click upload
+        </el-button>
+      </el-upload>
+    </div>
+    <div ref="imageWrapper" class="show-html" v-html="content" />
+  </div>
+</template>
+
+<script>
+import Tinymce from './index'
+import html2canvas from 'html2canvas'
+import { Loading } from 'element-ui'
+export default {
+  name: 'TinymceDemo',
+  components: { Tinymce },
+  data() {
+    return {
+      showPreviewDialog: false,
+      dataurl: '',
+      eventList: [
+        {
+          toolbarName: 'uploadImg',
+          tooltip: 'uploadImg',
+          text: 'uploadImg',
+          fn: (e, callback) => {
+            this.handleAdd('uploadImg', data => {
+              if (callback && typeof callback === 'function') {
+                callback(data)
+              }
+            })
+          }
+        },
+        // {
+        //   toolbarName: 'uploadVideo',
+        //   tooltip: 'uploadVideo',
+        //   text: 'uploadVideo',
+        //   fn: (e, callback) => {
+        //     this.handleAdd('uploadVideo', data => {
+        //       if (callback && typeof callback === 'function') {
+        //         callback(data)
+        //       }
+        //     })
+        //   }
+        // },
+        {
+          toolbarName: 'spreview',
+          tooltip: 'spreview',
+          text: 'spreview',
+          fn: (e, callback) => {
+            this.toImage()
+          }
+        }
+      ],
+      isUpload: false,
+      dataList: {
+        list: [
+          {
+            url: ''
+          }
+        ],
+        type: 'image',
+        setDom: v => `<a>${v.dom}</a>`
+      },
+      height: 700,
+      menu: {
+        file: { title: '文件', items: 'newdocument' },
+        edit: {
+          title: '编辑',
+          items: 'undo redo | cut copy paste pastetext | selectall'
+        },
+        insert: { title: '插入', items: 'link media | image hr' },
+        view: { title: '查看', items: 'visualaid' },
+        format: {
+          title: '格式',
+          items:
+            'bold italic underline strikethrough superscript subscript | formats | removeformat'
+        },
+        table: {
+          title: '表格',
+          items: 'inserttable tableprops deletetable | cell row column'
+        },
+        tools: { title: '工具', items: 'spellchecker code' }
+      },
+      loadingInstance: null,
+      content: `<h1 style="text-align: center;">测试demo!</h1>
+                <p>嗨</p>
+               <img class="img" src="https://ali-image-test.dabanjia.com/image/20200508/1588911589606_5140%24ban.jpg" width="200"/>
+                <p>枕着幸福在梦中微笑，清零生活的压力烦恼，阳光透过窗与你拥抱，伸伸懒腰迎接周末来到，问候源于无法按捺的心跳，愿你周末乐逍遥，生活更美妙！
+                    周末来到，让烦恼跑光，让忧愁找不到，跟寂寞说再见，跟压力说拜拜，跟快乐说你好，牵着幸福的手，携上平安，开开心心的过周末！
+                    每个人，都有一个世界；每首歌，都有一个故事；每一周，都有一个周末；每个人，都要一个愿望；我的愿望很现实：周末清晨，搅黄你的美梦！周末快乐！
+                </p>
+                `
+    }
+  },
+  computed: {
+    fileType() {
+      // 自定义配置上传组件支持的文件，需要对上传组件进行封装，制定文件规格
+      if (this.dataList.type === 'image') {
+        return 'png|jpe?g|gif|svg'
+      }
+      if (this.dataList.type === 'video') {
+        // 暂时只支持mp4
+        return 'mp4'
+        // return "mp4|webm|ogg|mp3|wav|flac|aac";
+      }
+      return ''
+    }
+  },
+  mounted() {
+    // 实时获取高度，并减去padding值
+    this.height = this.$refs.list.clientHeight - 32
+  },
+  methods: {
+    toImage() {
+      var width = 330 // 获取dom 宽度
+      var height = this.$refs.imageWrapper.scrollHeight // 获取dom 高度
+      var canvas = document.createElement('canvas') // 创建一个canvas节点
+      var scale = 2 // 定义任意放大倍数 支持小数默认设置为2，确保图片清晰度
+      canvas.width = width * scale * scale // 定义canvas 宽度 * 缩放
+      canvas.height = height * scale * scale // 定义canvas高度 *缩放
+      canvas.getContext('2d').scale(scale, scale) // 获取context,设置scale
+      var opts = {
+        tainttest: true, // 检测每张图片都已经加载完成
+        scale: scale, // 添加的scale 参数
+        useCORS: true,
+        canvas: canvas, // 自定义 canvas
+        logging: true, // 日志开关
+        width: width, // dom 原始宽度
+        height: height // dom 原始高度
+      }
+      html2canvas(this.$refs.imageWrapper, opts).then(canvas => {
+        const dataurl = canvas.toDataURL('image/png')
+        this.dataurl = dataurl
+        if (this.dataurl !== '') {
+          console.log(this.dataurl, '生成base64')
+        }
+      })
+    },
+    error(e) {
+      console.log(e)
+    },
+    handleAdd(key, callback) {
+      this.dataList.list[0].url = ''
+      this.isUpload = false
+      switch (key) {
+        case 'uploadImg':
+          this.dataList.type = 'image'
+          document.getElementById('editorUploader').click()
+
+          break
+        case 'uploadVideo':
+          this.dataList.type = 'video'
+          document.getElementById('editorUploader').click()
+
+          break
+        // 批量操作,可自定义所有操作
+        case 'selectImg':
+          break
+        case 'selectVideo':
+          break
+      }
+      const unWatch = this.$watch('isUpload', val => {
+        if (val && callback && typeof callback === 'function') {
+          callback(this.dataList)
+          // 取消监听
+          unWatch()
+        }
+      })
+    },
+    uploadProgress() {
+      this.loadingInstance = Loading.service({
+        lock: true,
+        text: '数据加载中，请稍后...',
+        background: 'rgba(0, 0, 0, 0.1)'
+      })
+    },
+    // 定义模板
+    handleSuccess(data, file) {
+      this.loadingInstance.close()
+      this.dataList.list[0].url = file.url
+      const { type } = this.dataList
+      if (type === 'image') {
+        this.dataList.setDom = v =>
+          `<img class="img-scale" src="${v.url}" width="200">`
+      }
+      if (type === 'video') {
+        // 自定义配置模板信息，宽高后期都可变成输入
+        this.dataList.setDom = v =>
+          `<p >
+              <video controls="controls" width="200" height="350"   >
+                 <source src="https://dev-saas.oss-cn-beijing.aliyuncs.com/056eb234fa9844b0b7ec3e13bd39faf7.mp4" type="video/mp4" />
+                 <source src="${v.url}" type="video/mp4" />
+              </video>
+               
+            </p>
+            `
+      }
+      this.isUpload = true
+    }
+  }
+}
+</script>
+<style scoped>
+.show-html {
+  position: fixed;
+  right: 40px;
+  top: 80px;
+  width: 330px;
+  padding: 16px;
+  background: #fff;
+  border: 1px solid goldenrod;
+}
+</style>

src/components/Tinymce/index.vue

@@ -1,8 +1,16 @@
 <template>
-  <div :class="{fullscreen:fullscreen}" class="tinymce-container" :style="{width:containerWidth}">
+  <div
+    :class="{ fullscreen: fullscreen }"
+    class="tinymce-container"
+    :style="{ width: containerWidth }"
+  >
     <textarea :id="tinymceId" class="tinymce-textarea" />
     <div class="editor-custom-btn-container">
-      <editorImage color="#1890ff" class="editor-upload-btn" @successCBK="imageSuccessCBK" />
+      <editorImage
+        color="#1890ff"
+        class="editor-upload-btn"
+        @successCBK="imageSuccessCBK"
+      />
     </div>
   </div>
 </template>
@@ -18,7 +26,8 @@ import toolbar from './toolbar'
 import load from './dynamicLoadScript'
 
 // why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one
-const tinymceCDN = 'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js'
+const tinymceCDN =
+  'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js'
 
 export default {
   name: 'Tinymce',
@@ -27,7 +36,11 @@ export default {
     id: {
       type: String,
       default: function() {
-        return 'vue-tinymce-' + +new Date() + ((Math.random() * 1000).toFixed(0) + '')
+        return (
+          'vue-tinymce-' +
+          +new Date() +
+          ((Math.random() * 1000).toFixed(0) + '')
+        )
       }
     },
     value: {
@@ -45,6 +58,13 @@ export default {
       type: String,
       default: 'file edit insert view format table'
     },
+    newEventList: {
+      type: Array,
+      required: false,
+      default() {
+        return []
+      }
+    },
     height: {
       type: [Number, String],
       required: false,
@@ -63,17 +83,18 @@ export default {
       tinymceId: this.id,
       fullscreen: false,
       languageTypeList: {
-        'en': 'en',
+        en: 'en',
-        'zh': 'zh_CN',
+        zh: 'zh_CN',
-        'es': 'es_MX',
+        es: 'es_MX',
-        'ja': 'ja'
+        ja: 'ja'
       }
     }
   },
   computed: {
     containerWidth() {
       const width = this.width
-      if (/^[\d]+(\.[\d]+)?$/.test(width)) { // matches `100`, `'100'`
+      if (/^[\d]+(\.[\d]+)?$/.test(width)) {
+        // matches `100`, `'100'`
         return `${width}px`
       }
       return width
@@ -83,7 +104,8 @@ export default {
     value(val) {
       if (!this.hasChange && this.hasInit) {
         this.$nextTick(() =>
-          window.tinymce.get(this.tinymceId).setContent(val || ''))
+          window.tinymce.get(this.tinymceId).setContent(val || '')
+        )
       }
     }
   },
@@ -104,7 +126,7 @@ export default {
   methods: {
     init() {
       // dynamic load tinymce from cdn
-      load(tinymceCDN, (err) => {
+      load(tinymceCDN, err => {
         if (err) {
           this.$message.error(err.message)
           return
@@ -114,13 +136,39 @@ export default {
     },
     initTinymce() {
       const _this = this
+      // 自定义事件列表
+      let newToolbar = []
+      let barStr = ''
+      const eventData = []
+      this.newEventList.map(itemData => {
+        const { toolbarName, tooltip, text, fn } = itemData
+        eventData.push({
+          data: {
+            tooltip,
+            text,
+            onclick: e => {
+              fn(e, data => {
+                // 当事件成功后触发回调函数
+                _this.dataSuccessCBK(data)
+              })
+            }
+          },
+          name: toolbarName
+        })
+        barStr += toolbarName + ' '
+      })
+      if (this.toolbar.length > 0) {
+        newToolbar = this.toolbar.concat(barStr)
+      } else {
+        newToolbar = toolbar.concat(barStr)
+      }
       window.tinymce.init({
         selector: `#${this.tinymceId}`,
         language: this.languageTypeList['en'],
         height: this.height,
         body_class: 'panel-body ',
         object_resizing: false,
-        toolbar: this.toolbar.length > 0 ? this.toolbar : toolbar,
+        toolbar: newToolbar,
         menubar: this.menubar,
         plugins: plugins,
         end_container_on_empty_block: true,
@@ -144,8 +192,9 @@ export default {
           })
         },
         setup(editor) {
-          editor.on('FullscreenStateChanged', (e) => {
+          eventData.map(item => {
-            _this.fullscreen = e.state
+            console.log('-----', item)
+            editor.addButton(item.name, item.data)
           })
         },
         // it will try to keep these URLs intact
@@ -204,7 +253,29 @@ 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}" >`)
+      })
+    },
+    dataSuccessCBK(dataList) {
+      const { type, list, setDom } = dataList
+      let newDom = ''
+      console.log(dataList)
+      const self = this
+      if (type === 'image') {
+        list.forEach(v => {
+          newDom = setDom(v)
+          window.tinymce.get(self.tinymceId).insertContent(newDom)
+        })
+      } else if (type === 'video') {
+        list.forEach(v => {
+          newDom = setDom(v)
+          window.tinymce.get(self.tinymceId).insertContent(newDom)
+        })
+      }
     }
   }
 }

src/directive/permission/permission.js

@@ -1,11 +1,11 @@
 import store from '@/store'
 
-function checkPermission(el, binding) {
+export default {
+  inserted(el, binding, vnode) {
     const { value } = binding
     const roles = store.getters && store.getters.roles
 
-  if (value && value instanceof Array) {
+    if (value && value instanceof Array && value.length > 0) {
-    if (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']"`)
     }
   }
-
-export default {
-  inserted(el, binding) {
-    checkPermission(el, binding)
-  },
-  update(el, binding) {
-    checkPermission(el, binding)
-  }
 }

src/layout/components/Sidebar/Item.vue

@@ -17,12 +17,8 @@ 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}/>)
     }
-    }
 
     if (title) {
       vnodes.push(<span slot='title'>{(title)}</span>)
@@ -31,11 +27,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-.sub-el-icon {
-  color: currentColor;
-  width: 1em;
-  height: 1em;
-}
-</style>

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)
@@ -197,7 +197,7 @@ export const asyncRoutes = [
     name: 'Example',
     meta: {
       title: 'Example',
-      icon: 'el-icon-s-help'
+      icon: 'example'
     },
     children: [
       {

src/store/modules/settings.js

@@ -13,7 +13,6 @@ const state = {
 
 const mutations = {
   CHANGE_SETTING: (state, { key, value }) => {
-    // eslint-disable-next-line no-prototype-builtins
     if (state.hasOwnProperty(key)) {
       state[key] = value
     }

src/store/modules/user.js

@@ -103,7 +103,8 @@ const actions = {
   },
 
   // dynamically modify permissions
-  async changeRoles({ commit, dispatch }, role) {
+  changeRoles({ commit, dispatch }, role) {
+    return new Promise(async resolve => {
       const token = role + '-token'
 
       commit('SET_TOKEN', token)
@@ -115,11 +116,15 @@ const actions = {
 
       // generate accessible routes map based on roles
       const accessRoutes = await dispatch('permission/generateRoutes', roles, { root: true })
+
       // dynamically add accessible routes
       router.addRoutes(accessRoutes)
 
       // reset visited views and cached views
       dispatch('tagsView/delAllViews', null, { root: true })
+
+      resolve()
+    })
   }
 }
 

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,

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 = {}
+  return JSON.parse(
-  const searchArr = search.split('&')
+    '{"' +
-  searchArr.forEach(v => {
+      decodeURIComponent(search)
-    const index = v.indexOf('=')
+        .replace(/"/g, '\\"')
-    if (index !== -1) {
+        .replace(/&/g, '","')
-      const name = v.substring(0, index)
+        .replace(/=/g, '":"')
-      const val = v.substring(index + 1, v.length)
+        .replace(/\+/g, ' ') +
-      obj[name] = val
+      '"}'
-    }
+  )
-  })
-  return obj
 }
 
 /**

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

src/utils/request.js

@@ -1,8 +1,12 @@
 import axios from 'axios'
-import { MessageBox, Message } from 'element-ui'
+import {
+  Message,
+  MessageBox,
+  Loading
+} from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
-
+var loadingInstance = null
 // create an axios instance
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
@@ -21,6 +25,12 @@ service.interceptors.request.use(
       // please modify it according to the actual situation
       config.headers['X-Token'] = getToken()
     }
+    console.log('------')
+    loadingInstance = Loading.service({
+      lock: true,
+      text: '数据加载中，请稍后...',
+      background: 'rgba(0, 0, 0, 0.1)'
+    })
     return config
   },
   error => {
@@ -43,6 +53,7 @@ service.interceptors.response.use(
    * You can also judge the status by HTTP Status Code
    */
   response => {
+    loadingInstance.close()
     const res = response.data
 
     // if the custom code is not 20000, it is judged as an error.
@@ -72,6 +83,7 @@ service.interceptors.response.use(
     }
   },
   error => {
+    loadingInstance.close()
     console.log('err' + error) // for debug
     Message({
       message: error.message,

src/views/components-demo/tinymce.vue

@@ -2,27 +2,37 @@
   <div class="components-container">
     <aside>
       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/feature/component/rich-editor.html">Documentation</a>
+      <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" />
+      <tinymce
+        v-model="content"
+        :height="300"
+      />
     </div>
-    <div class="editor-content" v-html="content" />
   </div>
 </template>
 
 <script>
-import Tinymce from '@/components/Tinymce'
+import Tinymce from '@/components/Tinymce/example'
 
 export default {
   name: 'TinymceDemo',
   components: { Tinymce },
   data() {
     return {
-      content:
+      content: `<h1 style="text-align: center;">测试demo!</h1>
-      `<h1 style="text-align: center;">Welcome to the TinyMCE demo!</h1><p style="text-align: center; font-size: 15px;"><img title="TinyMCE Logo" src="//www.tinymce.com/images/glyph-tinymce@2x.png" alt="TinyMCE Logo" width="110" height="97" /><ul>
+                <p>嗨</p>
-        <li>Our <a href="//www.tinymce.com/docs/">documentation</a> is a great resource for learning how to configure TinyMCE.</li><li>Have a specific question? Visit the <a href="https://community.tinymce.com/forum/">Community Forum</a>.</li><li>We also offer enterprise grade support as part of <a href="https://tinymce.com/pricing">TinyMCE premium subscriptions</a>.</li>
+               <img class="img" src="https://ali-image-test.dabanjia.com/image/20200508/1588911589606_5140%24ban.jpg" width="200"/>
-      </ul>`
+                <p>枕着幸福在梦中微笑，清零生活的压力烦恼，阳光透过窗与你拥抱，伸伸懒腰迎接周末来到，问候源于无法按捺的心跳，愿你周末乐逍遥，生活更美妙！
+                    周末来到，让烦恼跑光，让忧愁找不到，跟寂寞说再见，跟压力说拜拜，跟快乐说你好，牵着幸福的手，携上平安，开开心心的过周末！
+                    每个人，都有一个世界；每首歌，都有一个故事；每一周，都有一个周末；每个人，都要一个愿望；我的愿望很现实：周末清晨，搅黄你的美梦！周末快乐！
+                </p>
+                `
     }
   }
 }

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">

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;
+    width: 200px;
-    margin: 16px;
+    margin-bottom: 16px;
     line-height: 60px;
     font-size: 20px;
     text-align: center;

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: '测试'
-    })
-  })
-})

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
+    config.plugins.delete('preload') // TODO: need test
-    // it can improve the speed of the first screen, it is recommended to turn on preload
+    config.plugins.delete('prefetch') // TODO: need test
-    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')
 
     // 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')
         }
       )