[release] 3.6.2

perf[tinymce]: perf tinymce demo
bump[tinymce]: update tinymce to 4.7.5
2018-02-02 17:27:43 +08:00 · 2018-02-01 11:07:07 +08:00 · 2018-02-01 10:22:33 +08:00 · 2018-01-30 17:26:55 +08:00 · 2018-01-30 15:18:52 +08:00 · 2018-01-30 15:05:33 +08:00
103 changed files with 1048 additions and 5495 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 .DS_Store
 node_modules/
 dist/
-gifs/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
--- a/.postcssrc.js
+++ b/.postcssrc.js
@@ -2,8 +2,9 @@

 module.exports = {
  "plugins": {
-    // to edit target browsers: use "browserslist" field in package.json
    "postcss-import": {},
+    "postcss-url": {},
+    // to edit target browsers: use "browserslist" field in package.json
    "autoprefixer": {}
  }
 }
--- a/README.md
+++ b/README.md
@@ -78,6 +78,7 @@ You need to install [node](http://nodejs.org/) and [git](https://git-scm.com/) l
 - Export excel
 - Export zip
 - Front-end visualization excel
+- Tree Table
 - Table example
 - Dynamictable example
 - Drag and drop table example
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -91,6 +91,7 @@
 - 导出excel
 - 导出zip
 - 前端可视化excel
+- 树形table
 - Table example
 - 动态table example
 - 拖拽table example
--- a/config/index.js
+++ b/config/index.js
@@ -33,7 +33,7 @@ module.exports = {
     */

    // https://webpack.js.org/configuration/devtool/#development
-    devtool: 'eval-source-map',
+    devtool: '#cheap-source-map',

    // If you have problems debugging vue-files in devtools,
    // set this to false - it *may* help
--- a/gifs/2login.gif
+++ b/gifs/2login.gif
--- a/gifs/dynamictable.gif
+++ b/gifs/dynamictable.gif
--- a/gifs/echarts.gif
+++ b/gifs/echarts.gif
--- a/gifs/editor.gif
+++ b/gifs/editor.gif
--- a/gifs/errorlog.gif
+++ b/gifs/errorlog.gif
--- a/gifs/excel.png
+++ b/gifs/excel.png
--- a/gifs/leftmenu.gif
+++ b/gifs/leftmenu.gif
--- a/gifs/login.png
+++ b/gifs/login.png
--- a/gifs/order.gif
+++ b/gifs/order.gif
--- a/gifs/table.gif
+++ b/gifs/table.gif
--- a/gifs/tabs.gif
+++ b/gifs/tabs.gif
--- a/gifs/theme.gif
+++ b/gifs/theme.gif
--- a/gifs/upload1.gif
+++ b/gifs/upload1.gif
--- a/gifs/uploadAvatar.gif
+++ b/gifs/uploadAvatar.gif
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 		<title>vue-element-admin</title>
 	</head>
-	<script src=<%= htmlWebpackPlugin.options.path %>/tinymce/tinymce.min.js></script>
+	<script src=<%= htmlWebpackPlugin.options.path %>/tinymce4.7.5/tinymce.min.js></script>
 	<body>
 		<div id="app"></div>
 		<!-- built files will be auto injected -->
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vue-element-admin",
-  "version": "3.5.0",
+  "version": "3.6.2",
  "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",
@@ -39,7 +39,7 @@
    "vue-splitpane": "1.0.2",
    "vuedraggable": "2.15.0",
    "vuex": "3.0.1",
-    "xlsx": "^0.11.7"
+    "xlsx": "^0.11.16"
  },
  "devDependencies": {
    "autoprefixer": "7.2.3",
@@ -71,6 +71,7 @@
    "portfinder": "1.0.13",
    "postcss-import": "11.0.0",
    "postcss-loader": "2.0.9",
+    "postcss-url": "7.3.0",
    "pushstate-server": "3.0.1",
    "rimraf": "2.6.2",
    "sass-loader": "6.0.6",
--- a/src/components/JsonEditor/index.vue
+++ b/src/components/JsonEditor/index.vue
@@ -53,11 +53,19 @@ export default {
 }
 </script>

-<style>
-.CodeMirror {
+<style scoped>
+.json-editor{
  height: 100%;
+  position: relative;
 }
-.json-editor .cm-s-rubyblue span.cm-string {
+.json-editor >>> .CodeMirror {
+  height: auto;
+  min-height: 300px;
+}
+.json-editor >>> .CodeMirror-scroll{
+  min-height: 300px;
+}
+.json-editor >>> .cm-s-rubyblue span.cm-string {
  color: #F08047;
 }
 </style>
--- a/src/components/LangSelect/index.vue
+++ b/src/components/LangSelect/index.vue
@@ -34,7 +34,7 @@ export default {
 .international-icon {
  font-size: 20px;
  cursor: pointer;
-  vertical-align: -5px;
+  vertical-align: -5px!important;
 }
 </style>

--- a/src/components/MarkdownEditor/index.vue
+++ b/src/components/MarkdownEditor/index.vue
@@ -73,47 +73,44 @@ export default {
    })
  },
  destroyed() {
+    this.simplemde.toTextArea()
    this.simplemde = null
  }
 }
 </script>

-<style>
-.simplemde-container .CodeMirror {
+<style scoped>
+.simplemde-container>>>.CodeMirror {
+  min-height: 150px;
+  line-height: 20px;
+}
+
+.simplemde-container>>>.CodeMirror-scroll {
  min-height: 150px;
 }

-.simplemde-container .CodeMirror-scroll {
-  min-height: 150px;
-}
-
-.simplemde-container .CodeMirror-code {
+.simplemde-container>>>.CodeMirror-code {
  padding-bottom: 40px;
 }

-.simplemde-container .editor-statusbar {
+.simplemde-container>>>.editor-statusbar {
  display: none;
 }

-.simplemde-container .CodeMirror .CodeMirror-code .cm-link {
-  color: #1482F0;
+.simplemde-container>>>.CodeMirror .CodeMirror-code .cm-link {
+  color: #1890ff;
 }

-.simplemde-container .CodeMirror .CodeMirror-code .cm-string.cm-url {
+.simplemde-container>>>.CodeMirror .CodeMirror-code .cm-string.cm-url {
  color: #2d3b4d;
-  font-weight: bold;
 }

-.simplemde-container .CodeMirror .CodeMirror-code .cm-formatting-link-string.cm-url {
+.simplemde-container>>>.CodeMirror .CodeMirror-code .cm-formatting-link-string.cm-url {
  padding: 0 2px;
-  font-weight: bold;
  color: #E61E1E;
 }
-
-.simplemde-container .editor-toolbar.fullscreen,
-.simplemde-container .CodeMirror-fullscreen {
+.simplemde-container >>> .editor-toolbar.fullscreen,
+.simplemde-container >>> .CodeMirror-fullscreen {
  z-index: 1003;
 }
 </style>
-
-
--- a/src/components/Tinymce/components/editorImage.vue
+++ b/src/components/Tinymce/components/editorImage.vue
@@ -1,6 +1,6 @@
 <template>
  <div class="upload-container">
-    <el-button icon='upload' :style="{background:color,borderColor:color}" @click=" dialogVisible=true" type="primary">上传图片
+    <el-button icon='el-icon-upload' size="mini" :style="{background:color,borderColor:color}" @click=" dialogVisible=true" type="primary">上传图片
    </el-button>
    <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"
@@ -21,7 +21,7 @@ export default {
  props: {
    color: {
      type: String,
-      default: '#20a0ff'
+      default: '#1890ff'
    }
  },
  data() {
@@ -87,9 +87,9 @@ export default {
 </script>

 <style rel="stylesheet/scss" lang="scss" scoped>
-    .upload-container {
-        .editor-slide-upload {
-            margin-bottom: 20px;
-        }
-    }
+.upload-container {
+  .editor-slide-upload {
+    margin-bottom: 20px;
+  }
+}
 </style>
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -2,13 +2,15 @@
  <div class="tinymce-container editor-container">
    <textarea class="tinymce-textarea" :id="tinymceId"></textarea>
    <div class="editor-custom-btn-container">
-     <editorImage  color="#20a0ff" class="editor-upload-btn" @successCBK="imageSuccessCBK"></editorImage>
-      </div>
+      <editorImage color="#1890ff" class="editor-upload-btn" @successCBK="imageSuccessCBK"></editorImage>
+    </div>
  </div>
 </template>

 <script>
 import editorImage from './components/editorImage'
+import plugins from './plugins'
+import toolbar from './toolbar'

 export default {
  name: 'tinymce',
@@ -25,11 +27,11 @@ export default {
      type: Array,
      required: false,
      default() {
-        return ['removeformat undo redo |  bullist numlist | outdent indent | forecolor | fullscreen code', 'bold italic blockquote | h2 p  media link | alignleft aligncenter alignright']
+        return []
      }
    },
    menubar: {
-      default: ''
+      default: 'file edit insert view format table'
    },
    height: {
      type: Number,
@@ -68,17 +70,16 @@ export default {
        height: this.height,
        body_class: 'panel-body ',
        object_resizing: false,
-        toolbar: this.toolbar,
+        toolbar: this.toolbar.length > 0 ? this.toolbar : toolbar,
        menubar: this.menubar,
-        plugins: 'advlist,autolink,code,paste,textcolor, colorpicker,fullscreen,link,lists,media,wordcount, imagetools',
+        plugins: plugins,
        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: ['wpimg.wallstcn.com', 'wallstreetcn.com'],
-        imagetools_toolbar: 'watermark',
+        imagetools_cors_hosts: ['www.tinymce.com', 'codepen.io'],
        default_link_target: '_blank',
        link_title: false,
        init_instance_callback: editor => {
@@ -160,9 +161,9 @@ export default {
 }
 .editor-custom-btn-container {
  position: absolute;
-  right: 15px;
+  right: 4px;
+  top: 4px;
  /*z-index: 2005;*/
-  top: 18px;
 }
 .editor-upload-btn {
  display: inline-block;
--- a/src/components/Tinymce/plugins.js
+++ b/src/components/Tinymce/plugins.js
@@ -0,0 +1,7 @@
+// 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 bbcode 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']
+
+export default plugins
--- a/src/components/Tinymce/toolbar.js
+++ b/src/components/Tinymce/toolbar.js
@@ -0,0 +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']
+
+export default toolbar
--- a/src/components/TreeTable/eval.js
+++ b/src/components/TreeTable/eval.js
@@ -0,0 +1,29 @@
+/**
+* @Author: jianglei
+* @Date:   2017-10-12 12:06:49
+*/
+'use strict'
+import Vue from 'vue'
+export default function treeToArray(data, expandAll, parent = null, level = null) {
+  let tmp = []
+  Array.from(data).forEach(function(record) {
+    if (record._expanded === undefined) {
+      Vue.set(record, '_expanded', expandAll)
+    }
+    let _level = 1
+    if (level !== undefined && level !== null) {
+      _level = level + 1
+    }
+    Vue.set(record, '_level', _level)
+    // 如果有父元素
+    if (parent) {
+      Vue.set(record, 'parent', parent)
+    }
+    tmp.push(record)
+    if (record.children && record.children.length > 0) {
+      const children = treeToArray(record.children, expandAll, record, _level)
+      tmp = tmp.concat(children)
+    }
+  })
+  return tmp
+}
--- a/src/components/TreeTable/index.vue
+++ b/src/components/TreeTable/index.vue
@@ -0,0 +1,124 @@
+<template>
+  <el-table :data="formatData" :row-style="showRow" v-bind="$attrs">
+    <el-table-column v-if="columns.length===0" width="150">
+      <template slot-scope="scope">
+        <span v-for="space in scope.row._level" class="ms-tree-space" :key="space"></span>
+        <span class="tree-ctrl" v-if="iconShow(0,scope.row)" @click="toggleExpanded(scope.$index)">
+          <i v-if="!scope.row._expanded" class="el-icon-plus"></i>
+          <i v-else class="el-icon-minus"></i>
+        </span>
+        {{scope.$index}}
+      </template>
+    </el-table-column>
+    <el-table-column v-else v-for="(column, index) in columns" :key="column.value" :label="column.text" :width="column.width">
+      <template slot-scope="scope">
+        <span v-if="index === 0" v-for="space in scope.row._level" class="ms-tree-space" :key="space"></span>
+        <span class="tree-ctrl" v-if="iconShow(index,scope.row)" @click="toggleExpanded(scope.$index)">
+          <i v-if="!scope.row._expanded" class="el-icon-plus"></i>
+          <i v-else class="el-icon-minus"></i>
+        </span>
+        {{scope.row[column.value]}}
+      </template>
+    </el-table-column>
+    <slot></slot>
+  </el-table>
+</template>
+
+<script>
+/**
+  Auth: Lei.j1ang
+  Created: 2018/1/19-13:59
+*/
+import treeToArray from './eval'
+export default {
+  name: 'treeTable',
+  props: {
+    data: {
+      type: [Array, Object],
+      required: true
+    },
+    columns: {
+      type: Array,
+      default: () => []
+    },
+    evalFunc: Function,
+    evalArgs: Array,
+    expandAll: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    // 格式化数据源
+    formatData: function() {
+      let tmp
+      if (!Array.isArray(this.data)) {
+        tmp = [this.data]
+      } else {
+        tmp = this.data
+      }
+      const func = this.evalFunc || treeToArray
+      const args = this.evalArgs ? Array.concat([tmp, this.expandAll], this.evalArgs) : [tmp, this.expandAll]
+      return func.apply(null, args)
+    }
+  },
+  methods: {
+    showRow: function(row) {
+      const show = (row.row.parent ? (row.row.parent._expanded && row.row.parent._show) : true)
+      row.row._show = show
+      return show ? 'animation:treeTableShow 1s;-webkit-animation:treeTableShow 1s;' : 'display:none;'
+    },
+    // 切换下级是否展开
+    toggleExpanded: function(trIndex) {
+      const record = this.formatData[trIndex]
+      record._expanded = !record._expanded
+    },
+    // 图标显示
+    iconShow(index, record) {
+      return (index === 0 && record.children && record.children.length > 0)
+    }
+  }
+}
+</script>
+<style rel="stylesheet/css">
+  @keyframes treeTableShow {
+    from {opacity: 0;}
+    to {opacity: 1;}
+  }
+  @-webkit-keyframes treeTableShow {
+    from {opacity: 0;}
+    to {opacity: 1;}
+  }
+</style>
+
+<style lang="scss" rel="stylesheet/scss" scoped>
+  $color-blue: #2196F3;
+  $space-width: 18px;
+  .ms-tree-space {
+    position: relative;
+    top: 1px;
+    display: inline-block;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 1;
+    width: $space-width;
+    height: 14px;
+    &::before {
+      content: ""
+    }
+  }
+  .processContainer{
+    width: 100%;
+    height: 100%;
+  }
+  table td {
+    line-height: 26px;
+  }
+
+  .tree-ctrl{
+    position: relative;
+    cursor: pointer;
+    color: $color-blue;
+    margin-left: -$space-width;
+  }
+</style>
--- a/src/components/TreeTable/readme.md
+++ b/src/components/TreeTable/readme.md
@@ -0,0 +1,89 @@
+## 写在前面
+此组件仅提供一个创建TreeTable的解决思路
+
+## prop说明
+#### *data*
+  **必填**
+
+  原始数据,要求是一个数组或者对象
+  ```javascript
+    [{
+      key1: value1,
+      key2: value2,
+      children: [{
+        key1: value1
+      },
+      {
+        key1: value1
+      }]
+    },
+    {
+      key1: value1
+    }]
+  ```
+  或者
+ ```javascript
+    {
+      key1: value1,
+      key2: value2,
+      children: [{
+        key1: value1
+      },
+      {
+        key1: value1
+      }]
+    }
+  ```
+
+#### columns
+  列属性,要求是一个数组
+
+  1. text: 显示在表头的文字
+  2. value: 对应data的key。treeTable将显示相应的value
+  3. width: 每列的宽度，为一个数字(可选)
+  
+  如果你想要每个字段都有自定义的样式或者嵌套其他组件，columns可不提供，直接像在el-table一样写即可，如果没有自定义内容，提供columns将更加的便捷方便
+  
+  如果你有几个字段是需要自定义的，几个不需要，那么可以将不需要自定义的字段放入columns，将需要自定义的内容放入到slot中，详情见后文
+  ```javascript
+  [{
+    value:string,
+    text:string,
+    width:number
+  },{
+    value:string,
+    text:string,
+    width:number
+  }]
+  ```
+
+#### expandAll
+  是否默认全部展开，boolean值，默认为false
+
+#### evalFunc
+  解析函数，function，非必须
+
+  如果不提供，将使用默认的[evalFunc](./eval.js)
+
+  如果提供了evalFunc,那么会用提供的evalFunc去解析data，并返回treeTable渲染所需要的值。如何编写一个evalFunc，请参考[*eval.js*](https://github.com/PanJiaChen/vue-element-admin/blob/master/src/components/TreeTable/eval.js)或[*customEval.js*](https://github.com/PanJiaChen/vue-element-admin/blob/master/src/views/example/table/treeTable/customEval.js)
+
+#### evalArgs
+  解析函数的参数，是一个数组
+
+  **请注意，自定义的解析函数参数第一个为this.data，第二个参数为， this.expandAll,你不需要在evalArgs填写。一定记住，这两个参数是强制性的，并且位置不可颠倒** *this.data为需要解析的数据，this.expandAll为是否默认展开*
+
+  如你的解析函数需要的参数为`(this.data, this.expandAll,1,2,3,4)`，那么你只需要将`[1,2,3,4]`赋值给`evalArgs`就可以了
+  
+  如果你的解析函数参数只有`(this.data, this.expandAll)`,那么就可以不用填写evalArgs了
+  
+  具体可参考[*customEval.js*](https://github.com/PanJiaChen/vue-element-admin/blob/master/src/views/example/table/treeTable/customEval.js)的函数参数和[customTreeTable](https://github.com/PanJiaChen/vue-element-admin/blob/master/src/views/example/table/treeTable/customTreeTable.vue)的`evalArgs`属性值
+
+ ## slot
+ 这是一个自定义列的插槽。
+ 
+ 默认情况下，treeTable只有一行行展示数据的功能。但是一般情况下，我们会要给行加上一个操作按钮或者根据当行数据展示不同的样式，这时我们就需要自定义列了。请参考[customTreeTable](https://github.com/PanJiaChen/vue-element-admin/blob/master/src/views/example/table/treeTable/customTreeTable.vue)，[实例效果](http://panjiachen.github.io/vue-element-admin/#/example/table/custom-tree-table)
+ 
+ `slot`和`columns属性`可同时存在,columns里面的数据列会在slot自定义列的左边展示
+
+ ## 其他
+  如果有其他的需求，请参考[el-table](http://element-cn.eleme.io/#/en-US/component/table)的api自行修改index.vue
--- a/src/components/UploadExcel/index.vue
+++ b/src/components/UploadExcel/index.vue
@@ -1,7 +1,10 @@
 <template>
  <div>
-    <el-button :loading="loading" type="primary" @click="handleUpload">select excel file</el-button>
    <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>
+    </div>
  </div>
 </template>

@@ -22,16 +25,35 @@ export default {
    generateDate({ header, results }) {
      this.excelData.header = header
      this.excelData.results = results
-      this.loading = false
      this.$emit('on-selected-file', this.excelData)
    },
+    handleDrop(e) {
+      e.stopPropagation()
+      e.preventDefault()
+      const files = e.dataTransfer.files
+      if (files.length !== 1) {
+        this.$message.error('Only support uploading one file!')
+        return
+      }
+      const itemFile = files[0] // only use files[0]
+      this.readerData(itemFile)
+      e.stopPropagation()
+      e.preventDefault()
+    },
+    handleDragover(e) {
+      e.stopPropagation()
+      e.preventDefault()
+      e.dataTransfer.dropEffect = 'copy'
+    },
    handleUpload() {
      document.getElementById('excel-upload-input').click()
    },
    handkeFileChange(e) {
-      this.loading = true
      const files = e.target.files
      const itemFile = files[0] // only use files[0]
+      this.readerData(itemFile)
+    },
+    readerData(itemFile) {
      const reader = new FileReader()
      reader.onload = e => {
        const data = e.target.result
@@ -75,4 +97,16 @@ export default {
  display: none;
  z-index: -9999;
 }
+#drop{
+  border: 2px dashed #bbb;
+  width: 600px;
+  height: 160px;
+  line-height: 160px;
+  margin: 0 auto;
+  font-size: 24px;
+  border-radius: 5px;
+  text-align: center;
+  color: #bbb;
+  position: relative;
+}
 </style>
--- a/src/icons/svg/documentation.svg
+++ b/src/icons/svg/documentation.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1510826638494" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1669" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M743.253333 144.184889H374.499556v734.378667H743.253333a92.017778 92.017778 0 0 0 92.16-91.818667V235.975111a91.989333 91.989333 0 0 0-92.16-91.790222z m-0.398222 293.888c0.398222 20.48-1.507556 26.794667-9.756444 26.794667-3.612444 0.597333-9.415111-1.621333-17.863111-8.874667-12.657778-8.931556-21.504-16.753778-29.155556-21.617778-6.798222-5.888-17.550222-5.205333-24.291556 0-8.874667 4.949333-21.532444 15.872-28.814222 21.617778-8.988444 7.907556-15.018667 8.874667-17.180444 8.874667-8.618667 0-10.837333-7.424-10.496-26.794667l-0.312889-223.601778c0-21.162667 8.561778-24.376889 17.265778-24.376889h103.708444c10.552889 0 17.294222 4.835556 17.294222 24.376889l-0.398222 223.601778zM190.122667 235.975111V786.773333a92.046222 92.046222 0 0 0 92.188444 91.818667h46.08V144.184889h-46.08a92.017778 92.017778 0 0 0-92.188444 91.790222z" fill="" p-id="1670"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1517304186474" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5672" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M554.666667 384h234.666666L554.666667 149.333333V384M256 85.333333h341.333333l256 256v512a85.333333 85.333333 0 0 1-85.333333 85.333334H256a85.333333 85.333333 0 0 1-85.333333-85.333334V170.666667c0-47.36 37.973333-85.333333 85.333333-85.333334m384 682.666667v-85.333333H256v85.333333h384m128-170.666667v-85.333333H256v85.333333h512z" fill="" p-id="5673"></path></svg>
--- a/src/icons/svg/theme.svg
+++ b/src/icons/svg/theme.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1503994829667" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9989" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M788.00002 159.831491C756.00002 128 746 128 724.3801 128L642 128C642 128 576 188.923077 512 188.923077 448 188.923077 384 128 384 128L299.204802 128C276.629934 128 266 140.923077 245.847214 159.831491L81.582979 323.871735C70.243732 335.19552 52 371.692308 81.582979 408.655004 81.582979 408.655004 224.023667 540.29784 238.000003 541.53846L238.000003 835.076924C238.000003 868.452352 286.579 896 320 896L706 896C739.419808 896 788.00002 868.452352 788.00002 835.076924L788.00002 541.53846C802.145492 540.385864 942.448564 408.654992 942.448564 408.654992 974.00002 372 965.851264 334.883878 942.448584 311.513109L788.00002 159.831491Z" p-id="9990"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1517304322151" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6548" xmlns:xlink="http://www.w3.org/1999/xlink" width="64" height="64"><defs><style type="text/css"></style></defs><path d="M1004.094293 321.092267L762.737493 79.735467a68.266667 68.266667 0 0 0-96.546133 0l-30.293333 30.293333a68.283733 68.283733 0 0 1-48.264534 20.002133h-151.1936a68.181333 68.181333 0 0 1-48.264533-20.002133l-30.293333-30.293333a68.266667 68.266667 0 0 0-96.546134 0L19.962027 321.092267a68.266667 68.266667 0 0 0 0 96.546133l96.546133 96.546133a67.84 67.84 0 0 0 66.645333 17.271467c10.8032-3.072 21.674667 4.181333 21.674667 15.4112V896c0 37.546667 30.72 68.266667 68.266667 68.266667h477.866666c37.546667 0 68.266667-30.72 68.266667-68.266667V546.8672c0-11.229867 10.871467-18.4832 21.674667-15.4112a67.84 67.84 0 0 0 66.645333-17.271467l96.546133-96.546133a68.266667 68.266667 0 0 0 0-96.546133z" p-id="6549"></path></svg>
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -28,6 +28,8 @@ export default {
    dragTable: 'Drag Table',
    inlineEditTable: 'Inline Edit',
    complexTable: 'Complex Table',
+    treeTable: 'Tree Table',
+    customTreeTable: 'Custom TreeTable',
    tab: 'Tab',
    form: 'Form',
    createForm: 'Create Form',
@@ -40,7 +42,8 @@ export default {
    exportExcel: 'Export Excel',
    selectExcel: 'Export Selected',
    uploadExcel: 'Upload Excel',
-    exportZip: 'Zip',
+    zip: 'Zip',
+    exportZip: 'Export Zip',
    theme: 'Theme',
    clipboardDemo: 'Clipboard',
    i18n: 'I18n'
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -24,10 +24,12 @@ export default {
    mixChart: '混合图表',
    example: '综合实例',
    Table: 'Table',
-    dynamicTable: '动态table',
-    dragTable: '拖拽table',
-    inlineEditTable: 'table内编辑',
-    complexTable: '综合table',
+    dynamicTable: '动态Table',
+    dragTable: '拖拽Table',
+    inlineEditTable: 'Table内编辑',
+    complexTable: '综合Table',
+    treeTable: '树形表格',
+    customTreeTable: '自定义树表',
    tab: 'Tab',
    form: '表单',
    createForm: '创建表单',
@@ -36,13 +38,14 @@ export default {
    page401: '401',
    page404: '404',
    errorLog: '错误日志',
-    excel: 'excel',
-    exportExcel: 'export excel',
-    selectExcel: 'export selected',
-    uploadExcel: 'upload excel',
-    exportZip: 'zip',
+    excel: 'Excel',
+    exportExcel: 'Export Excel',
+    selectExcel: 'Export Selected',
+    uploadExcel: 'Upload Excel',
+    zip: 'Zip',
+    exportZip: 'Export Zip',
    theme: '换肤',
-    clipboardDemo: 'clipboard',
+    clipboardDemo: 'Clipboard',
    i18n: '国际化'
  },
  navbar: {
--- a/src/mock/login.js
+++ b/src/mock/login.js
@@ -2,14 +2,14 @@ import { param2Obj } from '@/utils'

 const userMap = {
  admin: {
-    role: ['admin'],
+    roles: ['admin'],
    token: 'admin',
    introduction: '我是超级管理员',
    avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif',
    name: 'Super Admin'
  },
  editor: {
-    role: ['editor'],
+    roles: ['editor'],
    token: 'editor',
    introduction: '我是编辑',
    avatar: 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif',
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,11 +1,13 @@
 import router from './router'
 import store from './store'
+import { Message } from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css'// progress bar style
 import { getToken } from '@/utils/auth' // getToken from cookie
-import { Message } from 'element-ui'

-// permissiom judge
+NProgress.configure({ showSpinner: false })// NProgress Configuration
+
+// permissiom judge function
 function hasPermission(roles, permissionRoles) {
  if (roles.indexOf('admin') >= 0) return true // admin permission passed directly
  if (!permissionRoles) return true
@@ -16,15 +18,16 @@ const whiteList = ['/login', '/authredirect']// no redirect whitelist

 router.beforeEach((to, from, next) => {
  NProgress.start() // start progress bar
-  if (getToken()) { // 判断是否有token
+  if (getToken()) { // determine if there has token
+    /* has token*/
    if (to.path === '/login') {
      next({ path: '/' })
-      NProgress.done() // router在hash模式下 手动改变hash 重定向回来 不会触发afterEach 暂时hack方案 ps：history模式下无问题，可删除该行！
+      NProgress.done() // if current page is dashboard will not trigger	afterEach hook, so manually handle it
    } else {
      if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
        store.dispatch('GetUserInfo').then(res => { // 拉取user_info
-          const roles = res.data.role
-          store.dispatch('GenerateRoutes', { roles }).then(() => { // 生成可访问的路由表
+          const roles = res.data.roles // note: roles must be a array! such as: ['editor','develop']
+          store.dispatch('GenerateRoutes', { roles }).then(() => { // 根据roles权限生成可访问的路由表
            router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
          })
@@ -36,21 +39,21 @@ router.beforeEach((to, from, next) => {
        })
      } else {
        // 没有动态改变权限的需求可直接next() 删除下方权限判断 ↓
-        if (hasPermission(store.getters.roles, to.meta.role)) {
+        if (hasPermission(store.getters.roles, to.meta.roles)) {
          next()//
        } else {
-          next({ path: '/401', query: { noGoBack: true }})
-          NProgress.done() // router在hash模式下 手动改变hash 重定向回来 不会触发afterEach 暂时hack方案 ps：history模式下无问题，可删除该行！
+          next({ path: '/401', replace: true, query: { noGoBack: true }})
        }
        // 可删 ↑
      }
    }
  } else {
+    /* has no token*/
    if (whiteList.indexOf(to.path) !== -1) { // 在免登录白名单，直接进入
      next()
    } else {
      next('/login') // 否则全部重定向到登录页
-      NProgress.done() // router在hash模式下 手动改变hash 重定向回来 不会触发afterEach 暂时hack方案 ps：history模式下无问题，可删除该行！
+      NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
    }
  }
 })
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -15,10 +15,13 @@ import Layout from '../views/layout/Layout'

 /**
 * hidden: true                   if `hidden:true` will not show in the sidebar(default is false)
+* alwaysShow: true               if set true, will always show the root menu, whatever its child routes length
+*                                if not set alwaysShow, only more than one route under the children
+*                                it will becomes nested mode, otherwise not show the root menu
 * redirect: noredirect           if `redirect:noredirect` will no redirct in the breadcrumb
 * name:'router-name'             the name is used by <keep-alive> (must set!!!)
 * meta : {
-    role: ['admin','editor']     will control the page role (you can set multiple roles)
+    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 fasle ,the page will no be cached(default is false)
@@ -54,7 +57,7 @@ export const constantRouterMap = [
 ]

 export default new Router({
-  // mode: 'history', //后端支持可开
+  // mode: 'history', // require service support
  scrollBehavior: () => ({ y: 0 }),
  routes: constantRouterMap
 })
@@ -64,7 +67,7 @@ export const asyncRouterMap = [
    path: '/permission',
    component: Layout,
    redirect: '/permission/index',
-    meta: { role: ['admin'] },
+    meta: { roles: ['admin'] }, // you can set roles in root nav
    children: [{
      path: 'index',
      component: _import('permission/index'),
@@ -72,7 +75,7 @@ export const asyncRouterMap = [
      meta: {
        title: 'permission',
        icon: 'lock',
-        role: ['admin']
+        roles: ['admin'] // or you can only set roles in sub nav
      }
    }]
  },
@@ -151,6 +154,8 @@ export const asyncRouterMap = [
          { path: 'dynamic-table', component: _import('example/table/dynamicTable/index'), name: 'dynamicTable', meta: { title: 'dynamicTable' }},
          { path: 'drag-table', component: _import('example/table/dragTable'), name: 'dragTable', meta: { title: 'dragTable' }},
          { path: 'inline-edit-table', component: _import('example/table/inlineEditTable'), name: 'inlineEditTable', meta: { title: 'inlineEditTable' }},
+          { path: 'tree-table', component: _import('example/table/treeTable/treeTable'), name: 'treeTableDemo', meta: { title: 'treeTable' }},
+          { path: 'custom-tree-table', component: _import('example/table/treeTable/customTreeTable'), name: 'customTreeTableDemo', meta: { title: 'customTreeTable' }},
          { path: 'complex-table', component: _import('example/table/complexTable'), name: 'complexTable', meta: { title: 'complexTable' }}
        ]
      },
@@ -215,7 +220,9 @@ export const asyncRouterMap = [
    path: '/zip',
    component: Layout,
    redirect: '/zip/download',
-    children: [{ path: 'download', component: _import('zip/index'), name: 'exportZip', meta: { title: 'exportZip', icon: 'zip' }}]
+    alwaysShow: true,
+    meta: { title: 'zip', icon: 'zip' },
+    children: [{ path: 'download', component: _import('zip/index'), name: 'exportZip', meta: { title: 'exportZip' }}]
  },

  {
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -5,7 +5,7 @@ const app = {
    sidebar: {
      opened: !+Cookies.get('sidebarStatus')
    },
-    language: Cookies.get('language') || 'zh'
+    language: Cookies.get('language') || 'en'
  },
  mutations: {
    TOGGLE_SIDEBAR: state => {
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -6,8 +6,8 @@ import { asyncRouterMap, constantRouterMap } from '@/router'
 * @param route
 */
 function hasPermission(roles, route) {
-  if (route.meta && route.meta.role) {
-    return roles.some(role => route.meta.role.indexOf(role) >= 0)
+  if (route.meta && route.meta.roles) {
+    return roles.some(role => route.meta.roles.indexOf(role) >= 0)
  } else {
    return true
  }
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -25,7 +25,7 @@ const tagsView = {
      for (const i of state.cachedViews) {
        if (i === view.name) {
          const index = state.cachedViews.indexOf(i)
-          state.cachedViews.splice(index, index + 1)
+          state.cachedViews.splice(index, 1)
          break
        }
      }
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -67,7 +67,7 @@ const user = {
            reject('error')
          }
          const data = response.data
-          commit('SET_ROLES', data.role)
+          commit('SET_ROLES', data.roles)
          commit('SET_NAME', data.name)
          commit('SET_AVATAR', data.avatar)
          commit('SET_INTRODUCTION', data.introduction)
@@ -116,13 +116,13 @@ const user = {
    },

    // 动态修改权限
-    ChangeRole({ commit }, role) {
+    ChangeRoles({ commit }, role) {
      return new Promise(resolve => {
        commit('SET_TOKEN', role)
        setToken(role)
        getUserInfo(role).then(response => {
          const data = response.data
-          commit('SET_ROLES', data.role)
+          commit('SET_ROLES', data.roles)
          commit('SET_NAME', data.name)
          commit('SET_AVATAR', data.avatar)
          commit('SET_INTRODUCTION', data.introduction)
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -140,10 +140,6 @@ code {
  margin-top: 30px;
 }

-.editor-container .CodeMirror {
-  height: 100%!important;
-}
-
 .text-center {
  text-align: center
 }
--- a/src/utils/i18n.js
+++ b/src/utils/i18n.js
@@ -1,4 +1,10 @@
 // translate router.meta.title, be used in breadcrumb sidebar tagsview
 export function generateTitle(title) {
-  return this.$t('route.' + title) // $t :this method from vue-i18n, inject in @/lang/index.js
+  const hasKey = this.$te('route.' + title)
+  const translatedTitle = this.$t('route.' + title) // $t :this method from vue-i18n, inject in @/lang/index.js
+
+  if (hasKey) {
+    return translatedTitle
+  }
+  return title
 }
--- a/src/views/components-demo/jsonEditor.vue
+++ b/src/views/components-demo/jsonEditor.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="components-container" style="height:100vh">
+  <div class="components-container">
    <code>JsonEditor is base on  <a href="https://github.com/codemirror/CodeMirror" target="_blank">CodeMirrorr</a> , lint base on json-lint </code>
    <div class="editor-container">
      <json-editor ref="jsonEditor" v-model="value"></json-editor>
--- a/src/views/components-demo/tinymce.vue
+++ b/src/views/components-demo/tinymce.vue
@@ -20,13 +20,9 @@ export default {
  data() {
    return {
      content:
-      `<h1 style="text-align: center;">Welcome to the TinyMCE demo!</h1>
-      <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>
-      `
+      `<h1 style="text-align: center;">Welcome to the TinyMCE demo!</h1><p style="text-align: center; font-size: 15px;"><img title="TinyMCE Logo" src="//www.tinymce.com/images/glyph-tinymce@2x.png" alt="TinyMCE Logo" width="110" height="97" /><ul>
+        <li>Our <a href="//www.tinymce.com/docs/">documentation</a> is a great resource for learning how to configure TinyMCE.</li><li>Have a specific question? Visit the <a href="https://community.tinymce.com/forum/">Community Forum</a>.</li><li>We also offer enterprise grade support as part of <a href="https://tinymce.com/pricing">TinyMCE premium subscriptions</a>.</li>
+      </ul>`
    }
  }
 }
--- a/src/views/example/table/dragTable.vue
+++ b/src/views/example/table/dragTable.vue
@@ -110,6 +110,11 @@ export default {
      const el = document.querySelectorAll('.el-table__body-wrapper > table > tbody')[0]
      this.sortable = Sortable.create(el, {
        ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
+        setData: function(dataTransfer) {
+          dataTransfer.setData('Text', '')
+          // to avoid Firefox bug
+          // Detail see : https://github.com/RubaXa/Sortable/issues/1012
+        },
        onEnd: evt => {
          const targetRow = this.list.splice(evt.oldIndex, 1)[0]
          this.list.splice(evt.newIndex, 0, targetRow)
--- a/src/views/example/table/treeTable/customEval.js
+++ b/src/views/example/table/treeTable/customEval.js
@@ -0,0 +1,48 @@
+/**
+* @Author: jianglei
+* @Date:   2017-10-12 12:06:49
+*/
+'use strict'
+import Vue from 'vue'
+export default function treeToArray(data, expandAll, parent, level, item) {
+  const marLTemp = []
+  let tmp = []
+  Array.from(data).forEach(function(record) {
+    if (record._expanded === undefined) {
+      Vue.set(record, '_expanded', expandAll)
+    }
+    let _level = 1
+    if (level !== undefined && level !== null) {
+      _level = level + 1
+    }
+    Vue.set(record, '_level', _level)
+    // 如果有父元素
+    if (parent) {
+      Vue.set(record, 'parent', parent)
+      // 如果父元素有偏移量，需要计算在this的偏移量中
+      // 偏移量还与前面同级元素有关，需要加上前面所有元素的长度和
+      if (!marLTemp[_level]) {
+        marLTemp[_level] = 0
+      }
+      Vue.set(record, '_marginLeft', marLTemp[_level] + parent._marginLeft)
+      Vue.set(record, '_width', record[item] / parent[item] * parent._width)
+      // 在本次计算过偏移量后加上自己长度，以供下一个元素使用
+      marLTemp[_level] += record._width
+    } else {
+      // 如果为根
+      // 初始化偏移量存储map
+      marLTemp[record.id] = []
+      // map中是一个数组，存储的是每级的长度和
+      // 初始情况下为0
+      marLTemp[record.id][_level] = 0
+      Vue.set(record, '_marginLeft', 0)
+      Vue.set(record, '_width', 1)
+    }
+    tmp.push(record)
+    if (record.children && record.children.length > 0) {
+      const children = treeToArray(record.children, expandAll, record, _level, item)
+      tmp = tmp.concat(children)
+    }
+  })
+  return tmp
+}
--- a/src/views/example/table/treeTable/customTreeTable.vue
+++ b/src/views/example/table/treeTable/customTreeTable.vue
@@ -0,0 +1,136 @@
+<template>
+  <div class="app-container">
+
+    <el-tag style="margin-bottom:20px;">
+      <a href="https://github.com/PanJiaChen/vue-element-admin/tree/master/src/components/TreeTable" target="_blank">Documentation</a>
+    </el-tag>
+
+    <tree-table :data="data" :evalFunc="func" :evalArgs="args" :expandAll="expandAll" border>
+      <el-table-column label="事件">
+        <template slot-scope="scope">
+          <span style="color:sandybrown">{{scope.row.event}}</span>
+          <el-tag>{{scope.row.timeLine+'ms'}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="时间线">
+        <template slot-scope="scope">
+          <el-tooltip effect="dark" :content="scope.row.timeLine+'ms'" placement="left">
+            <div class="processContainer">
+              <div class="process" :style="{ width:scope.row._width * 500+'px',
+              background:scope.row._width>0.5?'rgba(233,0,0,.5)':'rgba(0,0,233,0.5)',
+              marginLeft:scope.row._marginLeft * 500+'px' }">
+                <span style="display:inline-block"></span>
+              </div>
+            </div>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="200">
+        <template slot-scope="scope">
+          <el-button type="text" @click="message(scope.row)">点击</el-button>
+        </template>
+      </el-table-column>
+    </tree-table>
+  </div>
+</template>
+
+<script>
+/**
+  Auth: Lei.j1ang
+  Created: 2018/1/19-14:54
+*/
+import treeTable from '@/components/TreeTable'
+import treeToArray from './customEval'
+
+export default {
+  name: 'customTreeTableDemo',
+  components: { treeTable },
+  data() {
+    return {
+      func: treeToArray,
+      expandAll: false,
+      data:
+        {
+          id: 1,
+          event: '事件1',
+          timeLine: 100,
+          comment: '无',
+          children: [
+            {
+              id: 2,
+              event: '事件2',
+              timeLine: 10,
+              comment: '无'
+            },
+            {
+              id: 3,
+              event: '事件3',
+              timeLine: 90,
+              comment: '无',
+              children: [
+                {
+                  id: 4,
+                  event: '事件4',
+                  timeLine: 5,
+                  comment: '无'
+                },
+                {
+                  id: 5,
+                  event: '事件5',
+                  timeLine: 10,
+                  comment: '无'
+                },
+                {
+                  id: 6,
+                  event: '事件6',
+                  timeLine: 75,
+                  comment: '无',
+                  children: [
+                    {
+                      id: 7,
+                      event: '事件7',
+                      timeLine: 50,
+                      comment: '无',
+                      children: [
+                        {
+                          id: 71,
+                          event: '事件71',
+                          timeLine: 25,
+                          comment: 'xx'
+                        },
+                        {
+                          id: 72,
+                          event: '事件72',
+                          timeLine: 5,
+                          comment: 'xx'
+                        },
+                        {
+                          id: 73,
+                          event: '事件73',
+                          timeLine: 20,
+                          comment: 'xx'
+                        }
+                      ]
+                    },
+                    {
+                      id: 8,
+                      event: '事件8',
+                      timeLine: 25,
+                      comment: '无'
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+      args: [null, null, 'timeLine']
+    }
+  },
+  methods: {
+    message(row) {
+      this.$message.info(row.event)
+    }
+  }
+}
+</script>
--- a/src/views/example/table/treeTable/treeTable.vue
+++ b/src/views/example/table/treeTable/treeTable.vue
@@ -0,0 +1,129 @@
+<template>
+  <div class="app-container">
+
+    <el-tag style="margin-bottom:20px;">
+      <a href="https://github.com/PanJiaChen/vue-element-admin/tree/master/src/components/TreeTable" target="_blank">Documentation</a>
+    </el-tag>
+
+    <tree-table :data="data" :columns="columns" border></tree-table>
+
+  </div>
+</template>
+
+<script>
+/**
+  Auth: Lei.j1ang
+  Created: 2018/1/19-14:54
+*/
+import treeTable from '@/components/TreeTable'
+
+export default {
+  name: 'treeTableDemo',
+  components: { treeTable },
+  data() {
+    return {
+      columns: [
+        {
+          text: '事件',
+          value: 'event',
+          width: 200
+        },
+        {
+          text: 'ID',
+          value: 'id'
+        },
+        {
+          text: '时间线',
+          value: 'timeLine'
+        },
+        {
+          text: '备注',
+          value: 'comment'
+        }
+      ],
+      data: [
+        {
+          id: 0,
+          event: '事件1',
+          timeLine: 50,
+          comment: '无'
+        },
+        {
+          id: 1,
+          event: '事件1',
+          timeLine: 100,
+          comment: '无',
+          children: [
+            {
+              id: 2,
+              event: '事件2',
+              timeLine: 10,
+              comment: '无'
+            },
+            {
+              id: 3,
+              event: '事件3',
+              timeLine: 90,
+              comment: '无',
+              children: [
+                {
+                  id: 4,
+                  event: '事件4',
+                  timeLine: 5,
+                  comment: '无'
+                },
+                {
+                  id: 5,
+                  event: '事件5',
+                  timeLine: 10,
+                  comment: '无'
+                },
+                {
+                  id: 6,
+                  event: '事件6',
+                  timeLine: 75,
+                  comment: '无',
+                  children: [
+                    {
+                      id: 7,
+                      event: '事件7',
+                      timeLine: 50,
+                      comment: '无',
+                      children: [
+                        {
+                          id: 71,
+                          event: '事件71',
+                          timeLine: 25,
+                          comment: 'xx'
+                        },
+                        {
+                          id: 72,
+                          event: '事件72',
+                          timeLine: 5,
+                          comment: 'xx'
+                        },
+                        {
+                          id: 73,
+                          event: '事件73',
+                          timeLine: 20,
+                          comment: 'xx'
+                        }
+                      ]
+                    },
+                    {
+                      id: 8,
+                      event: '事件8',
+                      timeLine: 25,
+                      comment: '无'
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  }
+}
+</script>
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ b/src/views/layout/components/Sidebar/SidebarItem.vue
@@ -2,8 +2,8 @@
  <div class="menu-wrapper">
    <template v-for="item in routes" v-if="!item.hidden&&item.children">

-      <router-link v-if="item.children.length===1 && !item.children[0].children" :to="item.path+'/'+item.children[0].path" :key="item.children[0].name">
-        <el-menu-item :index="item.path+'/'+item.children[0].path" class='submenu-title-noDropdown'>
+      <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">
+        <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">{{generateTitle(item.children[0].meta.title)}}</span>
        </el-menu-item>
@@ -16,7 +16,7 @@
        </template>

        <template v-for="child in item.children" v-if="!child.hidden">
-          <sidebar-item class="nest-menu" v-if="child.children&&child.children.length>0" :routes="[child]" :key="child.path"></sidebar-item>
+          <sidebar-item :is-nest="true" class="nest-menu" v-if="child.children&&child.children.length>0" :routes="[child]" :key="child.path"></sidebar-item>

          <router-link v-else :to="item.path+'/'+child.path" :key="child.name">
            <el-menu-item :index="item.path+'/'+child.path">
@@ -39,6 +39,10 @@ export default {
  props: {
    routes: {
      type: Array
+    },
+    isNest: {
+      type: Boolean,
+      default: false
    }
  },
  methods: {
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -1,6 +1,6 @@
 <template>
  <scroll-bar>
-    <el-menu mode="vertical" :default-active="$route.path" :collapse="isCollapse" background-color="#304156" text-color="#fff" active-text-color="#409EFF">
+    <el-menu mode="vertical" :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>
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -1,7 +1,8 @@
 <template>
  <div class="tags-view-container">
    <scroll-pane class='tags-view-wrapper' ref='scrollPane'>
-      <router-link ref='tag' class="tags-view-item" :class="isActive(tag)?'active':''" v-for="tag in Array.from(visitedViews)" :to="tag.path" :key="tag.path" @contextmenu.prevent.native="openMenu(tag,$event)">
+      <router-link ref='tag' class="tags-view-item" :class="isActive(tag)?'active':''" v-for="tag in Array.from(visitedViews)"
+        :to="tag.path" :key="tag.path" @contextmenu.prevent.native="openMenu(tag,$event)">
        {{generateTitle(tag.title)}}
        <span class='el-icon-close' @click.prevent.stop='closeSelectedTag(tag)'></span>
      </router-link>
@@ -40,9 +41,9 @@ export default {
    },
    visible(value) {
      if (value) {
-        window.addEventListener('click', this.closeMenu)
+        document.body.addEventListener('click', this.closeMenu)
      } else {
-        window.removeEventListener('click', this.closeMenu)
+        document.body.removeEventListener('click', this.closeMenu)
      }
    }
  },
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -36,7 +36,7 @@
      <el-button class="thirdparty-button" type="primary" @click="showDialog=true">{{$t('login.thirdparty')}}</el-button>
    </el-form>

-    <el-dialog :title="$t('login.thirdparty')" :visible.sync="showDialog">
+    <el-dialog :title="$t('login.thirdparty')" :visible.sync="showDialog" append-to-body>
      {{$t('login.thirdpartyTips')}}
      <br/>
      <br/>
@@ -170,14 +170,14 @@ $light_gray:#eee;
 </style>

 <style rel="stylesheet/scss" lang="scss" scoped>
-@import "src/styles/mixin.scss";
 $bg:#2d3a4b;
 $dark_gray:#889aa4;
 $light_gray:#eee;

 .login-container {
-  @include relative;
-  height: 100vh;
+  position: fixed;
+  height: 100%;
+  width: 100%;
  background-color: $bg;
  .login-form {
    position: absolute;
--- a/src/views/permission/index.vue
+++ b/src/views/permission/index.vue
@@ -2,7 +2,7 @@
  <div class="app-container">
    <div style="margin-bottom:15px;">{{$t('permission.roles')}}： {{roles}}</div>
    {{$t('permission.switchRoles')}}：
-    <el-radio-group v-model="role">
+    <el-radio-group v-model="switchRoles">
      <el-radio-button label="editor"></el-radio-button>
    </el-radio-group>
  </div>
@@ -15,7 +15,7 @@ export default{
  name: 'permission',
  data() {
    return {
-      role: ''
+      switchRoles: ''
    }
  },
  computed: {
@@ -24,8 +24,8 @@ export default{
    ])
  },
  watch: {
-    role(val) {
-      this.$store.dispatch('ChangeRole', val).then(() => {
+    switchRoles(val) {
+      this.$store.dispatch('ChangeRoles', val).then(() => {
        this.$router.push({ path: '/permission/index?' + +new Date() })
      })
    }
--- a/static/tinymce/skins/lightgray/content.inline.min.css
+++ b/static/tinymce/skins/lightgray/content.inline.min.css
@@ -1 +0,0 @@
-.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:'-'}hr{cursor:default}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid #F00;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:#3399ff !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2d8ac7}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #7ACAFF}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2d8ac7}.mce-resize-bar-dragging{background-color:blue;opacity:.25;filter:alpha(opacity=25);zoom:1}
--- a/static/tinymce/skins/lightgray/content.min.css
+++ b/static/tinymce/skins/lightgray/content.min.css
@@ -1,601 +0,0 @@
-body {
-  background-color: #FFFFFF;
-  color: #000000;
-  font-family: Helvetica,Microsoft YaHei,Hiragino Sans GB,WenQuanYi Micro Hei,sans-serif;
-  font-size: 14px;
-  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: Helvetica,Microsoft YaHei,Hiragino Sans GB,WenQuanYi Micro Hei,sans-serif;
-  font-size: 14px
-}
-
-.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: '-'
-}
-
-hr {
-  cursor: default
-}
-
-.mce-match-marker {
-  background: #AAA;
-  color: #fff
-}
-
-.mce-match-marker-selected {
-  background: #3399ff;
-  color: #fff
-}
-
-.mce-spellchecker-word {
-  border-bottom: 2px solid #F00;
-  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: #3399ff !important
-}
-
-.mce-edit-focus {
-  outline: 1px dotted #333
-}
-
-.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus {
-  outline: 2px solid #2d8ac7
-}
-
-.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover {
-  outline: 2px solid #7ACAFF
-}
-
-.mce-content-body *[contentEditable=false][data-mce-selected] {
-  outline: 2px solid #2d8ac7
-}
-
-.mce-resize-bar-dragging {
-  background-color: blue;
-  opacity: .25;
-  filter: alpha(opacity=25);
-  zoom: 1
-}
-
-
-
-
-/*自定义*/
-.mce-resizehandle{
-  display: none;
-}
-b, strong {
-    font-weight: inherit;
-    font-weight: bolder;
-}
-/*img {
-  max-height: 300px;
-}*/
-
-.note-color .dropdown-menu li .btn-group:first-child {
-  display: none;
-}
-
-.note-control-sizing {
-  display: none;
-}
-
-.panel-body {
-  font-size: 16px;
-  color: #333;
-  letter-spacing: 0.5px;
-  line-height: 28px;
-  margin-bottom: 30px;
-  padding: 0 15px 0 10px;
-}
-
-.panel-body > :last-child {
-  margin-bottom: 0;
-}
-
-.panel-body img {
-  max-width: 100%;
-  display: block;
-  margin: 0 auto;
-}
-
-.panel-body table {
-  width: 100% !important;
-}
-
-.panel-body embed {
-  max-width: 100%;
-  margin-bottom: 30px;
-}
-
-.panel-body p {
-  font-size: 16px;
-  line-height: 28px;
-  letter-spacing: 0.5px;
-  margin-bottom: 30px;
-  text-align: justify;
-  word-break: break-all;
-}
-
-.panel-body ul {
-  margin-bottom: 30px;
-}
-
-.panel-body li {
-  margin-left: 20px;
-  margin-bottom: 30px;
-}
-
-.panel-body a {
-  color: #1478F0;
-}
-
-.panel-body hr {
-  margin: 1em auto;
-  border: none;
-  padding: 0;
-  width: 100%;
-  height: 1px;
-  background: #DCDCDC;
-}
-
-.panel-body blockquote p {
-  font-size: 16px;
-  letter-spacing: 1px;
-  line-height: 28px;
-  color: #333;
-}
-
-.panel-body blockquote p:last-of-type {
-  margin-bottom: 0;
-}
-
-.panel-body audio,
-.panel-body canvas,
-.panel-body video {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1;
-}
-
-.panel-body button,
-.panel-body input,
-.panel-body select,
-.panel-body textarea {
-  font: 500 14px/1.8 'Hiragino Sans GB', Microsoft YaHei, sans-serif;
-}
-
-.panel-body table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-.panel-body th {
-  text-align: inherit;
-}
-
-.panel-body fieldset,
-.panel-body img {
-  border: 0;
-}
-
-.panel-body img {
-  -ms-interpolation-mode: bicubic;
-}
-
-.panel-body iframe {
-  display: block;
-}
-
-.panel-body blockquote {
-  position: relative;
-  font-size: 16px;
-  letter-spacing: 1px;
-  line-height: 28px;
-  margin-bottom: 40px;
-  padding: 20px;
-  background: #f0f2f5;
-}
-
-.panel-body blockquote:before {
-  position: absolute;
-  content: " \300D";
-  top: 10px;
-  left: 2px;
-  -webkit-transform: rotate(180deg);
-  transform: rotate(180deg);
-  color: #333;
-}
-
-.panel-body blockquote:after {
-  position: absolute;
-  content: " \300D";
-  right: 6px;
-  bottom: 12px;
-  color: #333;
-}
-
-.panel-body blockquote blockquote {
-  padding: 0 0 0 1em;
-  margin-left: 2em;
-  border-left: 3px solid #1478F0;
-}
-
-.panel-body acronym,
-.panel-body abbr {
-  border-bottom: 1px dotted;
-  font-variant: normal;
-}
-
-.panel-body abbr {
-  cursor: help;
-}
-
-.panel-body del {
-  text-decoration: line-through;
-}
-
-.panel-body address,
-.panel-body caption,
-.panel-body cite,
-.panel-body code,
-.panel-body del,
-.panel-body th,
-.panel-body var {
-  font-style: normal;
-  font-weight: 500;
-}
-
-.panel-body caption,
-.panel-body th {
-  text-align: left;
-}
-
-.panel-body q:before,
-.panel-body q:after {
-  content: '';
-}
-
-.panel-body sub,
-.panel-body sup {
-  font-size: 75%;
-  line-height: 0;
-  position: relative;
-  vertical-align: text-top;
-}
-
-.panel-body :root sub,
-.panel-body :root sup {
-  vertical-align: baseline;
-  /* for ie9 and other mordern browsers */
-}
-
-.panel-body sup {
-  top: -0.5em;
-}
-
-.panel-body sub {
-  bottom: -0.25em;
-}
-
-.panel-body a:hover {
-  text-decoration: underline;
-}
-
-.panel-body ins,
-.panel-body a {
-  text-decoration: none;
-}
-
-.panel-body u,
-.panel-body .typo-u {
-  text-decoration: underline;
-}
-
-.panel-body mark {
-  background: #fffdd1;
-}
-
-.panel-body pre,
-.panel-body code {
-  font-family: "Courier New", Courier, monospace;
-}
-
-.panel-body pre {
-  border: 1px solid #ddd;
-  border-left-width: 0.4em;
-  background: #fbfbfb;
-  padding: 10px;
-}
-
-.panel-body small {
-  font-size: 12px;
-  color: #888;
-}
-
-.panel-body h1,
-.panel-body h2,
-.panel-body h3,
-.panel-body h4,
-.panel-body h5,
-.panel-body h6 {
-  font-size: 18px;
-  font-weight: 700;
-  color: #1478f0;
-  border-left: 5px solid #1478f0;
-  padding-left: 10px;
-  margin: 30px 0;
-}
-
-.panel-body h2 {
-  font-size: 1.2em;
-}
-
-.panel-body .typo p,
-.panel-body .typo pre,
-.panel-body .typo ul,
-.panel-body .typo ol,
-.panel-body .typo dl,
-.panel-body .typo form,
-.panel-body .typo hr,
-.panel-body .typo table,
-.panel-body .typo-p,
-.panel-body .typo-pre,
-.panel-body .typo-ul,
-.panel-body .typo-ol,
-.panel-body .typo-dl,
-.panel-body .typo-form,
-.panel-body .typo-hr,
-.panel-body .typo-table {
-  margin-bottom: 15px;
-  line-height: 25px;
-}
-
-.panel-body .typo h1,
-.panel-body .typo h2,
-.panel-body .typo h3,
-.panel-body .typo h4,
-.panel-body .typo h5,
-.panel-body .typo h6,
-.panel-body .typo-h1,
-.panel-body .typo-h2,
-.panel-body .typo-h3,
-.panel-body .typo-h4,
-.panel-body .typo-h5,
-.panel-body .typo-h6 {
-  margin-bottom: 0.4em;
-  line-height: 1.5;
-}
-
-.panel-body .typo h1,
-.panel-body .typo-h1 {
-  font-size: 1.8em;
-}
-
-.panel-body .typo h2,
-.panel-body .typo-h2 {
-  font-size: 1.6em;
-}
-
-.panel-body .typo h3,
-.panel-body .typo-h3 {
-  font-size: 1.4em;
-}
-
-.panel-body .typo h4,
-.panel-body .typo-h0 {
-  font-size: 1.2em;
-}
-
-.panel-body .typo h5,
-.panel-body .typo h6,
-.panel-body .typo-h5,
-.panel-body .typo-h6 {
-  font-size: 1em;
-}
-
-.panel-body .typo ul,
-.panel-body .typo-ul {
-  margin-left: 1.3em;
-  list-style: disc;
-}
-
-.panel-body .typo ol,
-.panel-body .typo-ol {
-  list-style: decimal;
-  margin-left: 1.9em;
-}
-
-.panel-body .typo li ul,
-.panel-body .typo li ol,
-.panel-body .typo-ul ul,
-.panel-body .typo-ul ol,
-.panel-body .typo-ol ul,
-.panel-body .typo-ol ol {
-  margin-top: 0;
-  margin-bottom: 0;
-  margin-left: 2em;
-}
-
-.panel-body .typo li ul,
-.panel-body .typo-ul ul,
-.panel-body .typo-ol ul {
-  list-style: circle;
-}
-
-.panel-body .typo table th,
-.panel-body .typo table td,
-.panel-body .typo-table th,
-.panel-body .typo-table td {
-  border: 1px solid #ddd;
-  padding: 5px 10px;
-}
-
-.panel-body .typo table th,
-.panel-body .typo-table th {
-  background: #fbfbfb;
-}
-
-.panel-body .typo table thead th,
-.panel-body .typo-table thead th {
-  background: #f1f1f1;
-}
--- a/static/tinymce/skins/lightgray/fonts/tinymce-small.json
+++ b/static/tinymce/skins/lightgray/fonts/tinymce-small.json
--- a/static/tinymce/skins/lightgray/fonts/tinymce.eot
+++ b/static/tinymce/skins/lightgray/fonts/tinymce.eot
--- a/static/tinymce/skins/lightgray/fonts/tinymce.json
+++ b/static/tinymce/skins/lightgray/fonts/tinymce.json
--- a/static/tinymce/skins/lightgray/fonts/tinymce.ttf
+++ b/static/tinymce/skins/lightgray/fonts/tinymce.ttf
--- a/static/tinymce/skins/lightgray/fonts/tinymce.woff
+++ b/static/tinymce/skins/lightgray/fonts/tinymce.woff
--- a/static/tinymce/skins/lightgray/skin.ie7.min.css
+++ b/static/tinymce/skins/lightgray/skin.ie7.min.css
--- a/static/tinymce/skins/lightgray/skin.min.css
+++ b/static/tinymce/skins/lightgray/skin.min.css
--- a/static/tinymce/tinymce.min.js
+++ b/static/tinymce/tinymce.min.js
--- a/static/tinymce4.7.5/langs/zh_CN.js
+++ b/static/tinymce4.7.5/langs/zh_CN.js
--- a/static/tinymce4.7.5/plugins/codesample/css/prism.css
+++ b/static/tinymce4.7.5/plugins/codesample/css/prism.css
@@ -0,0 +1,138 @@
+/* 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;
+}
+
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-cool.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-cool.gif
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-cry.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-cry.gif
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-embarassed.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-embarassed.gif
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-foot-in-mouth.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-foot-in-mouth.gif
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-frown.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-frown.gif
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-innocent.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-innocent.gif
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-kiss.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-kiss.gif
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-laughing.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-laughing.gif
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-money-mouth.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-money-mouth.gif
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-sealed.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-sealed.gif
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-smile.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-smile.gif
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-surprised.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-surprised.gif
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-tongue-out.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-tongue-out.gif
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-undecided.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-undecided.gif
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-wink.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-wink.gif
--- a/static/tinymce4.7.5/plugins/emoticons/img/smiley-yell.gif
+++ b/static/tinymce4.7.5/plugins/emoticons/img/smiley-yell.gif
--- a/static/tinymce4.7.5/plugins/visualblocks/css/visualblocks.css
+++ b/static/tinymce4.7.5/plugins/visualblocks/css/visualblocks.css
@@ -0,0 +1,154 @@
+.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;
+}
--- a/static/tinymce4.7.5/skins/lightgray/content.inline.min.css
+++ b/static/tinymce4.7.5/skins/lightgray/content.inline.min.css
@@ -0,0 +1 @@
+.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}.mce-content-body{line-height:1.3}
--- a/static/tinymce4.7.5/skins/lightgray/content.min.css
+++ b/static/tinymce4.7.5/skins/lightgray/content.min.css
@@ -0,0 +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;}
--- a/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-mobile.woff
+++ b/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-mobile.woff
--- a/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.eot
+++ b/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.eot
--- a/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.svg
+++ b/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.svg
--- a/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.ttf
+++ b/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.ttf
--- a/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.woff
+++ b/static/tinymce4.7.5/skins/lightgray/fonts/tinymce-small.woff
--- a/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.eot
+++ b/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.eot
--- a/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.svg
+++ b/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.svg
@@ -79,7 +79,7 @@
 <glyph unicode="&#xe800;" glyph-name="tabledeleterow" d="M886.4 572.8l-156.8-156.8 160-160-76.8-76.8-160 160-156.8-156.8-76.8 73.6 160 160-163.2 163.2 76.8 76.8 163.2-163.2 156.8 156.8 73.6-76.8zM0 896v-896h1024v896h-1024zM960 576h-22.4l-64-64h86.4v-192h-89.6l64-64h25.6v-192h-896v192h310.4l64 64h-374.4v192h371.2l-64 64h-307.2v192h896v-192z" />
 <glyph unicode="&#xe801;" glyph-name="tabledeletecol" d="M320 499.2l64-64v-12.8l-64-64v140.8zM640 422.4l64-64v137.6l-64-64v-9.6zM1024 896v-896h-1024v896h1024zM960 768h-256v-51.2l-12.8 12.8-51.2-51.2v89.6h-256v-89.6l-51.2 51.2-12.8-12.8v51.2h-256v-704h256v118.4l35.2-35.2 28.8 28.8v-115.2h256v115.2l48-48 16 16v-83.2h256v707.2zM672 662.4l-156.8-156.8-163.2 163.2-76.8-76.8 163.2-163.2-156.8-156.8 76.8-76.8 156.8 156.8 160-160 76.8 76.8-160 160 156.8 156.8-76.8 76.8z" />
 <glyph unicode="&#xe900;" glyph-name="a11y" d="M960 704v64l-448-128-448 128v-64l320-128v-256l-128-448h64l192 448 192-448h64l-128 448v256zM416 800q0 40 28 68t68 28 68-28 28-68-28-68-68-28-68 28-28 68z" />
-<glyph unicode="&#xe901;" glyph-name="toc" d="M0 896h128v-128h-128v128zM192 896h832v-128h-832v128zM192 704h128v-128h-128v128zM384 704h640v-128h-640v128zM384 512h128v-128h-128v128zM576 512h448v-128h-448v128zM0 320h128v-128h-128v128zM192 320h832v-128h-832v128zM192 128h128v-128h-128v128zM384 128h640v-128h-640v128z" />
+<glyph unicode="&#xe901;" glyph-name="toc" d="M0 896h128v-128h-128v128zM192 896h832v-128h-832v128zM0 512h128v-128h-128v128zM192 512h832v-128h-832v128zM0 128h128v-128h-128v128zM192 128h832v-128h-832v128zM192 704h128v-128h-128v128zM384 704h640v-128h-640v128zM192 320h128v-128h-128v128zM384 320h640v-128h-640v128z" />
 <glyph unicode="&#xe902;" glyph-name="fill" d="M521.6 915.2l-67.2-67.2-86.4 86.4-86.4-86.4 86.4-86.4-368-368 432-432 518.4 518.4-428.8 435.2zM435.2 134.4l-262.4 262.4 35.2 35.2 576 51.2-348.8-348.8zM953.6 409.6c-6.4-6.4-16-16-28.8-32-28.8-32-41.6-64-41.6-89.6v0 0 0 0 0 0 0c0-16 6.4-35.2 22.4-48 12.8-12.8 32-22.4 48-22.4s35.2 6.4 48 22.4 22.4 32 22.4 48v0 0 0 0 0 0 0c0 25.6-12.8 54.4-41.6 89.6-9.6 16-22.4 25.6-28.8 32v0z" />
 <glyph unicode="&#xe903;" glyph-name="borderwidth" d="M0 265.6h1024v-128h-1024v128zM0 32h1024v-64h-1024v64zM0 566.4h1024v-192h-1024v192zM0 928h1024v-256h-1024v256z" />
 <glyph unicode="&#xe904;" glyph-name="line" d="M739.2 627.2l-502.4-502.4h-185.6v185.6l502.4 502.4 185.6-185.6zM803.2 688l-185.6 185.6 67.2 67.2c22.4 22.4 54.4 22.4 76.8 0l108.8-108.8c22.4-22.4 22.4-54.4 0-76.8l-67.2-67.2zM41.6 48h940.8v-112h-940.8v112z" />
--- a/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.ttf
+++ b/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.ttf
--- a/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.woff
+++ b/static/tinymce4.7.5/skins/lightgray/fonts/tinymce.woff
--- a/static/tinymce4.7.5/skins/lightgray/img/anchor.gif
+++ b/static/tinymce4.7.5/skins/lightgray/img/anchor.gif
--- a/static/tinymce4.7.5/skins/lightgray/img/loader.gif
+++ b/static/tinymce4.7.5/skins/lightgray/img/loader.gif
--- a/static/tinymce4.7.5/skins/lightgray/img/object.gif
+++ b/static/tinymce4.7.5/skins/lightgray/img/object.gif
--- a/static/tinymce4.7.5/skins/lightgray/img/trans.gif
+++ b/static/tinymce4.7.5/skins/lightgray/img/trans.gif
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pan	2f411b870c	[release] 3.6.2	2018-02-02 17:27:43 +08:00
Pan	305d659431	perf[tinymce]: perf tinymce demo	2018-02-01 11:07:07 +08:00
Pan	55c08ab666	bump[tinymce]: update tinymce to 4.7.5	2018-02-01 10:22:33 +08:00
Pan	09e613b33a	perf[icon]: change some icons	2018-01-30 17:26:55 +08:00
Pan	c0ed44932e	fix[dragTable]: fixed bug in Firefox	2018-01-30 15:18:52 +08:00
Pan	a48a1bd8be	Doc[route]: refine treeTable name	2018-01-30 15:05:33 +08:00
Pan	55e8cd5306	perf[treeTable]: set treeTable to keep-alive	2018-01-30 10:05:25 +08:00
Zenon	dc9e27e4b1	1.fix bug (#431 ) * 1.fix bug 2.update treeTable readme 3.update args name in treetable/eval.js * 1.treeTable animate	2018-01-30 09:58:25 +08:00
Pan	d754eae662	perf[markdown-editor]	2018-01-29 14:45:43 +08:00
Pan	94ae1f8719	remove gifs	2018-01-26 14:39:26 +08:00
Pan	48070e5abf	perf[.gitignore]: rm gifs	2018-01-26 14:36:10 +08:00
Pan	eef99d3d14	fix[tags-view]: fixed contexrmenu bug on firefox	2018-01-25 13:52:28 +08:00
Pan	6f2a7ce804	feat[menu]: add alwaysShow option	2018-01-24 14:47:20 +08:00
Zenon	2e0d3fd0e4	修改treeTable相关 (#422 ) * 1.删除无用的属性 2.修改readme 3.修改eval.js，给后两个参数设置默认值 * update readme	2018-01-24 10:33:05 +08:00
Pan	bc01171466	[release] 3.6.1	2018-01-23 15:16:55 +08:00
Pan	4e65890b6a	fix[chore]: fixed devtool typo	2018-01-23 15:15:25 +08:00
Pan	79c5cb4fcd	[release] 3.6.0	2018-01-23 15:12:45 +08:00
Pan	0d47e3454e	perf[treeTable]	2018-01-23 15:12:17 +08:00
Pan	3253a91a7e	format[treeTable]: format code	2018-01-23 15:03:09 +08:00
Pan	fea6e5feee	chore[devtool]: set cheap-source-map to default	2018-01-23 14:45:31 +08:00
Zenon	1610945813	feat[treeTable]: add treeTable (#415 )(#319 ) * 1.增加treeTable 2.增加两个treeTable的demo * 1.增加treeTable的使用功能说明 * 优化代码，去除console * 修复bug * 修复marLTemp变量未清空的bug * 修复marLTemp变量未清空的bug * 修复marLTemp变量未清空的bug * 修改customTree，使其展示无columns时的功能	2018-01-23 14:44:47 +08:00
Pan	840eda6e27	fix[login]: fixed thirtparty login dialog bug	2018-01-22 15:55:40 +08:00
Pan	700e08b795	perf[css]: perf login-container css #404	2018-01-19 15:33:24 +08:00
Pan	3c0696d1a9	fix[tags-view]: fixed delete cachedViews bug #395	2018-01-12 13:30:27 +08:00
Pan	76a6eb12e7	perf[json-editor]:refine css	2018-01-11 11:44:34 +08:00
Pan	2c147649ba	perf[json-editor]:refine css	2018-01-11 11:28:14 +08:00
Pan	de3b29b5f3	[release] 3.5.1	2018-01-05 13:29:57 +08:00
Pan	54acf1e0d5	perf[permission]:set role => roles	2018-01-05 11:38:34 +08:00
Pan	de08e49f19	fix[i18n]: fixed defalut language bug	2018-01-04 12:37:08 +08:00
Pan	2472107768	perf[i18n]: refine generateTitle function	2018-01-04 10:04:14 +08:00
Pan	d18902dfee	perf[style]: refine css	2018-01-04 10:03:33 +08:00
Pan	9ba2648689	fix[sidebar]: fixed nest menu and noDropdown item bug	2018-01-03 13:40:22 +08:00
Pan	1d0b26cec8	perf[upload-excel]: support drag upload	2018-01-02 16:30:59 +08:00
Pan	ea7e139696	perf[core]: add postcss-url	2018-01-02 10:44:35 +08:00
				`@@ -1 +0,0 @@`
				.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:'-'}hr{cursor:default}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid #F00;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:#3399ff !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body [contentEditable=false] [contentEditable=true]:focus{outline:2px solid #2d8ac7}.mce-content-body [contentEditable=false] [contentEditable=true]:hover{outline:2px solid #7ACAFF}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2d8ac7}.mce-resize-bar-dragging{background-color:blue;opacity:.25;filter:alpha(opacity=25);zoom:1}
				`@@ -0,0 +1 @@`
				.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}.mce-content-body{line-height:1.3}
				`@@ -0,0 +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;}