Merge branch 'hotfix/scrollbar'

Former-commit-id: fb75ab2d12092ffde3224840c311ff9e982e75cc [formerly fb75ab2d12092ffde3224840c311ff9e982e75cc [formerly fb75ab2d12092ffde3224840c311ff9e982e75cc [formerly fb75ab2d12092ffde3224840c311ff9e982e75cc [formerly 174186c64ad27bf73ad10ac7e6c9eab13edb6d0d [formerly 3b34a6ba250ffa2bd95b27a50115e69cb8d2d846]]]]]
Former-commit-id: 1d00793b5825101194207d2090c110d295bc9568
Former-commit-id: efaac0df1a4bd734c08303e1a209326a7ead8578
Former-commit-id: 83910fbff79990871f80fb5763c79188935c2edb [formerly 36c175f375490da470377b57578442ffe39b7012]
Former-commit-id: 25d48df47cb2fe6a0b33f80d41b8a13feea1a6a9
Former-commit-id: 09c106db6a98ef1d44828fe50efc2843d92f2fe2
Former-commit-id: 8635fb1704bc26c60a537b4caa08ef2ce09574ee
Former-commit-id: c9cbbdfde50eb268c3be5dd141e04f5e084fb9f4
Former-commit-id: 0a8ed659fcaaeac1f953b9c28bb359fa7a1033af

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