From afe975b3c2eb9fa313b348b38880fe77e8f117f6 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Fri, 30 Mar 2018 17:08:01 +0800
Subject: [PATCH 01/17] fix[UploadExcel]: fix can't select the same excel

---
 src/components/UploadExcel/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

From 3cff6dcf4c01d1bdf3faa7d0bcae4a16c28e5d2e Mon Sep 17 00:00:00 2001
From: linlinjava <linlinjavaer@gmail.com>
Date: Fri, 6 Apr 2018 12:40:58 +0800
Subject: [PATCH 02/17] =?UTF-8?q?fix[BackToTop]:=20=E6=95=B0=E7=BB=84/?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E7=9A=84=E9=BB=98=E8=AE=A4=E5=80=BC=E5=BA=94?=
 =?UTF-8?q?=E5=BD=93=E7=94=B1=E4=B8=80=E4=B8=AA=E5=B7=A5=E5=8E=82=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E8=BF=94=E5=9B=9E=E3=80=82=20(#571)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BackToTop/index.vue | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/BackToTop/index.vue b/src/components/BackToTop/index.vue
index cbb1f21d..de953821 100644
--- a/src/components/BackToTop/index.vue
+++ b/src/components/BackToTop/index.vue
@@ -25,14 +25,16 @@ export default {
     },
     customStyle: {
       type: Object,
-      default: {
-        right: '50px',
-        bottom: '50px',
-        width: '40px',
-        height: '40px',
-        'border-radius': '4px',
-        'line-height': '45px',
-        background: '#e7eaf1'
+      default: function() {
+        return {
+          right: '50px',
+          bottom: '50px',
+          width: '40px',
+          height: '40px',
+          'border-radius': '4px',
+          'line-height': '45px',
+          background: '#e7eaf1'
+        }
       }
     },
     transitionName: {

From 51ad902d8fb2ae0caee58f137a79b1cc360c82a8 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Fri, 30 Mar 2018 17:29:00 +0800
Subject: [PATCH 03/17] css[elment-ui.scss]: perf css

---
 src/styles/element-ui.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index b159d16b..dc59591e 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -73,3 +73,10 @@
      }
    }
  }
+
+//dropdown
+ .el-dropdown-menu{
+  a{
+    display: block
+  }
+}

From f28a7149fbcccee50620dab3bebbb5433841b483 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Sat, 7 Apr 2018 00:38:32 +0800
Subject: [PATCH 04/17] fixed[Tinymce]: remove bbcode plugin

---
 src/components/Tinymce/plugins.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Tinymce/plugins.js b/src/components/Tinymce/plugins.js
index a1a64793..c98d1892 100644
--- a/src/components/Tinymce/plugins.js
+++ b/src/components/Tinymce/plugins.js
@@ -2,6 +2,6 @@
 // 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']
+const plugins = ['advlist anchor autolink autoresize autosave code codesample colorpicker colorpicker contextmenu directionality emoticons fullpage fullscreen hr image imagetools importcss insertdatetime legacyoutput link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textcolor textpattern visualblocks visualchars wordcount']
 
 export default plugins

From 01442ce4d75ea33b7ff8eba55b558a7c1339baeb Mon Sep 17 00:00:00 2001
From: weiqinl <772863869@qq.com>
Date: Mon, 9 Apr 2018 09:39:04 +0800
Subject: [PATCH 05/17] Fixed doc (#578)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优雅的使用 icon 此文档地址更新
---
 src/views/documentation/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/documentation/index.vue b/src/views/documentation/index.vue
index d8381592..8d3482d1 100644
--- a/src/views/documentation/index.vue
+++ b/src/views/documentation/index.vue
@@ -19,7 +19,7 @@ export default {
         { title: '实战篇', href: 'https://segmentfault.com/a/1190000009762198' },
         { title: 'vueAdmin-template 篇', href: 'https://segmentfault.com/a/1190000010043013' },
         { title: '自行封装 component', href: 'https://segmentfault.com/a/1190000009090836' },
-        { title: '优雅的使用 icon', href: 'https://segmentfault.com/a/https://segmentfault.com/a/1190000012213278' }
+        { title: '优雅的使用 icon', href: 'https://segmentfault.com/a/1190000012213278' }
       ]
     }
   }

From d29a9486a24526b3e76b4b1191e7aadc4eebbc44 Mon Sep 17 00:00:00 2001
From: weiwei Wang <Willworkgogogo@users.noreply.github.com>
Date: Wed, 11 Apr 2018 10:05:35 +0800
Subject: [PATCH 06/17] =?UTF-8?q?[bug]:=20=E4=BF=AE=E5=A4=8D401=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2dialog=E9=87=8C=E7=9A=84=E5=8A=A8=E5=9B=BE=E5=9C=A8?=
 =?UTF-8?q?=E5=B0=8F=E5=B1=8F=E4=B8=8D=E5=B1=85=E4=B8=AD=20(#585)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/errorPage/401.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/errorPage/401.vue b/src/views/errorPage/401.vue
index e36c83a2..99eea062 100644
--- a/src/views/errorPage/401.vue
+++ b/src/views/errorPage/401.vue
@@ -65,6 +65,7 @@ export default {
     .pan-img {
       display: block;
       margin: 0 auto;
+      width: 100%;
     }
     .text-jumbo {
       font-size: 60px;

From c5faa63ee5003e95c1c97d60f2782b32b91fe8ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Fri, 13 Apr 2018 10:23:05 +0800
Subject: [PATCH 07/17] Update to Element ui@2.3.0 (#596)

* update element-ui && refactor sidebar.css

* format
---
 package.json                                  |  2 +-
 src/styles/sidebar.scss                       | 75 ++++++-------------
 .../layout/components/Sidebar/SidebarItem.vue |  9 ++-
 src/views/layout/components/Sidebar/index.vue | 11 ++-
 4 files changed, 40 insertions(+), 57 deletions(-)

diff --git a/package.json b/package.json
index bf37a0dc..30dc32ce 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "codemirror": "5.32.0",
     "dropzone": "5.2.0",
     "echarts": "3.8.5",
-    "element-ui": "2.0.8",
+    "element-ui": "2.3.2",
     "file-saver": "1.3.3",
     "font-awesome": "4.7.0",
     "js-cookie": "2.2.0",
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index 2fed2b1d..e8bc0ab2 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -2,18 +2,21 @@
   // 主体区域
   .main-container {
     min-height: 100%;
-    transition: margin-left 0.28s;
+    transition: margin-left .28s;
     margin-left: 180px;
-  } // 侧边栏
+  }
+  // 侧边栏
   .sidebar-container {
-    transition: width 0.28s;
-    width: 180px!important;
+    transition: width .28s;
+    width: 180px !important;
     height: 100%;
     position: fixed;
+    font-size: 0px;
     top: 0;
     bottom: 0;
     left: 0;
     z-index: 1001;
+    overflow: hidden;
     a {
       display: inline-block;
       width: 100%;
@@ -23,78 +26,48 @@
     }
     .el-menu {
       border: none;
-      width: 100%;
+      width: 100% !important;
     }
   }
   .hideSidebar {
-    .sidebar-container,.sidebar-container .el-menu {
-      width: 36px!important;
-      // overflow: inherit;
+    .sidebar-container {
+      width: 36px !important;
     }
     .main-container {
       margin-left: 36px;
     }
-  }
-  .hideSidebar {
     .submenu-title-noDropdown {
-      padding-left: 10px!important;
+      padding-left: 10px !important;
       position: relative;
-      span {
-        height: 0;
-        width: 0;
-        overflow: hidden;
-        visibility: hidden;
-        transition: opacity .3s cubic-bezier(.55, 0, .1, 1);
-        opacity: 0;
-        display: inline-block;
-      }
-      &:hover {
-        span {
-          display: block;
-          border-radius: 3px;
-          z-index: 1002;
-          width: 140px;
-          height: 56px;
-          visibility: visible;
-          position: absolute;
-          right: -145px;
-          text-align: left;
-          text-indent: 20px;
-          top: 0px;
-          background-color: $subMenuBg!important;
-          opacity: 1;
-        }
+      .el-tooltip {
+        padding: 0 10px !important;
       }
     }
     .el-submenu {
       &>.el-submenu__title {
-        padding-left: 10px!important;
+        padding-left: 10px !important;
         &>span {
-          display: none;
+          height: 0;
+          width: 0;
+          overflow: hidden;
+          visibility: hidden;
+          display: inline-block;
         }
         .el-submenu__icon-arrow {
           display: none;
         }
       }
-      .nest-menu {
-        .el-submenu__icon-arrow {
-          display: block!important;
-        }
-        span {
-          display: inline-block!important;
-        }
-      }
     }
   }
   .nest-menu .el-submenu>.el-submenu__title,
   .el-submenu .el-menu-item {
-    min-width: 180px!important;
-    background-color: $subMenuBg!important;
+    min-width: 180px !important;
+    background-color: $subMenuBg !important;
     &:hover {
-      background-color: $menuHover!important;
+      background-color: $menuHover !important;
     }
   }
-  .el-menu--collapse .el-menu .el-submenu{
-    min-width: 180px!important;
+  .el-menu--collapse .el-menu .el-submenu {
+    min-width: 180px !important;
   }
 }
diff --git a/src/views/layout/components/Sidebar/SidebarItem.vue b/src/views/layout/components/Sidebar/SidebarItem.vue
index e60313f9..cddcd61d 100644
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ b/src/views/layout/components/Sidebar/SidebarItem.vue
@@ -2,17 +2,18 @@
   <div class="menu-wrapper">
     <template v-for="item in routes" v-if="!item.hidden&&item.children">
 
-      <router-link v-if="hasOneShowingChildren(item.children) && !item.children[0].children&&!item.alwaysShow" :to="item.path+'/'+item.children[0].path" :key="item.children[0].name">
+      <router-link v-if="hasOneShowingChildren(item.children) && !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>
+          <span v-if="item.children[0].meta&&item.children[0].meta.title" slot="title">{{generateTitle(item.children[0].meta.title)}}</span>
         </el-menu-item>
       </router-link>
 
       <el-submenu v-else :index="item.name||item.path" :key="item.name">
         <template slot="title">
           <svg-icon v-if="item.meta&&item.meta.icon" :icon-class="item.meta.icon"></svg-icon>
-          <span v-if="item.meta&&item.meta.title">{{generateTitle(item.meta.title)}}</span>
+          <span v-if="item.meta&&item.meta.title" slot="title">{{generateTitle(item.meta.title)}}</span>
         </template>
 
         <template v-for="child in item.children" v-if="!child.hidden">
@@ -21,7 +22,7 @@
           <router-link v-else :to="item.path+'/'+child.path" :key="child.name">
             <el-menu-item :index="item.path+'/'+child.path">
               <svg-icon v-if="child.meta&&child.meta.icon" :icon-class="child.meta.icon"></svg-icon>
-              <span v-if="child.meta&&child.meta.title">{{generateTitle(child.meta.title)}}</span>
+              <span v-if="child.meta&&child.meta.title" slot="title">{{generateTitle(child.meta.title)}}</span>
             </el-menu-item>
           </router-link>
         </template>
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index 6a6f1427..de434e81 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -1,6 +1,15 @@
 <template>
   <scroll-bar>
-    <el-menu mode="vertical" :default-active="$route.path" :collapse="isCollapse" background-color="#304156" text-color="#bfcbd9" active-text-color="#409EFF">
+    <el-menu
+      mode="vertical"
+      :collapse-transition="false"
+      :show-timeout="200"
+      :default-active="$route.path"
+      :collapse="isCollapse"
+      background-color="#304156"
+      text-color="#bfcbd9"
+      active-text-color="#409EFF"
+    >
       <sidebar-item :routes="permission_routers"></sidebar-item>
     </el-menu>
   </scroll-bar>

From 7003a79ef6e981cb035161cde6ec4fcb32b2932e Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Fri, 13 Apr 2018 10:28:52 +0800
Subject: [PATCH 08/17] [release] 3.6.5

---
 README.md       | 4 ++--
 README.zh-CN.md | 4 ++--
 package.json    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index a9736067..10749883 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
     <img src="https://img.shields.io/badge/vue-2.5.10-brightgreen.svg" alt="vue">
   </a>
   <a href="https://github.com/ElemeFE/element">
-    <img src="https://img.shields.io/badge/element--ui-2.0.8-brightgreen.svg" alt="element-ui">
+    <img src="https://img.shields.io/badge/element--ui-2.3.0-brightgreen.svg" alt="element-ui">
   </a>
   <a href="https://travis-ci.org/PanJiaChen/vue-element-admin" rel="nofollow">
     <img src="https://travis-ci.org/PanJiaChen/vue-element-admin.svg?branch=master" alt="Build Status">
@@ -39,7 +39,7 @@ English | [简体中文](./README.zh-CN.md)
  - Base template recommends using: [vueAdmin-template](https://github.com/PanJiaChen/vueAdmin-template)  
  - Desktop: [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
 
-**Note: This project uses element-ui@2.0.0+ version, so the minimum compatible vue@2.5.0+**
+**Note: This project uses element-ui@2.3.0+ version, so the minimum compatible vue@2.5.0+**
 
 ## Preparation
 
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 80427047..4d28dbf3 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -7,7 +7,7 @@
     <img src="https://img.shields.io/badge/vue-2.5.10-brightgreen.svg" alt="vue">
   </a>
   <a href="https://github.com/ElemeFE/element">
-    <img src="https://img.shields.io/badge/element--ui-2.0.8-brightgreen.svg" alt="element-ui">
+    <img src="https://img.shields.io/badge/element--ui-2.3.0-brightgreen.svg" alt="element-ui">
   </a>
   <a href="https://travis-ci.org/PanJiaChen/vue-element-admin" rel="nofollow">
     <img src="https://travis-ci.org/PanJiaChen/vue-element-admin.svg?branch=master" alt="Build Status">
@@ -38,7 +38,7 @@
  - 模板建议使用: [vueAdmin-template](https://github.com/PanJiaChen/vueAdmin-template)  
  - 桌面端: [electron-vue-admin](https://github.com/PanJiaChen/electron-vue-admin)
 
-**注意：该项目使用 element-ui@2.0.0+ 版本，所以最低兼容 vue@2.5.0+**
+**注意：该项目使用 element-ui@2.3.0+ 版本，所以最低兼容 vue@2.5.0+**
 
 ## 前序准备
 
diff --git a/package.json b/package.json
index 30dc32ce..96742a86 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-element-admin",
-  "version": "3.6.4",
+  "version": "3.6.5",
   "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",

From 14fee27a92e92978cce643f6b527fa1327e72947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E8=A3=A4=E8=A1=A9?= <panfree23@gmail.com>
Date: Fri, 13 Apr 2018 13:32:53 +0800
Subject: [PATCH 09/17] feature: add drag dialog (#477)

---
 src/directive/el-dragDialog/drag.js      | 46 ++++++++++++++++++++++++
 src/directive/el-dragDialog/index.js     | 13 +++++++
 src/lang/en.js                           |  1 +
 src/lang/zh.js                           |  1 +
 src/router/index.js                      |  3 +-
 src/views/components-demo/dragDialog.vue | 43 ++++++++++++++++++++++
 6 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 src/directive/el-dragDialog/drag.js
 create mode 100644 src/directive/el-dragDialog/index.js
 create mode 100644 src/views/components-demo/dragDialog.vue

diff --git a/src/directive/el-dragDialog/drag.js b/src/directive/el-dragDialog/drag.js
new file mode 100644
index 00000000..7d49e4bb
--- /dev/null
+++ b/src/directive/el-dragDialog/drag.js
@@ -0,0 +1,46 @@
+export default{
+  bind(el, binding) {
+    const dialogHeaderEl = el.querySelector('.el-dialog__header')
+    const dragDom = el.querySelector('.el-dialog')
+    dialogHeaderEl.style = 'cursor:move;'
+
+    // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
+    const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null)
+
+    dialogHeaderEl.onmousedown = (e) => {
+      // 鼠标按下，计算当前元素距离可视区的距离
+      const disX = e.clientX - dialogHeaderEl.offsetLeft
+      const disY = e.clientY - dialogHeaderEl.offsetTop
+
+      // 获取到的值带px 正则匹配替换
+      let styL, styT
+
+      // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
+      if (sty.left.includes('%')) {
+        styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100)
+        styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100)
+      } else {
+        styL = +sty.left.replace(/\px/g, '')
+        styT = +sty.top.replace(/\px/g, '')
+      }
+
+      document.onmousemove = function(e) {
+        // 通过事件委托，计算移动的距离
+        const l = e.clientX - disX
+        const t = e.clientY - disY
+
+        // 移动当前元素
+        dragDom.style.left = `${l + styL}px`
+        dragDom.style.top = `${t + styT}px`
+
+        // 将此时的位置传出去
+        // binding.value({x:e.pageX,y:e.pageY})
+      }
+
+      document.onmouseup = function(e) {
+        document.onmousemove = null
+        document.onmouseup = null
+      }
+    }
+  }
+}
diff --git a/src/directive/el-dragDialog/index.js b/src/directive/el-dragDialog/index.js
new file mode 100644
index 00000000..29facbfb
--- /dev/null
+++ b/src/directive/el-dragDialog/index.js
@@ -0,0 +1,13 @@
+import drag from './drag'
+
+const install = function(Vue) {
+  Vue.directive('el-drag-dialog', drag)
+}
+
+if (window.Vue) {
+  window['el-drag-dialog'] = drag
+  Vue.use(install); // eslint-disable-line
+}
+
+drag.install = install
+export default drag
diff --git a/src/lang/en.js b/src/lang/en.js
index 4ffc628b..c08c88ef 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -18,6 +18,7 @@ export default {
     countTo: 'CountTo',
     componentMixin: 'Mixin',
     backToTop: 'BackToTop',
+    dragDialog: 'Drag Dialog',
     charts: 'Charts',
     keyboardChart: 'Keyboard Chart',
     lineChart: 'Line Chart',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index bcae0dac..a4cc93d4 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -18,6 +18,7 @@ export default {
     countTo: 'CountTo',
     componentMixin: '小组件',
     backToTop: '返回顶部',
+    dragDialog: '拖拽 Dialog',
     charts: '图表',
     keyboardChart: '键盘图表',
     lineChart: '折线图',
diff --git a/src/router/index.js b/src/router/index.js
index 596564b9..a5d704ef 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -111,7 +111,8 @@ export const asyncRouterMap = [
       { path: 'sticky', component: _import('components-demo/sticky'), name: 'sticky-demo', meta: { title: 'sticky' }},
       { path: 'count-to', component: _import('components-demo/countTo'), name: 'countTo-demo', meta: { title: 'countTo' }},
       { path: 'mixin', component: _import('components-demo/mixin'), name: 'componentMixin-demo', meta: { title: 'componentMixin' }},
-      { path: 'back-to-top', component: _import('components-demo/backToTop'), name: 'backToTop-demo', meta: { title: 'backToTop' }}
+      { path: 'back-to-top', component: _import('components-demo/backToTop'), name: 'backToTop-demo', meta: { title: 'backToTop' }},
+      { path: 'drag-dialog', component: _import('components-demo/dragDialog'), name: 'dragDialog-demo', meta: { title: 'dragDialog' }}
     ]
   },
 
diff --git a/src/views/components-demo/dragDialog.vue b/src/views/components-demo/dragDialog.vue
new file mode 100644
index 00000000..3eb9bd91
--- /dev/null
+++ b/src/views/components-demo/dragDialog.vue
@@ -0,0 +1,43 @@
+<template>
+  <div class="components-container">
+    <el-button type="primary" @click="dialogTableVisible = true">open a Drag Dialog</el-button>
+    <el-dialog v-el-drag-dialog title="Shipping address" :visible.sync="dialogTableVisible">
+      <el-table :data="gridData">
+        <el-table-column property="date" label="Date" width="150"></el-table-column>
+        <el-table-column property="name" label="Name" width="200"></el-table-column>
+        <el-table-column property="address" label="Address"></el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import elDragDialog from '@/directive/el-dragDialog' // base on element-ui
+
+export default {
+  name: 'dragDialog-demo',
+  directives: { elDragDialog },
+  data() {
+    return {
+      dialogTableVisible: false,
+      gridData: [{
+        date: '2016-05-02',
+        name: 'John Smith',
+        address: 'No.1518,  Jinshajiang Road, Putuo District'
+      }, {
+        date: '2016-05-04',
+        name: 'John Smith',
+        address: 'No.1518,  Jinshajiang Road, Putuo District'
+      }, {
+        date: '2016-05-01',
+        name: 'John Smith',
+        address: 'No.1518,  Jinshajiang Road, Putuo District'
+      }, {
+        date: '2016-05-03',
+        name: 'John Smith',
+        address: 'No.1518,  Jinshajiang Road, Putuo District'
+      }]
+    }
+  }
+}
+</script>

From 7099e6a3eb1fa6e8c60f55bc92b8db9c41e8b59b Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Fri, 13 Apr 2018 13:35:43 +0800
Subject: [PATCH 10/17] doc: update readme

---
 README.md       | 1 +
 README.zh-CN.md | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 10749883..730f3521 100644
--- a/README.md
+++ b/README.md
@@ -86,6 +86,7 @@ You need to install [node](http://nodejs.org/) and [git](https://git-scm.com/) l
 - Form example
 - Two-step login
 - SplitPane
+- Drag Dialog
 - Dropzone
 - Sticky
 - CountTo
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 4d28dbf3..583ae982 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -52,7 +52,6 @@
  - [手摸手，带你封装一个 vue component](https://segmentfault.com/a/1190000009090836)
  - [手摸手，带你优雅的使用 icon](https://juejin.im/post/59bb864b5188257e7a427c09)
 
- 响应需求，开了一个qq群 `591724180` 方便大家交流
 
  或者加入该群主 **[圈子](https://jianshiapp.com/circles/1209)** 楼主会经常分享一些技术相关的东西
 
@@ -99,6 +98,7 @@
 - Form example
 - 二步登录
 - SplitPane
+- 拖拽 Dialog
 - Dropzone
 - Sticky
 - CountTo

From a1608483676717e1340000eeaa44c41a2944e323 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Sun, 15 Apr 2018 21:01:03 +0800
Subject: [PATCH 11/17] fix typo

---
 src/utils/validate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/validate.js b/src/utils/validate.js
index 5bdd1b43..10579fd3 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -26,7 +26,7 @@ export function validateUpperCase(str) {
 }
 
 /* 大小写字母*/
-export function validatAlphabets(str) {
+export function validateAlphabets(str) {
   const reg = /^[A-Za-z]+$/
   return reg.test(str)
 }

From 44e94b2d16cd3801bcf69d0b53ad0466031fb029 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Mon, 16 Apr 2018 18:09:53 +0800
Subject: [PATCH 12/17] doc: add gitter

---
 README.md       | 2 ++
 README.zh-CN.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 730f3521..c7ed03b6 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,8 @@ English | [简体中文](./README.zh-CN.md)
 
 - [Documentation](https://panjiachen.github.io/vue-element-admin-site/#/)
 
+- [Gitter](https://gitter.im/vue-element-admin/discuss)
+
 - [Wiki](https://github.com/PanJiaChen/vue-element-admin/wiki)
 
 - [Donate](https://panjiachen.github.io/vue-element-admin-site/#/donate)
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 583ae982..4fc5ebc5 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -30,6 +30,8 @@
 
 - [使用文档](https://panjiachen.github.io/vue-element-admin-site/#/zh-cn/)
 
+- [Gitter讨论组](https://gitter.im/vue-element-admin/discuss)
+
 - [Wiki](https://github.com/PanJiaChen/vue-element-admin/wiki)
 
 - [Donate](https://panjiachen.github.io/vue-element-admin-site/#/zh-cn/donate)

From 563ce873bd22b63354edeedaf9a9a9bf558e07b1 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Tue, 17 Apr 2018 10:19:01 +0800
Subject: [PATCH 13/17] perf[Tinymce]: remove fullpage plugin

---
 src/components/Tinymce/plugins.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Tinymce/plugins.js b/src/components/Tinymce/plugins.js
index c98d1892..db5e756c 100644
--- a/src/components/Tinymce/plugins.js
+++ b/src/components/Tinymce/plugins.js
@@ -2,6 +2,6 @@
 // Detail plugins list see https://www.tinymce.com/docs/plugins/
 // Custom builds see https://www.tinymce.com/download/custom-builds/
 
-const plugins = ['advlist anchor autolink autoresize autosave code codesample colorpicker colorpicker contextmenu directionality emoticons fullpage fullscreen hr image imagetools importcss insertdatetime legacyoutput link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textcolor textpattern visualblocks visualchars wordcount']
+const plugins = ['advlist anchor autolink autoresize autosave code codesample colorpicker colorpicker contextmenu directionality emoticons 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

From 0cccc636b896b27f29422c2c86bf5ccc81ab315b Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Wed, 18 Apr 2018 15:24:38 +0800
Subject: [PATCH 14/17] perf[sidebar.css]: perf collapse transition  Pan
 committed

---
 src/styles/sidebar.scss                       | 3 +++
 src/views/layout/components/Sidebar/index.vue | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index e8bc0ab2..36410770 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -7,6 +7,9 @@
   }
   // 侧边栏
   .sidebar-container {
+    .horizontal-collapse-transition {
+      transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
+    }
     transition: width .28s;
     width: 180px !important;
     height: 100%;
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index de434e81..007e792d 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -2,7 +2,6 @@
   <scroll-bar>
     <el-menu
       mode="vertical"
-      :collapse-transition="false"
       :show-timeout="200"
       :default-active="$route.path"
       :collapse="isCollapse"

From cc5e62d5f50231b89fec65c1d3ce1b82b5b1b8ef Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Wed, 18 Apr 2018 17:00:43 +0800
Subject: [PATCH 15/17] fix[contextmenu]: adjust contextmenu z-index

---
 src/views/layout/components/TagsView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue
index 09e95499..c3199338 100644
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -156,7 +156,7 @@ export default {
   .contextmenu {
     margin: 0;
     background: #fff;
-    z-index: 2;
+    z-index: 100;
     position: absolute;
     list-style-type: none;
     padding: 5px 0;

From 6821eac35bd06d223c50287a712d031f66a378eb Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Thu, 19 Apr 2018 13:24:35 +0800
Subject: [PATCH 16/17] fix[complexTable]: fixed export_json_to_excel bug

---
 src/views/example/table/complexTable.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/example/table/complexTable.vue b/src/views/example/table/complexTable.vue
index 15213b11..a5442ce1 100644
--- a/src/views/example/table/complexTable.vue
+++ b/src/views/example/table/complexTable.vue
@@ -335,7 +335,11 @@ export default {
         const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
         const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
         const data = this.formatJson(filterVal, this.list)
-        excel.export_json_to_excel(tHeader, data, 'table-list')
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: 'table-list'
+        })
         this.downloadLoading = false
       })
     },

From 8f379505895f14f9c2ffd0135f0d57616b046db7 Mon Sep 17 00:00:00 2001
From: Pan <panfree23@gmail.com>
Date: Thu, 19 Apr 2018 18:33:12 +0800
Subject: [PATCH 17/17] perf[Tinymce]: remove autosize plugin

---
 src/components/Tinymce/plugins.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Tinymce/plugins.js b/src/components/Tinymce/plugins.js
index db5e756c..45b42f82 100644
--- a/src/components/Tinymce/plugins.js
+++ b/src/components/Tinymce/plugins.js
@@ -2,6 +2,6 @@
 // Detail plugins list see https://www.tinymce.com/docs/plugins/
 // Custom builds see https://www.tinymce.com/download/custom-builds/
 
-const plugins = ['advlist anchor autolink autoresize autosave code codesample colorpicker colorpicker contextmenu directionality emoticons 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']
+const plugins = ['advlist anchor autolink autosave code codesample colorpicker colorpicker contextmenu directionality emoticons 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