From 4d27b441adaba602d7a639b0c41adf3bffcc1065 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 14 Jun 2018 18:46:20 +0800
Subject: [PATCH] no message

Former-commit-id: 059628b458d3ee7581082ea7eb5b207d7a8c4a77 [formerly 059628b458d3ee7581082ea7eb5b207d7a8c4a77 [formerly 059628b458d3ee7581082ea7eb5b207d7a8c4a77 [formerly 059628b458d3ee7581082ea7eb5b207d7a8c4a77 [formerly 937520e84e34cb24db8b676e42a549c9d024d0fb [formerly 5330ad3a07a01e43c451f4f66d4785d6917232d2]]]]]
Former-commit-id: 6162353a8407a1ded84a44abcce1fe48e6043ecb
Former-commit-id: 7a2e127380b8e9cbd796c3b18582d0cd273fb569
Former-commit-id: c4df7c09fc02282c3359b7318ea07d3d4c3b7447 [formerly be66306a300ecc02c534c382e8063c92a5518908]
Former-commit-id: 770586260ff645790530baf3f43954d0b34366be
Former-commit-id: 1c3286b94ea67cf20ea0913a428e9a7cce61ff81
Former-commit-id: 7c8eba0bf8eb2776f7d4b01fb63ba3ddbfae135d
Former-commit-id: c53ae7fdc501d6cf07052f710e01fc47f0997940
Former-commit-id: b9290d4cab13402a8d8f3d05e2330d82f1f207c4
---
 src/menu/index.js                             |  3 +-
 src/pages/demo/components/scrollbar/index.vue | 37 +++++++++++++++++++
 src/pages/demo/components/scrollbar/md/doc.md |  1 +
 src/router/index.js                           |  3 +-
 4 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/demo/components/scrollbar/index.vue
 create mode 100644 src/pages/demo/components/scrollbar/md/doc.md

diff --git a/src/menu/index.js b/src/menu/index.js
index 05afb67a..4b146d03 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -87,7 +87,8 @@ const demoComponents = {
         { path: `${pre}markdown/url`, title: '异步加载文件' }
       ]
     },
-    { path: `${pre}bigdata-table`, title: '超大量数据表格' },
+    { path: `${pre}bigdata-table`, title: '百万数量级表格' },
+    { path: `${pre}scrollbar`, title: '滚动条' },
     { 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
new file mode 100644
index 00000000..98881d84
--- /dev/null
+++ b/src/pages/demo/components/scrollbar/index.vue
@@ -0,0 +1,37 @@
+<template>
+  <d2-container>
+    <template slot="header">自定义滚动条</template>
+    <el-card shadow="never" class="demo-scrollbar-card">
+      <div class="demo-scrollbar-card-inner">
+        <el-scrollbar>
+          <div class="demo-scrollbar-group">
+            <div v-for="n in 20" :key="n" class="demo-scrollbar-item">
+              <el-button size="mini">n : {{n}}</el-button>
+            </div>
+          </div>
+        </el-scrollbar>
+      </div>
+    </el-card>
+  </d2-container>
+</template>
+
+
+<style lang="scss" scoped>
+@import '~@/assets/style/public.scss';
+.demo-scrollbar-card {
+  width: 300px;
+  .demo-scrollbar-card-inner {
+    margin: -20px;
+  }
+  .demo-scrollbar-group {
+    height: 200px;
+    .demo-scrollbar-item {
+      padding: 10px;
+      border-bottom: 1px solid $color-border-4;
+      &:last-child {
+        border-bottom: none;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/pages/demo/components/scrollbar/md/doc.md b/src/pages/demo/components/scrollbar/md/doc.md
new file mode 100644
index 00000000..158a909f
--- /dev/null
+++ b/src/pages/demo/components/scrollbar/md/doc.md
@@ -0,0 +1 @@
+[hahaha](https://github.com/ElemeFE/element/issues/2238)
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index af0ce1e1..5f0be777 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,7 +42,8 @@ const routes = [
       { path: 'layout/grid', name: `${pre}layout-grid`, component: () => import('@/pages/demo/components/layout/grid.vue') },
       { path: 'layout/splitpane', name: `${pre}layout-splitpane`, component: () => import('@/pages/demo/components/layout/splitpane.vue') },
       { path: 'markdown/source', name: `${pre}markdown-source`, component: () => import('@/pages/demo/components/markdown/source.vue') },
-      { path: 'markdown/url', name: `${pre}markdown-url`, component: () => import('@/pages/demo/components/markdown/url.vue') }
+      { path: 'markdown/url', name: `${pre}markdown-url`, component: () => import('@/pages/demo/components/markdown/url.vue') },
+      { path: 'scrollbar', name: `${pre}scrollbar`, component: () => import('@/pages/demo/components/scrollbar/index.vue') }
     ])('demo-components-')
   },
   {