From 28922ec116ad4c0649005c51863f5e2d987e85fa Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 20 Jun 2018 08:20:59 +0800
Subject: [PATCH 01/13] no message

Former-commit-id: cba677736e2f60aabfec82226a8a91c8c8714bac [formerly cba677736e2f60aabfec82226a8a91c8c8714bac [formerly cba677736e2f60aabfec82226a8a91c8c8714bac [formerly cba677736e2f60aabfec82226a8a91c8c8714bac [formerly 6c59c3126086bb46805ad046ce51d7d4eb6409e8 [formerly 5467b975994329dc9e7921e786e62bd26f7c9d7a]]]]]
Former-commit-id: e842168fc72d8aae90aa42c79ca42c9474c602a4
Former-commit-id: 831db109565a97d9ecf4ae7836e39625026e00f2
Former-commit-id: dc6fa891be376efc3a1d1abeda1c1f33e62c486f [formerly 75ca46019a8418b8b9282f4f57788ae467d9387f]
Former-commit-id: debe3ffba91eccc2a771b7591d3b1829e5367875
Former-commit-id: e1861989ed53d1e14aaa713d00b06c622246eeef
Former-commit-id: 8ecf0e44d957e858f993583808f2e4aff36d7cda
Former-commit-id: 3ee82394ea19e2dd0ef6dfc15063ade1e1fc23c2
Former-commit-id: a603969620a081be6b48e0677b7f4e506fe835ea
---
 src/menu/index.js                             |  4 +-
 .../demo/components/contextmenu/disabled.vue  | 38 ++++++++++++++++++
 .../demo/components/contextmenu/group.vue     |  2 +-
 .../demo/components/contextmenu/submenu.vue   | 40 +++++++++++++++++++
 src/router/index.js.REMOVED.git-id            |  2 +-
 5 files changed, 83 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/demo/components/contextmenu/disabled.vue
 create mode 100644 src/pages/demo/components/contextmenu/submenu.vue

diff --git a/src/menu/index.js b/src/menu/index.js
index 588660c2..3c48efd4 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -101,7 +101,9 @@ const demoComponents = {
       children: [
         { path: `${pre}contextmenu/simple`, title: '基础' },
         { path: `${pre}contextmenu/divier`, title: '分割线' },
-        { path: `${pre}contextmenu/group`, title: '按钮组' }
+        { path: `${pre}contextmenu/group`, title: '按钮组' },
+        { path: `${pre}contextmenu/submenu`, title: '子菜单' },
+        { path: `${pre}contextmenu/disabled`, title: '禁用' }
       ]
     },
     { path: `${pre}bigdata-table`, title: '百万数量级表格' },
diff --git a/src/pages/demo/components/contextmenu/disabled.vue b/src/pages/demo/components/contextmenu/disabled.vue
new file mode 100644
index 00000000..0c8576da
--- /dev/null
+++ b/src/pages/demo/components/contextmenu/disabled.vue
@@ -0,0 +1,38 @@
+<template>
+  <d2-container>
+    <template slot="header">禁用</template>
+    <v-contextmenu ref="contextmenu">
+      <v-contextmenu-item @click="handleClick">菜单1</v-contextmenu-item>
+      <v-contextmenu-item disabled @click="handleClick">菜单2</v-contextmenu-item>
+      <v-contextmenu-item divider></v-contextmenu-item>
+      <v-contextmenu-submenu title="子菜单">
+        <v-contextmenu-item @click="handleClick">菜单3</v-contextmenu-item>
+        <v-contextmenu-item divider></v-contextmenu-item>
+        <v-contextmenu-submenu disabled title="子菜单">
+          <v-contextmenu-item @click="handleClick">菜单5</v-contextmenu-item>
+        </v-contextmenu-submenu>
+        <v-contextmenu-item @click="handleClick">菜单4</v-contextmenu-item>
+      </v-contextmenu-submenu>
+    </v-contextmenu>
+    <div class="contextmenu-pad" v-contextmenu:contextmenu>
+      右键点击此区域
+    </div>
+  </d2-container>
+</template>
+
+<script>
+export default {
+  methods: {
+    handleClick (vm, event) {
+      this.$message({
+        message: `你点击了${vm.$slots.default[0].text}`,
+        type: 'info'
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import './style/pub.scss';
+</style>
diff --git a/src/pages/demo/components/contextmenu/group.vue b/src/pages/demo/components/contextmenu/group.vue
index 927763f9..8bc3312c 100644
--- a/src/pages/demo/components/contextmenu/group.vue
+++ b/src/pages/demo/components/contextmenu/group.vue
@@ -1,6 +1,6 @@
 <template>
   <d2-container>
-    <template slot="header">分割线</template>
+    <template slot="header">按钮组</template>
     <v-contextmenu ref="contextmenu">
       <v-contextmenu-group>
         <v-contextmenu-item>菜单1</v-contextmenu-item>
diff --git a/src/pages/demo/components/contextmenu/submenu.vue b/src/pages/demo/components/contextmenu/submenu.vue
new file mode 100644
index 00000000..4dbabcf4
--- /dev/null
+++ b/src/pages/demo/components/contextmenu/submenu.vue
@@ -0,0 +1,40 @@
+<template>
+  <d2-container>
+    <template slot="header">子菜单</template>
+    <v-contextmenu ref="contextmenu">
+      <v-contextmenu-item @click="handleClick">菜单 1</v-contextmenu-item>
+      <v-contextmenu-item @click="handleClick">菜单 2</v-contextmenu-item>
+      <v-contextmenu-item divider></v-contextmenu-item>
+      <v-contextmenu-submenu title="菜单 3">
+        <v-contextmenu-item @click="handleClick">菜单 3-1</v-contextmenu-item>
+        <v-contextmenu-item divider></v-contextmenu-item>
+        <v-contextmenu-submenu title="菜单 3-2">
+          <v-contextmenu-item @click="handleClick">菜单 3-2-1</v-contextmenu-item>
+        </v-contextmenu-submenu>
+        <v-contextmenu-item @click="handleClick">菜单 3-3</v-contextmenu-item>
+        <v-contextmenu-item @click="handleClick">菜单 3-4</v-contextmenu-item>
+        <v-contextmenu-item @click="handleClick">菜单 3-5</v-contextmenu-item>
+      </v-contextmenu-submenu>
+    </v-contextmenu>
+    <div class="contextmenu-pad" v-contextmenu:contextmenu>
+      右键点击此区域
+    </div>
+  </d2-container>
+</template>
+
+<script>
+export default {
+  methods: {
+    handleClick (vm, event) {
+      this.$message({
+        message: `你点击了${vm.$slots.default[0].text}`,
+        type: 'info'
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import './style/pub.scss';
+</style>
diff --git a/src/router/index.js.REMOVED.git-id b/src/router/index.js.REMOVED.git-id
index 43600d62..4a49c396 100644
--- a/src/router/index.js.REMOVED.git-id
+++ b/src/router/index.js.REMOVED.git-id
@@ -1 +1 @@
-ca9703fe75f6928e93a03443767f2b87cbe5ef2a
\ No newline at end of file
+339b0329c6d4d368603852cd4bc5ec119ad52832
\ No newline at end of file

From 6354ad59bf62fcc75e15ed316f98ce327fcdf8e2 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 20 Jun 2018 08:30:54 +0800
Subject: [PATCH 02/13] no message

Former-commit-id: 90d15f0a8f44a278fddd3a2ba50c5a555b07ae5e [formerly 90d15f0a8f44a278fddd3a2ba50c5a555b07ae5e [formerly 90d15f0a8f44a278fddd3a2ba50c5a555b07ae5e [formerly 90d15f0a8f44a278fddd3a2ba50c5a555b07ae5e [formerly cd89dd457e1cf01d26df89e8c486f1fe5de39395 [formerly 7cd87a0d9e58338de7ec770cb5375b76d80139ef]]]]]
Former-commit-id: c94a9202421b5bc75846f5846910e3d157705364
Former-commit-id: 28001973bb5b14065fb3bd3a79dc248d12b85c6a
Former-commit-id: 577ad7ac8d14ba31c1a442118f39a956d23d15d9 [formerly 71a8b4249c963e78f317730e9a4bbdbbc3220f98]
Former-commit-id: 640a8e086b3f8e5b979e93f80362a28f6779eb9b
Former-commit-id: 594229216e79e6484c0fe1c6f147b88d15bb199f
Former-commit-id: 88f8bd259204e759e223db8a8b285f3b1e007fe9
Former-commit-id: 38c640b2318fcc7a725233c4d7115206a893215d
Former-commit-id: df4f73df9a9e2e8d4f60eca334bd363d8579f5b6
---
 src/menu/index.js                             |  3 +-
 .../components/contextmenu/custom-trigger.vue | 46 +++++++++++++++++++
 src/router/index.js.REMOVED.git-id            |  2 +-
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/demo/components/contextmenu/custom-trigger.vue

diff --git a/src/menu/index.js b/src/menu/index.js
index 3c48efd4..b4bd2398 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -103,7 +103,8 @@ const demoComponents = {
         { path: `${pre}contextmenu/divier`, title: '分割线' },
         { path: `${pre}contextmenu/group`, title: '按钮组' },
         { path: `${pre}contextmenu/submenu`, title: '子菜单' },
-        { path: `${pre}contextmenu/disabled`, title: '禁用' }
+        { path: `${pre}contextmenu/disabled`, title: '禁用' },
+        { path: `${pre}contextmenu/custom-trigger`, title: '自定义事件' }
       ]
     },
     { path: `${pre}bigdata-table`, title: '百万数量级表格' },
diff --git a/src/pages/demo/components/contextmenu/custom-trigger.vue b/src/pages/demo/components/contextmenu/custom-trigger.vue
new file mode 100644
index 00000000..771b8ff7
--- /dev/null
+++ b/src/pages/demo/components/contextmenu/custom-trigger.vue
@@ -0,0 +1,46 @@
+<template>
+  <d2-container>
+    <template slot="header">自定义事件</template>
+    <v-contextmenu ref="contextmenu">
+      <v-contextmenu-item @click="handleClick">菜单1</v-contextmenu-item>
+      <v-contextmenu-item divider></v-contextmenu-item>
+      <v-contextmenu-item @click="handleClick">菜单2</v-contextmenu-item>
+      <v-contextmenu-item @click="handleClick">菜单3</v-contextmenu-item>
+    </v-contextmenu>
+    <v-contextmenu ref="dbContextmenu" event-type="dblclick">
+      <v-contextmenu-item @click="handleClick">菜单1</v-contextmenu-item>
+      <v-contextmenu-item divider></v-contextmenu-item>
+      <v-contextmenu-item @click="handleClick">菜单2</v-contextmenu-item>
+      <v-contextmenu-item @click="handleClick">菜单3</v-contextmenu-item>
+    </v-contextmenu>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <div class="contextmenu-pad" v-contextmenu:contextmenu>
+          右键点击此区域
+        </div>
+      </el-col>
+      <el-col :span="12">
+        <div class="contextmenu-pad" v-contextmenu:dbContextmenu>
+          左键双击此区域
+        </div>
+      </el-col>
+    </el-row>
+  </d2-container>
+</template>
+
+<script>
+export default {
+  methods: {
+    handleClick (vm, event) {
+      this.$message({
+        message: `你点击了${vm.$slots.default[0].text}`,
+        type: 'info'
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import './style/pub.scss';
+</style>
diff --git a/src/router/index.js.REMOVED.git-id b/src/router/index.js.REMOVED.git-id
index 4a49c396..293fcced 100644
--- a/src/router/index.js.REMOVED.git-id
+++ b/src/router/index.js.REMOVED.git-id
@@ -1 +1 @@
-339b0329c6d4d368603852cd4bc5ec119ad52832
\ No newline at end of file
+919c478f2e165432104d6811b3b855f7b049ea39
\ No newline at end of file

From 2cbf0c3e9a389f9eeb39d66047a99e71626dfc07 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 20 Jun 2018 08:33:52 +0800
Subject: [PATCH 03/13] no message

Former-commit-id: 5b06a66f3e8a1ae542d67d3c82ddb82d0d338647 [formerly 5b06a66f3e8a1ae542d67d3c82ddb82d0d338647 [formerly 5b06a66f3e8a1ae542d67d3c82ddb82d0d338647 [formerly 5b06a66f3e8a1ae542d67d3c82ddb82d0d338647 [formerly 0ac0e89d4e4752738e943273ea63ac1dfdb38140 [formerly 08764ab23b03ea5b80f239a4d05305f6d0f238cd]]]]]
Former-commit-id: 66bb1993a14b7250a4a0e53f7c0f264d9989aee6
Former-commit-id: 25b36bec2f4d25a2d3ad09cf3ae30b8815a8e17c
Former-commit-id: 8b15aa90fe8e6355848592efc6a5beec87a6a954 [formerly 9253e296681d5f7bb5efb4d64874170e5aea66eb]
Former-commit-id: 60da25838a51714dcd87a2c5de8eb9049efa1964
Former-commit-id: 71a946d7c04a24804fe26c8b2de928d28e5087e9
Former-commit-id: b346fa029dc0cb1574e694604771152867c91a10
Former-commit-id: 6ab83c6b83c9d8a4197674a70438c3edc803a090
Former-commit-id: 714f458c51607561025b91c2617f9f59bb6aa475
---
 docs/zh/guide/change-log.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/zh/guide/change-log.md b/docs/zh/guide/change-log.md
index 22370e5c..21361b86 100644
--- a/docs/zh/guide/change-log.md
+++ b/docs/zh/guide/change-log.md
@@ -29,6 +29,8 @@
 * [ 修复 ] d2-container 组件改为同步注册（之前的异步注册会有 mounted 生命周期问题，即 slot 内的页面在 mounted 生命周期内拿不到 dom）
 * [ 修复 ] d2-container 组件重构 flex 布局
 * [ 新增 ] 404 page
+* [ 新增 ] 顶栏联系方式
+* [ 新增 ] 右键菜单组件
 
 ## v1.0.0
 

From c2784d973e5a606608f9e61323eb3f3d18209611 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 20 Jun 2018 08:35:49 +0800
Subject: [PATCH 04/13] no message

Former-commit-id: 12915935b1fa7197608e15e8c14c667a22a51962 [formerly 12915935b1fa7197608e15e8c14c667a22a51962 [formerly 12915935b1fa7197608e15e8c14c667a22a51962 [formerly 12915935b1fa7197608e15e8c14c667a22a51962 [formerly 567d895d58d0894a40bb9602a420c5596d6360a2 [formerly f3befa60c78e139fda5b13226d7122503042d802]]]]]
Former-commit-id: 3f5f274d27c55a29464243bc033c21ec92f0a71a
Former-commit-id: f3d9755a2f12fc9bfcae31ac27a8732a67274811
Former-commit-id: c661fd83d40f790ae07bf7c23e11e3a8283789cf [formerly 47435fea11e49c2a43608ed1456bc18dd8ddf48f]
Former-commit-id: 49e79bbe263c7b10cd9dc03364668a3d54d9b2d3
Former-commit-id: 5952f01af5723c64aa784a88d284d28b142a14ed
Former-commit-id: bc37c214a8ff642faaacdac8cb5d91800f60a0cd
Former-commit-id: d2984a261997b9478f0b42b4b361109b2fde094f
Former-commit-id: 92992467fc42b355675d34805262ffb4b9d1738a
---
 src/components/core/register.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/core/register.js b/src/components/core/register.js
index fffddae7..0c3bf1fb 100644
--- a/src/components/core/register.js
+++ b/src/components/core/register.js
@@ -3,7 +3,7 @@ import Vue from 'vue'
 import { GridLayout, GridItem } from 'vue-grid-layout'
 import SplitPane from 'vue-splitpane'
 
-// 主容器
+// 主容器 这个必须要同步注册
 import d2Container from '@/components/core/d2-container'
 
 Vue.component('d2-grid-layout', GridLayout)

From 5369b7327132a9a961f541e13ae01337dfa83508 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 20 Jun 2018 08:37:55 +0800
Subject: [PATCH 05/13] no message

Former-commit-id: 9f86adc19b58e25f6166354c143e960b3a0f7ca4 [formerly 97285715cbaa217775bd1ce60b88226496232c0a] [formerly 9f86adc19b58e25f6166354c143e960b3a0f7ca4 [formerly 97285715cbaa217775bd1ce60b88226496232c0a] [formerly 9f86adc19b58e25f6166354c143e960b3a0f7ca4 [formerly 97285715cbaa217775bd1ce60b88226496232c0a] [formerly 97285715cbaa217775bd1ce60b88226496232c0a [formerly 6d362b70a16d5278ded81560ec46afa6b083b9b0 [formerly a36f2047215ee5992c4c9dfa850c5bd40215c362]]]]]
Former-commit-id: 7a178be095c85cc74725978e3a897ad50960067a
Former-commit-id: d5254f5fcbc6f94f7192c9e8b243dbb89926cb2b
Former-commit-id: c2b78b1b961238dc63673e6b43247d1ba863a9d2 [formerly ea6d5b54ed82a670dc0094bc00420c68da31f76d]
Former-commit-id: 5839cf83e33bf260b7c712454f5449f5d89783b4
Former-commit-id: 6d1adcb3231d5be615170a7c2cd2134dd9f04b56
Former-commit-id: 84a05aefd66db062663abcd9e84539e78185b3f3
Former-commit-id: dacf9230465d35affaf07b164f83c1f8516dba13
Former-commit-id: dae39df30f7c652a6280316ed106bf156973cf43
---
 src/menu/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/menu/index.js b/src/menu/index.js
index b4bd2398..69acd1eb 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -145,7 +145,7 @@ const demoChart = {
 // 路由菜单 组件库
 const demoElement = {
   path: '/demo/element',
-  title: '组件库',
+  title: 'Element 组件库',
   icon: 'puzzle-piece',
   children: (pre => [
     { path: `${pre}index`, title: '组件库首页' },

From 2411277c6cf1fe33e7fdc10b97cda6d65dc7beea Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 20 Jun 2018 08:46:01 +0800
Subject: [PATCH 06/13] no message

Former-commit-id: 3b46c347c405def07371d8061bd5d65099d5ebc9 [formerly 3b46c347c405def07371d8061bd5d65099d5ebc9 [formerly 3b46c347c405def07371d8061bd5d65099d5ebc9 [formerly 3b46c347c405def07371d8061bd5d65099d5ebc9 [formerly c4d69429153270b1532861c4478f379aad4c807a [formerly b200fc43219a1be1c587fc2dbe76da7e632a8919]]]]]
Former-commit-id: 26c5b6ae9e07eef57c12e8ea786e71a91849e506
Former-commit-id: abf238bbc510b619ca85dd6fbadd97eed4ed589b
Former-commit-id: 1309552d6f644152dcf0bc8b37618a315ad2c6dd [formerly 3378e4e56b8d49c3782a88c388b03f94b74d5e53]
Former-commit-id: b01a1fef0501c3013771d50a32a1b2086d9672e4
Former-commit-id: d3c9fad8d03c1129dfcef3787f5bf9c674eb1795
Former-commit-id: cd5ba3f6142d9f3dd094516d86f53172573a0892
Former-commit-id: 42e251897ac8d762121871b38e7445e78a139283
Former-commit-id: 9ec1921ec3d162907087b79d5be2f1e1c2afa309
---
 src/pages/demo/components/icon/list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/demo/components/icon/list.vue b/src/pages/demo/components/icon/list.vue
index e0ffcbaa..c4bae2cb 100644
--- a/src/pages/demo/components/icon/list.vue
+++ b/src/pages/demo/components/icon/list.vue
@@ -1,5 +1,5 @@
 <template>
-  <d2-container>
+  <d2-container type="full">
     <template slot="header">
       <el-radio-group v-model="showIndex" size="mini">
         <el-radio-button

From 0a9c15d7da1c2d0fe72e3d8f6f44c0abe3878963 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 20 Jun 2018 08:53:10 +0800
Subject: [PATCH 07/13] no message

Former-commit-id: e32b6034772bfefa25bf2bf7aa3aab96ef2dc454 [formerly e32b6034772bfefa25bf2bf7aa3aab96ef2dc454 [formerly e32b6034772bfefa25bf2bf7aa3aab96ef2dc454 [formerly e32b6034772bfefa25bf2bf7aa3aab96ef2dc454 [formerly ad3442f66c15214cf86681a005d67c4dc2dd9f8f [formerly 15dbf8928108074dad40dd488941aa06fdbc3d1f]]]]]
Former-commit-id: 17e63e9d3d41ec51d338718f6ecb691149a0a47f
Former-commit-id: 0aa764e715155aa9c7a2bbe7098f9f5637407e61
Former-commit-id: 8be798e6c23168286beeb9d6ef523dd07c0512fe [formerly b6036a70fe85ba4b7a11a4c222a6fd6e8ba992dd]
Former-commit-id: dead6c57826e51dfd396a04a3f08acd428d8b1c0
Former-commit-id: e1ed749b9914de78edc995f13ff697e293595633
Former-commit-id: 7fd5dc99b4679a44e1480525df284d614111e470
Former-commit-id: 56ec85abde1a7f3875962cd32141904293d60bfd
Former-commit-id: 80a31b90879f77de6dc321a47136f2300448dd08
---
 src/pages/demo/components/scrollbar/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/demo/components/scrollbar/index.vue b/src/pages/demo/components/scrollbar/index.vue
index bb74c16e..2ea1be4b 100644
--- a/src/pages/demo/components/scrollbar/index.vue
+++ b/src/pages/demo/components/scrollbar/index.vue
@@ -12,6 +12,7 @@
         </el-scrollbar>
       </div>
     </el-card>
+    <d2-markdown :source="`#Hello`"/>
   </d2-container>
 </template>
 

From 11fae5b46da6bf83131d370059c77f80cbe371c1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 20 Jun 2018 08:55:43 +0800
Subject: [PATCH 08/13] no message

Former-commit-id: 842fb01e882ba6bc2ecb96a5e45708d7507707e4 [formerly 842fb01e882ba6bc2ecb96a5e45708d7507707e4 [formerly 842fb01e882ba6bc2ecb96a5e45708d7507707e4 [formerly 842fb01e882ba6bc2ecb96a5e45708d7507707e4 [formerly a5bf7cf19e98823914bb3c80c903065124036446 [formerly 0d3deba5fff1d6f046a6b12e0eeffd93cb7c7cb1]]]]]
Former-commit-id: e58468fba4c83e7f5e777e9005db9463c112aa92
Former-commit-id: cf4ec7bf3b54c96d8e6a35ee41ef8bf5512aa6f3
Former-commit-id: 1372e7c5809d8eb1a33cda1cf9a7b3b678ebddb5 [formerly 484085ada5db41a497d5b2f980ae855fd5f5ebd0]
Former-commit-id: ede910e101bdb547f4bec243f9f7c6d4d5db2ce1
Former-commit-id: 5292283c77e47b13bb2a31914b2e358ecb4fa230
Former-commit-id: 81204fea95fcff76f6f58c471552565ea25e788b
Former-commit-id: 7d5d1d3b7d1e3c7f5a0bc99e736b5ff00a72bc8a
Former-commit-id: 3c0791a62bae56a25b85a7802f51cadd405c6484
---
 src/pages/demo/components/scrollbar/index.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/pages/demo/components/scrollbar/index.vue b/src/pages/demo/components/scrollbar/index.vue
index 2ea1be4b..289abea3 100644
--- a/src/pages/demo/components/scrollbar/index.vue
+++ b/src/pages/demo/components/scrollbar/index.vue
@@ -12,10 +12,22 @@
         </el-scrollbar>
       </div>
     </el-card>
-    <d2-markdown :source="`#Hello`"/>
+    <d2-markdown :source="doc"/>
   </d2-container>
 </template>
 
+<script>
+import doc from './md/doc.md'
+export default {
+  data () {
+    return {
+      doc
+    }
+  }
+}
+</script>
+
+
 <style lang="scss" scoped>
 @import '~@/assets/style/public.scss';
 .demo-scrollbar-card {

From b1b30f9eefa94285067e4fa042b63197f2198079 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 20 Jun 2018 09:07:33 +0800
Subject: [PATCH 09/13] no message

Former-commit-id: e86f01178ddcfea26f7b2b8235b46ec3710dae72 [formerly e86f01178ddcfea26f7b2b8235b46ec3710dae72 [formerly e86f01178ddcfea26f7b2b8235b46ec3710dae72 [formerly e86f01178ddcfea26f7b2b8235b46ec3710dae72 [formerly 4f35759b6688a45d8d6c33a04a4bb8adf50b446f [formerly ca58924c071f16d76d0a87afb18d5f52fa4e7a39]]]]]
Former-commit-id: b2f66e16101e2baba9425f7f09ae3f0eefa178b0
Former-commit-id: bba76c5dbbe67106be31c1223900db62919374a7
Former-commit-id: a2f218f8a7bae3a3a81e67e1f012fd62bb7fad52 [formerly fdce499b0fe304aa4ad39dd98e1c8f974f09c480]
Former-commit-id: 35f7237ae862933a9fabc00869fd0fdb9220f373
Former-commit-id: d9cdcaff285b97042cb2e082da806ff5a8b2b424
Former-commit-id: 2c4016a737a72194def57f3adc336776bad6d560
Former-commit-id: 59ffb9ce973618c20ae7cce3d7669bd5a85e97db
Former-commit-id: 831b6e1707be00195210b48c2ad5c72119e23299
---
 src/menu/index.js                             | 2 +-
 src/pages/demo/components/scrollbar/index.vue | 4 ++--
 src/pages/demo/components/scrollbar/md/doc.md | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/menu/index.js b/src/menu/index.js
index 69acd1eb..5dad5526 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -108,7 +108,7 @@ const demoComponents = {
       ]
     },
     { path: `${pre}bigdata-table`, title: '百万数量级表格' },
-    { path: `${pre}scrollbar`, title: 'ElementUI 滚动条组件' },
+    { path: `${pre}scrollbar`, title: 'Element 滚动条组件' },
     { path: `${pre}countup`, title: '数字动画' },
     { path: `${pre}editor-quill`, title: '富文本编辑器' },
     { path: `${pre}editor-simpleMDE`, title: 'markdown编辑器' },
diff --git a/src/pages/demo/components/scrollbar/index.vue b/src/pages/demo/components/scrollbar/index.vue
index 289abea3..49c7ae8b 100644
--- a/src/pages/demo/components/scrollbar/index.vue
+++ b/src/pages/demo/components/scrollbar/index.vue
@@ -1,7 +1,7 @@
 <template>
   <d2-container>
-    <template slot="header">自定义滚动条</template>
-    <el-card shadow="never" class="demo-scrollbar-card">
+    <template slot="header">Element 滚动条组件</template>
+    <el-card shadow="never" class="demo-scrollbar-card d2-mb">
       <div class="demo-scrollbar-card-inner">
         <el-scrollbar>
           <div class="demo-scrollbar-group">
diff --git a/src/pages/demo/components/scrollbar/md/doc.md b/src/pages/demo/components/scrollbar/md/doc.md
index 158a909f..21113513 100644
--- a/src/pages/demo/components/scrollbar/md/doc.md
+++ b/src/pages/demo/components/scrollbar/md/doc.md
@@ -1 +1,5 @@
-[hahaha](https://github.com/ElemeFE/element/issues/2238)
\ No newline at end of file
+本示例演示 ElementUI 的隐藏组件 `<el-scrollbar>`，详细信可以参照 [element/issues#2238](https://github.com/ElemeFE/element/issues/2238)
+
+> ElementUI 官网以及部分涉及滚动操作的组件内部使用了 `<el-scrollbar>` 组件，虽然已经暴露到全局但是并没有相关文档介绍
+
+如果你需要更高级的滚动自定义控制，D2Admin 已经集成 [better-scroll](https://github.com/ustbhuangyi/better-scroll)，示例见 [自定义滚动](/#/demo/plugins/better-scroll/base)，[滚动定位](/#/demo/plugins/better-scroll/to)
\ No newline at end of file

From 842668df0ddada32c6bb967ebfe76150cf7a8549 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 20 Jun 2018 10:32:33 +0800
Subject: [PATCH 10/13] no message

Former-commit-id: f1e279a6e038110d83e885595071d1de78096cb7 [formerly 9b4732e444d0517f514d3886658d2f0c3beadf40] [formerly f1e279a6e038110d83e885595071d1de78096cb7 [formerly 9b4732e444d0517f514d3886658d2f0c3beadf40] [formerly f1e279a6e038110d83e885595071d1de78096cb7 [formerly 9b4732e444d0517f514d3886658d2f0c3beadf40] [formerly 9b4732e444d0517f514d3886658d2f0c3beadf40 [formerly 67b972e4c2b42dbc6046e4b83c1bcfced0c0677f [formerly 4913f7defd20d9b01bb840fb9ea370cd6e4d6639]]]]]
Former-commit-id: ab6036bbe0349b54257f5f7502ce3072fd506261
Former-commit-id: 3cf6ec9683ca216e3fc594703081a39b094256e0
Former-commit-id: a78e8a7791fb77b7242390667bdb2dcc445dc90e [formerly 589783ae703200644b97baae100d5571fe7c1d5b]
Former-commit-id: af87ccecc90dd69cb277544bc231000cff7308bb
Former-commit-id: ffa2f771a70f30d686a32e69250d48850e423a2c
Former-commit-id: a54f892b759818934ce7d4dd92bd2b048da66f36
Former-commit-id: 986818c4fcb0f783ea61f0f0fa4d48345ca3b3b4
Former-commit-id: 449af0ba19a375cf704eddcabdb017120c2a1ef5
---
 src/pages/demo/plugins/build/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/demo/plugins/build/index.vue b/src/pages/demo/plugins/build/index.vue
index 08f640cf..efd29a22 100644
--- a/src/pages/demo/plugins/build/index.vue
+++ b/src/pages/demo/plugins/build/index.vue
@@ -1,6 +1,6 @@
 <template>
   <d2-container>
-    <template slot="header">多环境发布</template>
+    <template slot="header">环境区分</template>
     <p>当前是{{$env ? '开发' : '生产'}}环境</p>
   </d2-container>
 </template>
\ No newline at end of file

From 5be1a01af05ef595196585ee012e71c2681f270b Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 20 Jun 2018 10:45:01 +0800
Subject: [PATCH 11/13] no message

Former-commit-id: 1b47ade5d828ebd21cebf89733b330736fdb9b0a [formerly 1b47ade5d828ebd21cebf89733b330736fdb9b0a [formerly 1b47ade5d828ebd21cebf89733b330736fdb9b0a [formerly 1b47ade5d828ebd21cebf89733b330736fdb9b0a [formerly 815ebd019df4898f6020d8a83c626a62001855c5 [formerly ad017ce82a45ca26f9a2b7b83e12d3eaf0fa2202]]]]]
Former-commit-id: dd760fabf7dfdb920b55dbe6eb2e23d233abcace
Former-commit-id: d3f075eb4089bff2280d5374a6e3bbde964b8de5
Former-commit-id: c1648a260eea51bbcc9d1db788956b36f695c8ec [formerly 040f6f8fddb1f012d147fdfa6c49d2a57a656049]
Former-commit-id: 15d06ac27ea41b02dd1e4e08f29bab0d24ab351c
Former-commit-id: 53d2d63810676b38897c4d9ceeccb8b8bcc1e937
Former-commit-id: 15896299c57ca870257c3a78f581ea0b600808e1
Former-commit-id: 54e400274ca4c13982c8eedbc2cef86489d20e93
Former-commit-id: 3286aa286ac48f6ea4ed06bc67f0cf29de70fd38
---
 src/assets/style/fixed/vue-grid-layout.scss        | 2 --
 src/components/core/d2-container/index.vue         | 2 +-
 src/pages/demo/business/index/index.vue            | 2 +-
 src/pages/demo/business/user-center/home/index.vue | 6 ------
 4 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 src/pages/demo/business/user-center/home/index.vue

diff --git a/src/assets/style/fixed/vue-grid-layout.scss b/src/assets/style/fixed/vue-grid-layout.scss
index 5027db69..c2c045a6 100644
--- a/src/assets/style/fixed/vue-grid-layout.scss
+++ b/src/assets/style/fixed/vue-grid-layout.scss
@@ -1,7 +1,5 @@
 // vue-splitpane 样式补丁
 
-@import '~@/assets/style/unit/_color.scss';
-
 .vue-grid-item {
   &.vue-grid-placeholder {
     border: 1px solid $color-border-1;
diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index 7647124f..473801c9 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container-component" :class="{responsive}">
+  <div class="container-component" :class="{responsive}">z
     <!-- [card] 卡片容器 -->
     <el-card v-if="type === 'card'" shadow="never" class="d2-container-card d2-mr d2-mb">
       <slot v-if="$slots.header" name="header" slot="header"/>
diff --git a/src/pages/demo/business/index/index.vue b/src/pages/demo/business/index/index.vue
index a9927cb4..44750655 100644
--- a/src/pages/demo/business/index/index.vue
+++ b/src/pages/demo/business/index/index.vue
@@ -2,7 +2,7 @@
   <d2-container type="full">
     <d2-demo-page-cover
       title="示例业务页面"
-      sub-title="如果用不到 建议删除相关代码">
+      sub-title="暂时还没有什么">
       <img src="@/assets/image/logo/w500-business.png">
     </d2-demo-page-cover>
   </d2-container>
diff --git a/src/pages/demo/business/user-center/home/index.vue b/src/pages/demo/business/user-center/home/index.vue
deleted file mode 100644
index 32734de1..00000000
--- a/src/pages/demo/business/user-center/home/index.vue
+++ /dev/null
@@ -1,6 +0,0 @@
-<template>
-  <d2-container type="full">
-    <template slot="header">用户中心</template>
-    doing...
-  </d2-container>
-</template>

From 32633ae10d615a980644ef15c732a272494f1ffe Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 20 Jun 2018 10:45:35 +0800
Subject: [PATCH 12/13] no message

Former-commit-id: cbabc4711edd9a4b225d703ae54cea45c6dcc97d [formerly cbabc4711edd9a4b225d703ae54cea45c6dcc97d [formerly cbabc4711edd9a4b225d703ae54cea45c6dcc97d [formerly cbabc4711edd9a4b225d703ae54cea45c6dcc97d [formerly d7d02d19f7dea9280f7be7a6a203fcde1350ce47 [formerly 8ebd1a8259b1e58ed54033575c7ffe4b4b73d66d]]]]]
Former-commit-id: 107d97bd004047755b2e1fe50bfb8bb10bf35069
Former-commit-id: 81416061fd0a05eead8e7af0105fff50d13ce79e
Former-commit-id: f726dfdeaa5fd482f524cf70fa30fb5f88f3c1a0 [formerly ac6a60693f3941f3cb9dda5e8cd5d2a7275cbbea]
Former-commit-id: 29d79ae01feb50af04a5120ca26349ffc955b92d
Former-commit-id: bc433073bfae6e94a6e53d03f31a550c2810074a
Former-commit-id: 965b5d4f29302cec26c6ee6f7c5fcebdbfddcc8f
Former-commit-id: a8e42446d9b6e34f21d2fc80fe7b5d151580b409
Former-commit-id: 5b315434d00b178d5cd429722a84cad3ad7693cd
---
 src/components/core/d2-container/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index 473801c9..7647124f 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="container-component" :class="{responsive}">z
+  <div class="container-component" :class="{responsive}">
     <!-- [card] 卡片容器 -->
     <el-card v-if="type === 'card'" shadow="never" class="d2-container-card d2-mr d2-mb">
       <slot v-if="$slots.header" name="header" slot="header"/>

From 833a5e23424ce94a4d53e65f5678ae741a70f240 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Wed, 20 Jun 2018 10:49:18 +0800
Subject: [PATCH 13/13] no message

Former-commit-id: e54f45882e77d372b2d0d17929b4f52ad568daf2 [formerly e54f45882e77d372b2d0d17929b4f52ad568daf2 [formerly e54f45882e77d372b2d0d17929b4f52ad568daf2 [formerly e54f45882e77d372b2d0d17929b4f52ad568daf2 [formerly 54d78c865471252a8e23ca064934e45503951027 [formerly 88c5a80449e2e732e61934ccd815e276c5412be6]]]]]
Former-commit-id: cb8922d8cca45c1ac762ceb49e490bfcecdf00a3
Former-commit-id: ee410be6505d113e5e9166a0780d4e1320e2a3d0
Former-commit-id: 826f4585fc5ec9750ce3363c251b77b9ddadcd33 [formerly ae8139e7e0785375ff8fbed9142b1ba367d0ed50]
Former-commit-id: ea4447c05a97342f7458dee88af65a6aabf827a2
Former-commit-id: 99d9e2726bba333a0ec99ce4d3434b8d8c553628
Former-commit-id: 4f4644acc7ec974b404c747fd51e65e1ee30693b
Former-commit-id: fdbaadaf8d612c11161b42a275f2b6eb4f36ccac
Former-commit-id: f27a35136dbdcb5d9fe4778d2357ad7849319948
---
 src/pages/core/404/index.vue            | 3 ++-
 src/pages/demo/components/icon/icon.vue | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/core/404/index.vue b/src/pages/core/404/index.vue
index 7bc892c7..ea85f5d7 100644
--- a/src/pages/core/404/index.vue
+++ b/src/pages/core/404/index.vue
@@ -8,6 +8,7 @@
 </template>
 
 <style lang="scss" scoped>
+@import '~@/assets/style/public.scss';
 .page-404 {
   background-color: #555555;
   height: 100%;
@@ -17,7 +18,7 @@
   flex-direction: column;
   img {
     width: 196px;
-    user-select: none;
+    @extend %unable-select;
   }
 }
 </style>
diff --git a/src/pages/demo/components/icon/icon.vue b/src/pages/demo/components/icon/icon.vue
index 0ce31ce0..5d87199c 100644
--- a/src/pages/demo/components/icon/icon.vue
+++ b/src/pages/demo/components/icon/icon.vue
@@ -9,12 +9,12 @@
 </template>
 
 <style lang="scss">
+@import '~@/assets/style/public.scss';
 .icon-class-demo {
   transition: all .3s;
   font-size: 100px;
   color: #409EFF;
-  cursor: pointer;
-  user-select: none;
+  @extend %unable-select;
   &:hover{
     color: #F56C6C;
     transform: scale(1.2) rotate(30deg);