Merge pull request #14 from FairyEver/dev

bug fixed

Former-commit-id: 0b8d91586d9468982f02e075ff49ff7de30b332a [formerly 0b8d91586d9468982f02e075ff49ff7de30b332a [formerly 0b8d91586d9468982f02e075ff49ff7de30b332a [formerly 0b8d91586d9468982f02e075ff49ff7de30b332a [formerly 2effd3698a45c580e7af6cc7bd9130500a3c3ae0 [formerly db888f52995a8f55eca7933acd4ee30f2c56ba8c]]]]]
Former-commit-id: 73787aa072b1072edbb055c30749b451fdcbe86a
Former-commit-id: ec223a682ed2bd0018299f8a9f93e8d39245b4d9
Former-commit-id: cc5a496b8c7f1a272d07fb6ebaef76690d6a202b [formerly a56452026998e9084ab5b66b3c901de72917b4d3]
Former-commit-id: f0a6580e1185d889c96a034b5c5a7e3f3141790d
Former-commit-id: 6870cd93aafe51685591106ffbcfc289958fa1c3
Former-commit-id: ff114781b4c19db06ba5d267b2c6fa08650c19b7
Former-commit-id: 4da67f48d6a7e705d309eff8533868fb4114a61c
Former-commit-id: a6e70be72077b9866f0e4b660b6862e125f66f8d

docs/zh/guide/change-log.md

@@ -20,6 +20,9 @@
 * [ 修改 ] 删除 `timeago` 插件，更换为更强大的 `dayjs`
 * [ 新增 ] `Tomorrow Night Blue` 主题
 * [ 修改 ] `src/assets/style/public-class.scss` 写法优化
+* [ 新增 ] [vue-bigdata-table](https://github.com/lison16/vue-bigdata-table)组件
+* [ 修复 ] 侧边栏内容超过一屏后显示错误
+* [ 新增 ] 自定义滚动条演示页面
 
 ## v1.0.0
 

src/assets/style/theme/theme.scss

@@ -5,15 +5,6 @@
   background-size: cover;
   background-position: center;
   position: relative;
-  // &:before {
-  //   content: '';
-  //   position: absolute;
-  //   top: 0px;
-  //   right: 0px;
-  //   bottom: 0px;
-  //   left: 0px;
-  //   background-color: rgba(#000, .5);
-  // }
   // [布局] 顶栏
   .el-header {
     padding: 0px;
@@ -78,7 +69,7 @@
     // 侧边栏
     .el-aside {
       transition: width .3s;
-      overflow: inherit;
+      overflow: auto;
       // [菜单] 正常状态
       .el-menu {
         @extend %unable-select;

src/components/core/d2-layout-main/components/-theme/index.vue

@@ -6,7 +6,7 @@
       </el-button>
     </el-tooltip>
     <el-dialog title="主题" width="600px" :visible.sync="dialogVisible">
-      <d2-theme-list/>
+      <d2-theme-list style="margin-top: -20px;"/>
     </el-dialog>
   </div>
 </template>

src/components/core/d2-layout-main/index.vue

@@ -20,7 +20,7 @@
     <!-- 下面 主体 -->
     <el-container>
       <!-- 主体 侧边栏 -->
-      <el-aside :style="{width: collapse ? asideWidthCollapse : asideWidth}">
+      <el-aside ref="aside" :style="{width: collapse ? asideWidthCollapse : asideWidth}">
         <d2-layout-main-menu-side :collapse="collapse"/>
       </el-aside>
       <!-- 主体 -->

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编辑器' },

src/pages/demo/components/scrollbar/index.vue

@@ -0,0 +1,36 @@
+<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>

src/pages/demo/components/scrollbar/md/doc.md

@@ -0,0 +1 @@
+[hahaha](https://github.com/ElemeFE/element/issues/2238)

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-')
   },
   {