perf[chore]: webpack

README.md

@@ -3,21 +3,21 @@
 </p>
 
 <p align="center">
-  <a href="https://github.com/vuejs/vue">
+	<a href="https://github.com/vuejs/vue">
-    <img src="https://img.shields.io/badge/vue-2.5.10-brightgreen.svg" alt="vue">
+		<img src="https://img.shields.io/badge/vue-2.5.10-brightgreen.svg" alt="vue">
-  </a>
+	</a>
-  <a href="https://github.com/ElemeFE/element">
+	<a href="https://github.com/ElemeFE/element">
-    <img src="https://img.shields.io/badge/element--ui-2.3.0-brightgreen.svg" alt="element-ui">
+		<img src="https://img.shields.io/badge/element--ui-2.0.8-brightgreen.svg" alt="element-ui">
-  </a>
+	</a>
-  <a href="https://travis-ci.org/PanJiaChen/vue-element-admin" rel="nofollow">
+	<a href="https://travis-ci.org/PanJiaChen/vue-element-admin" rel="nofollow">
-    <img src="https://travis-ci.org/PanJiaChen/vue-element-admin.svg?branch=master" alt="Build Status">
+		<img src="https://travis-ci.org/PanJiaChen/vue-element-admin.svg?branch=master" alt="Build Status">
-  </a>
+	</a>
-  <a href="https://github.com/PanJiaChen/vue-element-admin/blob/master/LICENSE">
+	<a href="https://github.com/PanJiaChen/vue-element-admin/blob/master/LICENSE">
-    <img src="https://img.shields.io/github/license/mashape/apistatus.svg" alt="license">
+		<img src="https://img.shields.io/github/license/mashape/apistatus.svg" alt="license">
-  </a>
+	</a>
-  <a href="https://github.com/PanJiaChen/vue-element-admin/releases">
+	<a href="https://github.com/PanJiaChen/vue-element-admin/releases">
-    <img src="https://img.shields.io/github/release/PanJiaChen/vue-element-admin.svg" alt="GitHub release">
+		<img src="https://img.shields.io/github/release/PanJiaChen/vue-element-admin.svg" alt="GitHub release">
-  </a>
+	</a>
 </p>
 
 English | [简体中文](./README.zh-CN.md)
@@ -30,16 +30,16 @@ English | [简体中文](./README.zh-CN.md)
 
 - [Documentation](https://panjiachen.github.io/vue-element-admin-site/#/)
 
-- [Wiki](https://github.com/PanJiaChen/vue-element-admin/wiki)
+- [wiki](https://github.com/PanJiaChen/vue-element-admin/wiki)
 
-- [Donate](https://panjiachen.github.io/vue-element-admin-site/#/donate)
+- [donate](https://panjiachen.github.io/vue-element-admin-site/#/donate)
 
 **vue-element-admin is a admin interfaces integration solution, which is not suitable for secondary development as a base template.**
 
  - Base template recommends using: [vueAdmin-template](https://github.com/PanJiaChen/vueAdmin-template)  
  - Desktop: [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
 
-**Note: This project uses element-ui@2.3.0+ version, so the minimum compatible vue@2.5.0+**
+**Note: This project uses element-ui@2.0.0+ version, so the minimum compatible vue@2.5.0**
 
 ## Preparation
 
@@ -95,7 +95,7 @@ You need to install [node](http://nodejs.org/) and [git](https://git-scm.com/) l
 ## Getting started
 
 ```bash
-# clone the project
+# clone the projice
 git clone https://github.com/PanJiaChen/vue-element-admin.git
 
 # install dependency
@@ -146,8 +146,6 @@ If you find this project useful, you can buy author a glass of juice :tropical_d
 
 [Paypal Me](https://www.paypal.me/panfree23)
 
-[Buy me a coffee](https://www.buymeacoffee.com/Pan)
-
 ## License
 
 [MIT](https://github.com/PanJiaChen/vue-element-admin/blob/master/LICENSE)

README.zh-CN.md

@@ -3,21 +3,21 @@
 </p>
 
 <p align="center">
-  <a href="https://github.com/vuejs/vue">
+	<a href="https://github.com/vuejs/vue">
-    <img src="https://img.shields.io/badge/vue-2.5.10-brightgreen.svg" alt="vue">
+		<img src="https://img.shields.io/badge/vue-2.5.10-brightgreen.svg" alt="vue">
-  </a>
+	</a>
-  <a href="https://github.com/ElemeFE/element">
+	<a href="https://github.com/ElemeFE/element">
-    <img src="https://img.shields.io/badge/element--ui-2.3.0-brightgreen.svg" alt="element-ui">
+		<img src="https://img.shields.io/badge/element--ui-2.0.8-brightgreen.svg" alt="element-ui">
-  </a>
+	</a>
-  <a href="https://travis-ci.org/PanJiaChen/vue-element-admin" rel="nofollow">
+	<a href="https://travis-ci.org/PanJiaChen/vue-element-admin" rel="nofollow">
-    <img src="https://travis-ci.org/PanJiaChen/vue-element-admin.svg?branch=master" alt="Build Status">
+		<img src="https://travis-ci.org/PanJiaChen/vue-element-admin.svg?branch=master" alt="Build Status">
-  </a>
+	</a>
-  <a href="https://github.com/PanJiaChen/vue-element-admin/blob/master/LICENSE">
+	<a href="https://github.com/PanJiaChen/vue-element-admin/blob/master/LICENSE">
-    <img src="https://img.shields.io/github/license/mashape/apistatus.svg" alt="license">
+		<img src="https://img.shields.io/github/license/mashape/apistatus.svg" alt="license">
-  </a>
+	</a>
-  <a href="https://github.com/PanJiaChen/vue-element-admin/releases">
+	<a href="https://github.com/PanJiaChen/vue-element-admin/releases">
-    <img src="https://img.shields.io/github/release/PanJiaChen/vue-element-admin.svg" alt="GitHub release">
+		<img src="https://img.shields.io/github/release/PanJiaChen/vue-element-admin.svg" alt="GitHub release">
-  </a>
+	</a>
 </p>
 
 简体中文 | [English](./README.md)
@@ -28,17 +28,17 @@
 
 - [在线访问](http://panjiachen.github.io/vue-element-admin)
 
-- [使用文档](https://panjiachen.github.io/vue-element-admin-site/#/zh-cn/)
+- [使用文档](https://panjiachen.github.io/vue-element-admin-site/#/)
 
-- [Wiki](https://github.com/PanJiaChen/vue-element-admin/wiki)
+- [wiki](https://github.com/PanJiaChen/vue-element-admin/wiki)
 
-- [Donate](https://panjiachen.github.io/vue-element-admin-site/#/zh-cn/donate)
+- [donate](https://panjiachen.github.io/vue-element-admin-site/#/donate)
 
 **本项目的定位是后台集成方案，不适合当基础模板来开发。**
  - 模板建议使用: [vueAdmin-template](https://github.com/PanJiaChen/vueAdmin-template)  
  - 桌面端: [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
 
-**注意：该项目使用 element-ui@2.3.0+ 版本，所以最低兼容 vue@2.5.0+**
+**注意：该项目使用 element-ui@2.0.0+ 版本，所以最低兼容 vue@2.5.0**
 
 ## 前序准备
 
@@ -145,7 +145,7 @@ npm run lint
 npm run lint -- --fix
 ```
 
-更多信息请参考 [使用文档](https://panjiachen.github.io/vue-element-admin-site/#/zh-cn/deploy)
+更多信息请参考 [使用文档](https://panjiachen.github.io/vue-element-admin-site/#/deploy)
 
 ## Changelog
 Detailed changes for each release are documented in the [release notes](https://github.com/PanJiaChen/vue-element-admin/releases).

build/webpack.dev.conf.js

@@ -1,10 +1,11 @@
 'use strict'
-const path = require('path')
 const utils = require('./utils')
 const webpack = require('webpack')
 const config = require('../config')
 const merge = require('webpack-merge')
+const path = require('path')
 const baseWebpackConfig = require('./webpack.base.conf')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
 const portfinder = require('portfinder')
@@ -26,8 +27,13 @@ const devWebpackConfig = merge(baseWebpackConfig, {
   // these devServer options should be customized in /config/index.js
   devServer: {
     clientLogLevel: 'warning',
-    historyApiFallback: true,
+    historyApiFallback: {
+      rewrites: [
+        { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') },
+      ],
+    },
     hot: true,
+    contentBase: false, // since we use CopyWebpackPlugin.
     compress: true,
     host: HOST || config.dev.host,
     port: PORT || config.dev.port,
@@ -55,9 +61,16 @@ const devWebpackConfig = merge(baseWebpackConfig, {
       template: 'index.html',
       inject: true,
       favicon: resolve('favicon.ico'),
-      title: 'vue-element-admin',
+      title: 'vue-element-admin'
-      path: config.dev.assetsPublicPath + config.dev.assetsSubDirectory
     }),
+    // copy custom static assets
+    new CopyWebpackPlugin([
+      {
+        from: path.resolve(__dirname, '../static'),
+        to: config.dev.assetsSubDirectory,
+        ignore: ['.*']
+      }
+    ])
   ]
 })
 

build/webpack.prod.conf.js

@@ -69,7 +69,6 @@ const webpackConfig = merge(baseWebpackConfig, {
       inject: true,
       favicon: resolve('favicon.ico'),
       title: 'vue-element-admin',
-      path: config.build.assetsPublicPath + config.build.assetsSubDirectory,
       minify: {
         removeComments: true,
         collapseWhitespace: true,
@@ -128,6 +127,14 @@ const webpackConfig = merge(baseWebpackConfig, {
         var context = module.context;
         return context && (context.indexOf('xlsx') >= 0);
       }
+    }),
+    // split tinymce into its own file
+    new webpack.optimize.CommonsChunkPlugin({
+      async: 'tinymce',
+      minChunks(module) {
+        var context = module.context;
+        return context && (context.indexOf('tinymce') >= 0);
+      }
     }),
      // split codemirror into its own file
      new webpack.optimize.CommonsChunkPlugin({

config/dev.env.js

@@ -1,5 +1,5 @@
 module.exports = {
-  NODE_ENV: '"development"',
+	NODE_ENV: '"development"',
-  ENV_CONFIG: '"dev"',
+	ENV_CONFIG: '"dev"',
-  BASE_API: '"https://api-dev"'
+	BASE_API: '"https://api-dev"'
 }

config/prod.env.js

@@ -1,5 +1,5 @@
 module.exports = {
-  NODE_ENV: '"production"',
+	NODE_ENV: '"production"',
-  ENV_CONFIG: '"prod"',
+	ENV_CONFIG: '"prod"',
-  BASE_API: '"https://api-prod"'
+	BASE_API: '"https://api-prod"'
 }

config/sit.env.js

@@ -1,5 +1,5 @@
 module.exports = {
-  NODE_ENV: '"production"',
+	NODE_ENV: '"production"',
-  ENV_CONFIG: '"sit"',
+	ENV_CONFIG: '"sit"',
-  BASE_API: '"https://api-sit"'
+	BASE_API: '"https://api-sit"'
 }

index.html

@@ -1,15 +1,14 @@
 <!DOCTYPE html>
 <html>
-  <head>
+	<head>
-    <meta charset="utf-8">
+		<meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="renderer" content="webkit">
+		<meta name="renderer" content="webkit">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <title>vue-element-admin</title>
+		<title>vue-element-admin</title>
-  </head>
+	</head>
-  <body>
+	<body>
-    <script src=<%= htmlWebpackPlugin.options.path %>/tinymce4.7.5/tinymce.min.js></script>
+		<div id="app"></div>
-    <div id="app"></div>
+		<!-- built files will be auto injected -->
-    <!-- built files will be auto injected -->
+	</body>
-  </body>
 </html>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-element-admin",
-  "version": "3.6.5",
+  "version": "3.6.1",
   "description": "A magical vue admin. Typical templates for enterprise applications. Newest development stack of vue. Lots of awesome features",
   "author": "Pan <panfree23@gmail.com>",
   "license": "MIT",
@@ -18,7 +18,7 @@
     "codemirror": "5.32.0",
     "dropzone": "5.2.0",
     "echarts": "3.8.5",
-    "element-ui": "2.3.2",
+    "element-ui": "2.0.8",
     "file-saver": "1.3.3",
     "font-awesome": "4.7.0",
     "js-cookie": "2.2.0",
@@ -31,6 +31,7 @@
     "showdown": "1.8.5",
     "simplemde": "1.11.2",
     "sortablejs": "1.7.0",
+    "tinymce": "4.7.6",
     "vue": "2.5.10",
     "vue-count-to": "1.0.13",
     "vue-i18n": "7.3.2",

src/App.vue

@@ -1,11 +1,11 @@
 <template>
-  <div id="app">
+	<div id="app">
-    <router-view></router-view>
+		<router-view></router-view>
-  </div>
+	</div>
 </template>
 
 <script>
   export default{
-    name: 'App'
+    name: 'APP'
   }
 </script>

src/components/BackToTop/index.vue

@@ -25,16 +25,14 @@ export default {
     },
     customStyle: {
       type: Object,
-      default: function() {
+      default: {
-        return {
+        right: '50px',
-          right: '50px',
+        bottom: '50px',
-          bottom: '50px',
+        width: '40px',
-          width: '40px',
+        height: '40px',
-          height: '40px',
+        'border-radius': '4px',
-          'border-radius': '4px',
+        'line-height': '45px',
-          'line-height': '45px',
+        background: '#e7eaf1'
-          background: '#e7eaf1'
-        }
       }
     },
     transitionName: {

src/components/Charts/keyboard.vue

@@ -4,10 +4,8 @@
 
 <script>
 import echarts from 'echarts'
-import resize from './mixins/resize'
 
 export default {
-  mixins: [resize],
   props: {
     className: {
       type: String,

src/components/Charts/lineMarker.vue

@@ -4,10 +4,8 @@
 
 <script>
 import echarts from 'echarts'
-import resize from './mixins/resize'
 
 export default {
-  mixins: [resize],
   props: {
     className: {
       type: String,

src/components/Charts/mixChart.vue

@@ -4,10 +4,8 @@
 
 <script>
 import echarts from 'echarts'
-import resize from './mixins/resize'
 
 export default {
-  mixins: [resize],
   props: {
     className: {
       type: String,
@@ -33,6 +31,7 @@ export default {
   },
   mounted() {
     this.initChart()
+    this.chart = null
   },
   beforeDestroy() {
     if (!this.chart) {

src/components/Charts/mixins/resize.js

@@ -1,15 +0,0 @@
-import { debounce } from '@/utils'
-
-export default {
-  mounted() {
-    this.__resizeHanlder = debounce(() => {
-      if (this.chart) {
-        this.chart.resize()
-      }
-    }, 100)
-    window.addEventListener('resize', this.__resizeHanlder)
-  },
-  beforeDestroy() {
-    window.removeEventListener('resize', this.__resizeHanlder)
-  }
-}

src/components/Hamburger/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <svg t="1492500959545" @click="toggleClick" class="hamburger" :class="{'is-active':isActive}" style="" viewBox="0 0 1024 1024"
+    <svg t="1492500959545" @click="toggleClick" class="wscn-icon hamburger" :class="{'is-active':isActive}" style="" viewBox="0 0 1024 1024"
       version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1691" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64">
       <path d="M966.8023 568.849776 57.196677 568.849776c-31.397081 0-56.850799-25.452695-56.850799-56.850799l0 0c0-31.397081 25.452695-56.849776 56.850799-56.849776l909.605623 0c31.397081 0 56.849776 25.452695 56.849776 56.849776l0 0C1023.653099 543.397081 998.200404 568.849776 966.8023 568.849776z"
         p-id="1692"></path>
@@ -30,16 +30,16 @@ export default {
 
 <style scoped>
 .hamburger {
-  display: inline-block;
+	display: inline-block;
-  cursor: pointer;
+	cursor: pointer;
-  width: 20px;
+	width: 20px;
-  height: 20px;
+	height: 20px;
-  transform: rotate(90deg);
+	transform: rotate(90deg);
-  transition: .38s;
+	transition: .38s;
-  transform-origin: 50% 50%;
+	transform-origin: 50% 50%;
 }
 
 .hamburger.is-active {
-  transform: rotate(0deg);
+	transform: rotate(0deg);
 }
 </style>

src/components/ImageCropper/lang.js

@@ -0,0 +1,41 @@
+const langBag = {
+  zh: {
+    hint: '点击，或拖动图片至此处',
+    loading: '正在上传……',
+    noSupported: '浏览器不支持该功能，请使用IE10以上或其他现在浏览器！',
+    success: '上传成功',
+    fail: '图片上传失败',
+    preview: '头像预览',
+    btn: {
+      off: '取消',
+      close: '关闭',
+      back: '上一步',
+      save: '保存'
+    },
+    error: {
+      onlyImg: '仅限图片格式',
+      outOfSize: '单文件大小不能超过 ',
+      lowestPx: '图片最低像素为（宽*高）：'
+    }
+  },
+  en: {
+    hint: 'Click, or drag the file here',
+    loading: 'Uploading……',
+    noSupported: 'Browser does not support, please use IE10+ or other browsers',
+    success: 'Upload success',
+    fail: 'Upload failed',
+    preview: 'Preview',
+    btn: {
+      off: 'Cancel',
+      close: 'Close',
+      back: 'Back',
+      save: 'Save'
+    },
+    error: {
+      onlyImg: 'Image only',
+      outOfSize: 'Image exceeds size limit: ',
+      lowestPx: 'The lowest pixel in the image: '
+    }
+  }
+}
+export default langBag

src/components/ImageCropper/upload.css

@@ -0,0 +1,691 @@
+@charset "UTF-8";
+@-webkit-keyframes vicp_progress {
+    0% {
+        background-position-y: 0;
+    }
+    100% {
+        background-position-y: 40px;
+    }
+}
+
+@keyframes vicp_progress {
+    0% {
+        background-position-y: 0;
+    }
+    100% {
+        background-position-y: 40px;
+    }
+}
+
+@-webkit-keyframes vicp {
+    0% {
+        opacity: 0;
+        -webkit-transform: scale(0) translatey(-60px);
+        transform: scale(0) translatey(-60px);
+    }
+    100% {
+        opacity: 1;
+        -webkit-transform: scale(1) translatey(0);
+        transform: scale(1) translatey(0);
+    }
+}
+
+@keyframes vicp {
+    0% {
+        opacity: 0;
+        -webkit-transform: scale(0) translatey(-60px);
+        transform: scale(0) translatey(-60px);
+    }
+    100% {
+        opacity: 1;
+        -webkit-transform: scale(1) translatey(0);
+        transform: scale(1) translatey(0);
+    }
+}
+
+.vue-image-crop-upload {
+    position: fixed;
+    display: block;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    z-index: 10000;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.65);
+    -webkit-tap-highlight-color: transparent;
+    -moz-tap-highlight-color: transparent;
+}
+
+.vue-image-crop-upload .vicp-wrap {
+    -webkit-box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.23);
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.23);
+    position: fixed;
+    display: block;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    z-index: 10000;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 600px;
+    height: 330px;
+    padding: 25px;
+    background-color: #fff;
+    border-radius: 2px;
+    -webkit-animation: vicp 0.12s ease-in;
+    animation: vicp 0.12s ease-in;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-close {
+    position: absolute;
+    right: -30px;
+    top: -30px;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-close .vicp-icon4 {
+    position: relative;
+    display: block;
+    width: 30px;
+    height: 30px;
+    cursor: pointer;
+    -webkit-transition: -webkit-transform 0.18s;
+    transition: -webkit-transform 0.18s;
+    transition: transform 0.18s;
+    transition: transform 0.18s, -webkit-transform 0.18s;
+    -webkit-transform: rotate(0);
+    -ms-transform: rotate(0);
+    transform: rotate(0);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-close .vicp-icon4::after, .vue-image-crop-upload .vicp-wrap .vicp-close .vicp-icon4::before {
+    -webkit-box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.23);
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.23);
+    content: '';
+    position: absolute;
+    top: 12px;
+    left: 4px;
+    width: 20px;
+    height: 3px;
+    -webkit-transform: rotate(45deg);
+    -ms-transform: rotate(45deg);
+    transform: rotate(45deg);
+    background-color: #fff;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-close .vicp-icon4::after {
+    -webkit-transform: rotate(-45deg);
+    -ms-transform: rotate(-45deg);
+    transform: rotate(-45deg);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-close .vicp-icon4:hover {
+    -webkit-transform: rotate(90deg);
+    -ms-transform: rotate(90deg);
+    transform: rotate(90deg);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step1 .vicp-drop-area {
+    position: relative;
+    padding: 35px;
+    height: 200px;
+    background-color: rgba(0, 0, 0, 0.03);
+    text-align: center;
+    border: 1px dashed rgba(0, 0, 0, 0.08);
+    overflow: hidden;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step1 .vicp-drop-area .vicp-icon1 {
+    display: block;
+    margin: 0 auto 6px;
+    width: 42px;
+    height: 42px;
+    overflow: hidden;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step1 .vicp-drop-area .vicp-icon1 .vicp-icon1-arrow {
+    display: block;
+    margin: 0 auto;
+    width: 0;
+    height: 0;
+    border-bottom: 14.7px solid rgba(0, 0, 0, 0.3);
+    border-left: 14.7px solid transparent;
+    border-right: 14.7px solid transparent;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step1 .vicp-drop-area .vicp-icon1 .vicp-icon1-body {
+    display: block;
+    width: 12.6px;
+    height: 14.7px;
+    margin: 0 auto;
+    background-color: rgba(0, 0, 0, 0.3);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step1 .vicp-drop-area .vicp-icon1 .vicp-icon1-bottom {
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    display: block;
+    height: 12.6px;
+    border: 6px solid rgba(0, 0, 0, 0.3);
+    border-top: none;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step1 .vicp-drop-area .vicp-hint {
+    display: block;
+    padding: 15px;
+    font-size: 14px;
+    color: #666;
+    line-height: 30px;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step1 .vicp-drop-area .vicp-no-supported-hint {
+    display: block;
+    position: absolute;
+    top: 0;
+    left: 0;
+    padding: 30px;
+    width: 100%;
+    height: 60px;
+    line-height: 30px;
+    background-color: #eee;
+    text-align: center;
+    color: #666;
+    font-size: 14px;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step1 .vicp-drop-area:hover {
+    cursor: pointer;
+    border-color: rgba(0, 0, 0, 0.1);
+    background-color: rgba(0, 0, 0, 0.05);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop {
+    overflow: hidden;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left {
+    float: left;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-img-container {
+    position: relative;
+    display: block;
+    width: 240px;
+    height: 180px;
+    background-color: #e5e5e0;
+    overflow: hidden;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-img-container .vicp-img {
+    position: absolute;
+    display: block;
+    cursor: move;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-img-container .vicp-img-shade {
+    -webkit-box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.18);
+    box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.18);
+    position: absolute;
+    background-color: rgba(241, 242, 243, 0.8);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-img-container .vicp-img-shade.vicp-img-shade-1 {
+    top: 0;
+    left: 0;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-img-container .vicp-img-shade.vicp-img-shade-2 {
+    bottom: 0;
+    right: 0;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range {
+    position: relative;
+    margin: 30px 0;
+    width: 240px;
+    height: 18px;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range .vicp-icon5,
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range .vicp-icon6 {
+    position: absolute;
+    top: 0;
+    width: 18px;
+    height: 18px;
+    border-radius: 100%;
+    background-color: rgba(0, 0, 0, 0.08);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range .vicp-icon5:hover,
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range .vicp-icon6:hover {
+    -webkit-box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12);
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12);
+    cursor: pointer;
+    background-color: rgba(0, 0, 0, 0.14);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range .vicp-icon5 {
+    left: 0;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range .vicp-icon5::before {
+    position: absolute;
+    content: '';
+    display: block;
+    left: 3px;
+    top: 8px;
+    width: 12px;
+    height: 2px;
+    background-color: #fff;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range .vicp-icon6 {
+    right: 0;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range .vicp-icon6::before {
+    position: absolute;
+    content: '';
+    display: block;
+    left: 3px;
+    top: 8px;
+    width: 12px;
+    height: 2px;
+    background-color: #fff;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range .vicp-icon6::after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 3px;
+    left: 8px;
+    width: 2px;
+    height: 12px;
+    background-color: #fff;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range] {
+    display: block;
+    padding-top: 5px;
+    margin: 0 auto;
+    width: 180px;
+    height: 8px;
+    vertical-align: top;
+    background: transparent;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    cursor: pointer;
+    /* 滑块
+                     ---------------------------------------------------------------*/
+    /* 轨道
+                     ---------------------------------------------------------------*/
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]:focus {
+    outline: none;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]::-webkit-slider-thumb {
+    -webkit-box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.18);
+    box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.18);
+    -webkit-appearance: none;
+    appearance: none;
+    margin-top: -3px;
+    width: 12px;
+    height: 12px;
+    background-color: #61c091;
+    border-radius: 100%;
+    border: none;
+    -webkit-transition: 0.2s;
+    transition: 0.2s;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]::-moz-range-thumb {
+    box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.18);
+    -moz-appearance: none;
+    appearance: none;
+    width: 12px;
+    height: 12px;
+    background-color: #61c091;
+    border-radius: 100%;
+    border: none;
+    -webkit-transition: 0.2s;
+    transition: 0.2s;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]::-ms-thumb {
+    box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.18);
+    appearance: none;
+    width: 12px;
+    height: 12px;
+    background-color: #61c091;
+    border: none;
+    border-radius: 100%;
+    -webkit-transition: 0.2s;
+    transition: 0.2s;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]:active::-moz-range-thumb {
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.23);
+    width: 14px;
+    height: 14px;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]:active::-ms-thumb {
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.23);
+    width: 14px;
+    height: 14px;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]:active::-webkit-slider-thumb {
+    -webkit-box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.23);
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.23);
+    margin-top: -4px;
+    width: 14px;
+    height: 14px;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]::-webkit-slider-runnable-track {
+    -webkit-box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12);
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12);
+    width: 100%;
+    height: 6px;
+    cursor: pointer;
+    border-radius: 2px;
+    border: none;
+    background-color: rgba(68, 170, 119, 0.3);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]::-moz-range-track {
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12);
+    width: 100%;
+    height: 6px;
+    cursor: pointer;
+    border-radius: 2px;
+    border: none;
+    background-color: rgba(68, 170, 119, 0.3);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]::-ms-track {
+    box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12);
+    width: 100%;
+    cursor: pointer;
+    background: transparent;
+    border-color: transparent;
+    color: transparent;
+    height: 6px;
+    border-radius: 2px;
+    border: none;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]::-ms-fill-lower {
+    background-color: rgba(68, 170, 119, 0.3);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]::-ms-fill-upper {
+    background-color: rgba(68, 170, 119, 0.15);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]:focus::-webkit-slider-runnable-track {
+    background-color: rgba(68, 170, 119, 0.5);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]:focus::-moz-range-track {
+    background-color: rgba(68, 170, 119, 0.5);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]:focus::-ms-fill-lower {
+    background-color: rgba(68, 170, 119, 0.45);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-left .vicp-range input[type=range]:focus::-ms-fill-upper {
+    background-color: rgba(68, 170, 119, 0.25);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-right {
+    float: right;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-right .vicp-preview {
+    height: 150px;
+    overflow: hidden;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-right .vicp-preview .vicp-preview-item {
+    position: relative;
+    padding: 5px;
+    width: 100px;
+    height: 100px;
+    float: left;
+    margin-right: 16px;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-right .vicp-preview .vicp-preview-item span {
+    position: absolute;
+    bottom: -30px;
+    width: 100%;
+    font-size: 14px;
+    color: #bbb;
+    display: block;
+    text-align: center;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-right .vicp-preview .vicp-preview-item img {
+    position: absolute;
+    display: block;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    padding: 3px;
+    background-color: #fff;
+    border: 1px solid rgba(0, 0, 0, 0.15);
+    overflow: hidden;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-right .vicp-preview .vicp-preview-item:last-child {
+    margin-right: 0;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step2 .vicp-crop .vicp-crop-right .vicp-preview .vicp-preview-item:last-child img {
+    border-radius: 100%;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step3 .vicp-upload {
+    position: relative;
+    padding: 35px;
+    height: 200px;
+    background-color: rgba(0, 0, 0, 0.03);
+    text-align: center;
+    border: 1px dashed #ddd;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step3 .vicp-upload .vicp-loading {
+    display: block;
+    padding: 15px;
+    font-size: 16px;
+    color: #999;
+    line-height: 30px;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step3 .vicp-upload .vicp-progress-wrap {
+    margin-top: 12px;
+    background-color: rgba(0, 0, 0, 0.08);
+    border-radius: 3px;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step3 .vicp-upload .vicp-progress-wrap .vicp-progress {
+    position: relative;
+    display: block;
+    height: 5px;
+    border-radius: 3px;
+    background-color: #4a7;
+    -webkit-box-shadow: 0 2px 6px 0 rgba(68, 170, 119, 0.3);
+    box-shadow: 0 2px 6px 0 rgba(68, 170, 119, 0.3);
+    -webkit-transition: width 0.15s linear;
+    transition: width 0.15s linear;
+    background-image: -webkit-linear-gradient(135deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
+    background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.2) 50%, rgba(255, 255, 255, 0.2) 75%, transparent 75%, transparent);
+    background-size: 40px 40px;
+    -webkit-animation: vicp_progress 0.5s linear infinite;
+    animation: vicp_progress 0.5s linear infinite;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step3 .vicp-upload .vicp-progress-wrap .vicp-progress::after {
+    content: '';
+    position: absolute;
+    display: block;
+    top: -3px;
+    right: -3px;
+    width: 9px;
+    height: 9px;
+    border: 1px solid rgba(245, 246, 247, 0.7);
+    -webkit-box-shadow: 0 1px 4px 0 rgba(68, 170, 119, 0.7);
+    box-shadow: 0 1px 4px 0 rgba(68, 170, 119, 0.7);
+    border-radius: 100%;
+    background-color: #4a7;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-step3 .vicp-upload .vicp-error,
+.vue-image-crop-upload .vicp-wrap .vicp-step3 .vicp-upload .vicp-success {
+    height: 100px;
+    line-height: 100px;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-operate {
+    position: absolute;
+    right: 20px;
+    bottom: 20px;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-operate a {
+    position: relative;
+    float: left;
+    display: block;
+    margin-left: 10px;
+    width: 100px;
+    height: 36px;
+    line-height: 36px;
+    text-align: center;
+    cursor: pointer;
+    font-size: 14px;
+    color: #4a7;
+    border-radius: 2px;
+    overflow: hidden;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-operate a:hover {
+    background-color: rgba(0, 0, 0, 0.03);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-error,
+.vue-image-crop-upload .vicp-wrap .vicp-success {
+    display: block;
+    font-size: 14px;
+    line-height: 24px;
+    height: 24px;
+    color: #d10;
+    text-align: center;
+    vertical-align: top;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-success {
+    color: #4a7;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-icon3 {
+    position: relative;
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    top: 4px;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-icon3::after {
+    position: absolute;
+    top: 3px;
+    left: 6px;
+    width: 6px;
+    height: 10px;
+    border-width: 0 2px 2px 0;
+    border-color: #4a7;
+    border-style: solid;
+    -webkit-transform: rotate(45deg);
+    -ms-transform: rotate(45deg);
+    transform: rotate(45deg);
+    content: '';
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-icon2 {
+    position: relative;
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    top: 4px;
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-icon2::after, .vue-image-crop-upload .vicp-wrap .vicp-icon2::before {
+    content: '';
+    position: absolute;
+    top: 9px;
+    left: 4px;
+    width: 13px;
+    height: 2px;
+    background-color: #d10;
+    -webkit-transform: rotate(45deg);
+    -ms-transform: rotate(45deg);
+    transform: rotate(45deg);
+}
+
+.vue-image-crop-upload .vicp-wrap .vicp-icon2::after {
+    -webkit-transform: rotate(-45deg);
+    -ms-transform: rotate(-45deg);
+    transform: rotate(-45deg);
+}
+
+.e-ripple {
+    position: absolute;
+    border-radius: 100%;
+    background-color: rgba(0, 0, 0, 0.15);
+    background-clip: padding-box;
+    pointer-events: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    -webkit-transform: scale(0);
+    -ms-transform: scale(0);
+    transform: scale(0);
+    opacity: 1;
+}
+
+.e-ripple.z-active {
+    opacity: 0;
+    -webkit-transform: scale(2);
+    -ms-transform: scale(2);
+    transform: scale(2);
+    -webkit-transition: opacity 1.2s ease-out, -webkit-transform 0.6s ease-out;
+    transition: opacity 1.2s ease-out, -webkit-transform 0.6s ease-out;
+    transition: opacity 1.2s ease-out, transform 0.6s ease-out;
+    transition: opacity 1.2s ease-out, transform 0.6s ease-out, -webkit-transform 0.6s ease-out;
+}

src/components/ImageCropper/utils.js

@@ -0,0 +1,58 @@
+/* eslint-disable */
+
+/**
+ *
+ * @param e
+ * @param arg_opts
+ * @returns {boolean}
+ */
+export function effectRipple(e, arg_opts) {
+    let opts = Object.assign({
+            ele: e.target, // 波纹作用元素
+            type: 'hit', // hit点击位置扩散　center中心点扩展
+            bgc: 'rgba(0, 0, 0, 0.15)' // 波纹颜色
+        }, arg_opts),
+        target = opts.ele;
+    if (target) {
+        let rect = target.getBoundingClientRect(),
+            ripple = target.querySelector('.e-ripple');
+        if (!ripple) {
+            ripple = document.createElement('span');
+            ripple.className = 'e-ripple';
+            ripple.style.height = ripple.style.width = Math.max(rect.width, rect.height) + 'px';
+            target.appendChild(ripple);
+        } else {
+            ripple.className = 'e-ripple';
+        }
+        switch (opts.type) {
+            case 'center':
+                ripple.style.top = (rect.height / 2 - ripple.offsetHeight / 2) + 'px';
+                ripple.style.left = (rect.width / 2 - ripple.offsetWidth / 2) + 'px';
+                break;
+            default:
+                ripple.style.top = (e.pageY - rect.top - ripple.offsetHeight / 2 - document.body.scrollTop) + 'px';
+                ripple.style.left = (e.pageX - rect.left - ripple.offsetWidth / 2 - document.body.scrollLeft) + 'px';
+        }
+        ripple.style.backgroundColor = opts.bgc;
+        ripple.className = 'e-ripple z-active';
+        return false;
+    }
+}
+// database64文件格式转换为2进制
+/**
+ *
+ * @param data
+ * @param mime
+ * @returns {*}
+ */
+export function data2blob(data, mime) {
+    // dataURL 的格式为 “data:image/png;base64,****”,逗号之前都是一些说明性的文字，我们只需要逗号之后的就行了
+    data = data.split(',')[1];
+    data = window.atob(data);
+    var ia = new Uint8Array(data.length);
+    for (var i = 0; i < data.length; i++) {
+        ia[i] = data.charCodeAt(i);
+    }
+    // canvas.toDataURL 返回的默认格式就是 image/png
+    return new Blob([ia], {type: mime});
+};

src/components/ImageCropper/utils/data2blob.js

@@ -1,19 +0,0 @@
-/**
- * database64文件格式转换为2进制
- *
- * @param  {[String]} data dataURL 的格式为 “data:image/png;base64,****”,逗号之前都是一些说明性的文字，我们只需要逗号之后的就行了
- * @param  {[String]} mime [description]
- * @return {[blob]}      [description]
- */
-export default function(data, mime) {
-  data = data.split(',')[1]
-  data = window.atob(data)
-  var ia = new Uint8Array(data.length)
-  for (var i = 0; i < data.length; i++) {
-    ia[i] = data.charCodeAt(i)
-  }
-  // canvas.toDataURL 返回的默认格式就是 image/png
-  return new Blob([ia], {
-    type: mime
-  })
-}

src/components/ImageCropper/utils/effectRipple.js

@@ -1,39 +0,0 @@
-/**
- * 点击波纹效果
- *
- * @param  {[event]} e        [description]
- * @param  {[Object]} arg_opts [description]
- * @return {[bollean]}          [description]
- */
-export default function(e, arg_opts) {
-  var opts = Object.assign({
-    ele: e.target, // 波纹作用元素
-    type: 'hit', // hit点击位置扩散center中心点扩展
-    bgc: 'rgba(0, 0, 0, 0.15)' // 波纹颜色
-  }, arg_opts)
-  var target = opts.ele
-  if (target) {
-    var rect = target.getBoundingClientRect()
-    var ripple = target.querySelector('.e-ripple')
-    if (!ripple) {
-      ripple = document.createElement('span')
-      ripple.className = 'e-ripple'
-      ripple.style.height = ripple.style.width = Math.max(rect.width, rect.height) + 'px'
-      target.appendChild(ripple)
-    } else {
-      ripple.className = 'e-ripple'
-    }
-    switch (opts.type) {
-      case 'center':
-        ripple.style.top = (rect.height / 2 - ripple.offsetHeight / 2) + 'px'
-        ripple.style.left = (rect.width / 2 - ripple.offsetWidth / 2) + 'px'
-        break
-      default:
-        ripple.style.top = (e.pageY - rect.top - ripple.offsetHeight / 2 - document.body.scrollTop) + 'px'
-        ripple.style.left = (e.pageX - rect.left - ripple.offsetWidth / 2 - document.body.scrollLeft) + 'px'
-    }
-    ripple.style.backgroundColor = opts.bgc
-    ripple.className = 'e-ripple z-active'
-    return false
-  }
-}

src/components/ImageCropper/utils/language.js

@@ -1,232 +0,0 @@
-export default {
-  zh: {
-    hint: '点击，或拖动图片至此处',
-    loading: '正在上传……',
-    noSupported: '浏览器不支持该功能，请使用IE10以上或其他现在浏览器！',
-    success: '上传成功',
-    fail: '图片上传失败',
-    preview: '头像预览',
-    btn: {
-      off: '取消',
-      close: '关闭',
-      back: '上一步',
-      save: '保存'
-    },
-    error: {
-      onlyImg: '仅限图片格式',
-      outOfSize: '单文件大小不能超过 ',
-      lowestPx: '图片最低像素为（宽*高）：'
-    }
-  },
-  'zh-tw': {
-    hint: '點擊，或拖動圖片至此處',
-    loading: '正在上傳……',
-    noSupported: '瀏覽器不支持該功能，請使用IE10以上或其他現代瀏覽器！',
-    success: '上傳成功',
-    fail: '圖片上傳失敗',
-    preview: '頭像預覽',
-    btn: {
-      off: '取消',
-      close: '關閉',
-      back: '上一步',
-      save: '保存'
-    },
-    error: {
-      onlyImg: '僅限圖片格式',
-      outOfSize: '單文件大小不能超過 ',
-      lowestPx: '圖片最低像素為（寬*高）：'
-    }
-  },
-  en: {
-    hint: 'Click or drag the file here to upload',
-    loading: 'Uploading…',
-    noSupported: 'Browser is not supported, please use IE10+ or other browsers',
-    success: 'Upload success',
-    fail: 'Upload failed',
-    preview: 'Preview',
-    btn: {
-      off: 'Cancel',
-      close: 'Close',
-      back: 'Back',
-      save: 'Save'
-    },
-    error: {
-      onlyImg: 'Image only',
-      outOfSize: 'Image exceeds size limit: ',
-      lowestPx: 'Image\'s size is too low. Expected at least: '
-    }
-  },
-  ro: {
-    hint: 'Atinge sau trage fișierul aici',
-    loading: 'Se încarcă',
-    noSupported: 'Browser-ul tău nu suportă acest feature. Te rugăm încearcă cu alt browser.',
-    success: 'S-a încărcat cu succes',
-    fail: 'A apărut o problemă la încărcare',
-    preview: 'Previzualizează',
-
-    btn: {
-      off: 'Anulează',
-      close: 'Închide',
-      back: 'Înapoi',
-      save: 'Salvează'
-    },
-
-    error: {
-      onlyImg: 'Doar imagini',
-      outOfSize: 'Imaginea depășește limita de: ',
-      loewstPx: 'Imaginea este prea mică; Minim: '
-    }
-  },
-  ru: {
-    hint: 'Нажмите, или перетащите файл в это окно',
-    loading: 'Загружаю……',
-    noSupported: 'Ваш браузер не поддерживается, пожалуйста, используйте IE10 + или другие браузеры',
-    success: 'Загрузка выполнена успешно',
-    fail: 'Ошибка загрузки',
-    preview: 'Предпросмотр',
-    btn: {
-      off: 'Отменить',
-      close: 'Закрыть',
-      back: 'Назад',
-      save: 'Сохранить'
-    },
-    error: {
-      onlyImg: 'Только изображения',
-      outOfSize: 'Изображение превышает предельный размер: ',
-      lowestPx: 'Минимальный размер изображения: '
-    }
-  },
-  'pt-br': {
-    hint: 'Clique ou arraste o arquivo aqui para carregar',
-    loading: 'Carregando…',
-    noSupported: 'Browser não suportado, use o IE10+ ou outro browser',
-    success: 'Sucesso ao carregar imagem',
-    fail: 'Falha ao carregar imagem',
-    preview: 'Pré-visualizar',
-    btn: {
-      off: 'Cancelar',
-      close: 'Fechar',
-      back: 'Voltar',
-      save: 'Salvar'
-    },
-    error: {
-      onlyImg: 'Apenas imagens',
-      outOfSize: 'A imagem excede o limite de tamanho: ',
-      lowestPx: 'O tamanho da imagem é muito pequeno. Tamanho mínimo: '
-    }
-  },
-  fr: {
-    hint: 'Cliquez ou glissez le fichier ici.',
-    loading: 'Téléchargement…',
-    noSupported: 'Votre navigateur n\'est pas supporté. Utilisez IE10 + ou un autre navigateur s\'il vous plaît.',
-    success: 'Téléchargement réussit',
-    fail: 'Téléchargement echoué',
-    preview: 'Aperçu',
-    btn: {
-      off: 'Annuler',
-      close: 'Fermer',
-      back: 'Retour',
-      save: 'Enregistrer'
-    },
-    error: {
-      onlyImg: 'Image uniquement',
-      outOfSize: 'L\'image sélectionnée dépasse la taille maximum: ',
-      lowestPx: 'L\'image sélectionnée est trop petite. Dimensions attendues: '
-    }
-  },
-  nl: {
-    hint: 'Klik hier of sleep een afbeelding in dit vlak',
-    loading: 'Uploaden…',
-    noSupported: 'Je browser wordt helaas niet ondersteund. Gebruik IE10+ of een andere browser.',
-    success: 'Upload succesvol',
-    fail: 'Upload mislukt',
-    preview: 'Voorbeeld',
-    btn: {
-      off: 'Annuleren',
-      close: 'Sluiten',
-      back: 'Terug',
-      save: 'Opslaan'
-    },
-    error: {
-      onlyImg: 'Alleen afbeeldingen',
-      outOfSize: 'De afbeelding is groter dan: ',
-      lowestPx: 'De afbeelding is te klein! Minimale afmetingen: '
-    }
-  },
-  tr: {
-    hint: 'Tıkla veya yüklemek istediğini buraya sürükle',
-    loading: 'Yükleniyor…',
-    noSupported: 'Tarayıcı desteklenmiyor, lütfen IE10+ veya farklı tarayıcı kullanın',
-    success: 'Yükleme başarılı',
-    fail: 'Yüklemede hata oluştu',
-    preview: 'Önizle',
-    btn: {
-      off: 'İptal',
-      close: 'Kapat',
-      back: 'Geri',
-      save: 'Kaydet'
-    },
-    error: {
-      onlyImg: 'Sadece resim',
-      outOfSize: 'Resim yükleme limitini aşıyor: ',
-      lowestPx: 'Resmin boyutu çok küçük. En az olması gereken: '
-    }
-  },
-  'es-MX': {
-    hint: 'Selecciona o arrastra una imagen',
-    loading: 'Subiendo...',
-    noSupported: 'Tu navegador no es soportado, porfavor usa IE10+ u otros navegadores mas recientes',
-    success: 'Subido exitosamente',
-    fail: 'Sucedió un error',
-    preview: 'Vista previa',
-    btn: {
-      off: 'Cancelar',
-      close: 'Cerrar',
-      back: 'Atras',
-      save: 'Guardar'
-    },
-    error: {
-      onlyImg: 'Unicamente imagenes',
-      outOfSize: 'La imagen excede el tamaño maximo:',
-      lowestPx: 'La imagen es demasiado pequeño. Se espera por lo menos:'
-    }
-  },
-  de: {
-    hint: 'Klick hier oder zieh eine Datei hier rein zum Hochladen',
-    loading: 'Hochladen…',
-    noSupported: 'Browser wird nicht unterstützt, bitte verwende IE10+ oder andere Browser',
-    success: 'Upload erfolgreich',
-    fail: 'Upload fehlgeschlagen',
-    preview: 'Vorschau',
-    btn: {
-      off: 'Abbrechen',
-      close: 'Schließen',
-      back: 'Zurück',
-      save: 'Speichern'
-    },
-    error: {
-      onlyImg: 'Nur Bilder',
-      outOfSize: 'Das Bild ist zu groß: ',
-      lowestPx: 'Das Bild ist zu klein. Mindestens: '
-    }
-  },
-  ja: {
-    hint: 'クリック・ドラッグしてファイルをアップロード',
-    loading: 'アップロード中...',
-    noSupported: 'このブラウザは対応されていません。IE10+かその他の主要ブラウザをお使いください。',
-    success: 'アップロード成功',
-    fail: 'アップロード失敗',
-    preview: 'プレビュー',
-    btn: {
-      off: 'キャンセル',
-      close: '閉じる',
-      back: '戻る',
-      save: '保存'
-    },
-    error: {
-      onlyImg: '画像のみ',
-      outOfSize: '画像サイズが上限を超えています。上限: ',
-      lowestPx: '画像が小さすぎます。最小サイズ: '
-    }
-  }
-}

src/components/ImageCropper/utils/mimes.js

@@ -1,7 +0,0 @@
-export default {
-  'jpg': 'image/jpeg',
-  'png': 'image/png',
-  'gif': 'image/gif',
-  'svg': 'image/svg+xml',
-  'psd': 'image/photoshop'
-}

src/components/PanThumb/index.vue

@@ -1,12 +1,12 @@
 <template>
-  <div class="pan-item" :style="{zIndex:zIndex,height:height,width:width}">
+	<div class="pan-item" :style="{zIndex:zIndex,height:height,width:width}">
-    <div class="pan-info">
+		<div class="pan-info">
-      <div class="pan-info-roles-container">
+			<div class="pan-info-roles-container">
-        <slot></slot>
+				<slot></slot>
-      </div>
+			</div>
-    </div>
+		</div>
-    <img class="pan-thumb" :src="image">
+		<img class="pan-thumb" :src="image">
-  </div>
+	</div>
 </template>
 
 <script>
@@ -19,7 +19,7 @@ export default {
     },
     zIndex: {
       type: Number,
-      default: 1
+      default: 100
     },
     width: {
       type: String,
@@ -35,106 +35,106 @@ export default {
 
 <style scoped>
 .pan-item {
-  width: 200px;
+	width: 200px;
-  height: 200px;
+	height: 200px;
-  border-radius: 50%;
+	border-radius: 50%;
-  display: inline-block;
+	display: inline-block;
-  position: relative;
+	position: relative;
-  cursor: default;
+	cursor: default;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
 }
 
 .pan-info-roles-container {
-  padding: 20px;
+	padding: 20px;
-  text-align: center;
+	text-align: center;
 }
 
 .pan-thumb {
-  width: 100%;
+	width: 100%;
-  height: 100%;
+	height: 100%;
-  background-size: 100%;
+	background-size: 100%;
-  border-radius: 50%;
+	border-radius: 50%;
-  overflow: hidden;
+	overflow: hidden;
-  position: absolute;
+	position: absolute;
-  transform-origin: 95% 40%;
+	transform-origin: 95% 40%;
-  transition: all 0.3s ease-in-out;
+	transition: all 0.3s ease-in-out;
 }
 
 .pan-thumb:after {
-  content: '';
+	content: '';
-  width: 8px;
+	width: 8px;
-  height: 8px;
+	height: 8px;
-  position: absolute;
+	position: absolute;
-  border-radius: 50%;
+	border-radius: 50%;
-  top: 40%;
+	top: 40%;
-  left: 95%;
+	left: 95%;
-  margin: -4px 0 0 -4px;
+	margin: -4px 0 0 -4px;
-  background: radial-gradient(ellipse at center, rgba(14, 14, 14, 1) 0%, rgba(125, 126, 125, 1) 100%);
+	background: radial-gradient(ellipse at center, rgba(14, 14, 14, 1) 0%, rgba(125, 126, 125, 1) 100%);
-  box-shadow: 0 0 1px rgba(255, 255, 255, 0.9);
+	box-shadow: 0 0 1px rgba(255, 255, 255, 0.9);
 }
 
 .pan-info {
-  position: absolute;
+	position: absolute;
-  width: inherit;
+	width: inherit;
-  height: inherit;
+	height: inherit;
-  border-radius: 50%;
+	border-radius: 50%;
-  overflow: hidden;
+	overflow: hidden;
-  box-shadow: inset 0 0 0 5px rgba(0, 0, 0, 0.05);
+	box-shadow: inset 0 0 0 5px rgba(0, 0, 0, 0.05);
 }
 
 .pan-info h3 {
-  color: #fff;
+	color: #fff;
-  text-transform: uppercase;
+	text-transform: uppercase;
-  position: relative;
+	position: relative;
-  letter-spacing: 2px;
+	letter-spacing: 2px;
-  font-size: 18px;
+	font-size: 18px;
-  margin: 0 60px;
+	margin: 0 60px;
-  padding: 22px 0 0 0;
+	padding: 22px 0 0 0;
-  height: 85px;
+	height: 85px;
-  font-family: 'Open Sans', Arial, sans-serif;
+	font-family: 'Open Sans', Arial, sans-serif;
-  text-shadow: 0 0 1px #fff, 0 1px 2px rgba(0, 0, 0, 0.3);
+	text-shadow: 0 0 1px #fff, 0 1px 2px rgba(0, 0, 0, 0.3);
 }
 
 .pan-info p {
-  color: #fff;
+	color: #fff;
-  padding: 10px 5px;
+	padding: 10px 5px;
-  font-style: italic;
+	font-style: italic;
-  margin: 0 30px;
+	margin: 0 30px;
-  font-size: 12px;
+	font-size: 12px;
-  border-top: 1px solid rgba(255, 255, 255, 0.5);
+	border-top: 1px solid rgba(255, 255, 255, 0.5);
 }
 
 .pan-info p a {
-  display: block;
+	display: block;
-  color: #333;
+	color: #333;
-  width: 80px;
+	width: 80px;
-  height: 80px;
+	height: 80px;
-  background: rgba(255, 255, 255, 0.3);
+	background: rgba(255, 255, 255, 0.3);
-  border-radius: 50%;
+	border-radius: 50%;
-  color: #fff;
+	color: #fff;
-  font-style: normal;
+	font-style: normal;
-  font-weight: 700;
+	font-weight: 700;
-  text-transform: uppercase;
+	text-transform: uppercase;
-  font-size: 9px;
+	font-size: 9px;
-  letter-spacing: 1px;
+	letter-spacing: 1px;
-  padding-top: 24px;
+	padding-top: 24px;
-  margin: 7px auto 0;
+	margin: 7px auto 0;
-  font-family: 'Open Sans', Arial, sans-serif;
+	font-family: 'Open Sans', Arial, sans-serif;
-  opacity: 0;
+	opacity: 0;
-  transition: transform 0.3s ease-in-out 0.2s, opacity 0.3s ease-in-out 0.2s, background 0.2s linear 0s;
+	transition: transform 0.3s ease-in-out 0.2s, opacity 0.3s ease-in-out 0.2s, background 0.2s linear 0s;
-  transform: translateX(60px) rotate(90deg);
+	transform: translateX(60px) rotate(90deg);
 }
 
 .pan-info p a:hover {
-  background: rgba(255, 255, 255, 0.5);
+	background: rgba(255, 255, 255, 0.5);
 }
 
 .pan-item:hover .pan-thumb {
-  transform: rotate(-110deg);
+	transform: rotate(-110deg);
 }
 
 .pan-item:hover .pan-info p a {
-  opacity: 1;
+	opacity: 1;
-  transform: translateX(0px) rotate(0deg);
+	transform: translateX(0px) rotate(0deg);
 }
 </style>

src/components/Tinymce/components/editorImage.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="upload-container">
-    <el-button icon='el-icon-upload' size="mini" :style="{background:color,borderColor:color}" @click=" dialogVisible=true" type="primary">上传图片
+    <el-button icon='upload' :style="{background:color,borderColor:color}" @click=" dialogVisible=true" type="primary">上传图片
     </el-button>
-    <el-dialog append-to-body :visible.sync="dialogVisible">
+    <el-dialog :visible.sync="dialogVisible">
       <el-upload class="editor-slide-upload" action="https://httpbin.org/post" :multiple="true" :file-list="fileList" :show-file-list="true"
         list-type="picture-card" :on-remove="handleRemove" :on-success="handleSuccess" :before-upload="beforeUpload">
         <el-button size="small" type="primary">点击上传</el-button>
@@ -21,7 +21,7 @@ export default {
   props: {
     color: {
       type: String,
-      default: '#1890ff'
+      default: '#20a0ff'
     }
   },
   data() {
@@ -87,9 +87,9 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.upload-container {
+    .upload-container {
-  .editor-slide-upload {
+        .editor-slide-upload {
-    margin-bottom: 20px;
+            margin-bottom: 20px;
-  }
+        }
-}
+    }
 </style>

src/components/Tinymce/index.vue

@@ -2,16 +2,27 @@
   <div class="tinymce-container editor-container">
     <textarea class="tinymce-textarea" :id="tinymceId"></textarea>
     <div class="editor-custom-btn-container">
-      <editorImage color="#1890ff" class="editor-upload-btn" @successCBK="imageSuccessCBK"></editorImage>
+     <editorImage  color="#20a0ff" class="editor-upload-btn" @successCBK="imageSuccessCBK"></editorImage>
-    </div>
+      </div>
   </div>
 </template>
 
 <script>
-import editorImage from './components/editorImage'
+// Import Tinymce
+import tinymce from 'tinymce/tinymce'
+
+tinymce.baseURL = 'static/tinymce'
+
+// A theme is also required
+import 'tinymce/themes/modern/theme'
+
+// Any plugins you want to use has to be imported
 import plugins from './plugins'
+
 import toolbar from './toolbar'
 
+import editorImage from './components/editorImage'
+
 export default {
   name: 'tinymce',
   components: { editorImage },
@@ -31,7 +42,7 @@ export default {
       }
     },
     menubar: {
-      default: 'file edit insert view format table'
+      default: 'file edit insert view format table help'
     },
     height: {
       type: Number,
@@ -49,7 +60,7 @@ export default {
   watch: {
     value(val) {
       if (!this.hasChange && this.hasInit) {
-        this.$nextTick(() => window.tinymce.get(this.tinymceId).setContent(val))
+        this.$nextTick(() => tinymce.get(this.tinymceId).setContent(val))
       }
     }
   },
@@ -65,21 +76,23 @@ export default {
   methods: {
     initTinymce() {
       const _this = this
-      window.tinymce.init({
+      tinymce.init({
         selector: `#${this.tinymceId}`,
+        // language: 'zh_CN',
         height: this.height,
-        body_class: 'panel-body ',
-        object_resizing: false,
         toolbar: this.toolbar.length > 0 ? this.toolbar : toolbar,
         menubar: this.menubar,
         plugins: plugins,
+        body_class: 'panel-body ',
+        object_resizing: false,
         end_container_on_empty_block: true,
         powerpaste_word_import: 'clean',
         code_dialog_height: 450,
         code_dialog_width: 1000,
         advlist_bullet_styles: 'square',
         advlist_number_styles: 'default',
-        imagetools_cors_hosts: ['www.tinymce.com', 'codepen.io'],
+        imagetools_cors_hosts: ['wpimg.wallstcn.com', 'wallstreetcn.com'],
+        imagetools_toolbar: 'watermark',
         default_link_target: '_blank',
         link_title: false,
         init_instance_callback: editor => {
@@ -87,9 +100,9 @@ export default {
             editor.setContent(_this.value)
           }
           _this.hasInit = true
-          editor.on('NodeChange Change KeyUp SetContent', () => {
+          editor.on('NodeChange Change KeyUp', () => {
             this.hasChange = true
-            this.$emit('input', editor.getContent())
+            this.$emit('input', editor.getContent({ format: 'raw' }))
           })
         }
         // 整合七牛上传
@@ -128,20 +141,20 @@ export default {
       })
     },
     destroyTinymce() {
-      if (window.tinymce.get(this.tinymceId)) {
+      if (tinymce.get(this.tinymceId)) {
-        window.tinymce.get(this.tinymceId).destroy()
+        tinymce.get(this.tinymceId).destroy()
       }
     },
     setContent(value) {
-      window.tinymce.get(this.tinymceId).setContent(value)
+      tinymce.get(this.tinymceId).setContent(value)
     },
     getContent() {
-      window.tinymce.get(this.tinymceId).getContent()
+      tinymce.get(this.tinymceId).getContent()
     },
     imageSuccessCBK(arr) {
       const _this = this
       arr.forEach(v => {
-        window.tinymce.get(_this.tinymceId).insertContent(`<img class="wscnph" src="${v.url}" >`)
+        tinymce.get(_this.tinymceId).insertContent(`<img class="wscnph" src="${v.url}" >`)
       })
     }
   },
@@ -153,10 +166,7 @@ export default {
 
 <style scoped>
 .tinymce-container {
-  position: relative;
+  position: relative
-}
-.tinymce-container>>>.mce-fullscreen {
-  z-index: 10000;
 }
 .tinymce-textarea {
   visibility: hidden;
@@ -164,9 +174,9 @@ export default {
 }
 .editor-custom-btn-container {
   position: absolute;
-  right: 4px;
+  right: 15px;
-  top: 4px;
   /*z-index: 2005;*/
+  top: 18px;
 }
 .editor-upload-btn {
   display: inline-block;

src/components/Tinymce/plugins.js

@@ -1,7 +1,49 @@
 // Any plugins you want to use has to be imported
 // Detail plugins list see https://www.tinymce.com/docs/plugins/
-// Custom builds see https://www.tinymce.com/download/custom-builds/
 
-const plugins = ['advlist anchor autolink autoresize autosave code codesample colorpicker colorpicker contextmenu directionality emoticons fullpage fullscreen hr image imagetools importcss insertdatetime legacyoutput link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textcolor textpattern visualblocks visualchars wordcount']
+import 'tinymce/plugins/advlist'
+import 'tinymce/plugins/anchor'
+import 'tinymce/plugins/autolink'
+import 'tinymce/plugins/autoresize'
+import 'tinymce/plugins/autosave'
+import 'tinymce/plugins/bbcode'
+import 'tinymce/plugins/charmap'
+import 'tinymce/plugins/code'
+import 'tinymce/plugins/colorpicker'
+import 'tinymce/plugins/colorpicker'
+import 'tinymce/plugins/contextmenu'
+import 'tinymce/plugins/directionality'
+import 'tinymce/plugins/fullpage'
+import 'tinymce/plugins/fullscreen'
+import 'tinymce/plugins/hr'
+import 'tinymce/plugins/image'
+import 'tinymce/plugins/imagetools'
+import 'tinymce/plugins/importcss'
+import 'tinymce/plugins/insertdatetime'
+import 'tinymce/plugins/legacyoutput'
+import 'tinymce/plugins/link'
+import 'tinymce/plugins/lists'
+import 'tinymce/plugins/media'
+import 'tinymce/plugins/nonbreaking'
+import 'tinymce/plugins/noneditable'
+import 'tinymce/plugins/pagebreak'
+import 'tinymce/plugins/paste'
+import 'tinymce/plugins/preview'
+import 'tinymce/plugins/print'
+import 'tinymce/plugins/save'
+import 'tinymce/plugins/searchreplace'
+import 'tinymce/plugins/spellchecker'
+import 'tinymce/plugins/tabfocus'
+import 'tinymce/plugins/table'
+import 'tinymce/plugins/template'
+import 'tinymce/plugins/textcolor'
+import 'tinymce/plugins/textpattern'
+import 'tinymce/plugins/visualblocks'
+import 'tinymce/plugins/visualchars'
+import 'tinymce/plugins/wordcount'
+import 'tinymce/plugins/help'
+import 'tinymce/plugins/toc'
+
+const plugins = ['advlist anchor autolink autoresize autosave bbcode code colorpicker colorpicker contextmenu directionality fullpage fullscreen hr image imagetools importcss insertdatetime legacyoutput link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textcolor textpattern visualblocks visualchars wordcount help toc']
 
 export default plugins

src/components/Tinymce/toolbar.js

@@ -1,6 +1,6 @@
 // Here is a list of the toolbar
 // Detail list see https://www.tinymce.com/docs/advanced/editor-control-identifiers/#toolbarcontrols
 
-const toolbar = ['bold italic underline strikethrough alignleft aligncenter alignright outdent indent  blockquote undo redo removeformat subscript superscript code codesample', 'hr bullist numlist link image charmap	 preview anchor pagebreak fullscreen insertdatetime media table emoticons forecolor backcolor']
+const toolbar = ['bold italic underline strikethrough alignleft aligncenter alignright outdent indent  blockquote undo redo removeformat subscript superscript code', 'hr bullist numlist link image charmap	 preview anchor pagebreak fullscreen insertdatetime media table emoticons forecolor backcolor']
 
 export default toolbar

src/components/Upload/singleImage2.vue

@@ -1,19 +1,19 @@
 <template>
-  <div class="singleImageUpload2 upload-container">
+	<div class="singleImageUpload2 upload-container">
-    <el-upload class="image-uploader" :data="dataObj" drag :multiple="false" :show-file-list="false" action="https://httpbin.org/post"
+		<el-upload class="image-uploader" :data="dataObj" drag :multiple="false" :show-file-list="false" action="https://httpbin.org/post"
-      :on-success="handleImageScucess">
+		  :on-success="handleImageScucess">
-      <i class="el-icon-upload"></i>
+			<i class="el-icon-upload"></i>
-      <div class="el-upload__text">Drag或<em>点击上传</em></div>
+			<div class="el-upload__text">Drag或<em>点击上传</em></div>
-    </el-upload>
+		</el-upload>
-    <div v-show="imageUrl.length>0" class="image-preview">
+		<div v-show="imageUrl.length>0" class="image-preview">
-      <div class="image-preview-wrapper" v-show="imageUrl.length>1">
+			<div class="image-preview-wrapper" v-show="imageUrl.length>1">
-        <img :src="imageUrl">
+				<img :src="imageUrl">
-        <div class="image-preview-action">
+				<div class="image-preview-action">
-          <i @click="rmImage" class="el-icon-delete"></i>
+					<i @click="rmImage" class="el-icon-delete"></i>
-        </div>
+				</div>
-      </div>
+			</div>
-    </div>
+		</div>
-  </div>
+	</div>
 </template>
 
 <script>
@@ -66,53 +66,53 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 .upload-container {
-  width: 100%;
+	width: 100%;
-  height: 100%;
+	height: 100%;
-  position: relative;
+	position: relative;
-  .image-uploader {
+	.image-uploader {
-    height: 100%;
+		height: 100%;
-  }
+	}
-  .image-preview {
+	.image-preview {
-    width: 100%;
+		width: 100%;
-    height: 100%;
+		height: 100%;
-    position: absolute;
+		position: absolute;
-    left: 0px;
+		left: 0px;
-    top: 0px;
+		top: 0px;
-    border: 1px dashed #d9d9d9;
+		border: 1px dashed #d9d9d9;
-    .image-preview-wrapper {
+		.image-preview-wrapper {
-      position: relative;
+			position: relative;
-      width: 100%;
+			width: 100%;
-      height: 100%;
+			height: 100%;
-      img {
+			img {
-        width: 100%;
+				width: 100%;
-        height: 100%;
+				height: 100%;
-      }
+			}
-    }
+		}
-    .image-preview-action {
+		.image-preview-action {
-      position: absolute;
+			position: absolute;
-      width: 100%;
+			width: 100%;
-      height: 100%;
+			height: 100%;
-      left: 0;
+			left: 0;
-      top: 0;
+			top: 0;
-      cursor: default;
+			cursor: default;
-      text-align: center;
+			text-align: center;
-      color: #fff;
+			color: #fff;
-      opacity: 0;
+			opacity: 0;
-      font-size: 20px;
+			font-size: 20px;
-      background-color: rgba(0, 0, 0, .5);
+			background-color: rgba(0, 0, 0, .5);
-      transition: opacity .3s;
+			transition: opacity .3s;
-      cursor: pointer;
+			cursor: pointer;
-      text-align: center;
+			text-align: center;
-      line-height: 200px;
+			line-height: 200px;
-      .el-icon-delete {
+			.el-icon-delete {
-        font-size: 36px;
+				font-size: 36px;
-      }
+			}
-    }
+		}
-    &:hover {
+		&:hover {
-      .image-preview-action {
+			.image-preview-action {
-        opacity: 1;
+				opacity: 1;
-      }
+			}
-    }
+		}
-  }
+	}
 }
 </style>

src/components/Upload/singleImage3.vue

@@ -1,34 +1,34 @@
 <template>
-  <div class="upload-container">
+	<div class="upload-container">
-    <el-upload class="image-uploader" :data="dataObj" drag :multiple="false" :show-file-list="false" action="https://httpbin.org/post"
+		<el-upload class="image-uploader" :data="dataObj" drag :multiple="false" :show-file-list="false" action="https://httpbin.org/post"
-      :on-success="handleImageScucess">
+		  :on-success="handleImageScucess">
-      <i class="el-icon-upload"></i>
+			<i class="el-icon-upload"></i>
-      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+			<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-    </el-upload>
+		</el-upload>
-    <div class="image-preview image-app-preview">
+		<div class="image-preview image-app-preview">
-      <div class="image-preview-wrapper" v-show="imageUrl.length>1">
+			<div class="image-preview-wrapper" v-show="imageUrl.length>1">
-        <img :src="imageUrl">
+				<img :src="imageUrl">
-        <div class="image-preview-action">
+				<div class="image-preview-action">
-          <i @click="rmImage" class="el-icon-delete"></i>
+					<i @click="rmImage" class="el-icon-delete"></i>
-        </div>
+				</div>
-      </div>
+			</div>
-    </div>
+		</div>
-    <div class="image-preview">
+		<div class="image-preview">
-      <div class="image-preview-wrapper" v-show="imageUrl.length>1">
+			<div class="image-preview-wrapper" v-show="imageUrl.length>1">
-        <img :src="imageUrl">
+				<img :src="imageUrl">
-        <div class="image-preview-action">
+				<div class="image-preview-action">
-          <i @click="rmImage" class="el-icon-delete"></i>
+					<i @click="rmImage" class="el-icon-delete"></i>
-        </div>
+				</div>
-      </div>
+			</div>
-    </div>
+		</div>
-  </div>
+	</div>
 </template>
 
 <script>
 import { getToken } from '@/api/qiniu'
 
 export default {
-  name: 'singleImageUpload3',
+  name: 'singleImageUpload',
   props: {
     value: String
   },
@@ -76,70 +76,70 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 @import "src/styles/mixin.scss";
 .upload-container {
-  width: 100%;
+	width: 100%;
-  position: relative;
+	position: relative;
-  @include clearfix;
+	@include clearfix;
-  .image-uploader {
+	.image-uploader {
-    width: 35%;
+		width: 35%;
-    float: left;
+		float: left;
-  }
+	}
-  .image-preview {
+	.image-preview {
-    width: 200px;
+		width: 200px;
-    height: 200px;
+		height: 200px;
-    position: relative;
+		position: relative;
-    border: 1px dashed #d9d9d9;
+		border: 1px dashed #d9d9d9;
-    float: left;
+		float: left;
-    margin-left: 50px;
+		margin-left: 50px;
-    .image-preview-wrapper {
+		.image-preview-wrapper {
-      position: relative;
+			position: relative;
-      width: 100%;
+			width: 100%;
-      height: 100%;
+			height: 100%;
-      img {
+			img {
-        width: 100%;
+				width: 100%;
-        height: 100%;
+				height: 100%;
-      }
+			}
-    }
+		}
-    .image-preview-action {
+		.image-preview-action {
-      position: absolute;
+			position: absolute;
-      width: 100%;
+			width: 100%;
-      height: 100%;
+			height: 100%;
-      left: 0;
+			left: 0;
-      top: 0;
+			top: 0;
-      cursor: default;
+			cursor: default;
-      text-align: center;
+			text-align: center;
-      color: #fff;
+			color: #fff;
-      opacity: 0;
+			opacity: 0;
-      font-size: 20px;
+			font-size: 20px;
-      background-color: rgba(0, 0, 0, .5);
+			background-color: rgba(0, 0, 0, .5);
-      transition: opacity .3s;
+			transition: opacity .3s;
-      cursor: pointer;
+			cursor: pointer;
-      text-align: center;
+			text-align: center;
-      line-height: 200px;
+			line-height: 200px;
-      .el-icon-delete {
+			.el-icon-delete {
-        font-size: 36px;
+				font-size: 36px;
-      }
+			}
-    }
+		}
-    &:hover {
+		&:hover {
-      .image-preview-action {
+			.image-preview-action {
-        opacity: 1;
+				opacity: 1;
-      }
+			}
-    }
+		}
-  }
+	}
-  .image-app-preview {
+	.image-app-preview {
-    width: 320px;
+		width: 320px;
-    height: 180px;
+		height: 180px;
-    position: relative;
+		position: relative;
-    border: 1px dashed #d9d9d9;
+		border: 1px dashed #d9d9d9;
-    float: left;
+		float: left;
-    margin-left: 50px;
+		margin-left: 50px;
-    .app-fake-conver {
+		.app-fake-conver {
-      height: 44px;
+			height: 44px;
-      position: absolute;
+			position: absolute;
-      width: 100%; // background: rgba(0, 0, 0, .1);
+			width: 100%; // background: rgba(0, 0, 0, .1);
-      text-align: center;
+			text-align: center;
-      line-height: 64px;
+			line-height: 64px;
-      color: #fff;
+			color: #fff;
-    }
+		}
-  }
+	}
 }
 </style>

src/components/UploadExcel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <input id="excel-upload-input" ref="excel-upload-input" type="file" accept=".xlsx, .xls" class="c-hide" @change="handkeFileChange">
+    <input id="excel-upload-input" type="file" accept=".xlsx, .xls" class="c-hide" @change="handkeFileChange">
     <div id="drop" @drop="handleDrop" @dragover="handleDragover" @dragenter="handleDragover">
       Drop excel file here or
       <el-button style="margin-left:16px;" size="mini" type="primary" @click="handleUpload">browse</el-button>
@@ -51,9 +51,7 @@ export default {
     handkeFileChange(e) {
       const files = e.target.files
       const itemFile = files[0] // only use files[0]
-      if (!itemFile) return
       this.readerData(itemFile)
-      this.$refs['excel-upload-input'].value = null // fix can't select the same excel
     },
     readerData(itemFile) {
       const reader = new FileReader()

src/lang/en.js

@@ -125,10 +125,5 @@ export default {
     change: 'Theme change',
     documentation: 'Theme documentation',
     tips: 'Tips: It is different from the theme-pick on the navbar is two different skinning methods, each with different application scenarios. Refer to the documentation for details.'
-  },
-  tagsView: {
-    close: 'Close',
-    closeOthers: 'Close Others',
-    closeAll: 'Close All'
   }
 }

src/lang/zh.js

@@ -125,10 +125,5 @@ export default {
     change: '换肤',
     documentation: '换肤文档',
     tips: 'Tips: 它区别于 navbar 上的 theme-pick, 是两种不同的换肤方法，各自有不同的应用场景，具体请参考文档。'
-  },
-  tagsView: {
-    close: '关闭',
-    closeOthers: '关闭其它',
-    closeAll: '关闭所有'
   }
 }

src/router/index.js

@@ -24,7 +24,7 @@ import Layout from '../views/layout/Layout'
     roles: ['admin','editor']     will control the page roles (you can set multiple roles)
     title: 'title'               the name show in submenu and breadcrumb (recommend set)
     icon: 'svg-name'             the icon show in the sidebar,
-    noCache: true                if true ,the page will no be cached(default is false)
+    noCache: true                if fasle ,the page will no be cached(default is false)
   }
 **/
 export const constantRouterMap = [

src/styles/element-ui.scss

@@ -44,7 +44,7 @@
    }
  }
 
- //暂时性解决dialog 问题 https://github.com/ElemeFE/element/issues/2461
+ //暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461
  .el-dialog {
    transform: none;
    left: 0;
@@ -73,10 +73,3 @@
      }
    }
  }
-
-//dropdown
- .el-dropdown-menu{
-  a{
-    display: block
-  }
-}

src/styles/sidebar.scss

@@ -2,21 +2,18 @@
   // 主体区域
   .main-container {
     min-height: 100%;
-    transition: margin-left .28s;
+    transition: margin-left 0.28s;
     margin-left: 180px;
-  }
+  } // 侧边栏
-  // 侧边栏
   .sidebar-container {
-    transition: width .28s;
+    transition: width 0.28s;
-    width: 180px !important;
+    width: 180px!important;
     height: 100%;
     position: fixed;
-    font-size: 0px;
     top: 0;
     bottom: 0;
     left: 0;
     z-index: 1001;
-    overflow: hidden;
     a {
       display: inline-block;
       width: 100%;
@@ -26,48 +23,78 @@
     }
     .el-menu {
       border: none;
-      width: 100% !important;
+      width: 100%;
     }
   }
   .hideSidebar {
-    .sidebar-container {
+    .sidebar-container,.sidebar-container .el-menu {
-      width: 36px !important;
+      width: 36px!important;
+      // overflow: inherit;
     }
     .main-container {
       margin-left: 36px;
     }
+  }
+  .hideSidebar {
     .submenu-title-noDropdown {
-      padding-left: 10px !important;
+      padding-left: 10px!important;
       position: relative;
-      .el-tooltip {
+      span {
-        padding: 0 10px !important;
+        height: 0;
+        width: 0;
+        overflow: hidden;
+        visibility: hidden;
+        transition: opacity .3s cubic-bezier(.55, 0, .1, 1);
+        opacity: 0;
+        display: inline-block;
+      }
+      &:hover {
+        span {
+          display: block;
+          border-radius: 3px;
+          z-index: 1002;
+          width: 140px;
+          height: 56px;
+          visibility: visible;
+          position: absolute;
+          right: -145px;
+          text-align: left;
+          text-indent: 20px;
+          top: 0px;
+          background-color: $subMenuBg!important;
+          opacity: 1;
+        }
       }
     }
     .el-submenu {
       &>.el-submenu__title {
-        padding-left: 10px !important;
+        padding-left: 10px!important;
         &>span {
-          height: 0;
+          display: none;
-          width: 0;
-          overflow: hidden;
-          visibility: hidden;
-          display: inline-block;
         }
         .el-submenu__icon-arrow {
           display: none;
         }
       }
+      .nest-menu {
+        .el-submenu__icon-arrow {
+          display: block!important;
+        }
+        span {
+          display: inline-block!important;
+        }
+      }
     }
   }
   .nest-menu .el-submenu>.el-submenu__title,
   .el-submenu .el-menu-item {
-    min-width: 180px !important;
+    min-width: 180px!important;
-    background-color: $subMenuBg !important;
+    background-color: $subMenuBg!important;
     &:hover {
-      background-color: $menuHover !important;
+      background-color: $menuHover!important;
     }
   }
-  .el-menu--collapse .el-menu .el-submenu {
+  .el-menu--collapse .el-menu .el-submenu{
-    min-width: 180px !important;
+    min-width: 180px!important;
   }
 }

src/utils/index.js

@@ -131,14 +131,16 @@ export function objectMerge(target, source) {
   if (Array.isArray(source)) {
     return source.slice()
   }
-  Object.keys(source).forEach((property) => {
+  for (const property in source) {
-    const sourceProperty = source[property]
+    if (source.hasOwnProperty(property)) {
-    if (typeof sourceProperty === 'object') {
+      const sourceProperty = source[property]
-      target[property] = objectMerge(target[property], sourceProperty)
+      if (typeof sourceProperty === 'object') {
-    } else {
+        target[property] = objectMerge(target[property], sourceProperty)
+        continue
+      }
       target[property] = sourceProperty
     }
-  })
+  }
   return target
 }
 
@@ -251,13 +253,15 @@ export function deepClone(source) {
     throw new Error('error arguments', 'shallowClone')
   }
   const targetObj = source.constructor === Array ? [] : {}
-  Object.keys(source).forEach((keys) => {
+  for (const keys in source) {
-    if (source[keys] && typeof source[keys] === 'object') {
+    if (source.hasOwnProperty(keys)) {
-      targetObj[keys] = source[keys].constructor === Array ? [] : {}
+      if (source[keys] && typeof source[keys] === 'object') {
-      targetObj[keys] = deepClone(source[keys])
+        targetObj[keys] = source[keys].constructor === Array ? [] : {}
-    } else {
+        targetObj[keys] = deepClone(source[keys])
-      targetObj[keys] = source[keys]
+      } else {
+        targetObj[keys] = source[keys]
+      }
     }
-  })
+  }
   return targetObj
 }

src/vendor/Export2Excel.js

@@ -116,43 +116,45 @@ export function export_table_to_excel(id) {
     saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), "test.xlsx")
 }
 
-export function export_json_to_excel({header, data, filename='excel-list', autoWidth=true}={}) {
+export function export_json_to_excel(th, jsonData, defaultTitle) {
+
     /* original data */
-    data=[...data]
+
-    data.unshift(header);
+    var data = jsonData;
+    data.unshift(th);
     var ws_name = "SheetJS";
+
     var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
 
-    if(autoWidth){
+    /*设置worksheet每列的最大宽度*/
-      /*设置worksheet每列的最大宽度*/
+    const colWidth = data.map(row => row.map(val => {
-      const colWidth = data.map(row => row.map(val => {
+      /*先判断是否为null/undefined*/
-        /*先判断是否为null/undefined*/
+      if (val == null) {
-        if (val == null) {
+        return {'wch': 10};
-          return {'wch': 10};
+      }
-        }
+      /*再判断是否为中文*/
-        /*再判断是否为中文*/
+      else if (val.toString().charCodeAt(0) > 255) {
-        else if (val.toString().charCodeAt(0) > 255) {
+        return {'wch': val.toString().length * 2};
-          return {'wch': val.toString().length * 2};
+      } else {
-        } else {
+        return {'wch': val.toString().length};
-          return {'wch': val.toString().length};
+      }
-        }
+    }))
-      }))
+    /*以第一行为初始值*/
-      /*以第一行为初始值*/
+    let result = colWidth[0];
-      let result = colWidth[0];
+    for (let i = 1; i < colWidth.length; i++) {
-      for (let i = 1; i < colWidth.length; i++) {
+      for (let j = 0; j < colWidth[i].length; j++) {
-        for (let j = 0; j < colWidth[i].length; j++) {
+        if (result[j]['wch'] < colWidth[i][j]['wch']) {
-          if (result[j]['wch'] < colWidth[i][j]['wch']) {
+          result[j]['wch'] = colWidth[i][j]['wch'];
-            result[j]['wch'] = colWidth[i][j]['wch'];
-          }
         }
       }
-      ws['!cols'] = result;
     }
+    ws['!cols'] = result;
 
     /* add worksheet to workbook */
     wb.SheetNames.push(ws_name);
     wb.Sheets[ws_name] = ws;
 
     var wbout = XLSX.write(wb, {bookType: 'xlsx', bookSST: false, type: 'binary'});
-    saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), filename + ".xlsx");
+    var title = defaultTitle || 'excel-list'
+    saveAs(new Blob([s2ab(wbout)], {type: "application/octet-stream"}), title + ".xlsx")
 }

src/views/components-demo/splitpane.vue

@@ -38,30 +38,30 @@ export default {
 </script>
 
 <style  scoped>
-  .components-container {
+	.components-container {
-    position: relative;
+	  position: relative;
-    height: 100vh;
+	  height: 100vh;
-  }
+	}
 
-  .left-container {
+	.left-container {
-    background-color: #F38181;
+	  background-color: #F38181;
-    height: 100%;
+	  height: 100%;
-  }
+	}
 
-  .right-container {
+	.right-container {
-    background-color: #FCE38A;
+	  background-color: #FCE38A;
-    height: 200px;
+	  height: 200px;
-  }
+	}
 
-  .top-container {
+	.top-container {
-    background-color: #FCE38A;
+	  background-color: #FCE38A;
-    width: 100%;
+	  width: 100%;
-    height: 100%;
+	  height: 100%;
-  }
+	}
 
-  .bottom-container {
+	.bottom-container {
-    width: 100%;
+	  width: 100%;
-    background-color: #95E1D3;
+	  background-color: #95E1D3;
-    height: 100%;
+	  height: 100%;
-  }
+	}
 </style>

src/views/components-demo/tinymce.vue

@@ -20,9 +20,13 @@ export default {
   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>
+      `<h1 style="text-align: center;">Welcome to the TinyMCE demo!</h1>
-        <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>
-      </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>
+      `
     }
   }
 }

src/views/dashboard/admin/components/TodoList/index.scss

@@ -1,319 +1,317 @@
 .todoapp {
-  font: 14px 'Helvetica Neue', Helvetica, Arial, sans-serif;
+	font: 14px 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  line-height: 1.4em;
+	line-height: 1.4em;
-  color: #4d4d4d;
+	color: #4d4d4d;
-  min-width: 230px;
+	min-width: 230px;
-  max-width: 550px;
+	max-width: 550px;
-  margin: 0 auto ;
+	margin: 0 auto ;
-  -webkit-font-smoothing: antialiased;
+	-webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
+	-moz-osx-font-smoothing: grayscale;
-  font-weight: 300;
+	font-weight: 300;
-  background: #fff;
+	background: #fff;
-  z-index: 1;
+	z-index: 1;
-  position: relative;
+	position: relative;
-  button {
+	button {
-    margin: 0;
+		margin: 0;
-    padding: 0;
+		padding: 0;
-    border: 0;
+		border: 0;
-    background: none;
+		background: none;
-    font-size: 100%;
+		font-size: 100%;
-    vertical-align: baseline;
+		vertical-align: baseline;
-    font-family: inherit;
+		font-family: inherit;
-    font-weight: inherit;
+		font-weight: inherit;
-    color: inherit;
+		color: inherit;
-    -webkit-appearance: none;
+		-webkit-appearance: none;
-    appearance: none;
+		appearance: none;
-    -webkit-font-smoothing: antialiased;
+		-webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
+		-moz-osx-font-smoothing: grayscale;
-  }
+	}
-  :focus {
+	:focus {
-    outline: 0;
+		outline: 0;
-  }
+	}
-  .hidden {
+	.hidden {
-    display: none;
+		display: none;
-  }
+	}
-  .todoapp {
+	.todoapp {
-    background: #fff;
+		background: #fff;
-    margin: 130px 0 40px 0;
+		margin: 130px 0 40px 0;
-    position: relative;
+		position: relative;
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 25px 50px 0 rgba(0, 0, 0, 0.1);
+		box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 25px 50px 0 rgba(0, 0, 0, 0.1);
-  }
+	}
-  .todoapp input::-webkit-input-placeholder {
+	.todoapp input::-webkit-input-placeholder {
-    font-style: italic;
+		font-style: italic;
-    font-weight: 300;
+		font-weight: 300;
-    color: #e6e6e6;
+		color: #e6e6e6;
-  }
+	}
-  .todoapp input::-moz-placeholder {
+	.todoapp input::-moz-placeholder {
-    font-style: italic;
+		font-style: italic;
-    font-weight: 300;
+		font-weight: 300;
-    color: #e6e6e6;
+		color: #e6e6e6;
-  }
+	}
-  .todoapp input::input-placeholder {
+	.todoapp input::input-placeholder {
-    font-style: italic;
+		font-style: italic;
-    font-weight: 300;
+		font-weight: 300;
-    color: #e6e6e6;
+		color: #e6e6e6;
-  }
+	}
-  .todoapp h1 {
+	.todoapp h1 {
-    position: absolute;
+		position: absolute;
-    top: -155px;
+		top: -155px;
-    width: 100%;
+		width: 100%;
-    font-size: 100px;
+		font-size: 100px;
-    font-weight: 100;
+		font-weight: 100;
-    text-align: center;
+		text-align: center;
-    color: rgba(175, 47, 47, 0.15);
+		color: rgba(175, 47, 47, 0.15);
-    -webkit-text-rendering: optimizeLegibility;
+		-webkit-text-rendering: optimizeLegibility;
-    -moz-text-rendering: optimizeLegibility;
+		-moz-text-rendering: optimizeLegibility;
-    text-rendering: optimizeLegibility;
+		text-rendering: optimizeLegibility;
-  }
+	}
-  .new-todo,
+	.new-todo,
-  .edit {
+	.edit {
-    position: relative;
+		position: relative;
-    margin: 0;
+		margin: 0;
-    width: 100%;
+		width: 100%;
-    font-size: 18px;
+		font-size: 18px;
-    font-family: inherit;
+		font-family: inherit;
-    font-weight: inherit;
+		font-weight: inherit;
-    line-height: 1.4em;
+		line-height: 1.4em;
-    border: 0;
+		border: 0;
-    color: inherit;
+		color: inherit;
-    padding: 6px;
+		padding: 6px;
-    border: 1px solid #999;
+		border: 1px solid #999;
-    box-shadow: inset 0 -1px 5px 0 rgba(0, 0, 0, 0.2);
+		box-shadow: inset 0 -1px 5px 0 rgba(0, 0, 0, 0.2);
-    box-sizing: border-box;
+		box-sizing: border-box;
-    -webkit-font-smoothing: antialiased;
+		-webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
+		-moz-osx-font-smoothing: grayscale;
-  }
+	}
-  .new-todo {
+	.new-todo {
-    padding: 10px 16px 16px 60px;
+		padding: 10px 16px 16px 60px;
-    border: none;
+		border: none;
-    background: rgba(0, 0, 0, 0.003);
+		background: rgba(0, 0, 0, 0.003);
-    box-shadow: inset 0 -2px 1px rgba(0, 0, 0, 0.03);
+		box-shadow: inset 0 -2px 1px rgba(0, 0, 0, 0.03);
-  }
+	}
-  .main {
+	.main {
-    position: relative;
+		position: relative;
-    z-index: 2;
+		z-index: 2;
-    border-top: 1px solid #e6e6e6;
+		border-top: 1px solid #e6e6e6;
-  }
+	}
-  .toggle-all {
+	.toggle-all {
-    text-align: center;
+		text-align: center;
-    border: none;
+		border: none;
-    /* Mobile Safari */
+		/* Mobile Safari */
-    opacity: 0;
+		opacity: 0;
-    position: absolute;
+		position: absolute;
-  }
+	}
-  .toggle-all+label {
+	.toggle-all+label {
-    width: 60px;
+		width: 60px;
-    height: 34px;
+		height: 34px;
-    font-size: 0;
+		font-size: 0;
-    position: absolute;
+		position: absolute;
-    top: -52px;
+		top: -52px;
-    left: -13px;
+		left: -13px;
-    -webkit-transform: rotate(90deg);
+		-webkit-transform: rotate(90deg);
-    transform: rotate(90deg);
+		transform: rotate(90deg);
-  }
+	}
-  .toggle-all+label:before {
+	.toggle-all+label:before {
-    content: '❯';
+		content: '❯';
-    font-size: 22px;
+		font-size: 22px;
-    color: #e6e6e6;
+		color: #e6e6e6;
-    padding: 10px 27px 10px 27px;
+		padding: 10px 27px 10px 27px;
-  }
+	}
-  .toggle-all:checked+label:before {
+	.toggle-all:checked+label:before {
-    color: #737373;
+		color: #737373;
-  }
+	}
-  .todo-list {
+	.todo-list {
-    margin: 0;
+		margin: 0;
-    padding: 0;
+		padding: 0;
-    list-style: none;
+		list-style: none;
-  }
+	}
-  .todo-list li {
+	.todo-list li {
-    position: relative;
+		position: relative;
-    font-size: 24px;
+		font-size: 24px;
-    border-bottom: 1px solid #ededed;
+		border-bottom: 1px solid #ededed;
-  }
+	}
-  .todo-list li:last-child {
+	.todo-list li:last-child {
-    border-bottom: none;
+		border-bottom: none;
-  }
+	}
-  .todo-list li.editing {
+	.todo-list li.editing {
-    border-bottom: none;
+		border-bottom: none;
-    padding: 0;
+		padding: 0;
-  }
+	}
-  .todo-list li.editing .edit {
+	.todo-list li.editing .edit {
-    display: block;
+		display: block;
-    width: 506px;
+		width: 506px;
-    padding: 12px 16px;
+		padding: 12px 16px;
-    margin: 0 0 0 43px;
+		margin: 0 0 0 43px;
-  }
+	}
-  .todo-list li.editing .view {
+	.todo-list li.editing .view {
-    display: none;
+		display: none;
-  }
+	}
-  .todo-list li .toggle {
+	.todo-list li .toggle {
-    text-align: center;
+		text-align: center;
-    width: 40px;
+		width: 40px;
-    /* auto, since non-WebKit browsers doesn't support input styling */
+		/* auto, since non-WebKit browsers doesn't support input styling */
-    height: auto;
+		height: auto;
-    position: absolute;
+		position: absolute;
-    top: 0;
+		top: 0;
-    bottom: 0;
+		bottom: 0;
-    margin: auto 0;
+		margin: auto 0;
-    border: none;
+		border: none;
-    /* Mobile Safari */
+		/* Mobile Safari */
-    -webkit-appearance: none;
+		-webkit-appearance: none;
-    appearance: none;
+		appearance: none;
-  }
+	}
-  .todo-list li .toggle {
+	.todo-list li .toggle {
-    opacity: 0;
+		opacity: 0;
-  }
+	}
-  .todo-list li .toggle+label {
+	.todo-list li .toggle+label {
-    /*
+		/*
-    Firefox requires `#` to be escaped - https://bugzilla.mozilla.org/show_bug.cgi?id=922433
+		Firefox requires `#` to be escaped - https://bugzilla.mozilla.org/show_bug.cgi?id=922433
-    IE and Edge requires *everything* to be escaped to render, so we do that instead of just the `#` - https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/7157459/
+		IE and Edge requires *everything* to be escaped to render, so we do that instead of just the `#` - https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/7157459/
-  */
+	*/
-    background-image: url('data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%22-10%20-18%20100%20135%22%3E%3Ccircle%20cx%3D%2250%22%20cy%3D%2250%22%20r%3D%2250%22%20fill%3D%22none%22%20stroke%3D%22%23ededed%22%20stroke-width%3D%223%22/%3E%3C/svg%3E');
+		background-image: url('data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%22-10%20-18%20100%20135%22%3E%3Ccircle%20cx%3D%2250%22%20cy%3D%2250%22%20r%3D%2250%22%20fill%3D%22none%22%20stroke%3D%22%23ededed%22%20stroke-width%3D%223%22/%3E%3C/svg%3E');
-    background-repeat: no-repeat;
+		background-repeat: no-repeat;
-    background-position: center left;
+		background-position: center left;
-    background-size: 36px;
+		background-size: 36px;
-  }
+	}
-  .todo-list li .toggle:checked+label {
+	.todo-list li .toggle:checked+label {
-    background-size: 36px;
+		background-size: 36px;
-    background-image: url('data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%22-10%20-18%20100%20135%22%3E%3Ccircle%20cx%3D%2250%22%20cy%3D%2250%22%20r%3D%2250%22%20fill%3D%22none%22%20stroke%3D%22%23bddad5%22%20stroke-width%3D%223%22/%3E%3Cpath%20fill%3D%22%235dc2af%22%20d%3D%22M72%2025L42%2071%2027%2056l-4%204%2020%2020%2034-52z%22/%3E%3C/svg%3E');
+		background-image: url('data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%22-10%20-18%20100%20135%22%3E%3Ccircle%20cx%3D%2250%22%20cy%3D%2250%22%20r%3D%2250%22%20fill%3D%22none%22%20stroke%3D%22%23bddad5%22%20stroke-width%3D%223%22/%3E%3Cpath%20fill%3D%22%235dc2af%22%20d%3D%22M72%2025L42%2071%2027%2056l-4%204%2020%2020%2034-52z%22/%3E%3C/svg%3E');
-  }
+	}
-  .todo-list li label {
+	.todo-list li label {
-    word-break: break-all;
+		word-break: break-all;
-    padding: 15px 15px 15px 50px;
+		padding: 15px 15px 15px 50px;
-    display: block;
+		display: block;
-    line-height: 1.0;
+		line-height: 1.0;
-        font-size: 14px;
+		    font-size: 14px;
-    transition: color 0.4s;
+		transition: color 0.4s;
-  }
+	}
-  .todo-list li.completed label {
+	.todo-list li.completed label {
-    color: #d9d9d9;
+		color: #d9d9d9;
-    text-decoration: line-through;
+		text-decoration: line-through;
-  }
+	}
-  .todo-list li .destroy {
+	.todo-list li .destroy {
-    display: none;
+		display: none;
-    position: absolute;
+		position: absolute;
-    top: 0;
+		top: 0;
-    right: 10px;
+		right: 10px;
-    bottom: 0;
+		bottom: 0;
-    width: 40px;
+		width: 40px;
-    height: 40px;
+		height: 40px;
-    margin: auto 0;
+		margin: auto 0;
-    font-size: 30px;
+		font-size: 30px;
-    color: #cc9a9a;
+		color: #cc9a9a;
-    transition: color 0.2s ease-out;
+		transition: color 0.2s ease-out;
-  }
+	}
-  .todo-list li .destroy:hover {
+	.todo-list li .destroy:hover {
-    color: #af5b5e;
+		color: #af5b5e;
-  }
+	}
-  .todo-list li .destroy:after {
+	.todo-list li .destroy:after {
-    content: '×';
+		content: '×';
-  }
+	}
-  .todo-list li:hover .destroy {
+	.todo-list li:hover .destroy {
-    display: block;
+		display: block;
-  }
+	}
-  .todo-list li .edit {
+	.todo-list li .edit {
-    display: none;
+		display: none;
-  }
+	}
-  .todo-list li.editing:last-child {
+	.todo-list li.editing:last-child {
-    margin-bottom: -1px;
+		margin-bottom: -1px;
-  }
+	}
-  .footer {
+	.footer {
-    color: #777;
+		color: #777;
-    position: relative;
+		position: relative;
-    padding: 10px 15px;
+		padding: 10px 15px;
-    height: 40px;
+		height: 40px;
-    text-align: center;
+		text-align: center;
-    border-top: 1px solid #e6e6e6;
+		border-top: 1px solid #e6e6e6;
-  }
+	}
-  .footer:before {
+	.footer:before {
-    content: '';
+		content: '';
-    position: absolute;
+		position: absolute;
-    right: 0;
+		right: 0;
-    bottom: 0;
+		bottom: 0;
-    left: 0;
+		left: 0;
-    height: 40px;
+		height: 50px;
-    overflow: hidden;
+		overflow: hidden;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2), 0 8px 0 -3px #f6f6f6, 0 9px 1px -3px rgba(0, 0, 0, 0.2), 0 16px 0 -6px #f6f6f6, 0 17px 2px -6px rgba(0, 0, 0, 0.2);
+		box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2), 0 8px 0 -3px #f6f6f6, 0 9px 1px -3px rgba(0, 0, 0, 0.2), 0 16px 0 -6px #f6f6f6, 0 17px 2px -6px rgba(0, 0, 0, 0.2);
-  }
+	}
-  .todo-count {
+	.todo-count {
-    float: left;
+		float: left;
-    text-align: left;
+		text-align: left;
-  }
+	}
-  .todo-count strong {
+	.todo-count strong {
-    font-weight: 300;
+		font-weight: 300;
-  }
+	}
-  .filters {
+	.filters {
-    margin: 0;
+		margin: 0;
-    padding: 0;
+		padding: 0;
-    position: relative;
+		list-style: none;
-    z-index: 1;
+	}
-    list-style: none;
+	.filters li {
-  }
+		display: inline;
-  .filters li {
+	}
-    display: inline;
+	.filters li a {
-  }
+		color: inherit;
-  .filters li a {
+		font-size: 12px;
-    color: inherit;
+		padding: 3px 7px;
-    font-size: 12px;
+		text-decoration: none;
-    padding: 3px 7px;
+		border: 1px solid transparent;
-    text-decoration: none;
+		border-radius: 3px;
-    border: 1px solid transparent;
+	}
-    border-radius: 3px;
+	.filters li a:hover {
-  }
+		border-color: rgba(175, 47, 47, 0.1);
-  .filters li a:hover {
+	}
-    border-color: rgba(175, 47, 47, 0.1);
+	.filters li a.selected {
-  }
+		border-color: rgba(175, 47, 47, 0.2);
-  .filters li a.selected {
+	}
-    border-color: rgba(175, 47, 47, 0.2);
+	.clear-completed,
-  }
+	html .clear-completed:active {
-  .clear-completed,
+		float: right;
-  html .clear-completed:active {
+		position: relative;
-    float: right;
+		line-height: 20px;
-    position: relative;
+		text-decoration: none;
-    line-height: 20px;
+		cursor: pointer;
-    text-decoration: none;
+	}
-    cursor: pointer;
+	.clear-completed:hover {
-  }
+		text-decoration: underline;
-  .clear-completed:hover {
+	}
-    text-decoration: underline;
+	.info {
-  }
+		margin: 65px auto 0;
-  .info {
+		color: #bfbfbf;
-    margin: 65px auto 0;
+		font-size: 10px;
-    color: #bfbfbf;
+		text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-    font-size: 10px;
+		text-align: center;
-    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+	}
-    text-align: center;
+	.info p {
-  }
+		line-height: 1;
-  .info p {
+	}
-    line-height: 1;
+	.info a {
-  }
+		color: inherit;
-  .info a {
+		text-decoration: none;
-    color: inherit;
+		font-weight: 400;
-    text-decoration: none;
+	}
-    font-weight: 400;
+	.info a:hover {
-  }
+		text-decoration: underline;
-  .info a:hover {
+	}
-    text-decoration: underline;
+	/*
-  }
+	Hack to remove background from Mobile Safari.
-  /*
+	Can't use it globally since it destroys checkboxes in Firefox
-  Hack to remove background from Mobile Safari.
-  Can't use it globally since it destroys checkboxes in Firefox
 */
-  @media screen and (-webkit-min-device-pixel-ratio:0) {
+	@media screen and (-webkit-min-device-pixel-ratio:0) {
-    .toggle-all,
+		.toggle-all,
-    .todo-list li .toggle {
+		.todo-list li .toggle {
-      background: none;
+			background: none;
-    }
+		}
-    .todo-list li .toggle {
+		.todo-list li .toggle {
-      height: 40px;
+			height: 40px;
-    }
+		}
-  }
+	}
-  @media (max-width: 430px) {
+	@media (max-width: 430px) {
-    .footer {
+		.footer {
-      height: 50px;
+			height: 50px;
-    }
+		}
-    .filters {
+		.filters {
-      bottom: 10px;
+			bottom: 10px;
-    }
+		}
-  }
+	}
 }

src/views/dashboard/editor/index.vue

@@ -40,34 +40,35 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .emptyGif {
+	.emptyGif {
-    display: block;
+		display: block;
-    width: 45%;
+		width: 45%;
-    margin: 0 auto;
+		margin: 0 auto;
-  }
+	}
 
-  .dashboard-editor-container {
+	.dashboard-editor-container {
-    background-color: #e3e3e3;
+		background-color: #e3e3e3;
-    min-height: 100vh;
+		min-height: 100vh;
-    padding: 50px 60px 0px;
+		margin-top: -50px;
-    .pan-info-roles {
+		padding: 100px 60px 0px;
-      font-size: 12px;
+		.pan-info-roles {
-      font-weight: 700;
+			font-size: 12px;
-      color: #333;
+			font-weight: 700;
-      display: block;
+			color: #333;
-    }
+			display: block;
-    .info-container {
+		}
-      position: relative;
+		.info-container {
-      margin-left: 190px;
+			position: relative;
-      height: 150px;
+			margin-left: 190px;
-      line-height: 200px;
+			height: 150px;
-      .display_name {
+			line-height: 200px;
-        font-size: 48px;
+			.display_name {
-        line-height: 48px;
+				font-size: 48px;
-        color: #212121;
+				line-height: 48px;
-        position: absolute;
+				color: #212121;
-        top: 25px;
+				position: absolute;
-      }
+				top: 25px;
-    }
+			}
-  }
+		}
+	}
 </style>

src/views/documentation/index.vue

@@ -19,7 +19,7 @@ export default {
         { title: '实战篇', href: 'https://segmentfault.com/a/1190000009762198' },
         { title: 'vueAdmin-template 篇', href: 'https://segmentfault.com/a/1190000010043013' },
         { title: '自行封装 component', href: 'https://segmentfault.com/a/1190000009090836' },
-        { title: '优雅的使用 icon', href: 'https://segmentfault.com/a/1190000012213278' }
+        { title: '优雅的使用 icon', href: 'https://segmentfault.com/a/https://segmentfault.com/a/1190000012213278' }
       ]
     }
   }

src/views/errorPage/401.vue

@@ -65,7 +65,6 @@ export default {
     .pan-img {
       display: block;
       margin: 0 auto;
-      width: 100%;
     }
     .text-jumbo {
       font-size: 60px;

src/views/example/table/complexTable.vue

@@ -79,7 +79,8 @@
     </el-table>
 
     <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listQuery.page" :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.page"
+        :page-sizes="[10,20,30, 50]" :page-size="listQuery.limit" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>
 

src/views/excel/exportExcel.vue

@@ -1,16 +1,8 @@
 <template>
-  <!-- $t is vue-i18n global function to translate lang -->
+ <!-- $t is vue-i18n global function to translate lang -->
   <div class="app-container">
-
-    <label class="radio-label" style="padding-left:0;">Filename: </label>
     <el-input style='width:340px;' :placeholder="$t('excel.placeholder')" prefix-icon="el-icon-document" v-model="filename"></el-input>
-    <label class="radio-label">Cell Auto Width: </label>
+    <el-button style='margin-bottom:20px;' type="primary" icon="document" @click="handleDownload" :loading="downloadLoading">{{$t('excel.export')}} excel</el-button>
-    <el-radio-group v-model="autoWidth">
-      <el-radio :label="true" border>True</el-radio>
-      <el-radio :label="false" border>False</el-radio>
-    </el-radio-group>
-    <el-button style='margin:0 0 20px 20px;' type="primary" icon="document" @click="handleDownload" :loading="downloadLoading">{{$t('excel.export')}} excel</el-button>
-
     <el-table :data="list" v-loading.body="listLoading" element-loading-text="拼命加载中" border fit highlight-current-row>
       <el-table-column align="center" label='Id' width="95">
         <template slot-scope="scope">
@@ -53,8 +45,7 @@ export default {
       list: null,
       listLoading: true,
       downloadLoading: false,
-      filename: '',
+      filename: ''
-      autoWidth: true
     }
   },
   created() {
@@ -75,12 +66,7 @@ export default {
         const filterVal = ['id', 'title', 'author', 'pageviews', 'display_time']
         const list = this.list
         const data = this.formatJson(filterVal, list)
-        excel.export_json_to_excel({
+        excel.export_json_to_excel(tHeader, data, this.filename)
-          header: tHeader,
-          data,
-          filename: this.filename,
-          autoWidth: this.autoWidth
-        })
         this.downloadLoading = false
       })
     },
@@ -96,13 +82,3 @@ export default {
   }
 }
 </script>
-
-<style>
-.radio-label {
-  font-size: 14px;
-  color: #606266;
-  line-height: 40px;
-  padding: 0 12px 0 30px;
-}
-</style>
-

src/views/excel/selectExcel.vue

@@ -72,11 +72,7 @@ export default {
           const filterVal = ['id', 'title', 'author', 'pageviews', 'display_time']
           const list = this.multipleSelection
           const data = this.formatJson(filterVal, list)
-          excel.export_json_to_excel({
+          excel.export_json_to_excel(tHeader, data, this.filename)
-            header: tHeader,
-            data,
-            filename: this.filename
-          })
           this.$refs.multipleTable.clearSelection()
           this.downloadLoading = false
         })

src/views/layout/Layout.vue

@@ -1,12 +1,12 @@
 <template>
-  <div class="app-wrapper" :class="{hideSidebar:!sidebar.opened}">
+	<div class="app-wrapper" :class="{hideSidebar:!sidebar.opened}">
-    <sidebar class="sidebar-container"></sidebar>
+		<sidebar class="sidebar-container"></sidebar>
-    <div class="main-container">
+		<div class="main-container">
-      <navbar></navbar>
+			<navbar></navbar>
-      <tags-view></tags-view>
+			<tags-view></tags-view>
-      <app-main></app-main>
+			<app-main></app-main>
-    </div>
+		</div>
-  </div>
+	</div>
 </template>
 
 <script>
@@ -29,11 +29,11 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  @import "src/styles/mixin.scss";
+	@import "src/styles/mixin.scss";
-  .app-wrapper {
+	.app-wrapper {
-    @include clearfix;
+	  @include clearfix;
-    position: relative;
+	  position: relative;
-    height: 100%;
+	  height: 100%;
-    width: 100%;
+	  width: 100%;
-  }
+	}
 </style>

src/views/layout/components/Sidebar/SidebarItem.vue

@@ -2,18 +2,17 @@
   <div class="menu-wrapper">
     <template v-for="item in routes" v-if="!item.hidden&&item.children">
 
-      <router-link v-if="hasOneShowingChildren(item.children) && !item.children[0].children&&!item.alwaysShow" :to="item.path+'/'+item.children[0].path"
+      <router-link v-if="item.children.length===1 && !item.children[0].children&&!item.alwaysShow" :to="item.path+'/'+item.children[0].path" :key="item.children[0].name">
-        :key="item.children[0].name">
         <el-menu-item :index="item.path+'/'+item.children[0].path" :class="{'submenu-title-noDropdown':!isNest}">
           <svg-icon v-if="item.children[0].meta&&item.children[0].meta.icon" :icon-class="item.children[0].meta.icon"></svg-icon>
-          <span v-if="item.children[0].meta&&item.children[0].meta.title" slot="title">{{generateTitle(item.children[0].meta.title)}}</span>
+          <span v-if="item.children[0].meta&&item.children[0].meta.title">{{generateTitle(item.children[0].meta.title)}}</span>
         </el-menu-item>
       </router-link>
 
       <el-submenu v-else :index="item.name||item.path" :key="item.name">
         <template slot="title">
           <svg-icon v-if="item.meta&&item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
-          <span v-if="item.meta&&item.meta.title" slot="title">{{generateTitle(item.meta.title)}}</span>
+          <span v-if="item.meta&&item.meta.title">{{generateTitle(item.meta.title)}}</span>
         </template>
 
         <template v-for="child in item.children" v-if="!child.hidden">
@@ -22,7 +21,7 @@
           <router-link v-else :to="item.path+'/'+child.path" :key="child.name">
             <el-menu-item :index="item.path+'/'+child.path">
               <svg-icon v-if="child.meta&&child.meta.icon" :icon-class="child.meta.icon"></svg-icon>
-              <span v-if="child.meta&&child.meta.title" slot="title">{{generateTitle(child.meta.title)}}</span>
+              <span v-if="child.meta&&child.meta.title">{{generateTitle(child.meta.title)}}</span>
             </el-menu-item>
           </router-link>
         </template>
@@ -47,15 +46,6 @@ export default {
     }
   },
   methods: {
-    hasOneShowingChildren(children) {
-      const showingChildren = children.filter(item => {
-        return !item.hidden
-      })
-      if (showingChildren.length === 1) {
-        return true
-      }
-      return false
-    },
     generateTitle
   }
 }

src/views/layout/components/Sidebar/index.vue

@@ -1,15 +1,6 @@
 <template>
   <scroll-bar>
-    <el-menu
+    <el-menu mode="vertical" :default-active="$route.path" :collapse="isCollapse" background-color="#304156" text-color="#bfcbd9" active-text-color="#409EFF">
-      mode="vertical"
-      :collapse-transition="false"
-      :show-timeout="200"
-      :default-active="$route.path"
-      :collapse="isCollapse"
-      background-color="#304156"
-      text-color="#bfcbd9"
-      active-text-color="#409EFF"
-    >
       <sidebar-item :routes="permission_routers"></sidebar-item>
     </el-menu>
   </scroll-bar>

src/views/layout/components/TagsView.vue

@@ -8,9 +8,9 @@
       </router-link>
     </scroll-pane>
     <ul class='contextmenu' v-show="visible" :style="{left:left+'px',top:top+'px'}">
-      <li @click="closeSelectedTag(selectedTag)">{{$t('tagsView.close')}}</li>
+      <li @click="closeSelectedTag(selectedTag)">Close</li>
-      <li @click="closeOthersTags">{{$t('tagsView.closeOthers')}}</li>
+      <li @click="closeOthersTags">Close Others</li>
-      <li @click="closeAllTags">{{$t('tagsView.closeAll')}}</li>
+      <li @click="closeAllTags">Close All</li>
     </ul>
   </div>
 </template>

src/views/login/socialsignin.vue

@@ -34,35 +34,35 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .social-signup-container {
+	.social-signup-container {
-    margin: 20px 0;
+	  margin: 20px 0;
-    .sign-btn {
+	  .sign-btn {
-      display: inline-block;
+	    display: inline-block;
-      cursor: pointer;
+	    cursor: pointer;
-    }
+	  }
-    .icon {
+	  .icon {
-      color: #fff;
+	    color: #fff;
-      font-size: 30px;
+	    font-size: 30px;
-      margin-top: 6px;
+	    margin-top: 6px;
-    }
+	  }
-    .wx-svg-container,
+	  .wx-svg-container,
-    .qq-svg-container {
+	  .qq-svg-container {
-      display: inline-block;
+	    display: inline-block;
-      width: 40px;
+	    width: 40px;
-      height: 40px;
+	    height: 40px;
-      line-height: 40px;
+	    line-height: 40px;
-      text-align: center;
+	    text-align: center;
-      padding-top: 1px;
+	    padding-top: 1px;
-      border-radius: 4px;
+	    border-radius: 4px;
-      margin-bottom: 20px;
+	    margin-bottom: 20px;
-      margin-right: 5px;
+	    margin-right: 5px;
-    }
+	  }
-    .wx-svg-container {
+	  .wx-svg-container {
-      background-color: #8dc349;
+	    background-color: #8dc349;
-    }
+	  }
-    .qq-svg-container {
+	  .qq-svg-container {
-      background-color: #6BA2D6;
+	    background-color: #6BA2D6;
-      margin-left: 50px;
+	    margin-left: 50px;
-    }
+	  }
-  }
+	}
 </style>

src/views/svg-icons/index.vue

@@ -11,7 +11,7 @@
             {{generateIconCode(item)}}
           </div>
           <div class="icon-item">
-            <svg-icon class-name="disabled" :icon-class="item" />
+            <svg-icon :icon-class="item" />
             <span>{{item}}</span>
           </div>
         </el-tooltip>
@@ -70,8 +70,5 @@ export default {
     font-size: 24px;
     margin-top: 10px;
   }
-  .disabled{
-    pointer-events: none;
-  }
 }
 </style>

static/tinymce/skins/lightgray/content.min.css

@@ -1 +1 @@
-body{background-color:#FFFFFF;color:#000000;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px;line-height:1.3;scrollbar-3dlight-color:#F0F0EE;scrollbar-arrow-color:#676662;scrollbar-base-color:#F0F0EE;scrollbar-darkshadow-color:#DDDDDD;scrollbar-face-color:#E0E0DD;scrollbar-highlight-color:#F0F0EE;scrollbar-shadow-color:#F0F0EE;scrollbar-track-color:#F5F5F5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px}.word-wrap{word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid rgba(208,2,27,0.5);cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#2276d2 !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2276d2}.mce-content-body *[data-mce-selected="inline-boundary"]{background:#bfe6ff}.mce-content-body .mce-item-anchor[data-mce-selected]{background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-content-body hr{cursor:default}.ephox-snooker-resizer-bar{background-color:#2276d2;opacity:0}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:.2} a {color: #1478F0;}
+body{background-color:#FFFFFF;color:#000000;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px;line-height:1.3;scrollbar-3dlight-color:#F0F0EE;scrollbar-arrow-color:#676662;scrollbar-base-color:#F0F0EE;scrollbar-darkshadow-color:#DDDDDD;scrollbar-face-color:#E0E0DD;scrollbar-highlight-color:#F0F0EE;scrollbar-shadow-color:#F0F0EE;scrollbar-track-color:#F5F5F5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px}.word-wrap{word-wrap:break-word;-ms-word-break:break-all;word-break:break-all;word-break:break-word;-ms-hyphens:auto;-moz-hyphens:auto;-webkit-hyphens:auto;hyphens:auto}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid rgba(208,2,27,0.5);cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#2276d2 !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #2276d2}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2276d2}.mce-content-body *[data-mce-selected="inline-boundary"]{background:#bfe6ff}.mce-content-body .mce-item-anchor[data-mce-selected]{background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-content-body hr{cursor:default}.ephox-snooker-resizer-bar{background-color:#2276d2;opacity:0}.ephox-snooker-resizer-cols{cursor:col-resize}.ephox-snooker-resizer-rows{cursor:row-resize}.ephox-snooker-resizer-bar.ephox-snooker-resizer-bar-dragging{opacity:.2}

static/tinymce4.7.5/plugins/codesample/css/prism.css

@@ -1,138 +0,0 @@
-/* http://prismjs.com/download.html?themes=prism&languages=markup+css+clike+javascript */
-/**
- * prism.js default theme for JavaScript, CSS and HTML
- * Based on dabblet (http://dabblet.com)
- * @author Lea Verou
- */
-
-code[class*="language-"],
-pre[class*="language-"] {
-  color: black;
-  text-shadow: 0 1px white;
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-  direction: ltr;
-  text-align: left;
-  white-space: pre;
-  word-spacing: normal;
-  word-break: normal;
-  word-wrap: normal;
-  line-height: 1.5;
-
-  -moz-tab-size: 4;
-  -o-tab-size: 4;
-  tab-size: 4;
-
-  -webkit-hyphens: none;
-  -moz-hyphens: none;
-  -ms-hyphens: none;
-  hyphens: none;
-}
-
-pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection,
-code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
-code[class*="language-"]::selection, code[class*="language-"] ::selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-@media print {
-  code[class*="language-"],
-  pre[class*="language-"] {
-    text-shadow: none;
-  }
-}
-
-/* Code blocks */
-pre[class*="language-"] {
-  padding: 1em;
-  margin: .5em 0;
-  overflow: auto;
-}
-
-:not(pre) > code[class*="language-"],
-pre[class*="language-"] {
-  background: #f5f2f0;
-}
-
-/* Inline code */
-:not(pre) > code[class*="language-"] {
-  padding: .1em;
-  border-radius: .3em;
-}
-
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-  color: slategray;
-}
-
-.token.punctuation {
-  color: #999;
-}
-
-.namespace {
-  opacity: .7;
-}
-
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.constant,
-.token.symbol,
-.token.deleted {
-  color: #905;
-}
-
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-  color: #690;
-}
-
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string {
-  color: #a67f59;
-  background: hsla(0, 0%, 100%, .5);
-}
-
-.token.atrule,
-.token.attr-value,
-.token.keyword {
-  color: #07a;
-}
-
-.token.function {
-  color: #DD4A68;
-}
-
-.token.regex,
-.token.important,
-.token.variable {
-  color: #e90;
-}
-
-.token.important,
-.token.bold {
-  font-weight: bold;
-}
-.token.italic {
-  font-style: italic;
-}
-
-.token.entity {
-  cursor: help;
-}
-

static/tinymce4.7.5/plugins/visualblocks/css/visualblocks.css

@@ -1,154 +0,0 @@
-.mce-visualblocks p {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin-left: 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks h1 {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin-left: 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks h2 {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin-left: 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8Hybbx4oOuqgTynJd6bGlWg3DkJzoaUAAAOw==);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks h3 {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin-left: 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIZjI8Hybbx4oOuqgTynJf2Ln2NOHpQpmhAAQA7);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks h4 {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin-left: 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxInR0zqeAdhtJlXwV1oCll2HaWgAAOw==);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks h5 {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin-left: 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjane4iq5GlW05GgIkIZUAAAOw==);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks h6 {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin-left: 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhDgAKAIABALu7u////yH5BAEAAAEALAAAAAAOAAoAAAIajI8HybbxIoiuwjan04jep1iZ1XRlAo5bVgAAOw==);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks div:not([data-mce-bogus]) {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin-left: 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhEgAKAIABALu7u////yH5BAEAAAEALAAAAAASAAoAAAIfjI9poI0cgDywrhuxfbrzDEbQM2Ei5aRjmoySW4pAAQA7);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks section {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin: 0 0 1em 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhKAAKAIABALu7u////yH5BAEAAAEALAAAAAAoAAoAAAI5jI+pywcNY3sBWHdNrplytD2ellDeSVbp+GmWqaDqDMepc8t17Y4vBsK5hDyJMcI6KkuYU+jpjLoKADs=);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks article {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin: 0 0 1em 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhKgAKAIABALu7u////yH5BAEAAAEALAAAAAAqAAoAAAI6jI+pywkNY3wG0GBvrsd2tXGYSGnfiF7ikpXemTpOiJScasYoDJJrjsG9gkCJ0ag6KhmaIe3pjDYBBQA7);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks blockquote {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  background-image: url(data:image/gif;base64,R0lGODlhPgAKAIABALu7u////yH5BAEAAAEALAAAAAA+AAoAAAJPjI+py+0Knpz0xQDyuUhvfoGgIX5iSKZYgq5uNL5q69asZ8s5rrf0yZmpNkJZzFesBTu8TOlDVAabUyatguVhWduud3EyiUk45xhTTgMBBQA7);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks address {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin: 0 0 1em 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH5BAEAAAEALAAAAAAtAAoAAAI/jI+pywwNozSP1gDyyZcjb3UaRpXkWaXmZW4OqKLhBmLs+K263DkJK7OJeifh7FicKD9A1/IpGdKkyFpNmCkAADs=);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks pre {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin-left: 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks figure {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin: 0 0 1em 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks hgroup {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin: 0 0 1em 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks aside {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin: 0 0 1em 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks figcaption {
-  border: 1px dashed #BBB;
-}
-
-.mce-visualblocks ul {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin: 0 0 1em 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIAAALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGuYnqUVSjvw26DzzXiqIDlVwAAOw==);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks ol {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin: 0 0 1em 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybH6HHt0qourxC6CvzXieHyeWQAAOw==);
-  background-repeat: no-repeat;
-}
-
-.mce-visualblocks dl {
-  padding-top: 10px;
-  border: 1px dashed #BBB;
-  margin: 0 0 1em 3px;
-  background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybEOnmOvUoWznTqeuEjNSCqeGRUAOw==);
-  background-repeat: no-repeat;
-}