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

[release] 4.3.0
perf: change >>> ::v-deep
2020-06-11 16:31:07 +08:00 · 2020-06-08 21:35:01 +08:00 · 2020-06-08 20:42:55 +08:00 · 2020-06-08 20:41:46 +08:00 · 2020-06-08 19:38:55 +08:00 · 2020-06-05 13:32:15 +08:00
29 changed files with 541 additions and 116 deletions
--- a/README.es.md
+++ b/README.es.md
@@ -51,24 +51,26 @@ Vue Element Admin es una solución práctica basada en la nueva plataforma de de
 - Plantilla de Typescript: [vue-typescript-admin-template](https://github.com/Armour/vue-typescript-admin-template) (Créditos: [@Armour](https://github.com/Armour))
 - [awesome-project](https://github.com/PanJiaChen/vue-element-admin/issues/2312)

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

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

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

 ## Preparación

 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.

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

 ## Patrocinantes

-Se un patrocinante y pon tu logo en nuestro README on GitHub con un enlace directo a tu sitio web. [[Se un Patrocinante]](https://www.patreon.com/panjiachen)
+Sea un patrocinante y coloque su logo en nuestro LEEME en GitHub con un enlace directo a su sitio web. [[Se un Patrocinante]](https://www.patreon.com/panjiachen)

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

@@ -77,25 +79,28 @@ Se un patrocinante y pon tu logo en nuestro README on GitHub con un enlace direc
 ```
 - Iniciar / Cerrar Sesión

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

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

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

 - Editor
  - Editor de Texto Enriquecido
@@ -106,7 +111,7 @@ Se un patrocinante y pon tu logo en nuestro README on GitHub con un enlace direc
  - Exportación a Excel
  - Carga de Excel
  - Visualización de Excel
-  - Exportación como zip
+  - Exportación como ZIP

 - Tabla
  - Tabla Dinámica
@@ -135,7 +140,7 @@ Se un patrocinante y pon tu logo en nuestro README on GitHub con un enlace direc
 - Página de Guías
 - ECharts (Gráficos)
 - Portapapeles
- Convertidor de Markdown a html
+- Convertidor de Markdown a HTML
 ```

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

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

 ## Licencia

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

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

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

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

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

 - 共通機能
  - 多言語切替
@@ -204,7 +209,7 @@ Modern browsers and Internet Explorer 10+.

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

 ## License

--- a/README.md
+++ b/README.md
@@ -62,7 +62,9 @@ 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.

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

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

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

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

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

 ## License

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

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

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

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

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

 - 全局功能
  - 国际化多语言
@@ -221,13 +226,17 @@ 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/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vue-element-admin",
-  "version": "4.2.1",
+  "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",
@@ -89,12 +89,13 @@
    "eslint": "5.15.3",
    "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",
-    "node-sass": "^4.9.0",
    "plop": "2.3.0",
    "runjs": "^4.3.2",
+    "sass": "^1.26.2",
    "sass-loader": "^7.1.0",
    "script-ext-html-webpack-plugin": "2.1.3",
    "serve-static": "^1.13.2",
--- a/src/components/DragSelect/index.vue
+++ b/src/components/DragSelect/index.vue
@@ -48,14 +48,18 @@ export default {
 }
 </script>

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

-.drag-select >>> .el-tag {
-  cursor: pointer;
+    .el-tag {
+      cursor: pointer;
+    }
+  }
 }
 </style>
--- a/src/components/HeaderSearch/index.vue
+++ b/src/components/HeaderSearch/index.vue
@@ -159,7 +159,7 @@ export default {
    display: inline-block;
    vertical-align: middle;

-    /deep/ .el-input__inner {
+    ::v-deep .el-input__inner {
      border-radius: 0;
      border: 0;
      padding-left: 0;
--- a/src/components/JsonEditor/index.vue
+++ b/src/components/JsonEditor/index.vue
@@ -54,19 +54,24 @@ export default {
 }
 </script>

-<style scoped>
-.json-editor{
+<style lang="scss" scoped>
+.json-editor {
  height: 100%;
  position: relative;
-}
-.json-editor >>> .CodeMirror {
-  height: auto;
-  min-height: 300px;
-}
-.json-editor >>> .CodeMirror-scroll{
-  min-height: 300px;
-}
-.json-editor >>> .cm-s-rubyblue span.cm-string {
-  color: #F08047;
+
+  ::v-deep {
+    .CodeMirror {
+      height: auto;
+      min-height: 300px;
+    }
+
+    .CodeMirror-scroll {
+      min-height: 300px;
+    }
+
+    .cm-s-rubyblue span.cm-string {
+      color: #F08047;
+    }
+  }
 }
 </style>
--- a/src/components/SvgIcon/index.vue
+++ b/src/components/SvgIcon/index.vue
@@ -1,7 +1,7 @@
 <template>
  <div v-if="isExternal" :style="styleExternalIcon" class="svg-external-icon svg-icon" v-on="$listeners" />
  <svg v-else :class="svgClass" aria-hidden="true" v-on="$listeners">
-    <use :href="iconName" />
+    <use :xlink:href="iconName" />
  </svg>
 </template>

--- a/src/components/Tinymce/components/EditorImage.vue
+++ b/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)
      })
@@ -104,7 +125,7 @@ export default {
 <style lang="scss" scoped>
 .editor-slide-upload {
  margin-bottom: 20px;
-  /deep/ .el-upload--picture-card {
+  ::v-deep .el-upload--picture-card {
    width: 100%;
  }
 }
--- a/src/components/Tinymce/example.vue
+++ b/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>
--- a/src/components/Tinymce/index.vue
+++ b/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',
-        'zh': 'zh_CN',
-        'es': 'es_MX',
-        'ja': 'ja'
+        en: 'en',
+        zh: 'zh_CN',
+        es: 'es_MX',
+        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,10 +192,15 @@ export default {
          })
        },
        setup(editor) {
-          editor.on('FullscreenStateChanged', (e) => {
-            _this.fullscreen = e.state
+          eventData.map(item => {
+            console.log('-----', item)
+            editor.addButton(item.name, item.data)
          })
-        }
+        },
+        // it will try to keep these URLs intact
+        // https://www.tiny.cloud/docs-3x/reference/configuration/Configuration3x@convert_urls/
+        // https://stackoverflow.com/questions/5196205/disable-tinymce-absolute-to-relative-url-conversions
+        convert_urls: false
        // 整合七牛上传
        // images_dataimg_filter(img) {
        //   setTimeout(() => {
@@ -202,35 +255,63 @@ export default {
    imageSuccessCBK(arr) {
      const _this = this
      arr.forEach(v => {
-        window.tinymce.get(_this.tinymceId).insertContent(`<img class="wscnph" src="${v.url}" >`)
+        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)
+        })
+      }
    }
  }
 }
 </script>

-<style scoped>
+<style lang="scss" scoped>
 .tinymce-container {
  position: relative;
  line-height: normal;
 }
-.tinymce-container>>>.mce-fullscreen {
-  z-index: 10000;
+
+.tinymce-container {
+  ::v-deep {
+    .mce-fullscreen {
+      z-index: 10000;
+    }
+  }
 }
+
 .tinymce-textarea {
  visibility: hidden;
  z-index: -1;
 }
+
 .editor-custom-btn-container {
  position: absolute;
  right: 4px;
  top: 4px;
  /*z-index: 2005;*/
 }
+
 .fullscreen .editor-custom-btn-container {
  z-index: 10000;
  position: fixed;
 }
+
 .editor-upload-btn {
  display: inline-block;
 }
--- a/src/layout/components/Sidebar/Link.vue
+++ b/src/layout/components/Sidebar/Link.vue
@@ -1,7 +1,5 @@
-
 <template>
-  <!-- eslint-disable vue/require-component-is -->
-  <component v-bind="linkProps(to)">
+  <component :is="type" v-bind="linkProps(to)">
    <slot />
  </component>
 </template>
@@ -16,19 +14,28 @@ export default {
      required: true
    }
  },
+  computed: {
+    isExternal() {
+      return isExternal(this.to)
+    },
+    type() {
+      if (this.isExternal) {
+        return 'a'
+      }
+      return 'router-link'
+    }
+  },
  methods: {
-    linkProps(url) {
-      if (isExternal(url)) {
+    linkProps(to) {
+      if (this.isExternal) {
        return {
-          is: 'a',
-          href: url,
+          href: to,
          target: '_blank',
          rel: 'noopener'
        }
      }
      return {
-        is: 'router-link',
-        to: url
+        to: to
      }
    }
  }
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -19,12 +19,21 @@ export default {
      return this.$refs.scrollContainer.$refs.wrap
    }
  },
+  mounted() {
+    this.scrollWrapper.addEventListener('scroll', this.emitScroll, true)
+  },
+  beforeDestroy() {
+    this.scrollWrapper.removeEventListener('scroll', this.emitScroll)
+  },
  methods: {
    handleScroll(e) {
      const eventDelta = e.wheelDelta || -e.deltaY * 40
      const $scrollWrapper = this.scrollWrapper
      $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
    },
+    emitScroll() {
+      this.$emit('scroll')
+    },
    moveToTarget(currentTag) {
      const $container = this.$refs.scrollContainer.$el
      const $containerWidth = $container.offsetWidth
@@ -73,7 +82,7 @@ export default {
  position: relative;
  overflow: hidden;
  width: 100%;
-  /deep/ {
+  ::v-deep {
    .el-scrollbar__bar {
      bottom: 0px;
    }
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -1,6 +1,6 @@
 <template>
  <div id="tags-view-container" class="tags-view-container">
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper">
+    <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
      <router-link
        v-for="tag in visitedViews"
        ref="tag"
@@ -189,6 +189,9 @@ export default {
    },
    closeMenu() {
      this.visible = false
+    },
+    handleScroll() {
+      this.closeMenu()
    }
  }
 }
--- 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

@@ -33,7 +34,8 @@ if (process.env.NODE_ENV === 'production') {
 }

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

 // register global utility filters
--- a/src/permission.js
+++ b/src/permission.js
@@ -24,7 +24,7 @@ router.beforeEach(async(to, from, next) => {
    if (to.path === '/login') {
      // if is logged in, redirect to the home page
      next({ path: '/' })
-      NProgress.done()
+      NProgress.done() // hack: https://github.com/PanJiaChen/vue-element-admin/pull/2939
    } else {
      // determine whether the user has obtained his permission roles through getInfo
      const hasRoles = store.getters.roles && store.getters.roles.length > 0
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -31,7 +31,7 @@
 .fixed-width {
  .el-button--mini {
    padding: 7px 10px;
-    width: 60px;
+    min-width: 60px;
  }
 }

--- a/src/styles/element-variables.scss
+++ b/src/styles/element-variables.scss
@@ -6,7 +6,7 @@
 /* theme color */
 $--color-primary: #1890ff;
 $--color-success: #13ce66;
-$--color-warning: #FFBA00;
+$--color-warning: #ffba00;
 $--color-danger: #ff4949;
 // $--color-info: #1E1E1E;

@@ -17,10 +17,10 @@ $--button-font-weight: 400;
 $--border-color-light: #dfe4ed;
 $--border-color-lighter: #e6ebf5;

-$--table-border:1px solid#dfe6ec;
+$--table-border: 1px solid #dfe6ec;

 /* icon font path, required */
-$--font-path: '~element-ui/lib/theme-chalk/fonts';
+$--font-path: "~element-ui/lib/theme-chalk/fonts";

@import "~element-ui/packages/theme-chalk/src/index";

--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -9,7 +9,7 @@
 * @returns {string | null}
 */
 export function parseTime(time, cFormat) {
-  if (arguments.length === 0) {
+  if (arguments.length === 0 || !time) {
    return null
  }
  const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}'
@@ -17,9 +17,17 @@ export function parseTime(time, cFormat) {
  if (typeof time === 'object') {
    date = time
  } else {
-    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
-      time = parseInt(time)
+    if ((typeof time === 'string')) {
+      if ((/^[0-9]+$/.test(time))) {
+        // support "1548221490638"
+        time = parseInt(time)
+      } else {
+        // support safari
+        // https://stackoverflow.com/questions/4310953/invalid-date-in-safari
+        time = time.replace(new RegExp(/-/gm), '/')
+      }
    }
+
    if ((typeof time === 'number') && (time.toString().length === 10)) {
      time = time * 1000
    }
--- a/src/utils/request.js
+++ b/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,
--- a/src/views/components-demo/tinymce.vue
+++ b/src/views/components-demo/tinymce.vue
@@ -2,34 +2,44 @@
  <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/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:
-      `<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>
-        <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>
-      </ul>`
+      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>
+                `
    }
  }
 }
 </script>

 <style scoped>
-.editor-content{
+.editor-content {
  margin-top: 20px;
 }
 </style>
--- a/src/views/dashboard/admin/components/BoxCard.vue
+++ b/src/views/dashboard/admin/components/BoxCard.vue
@@ -101,7 +101,7 @@ export default {
    background-color: #fff;
    margin: auto;
    box-shadow: none!important;
-    /deep/ .pan-info {
+    ::v-deep .pan-info {
      box-shadow: none!important;
    }
  }
--- a/src/views/dashboard/admin/components/RaddarChart.vue
+++ b/src/views/dashboard/admin/components/RaddarChart.vue
@@ -70,7 +70,7 @@ export default {
          indicator: [
            { name: 'Sales', max: 10000 },
            { name: 'Administration', max: 20000 },
-            { name: 'Information Techology', max: 20000 },
+            { name: 'Information Technology', max: 20000 },
            { name: 'Customer Support', max: 20000 },
            { name: 'Development', max: 20000 },
            { name: 'Marketing', max: 20000 }
--- a/src/views/example/components/ArticleDetail.vue
+++ b/src/views/example/components/ArticleDetail.vue
@@ -277,7 +277,7 @@ export default {
  }
 }

-.article-textarea /deep/ {
+.article-textarea ::v-deep {
  textarea {
    padding-right: 40px;
    resize: none;
--- a/src/views/permission/directive.vue
+++ b/src/views/permission/directive.vue
@@ -91,7 +91,7 @@ export default {

 <style lang="scss" scoped>
 .app-container {
-  /deep/ .permission-alert {
+  ::v-deep .permission-alert {
    width: 320px;
    margin-top: 15px;
    background-color: #f0f9eb;
@@ -100,10 +100,10 @@ export default {
    border-radius: 4px;
    display: inline-block;
  }
-  /deep/ .permission-sourceCode {
+  ::v-deep .permission-sourceCode {
    margin-left: 15px;
  }
-  /deep/ .permission-tag {
+  ::v-deep .permission-tag {
    background-color: #ecf5ff;
  }
 }
--- a/src/views/tab/index.vue
+++ b/src/views/tab/index.vue
@@ -13,11 +13,11 @@
 </template>

 <script>
-import tabPane from './components/TabPane'
+import TabPane from './components/TabPane'

 export default {
  name: 'Tab',
-  components: { tabPane },
+  components: { TabPane },
  data() {
    return {
      tabMapOptions: [
--- a/tests/unit/utils/parseTime.spec.js
+++ b/tests/unit/utils/parseTime.spec.js
@@ -1,9 +1,15 @@
 import { parseTime } from '@/utils/index.js'
+
 describe('Utils:parseTime', () => {
  const d = new Date('2018-07-13 17:54:01') // "2018-07-13 17:54:01"
  it('timestamp', () => {
    expect(parseTime(d)).toBe('2018-07-13 17:54:01')
  })
+
+  it('timestamp string', () => {
+    expect(parseTime((d + ''))).toBe('2018-07-13 17:54:01')
+  })
+
  it('ten digits timestamp', () => {
    expect(parseTime((d / 1000).toFixed(0))).toBe('2018-07-13 17:54:01')
  })
@@ -24,4 +30,8 @@ describe('Utils:parseTime', () => {
  it('empty argument', () => {
    expect(parseTime()).toBeNull()
  })
+
+  it('null', () => {
+    expect(parseTime(null)).toBeNull()
+  })
 })
--- a/vue.config.js
+++ b/vue.config.js
@@ -80,12 +80,6 @@ module.exports = {
      })
      .end()

-    config
-      // https://webpack.js.org/configuration/devtool/#development
-      .when(process.env.NODE_ENV === 'development',
-        config => config.devtool('cheap-source-map')
-      )
-
    config
      .when(process.env.NODE_ENV !== 'development',
        config => {
Author	SHA1	Message	Date
laven-der	d48ea83378	feature:新增富文本编辑器插件功能入口,提供导出图片功能,全局loading配置	2020-06-11 16:31:07 +08:00
花裤衩	f14805d0cd	[release] 4.3.0	2020-06-08 21:35:01 +08:00
花裤衩	c5abe7532c	perf: change >>> ::v-deep	2020-06-08 20:42:55 +08:00
Cat73	534cd5bc26	chore: change node-sass to dart-sass (#3040 )	2020-06-08 20:41:46 +08:00
花裤衩	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