Merge branch 'hotfix/scrollbar' into develop

Former-commit-id: 8e6f53828dbf75d272fc1689808d556e25b3eac0 [formerly 159af64aa6acb81d18c0194667eb59d59681678a] [formerly 8e6f53828dbf75d272fc1689808d556e25b3eac0 [formerly 159af64aa6acb81d18c0194667eb59d59681678a] [formerly 8e6f53828dbf75d272fc1689808d556e25b3eac0 [formerly 159af64aa6acb81d18c0194667eb59d59681678a] [formerly 159af64aa6acb81d18c0194667eb59d59681678a [formerly 6fbbc65785c9b4bb20622c3cd9faa0961a584c31 [formerly 4b955053c65115df2e2a948a483667890eff6980]]]]]
Former-commit-id: 8a627735b504026d17ac7159b0cf28ae83e8b5f0
Former-commit-id: 9efc29c0e25f8b199ee15cf524f386ef87feef2c
Former-commit-id: 737d0bf1b9690c8f255fddfc714246b2b3b7ea99 [formerly c4f791f9b9bf56a308207056d74d652bf8e03024]
Former-commit-id: 9550e3fe4c6998467fc3a61471b0f4188f743e86
Former-commit-id: aa74bc8c64c8b43525d2d72a4721c9138884be92
Former-commit-id: b825a1827ea428a6d417f25e03e02dbb5a2895e2
Former-commit-id: efa05c3b11e92eb7118c418b4722d860f1954884
Former-commit-id: 35907f8e0e9a0c4384dba2d7e340c5292b35e6ef

src/main.js

@@ -1,7 +1,6 @@
 import 'babel-polyfill'
 import Vue from 'vue'
 import App from './App'
-// flex.css
 import 'flex.css'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'

src/pages/demo/playground/store/menu/index.vue

@@ -1,46 +1,21 @@
 <template>
-  <d2-container type="ghost">
+  <d2-container>
-    <template slot="header">菜单控制试验台</template>
+    <el-tabs>
-    <el-row :gutter="20" class="d2-mt d2-mb">
+      <el-tab-pane label="顶栏菜单">
-      <el-col :span="12">
+        <el-button-group class="d2-mb">
-        <el-card shadow="never" class="d2-card">
+          <el-button @click="handleMenuHeaderSet">设置顶栏空菜单</el-button>
-          <template slot="header">顶栏菜单</template>
+          <el-button @click="menuHeaderReset">恢复顶栏菜单</el-button>
-          <el-button-group class="d2-mb">
+        </el-button-group>
-            <el-button @click="handleMenuHeaderSet">设置空菜单</el-button>
+        <d2-highlight :code="JSON.stringify(menuHeader, null, 2)"/>
-            <el-button @click="menuHeaderReset">恢复</el-button>
+      </el-tab-pane>
-          </el-button-group>
+      <el-tab-pane label="侧栏菜单">
-          <div style="height: 400px; overflow: auto;">
+        <el-button-group class="d2-mb">
-            <d2-highlight :code="JSON.stringify(menuHeader, null, 2)"/>
+          <el-button @click="handleMenuAsideSet">设置侧栏空菜单</el-button>
-            <!-- <tree-view
+          <el-button @click="menuAsideReset">恢复侧栏菜单</el-button>
-              class="tree-view-small"
+        </el-button-group>
-              :data="menuHeader"
+        <d2-highlight :code="JSON.stringify(menuAside, null, 2)"/>
-              :options="{
+      </el-tab-pane>
-                rootObjectKey: 'menuHeader',
+    </el-tabs>
-                maxDepth: 1
-              }"/> -->
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :span="12">
-        <el-card shadow="never" class="d2-card">
-          <template slot="header">侧栏菜单</template>
-          <el-button-group class="d2-mb">
-            <el-button @click="handleMenuAsideSet">设置空菜单</el-button>
-            <el-button @click="menuAsideReset">恢复</el-button>
-          </el-button-group>
-          <div style="height: 400px; overflow: auto;">
-            <d2-highlight :code="JSON.stringify(menuAside, null, 2)"/>
-            <!-- <tree-view
-              class="tree-view-small"
-              :data="menuAside"
-              :options="{
-                rootObjectKey: 'menuAside',
-                maxDepth: 1
-              }"/> -->
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
   </d2-container>
 </template>