完善细节

Former-commit-id: 97f287347018f446e43844e15d9b098b057fb8cd [formerly e426411792b3e51f137fd629dcaf59bebaa4bad9] [formerly 97f287347018f446e43844e15d9b098b057fb8cd [formerly e426411792b3e51f137fd629dcaf59bebaa4bad9] [formerly 97f287347018f446e43844e15d9b098b057fb8cd [formerly e426411792b3e51f137fd629dcaf59bebaa4bad9] [formerly e426411792b3e51f137fd629dcaf59bebaa4bad9 [formerly 48dba525c8f71c68265ae4ef28d86cbd8034ddb3 [formerly ecd7e52d5f268a9455858be0fffa9abbbb9059ed]]]]]
Former-commit-id: e31a3138c7acb78190f5db3150979efee0eda8da
Former-commit-id: 93757e2ac680fb3ddd026dbdf647bbd7c11a2254
Former-commit-id: de68fd594fbcb39c0be6d6340bac01d83e8c8b0b [formerly 7dd96a7147db1e8b559b72ea55ae411422535fe0]
Former-commit-id: c2388088d0806eb3d8bee019881e0a336b4bf50f
Former-commit-id: 7609dde0d96ec21daac0c255aae5ea8b14676851
Former-commit-id: efbabe795bd247e52db8802a77cf1f6857de609e
Former-commit-id: e6e09a5cddd7122ad187b0ab0cce9583bcf37f53
Former-commit-id: 21076aa407ff3db44ff8bd12bee36795f5bf1ca4

docs/zh/guide/change-log.md

@@ -15,7 +15,7 @@
 * [ 新增 ] playground 新增浏览器信息查看界面
 * [ 修改 ] 登陆注销逻辑移至 vuex
 * [ 新增 ] 登陆页面新增快速选择用户示例
-* [ 修改 ] 侧边栏切换控制辑移至 vuex
+* [ 新增 ] 侧边栏切换控制辑移至 vuex
 * [ 新增 ] 判断手机浏览自动跳转至提示页面
 * [ 修改 ] 侧边栏弹出菜单尺寸缩小以容纳更多菜单
 * [ 修改 ] d2-container 组件重构，每种模式现都支持 scroll 属性以及 header footer 插槽
@@ -26,6 +26,11 @@
 * [ 新增 ] 注销画面灰度效果
 * [ 新增 ] .d2-card 样式类，可以让 el-card 具有跟随主题变化的样式
 * [ 新增 ] ElementUI 表格组件全部示例移植
+* [ 新增 ] 全局状态管理 playground
+* [ 新增 ] 侧边栏和顶栏菜单设置 playground
+* [ 新增 ] d2-container 组件 card 模式下 footer 样式优化
+* [ 修改 ] 侧边栏折叠模式下弹出菜单尺寸缩小
+* [ 修改 ] 默认取消了侧边栏的自定义滚动条显示
 
 ## v1.1.4
 

src/layout/header-aside/components/menu-side/index.vue

@@ -76,11 +76,12 @@ export default {
   methods: {
     scrollInit () {
       this.BS = new BScroll(this.$el, {
-        mouseWheel: true,
-        scrollbar: {
-          fade: true,
-          interactive: false
-        }
+        mouseWheel: true
+        // 如果你愿意可以打开显示滚动条
+        // scrollbar: {
+        //   fade: true,
+        //   interactive: false
+        // }
       })
     },
     scrollDestroy () {

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

@@ -1,19 +1,19 @@
 <template>
   <d2-container>
     <template slot="header">代码高亮组件</template>
-    <el-card shadow="never" class="d2-card d2-mb">
+    <el-card shadow="never" class="d2-mb">
       <p slot="title">javascript</p>
       <d2-highlight :code="codeJavascript"/>
     </el-card>
-    <el-card shadow="never" class="d2-card d2-mb">
+    <el-card shadow="never" class="d2-mb">
       <p slot="title">css</p>
       <d2-highlight :code="codeCSS"/>
     </el-card>
-    <el-card shadow="never" class="d2-card d2-mb">
+    <el-card shadow="never" class="d2-mb">
       <p slot="title">scss</p>
       <d2-highlight :code="codeSCSS"/>
     </el-card>
-    <el-card shadow="never" class="d2-card">
+    <el-card shadow="never">
       <p slot="title">html</p>
       <d2-highlight :code="codeHTML"/>
     </el-card>

src/pages/demo/plugins/clipboard-polyfill/index.vue

@@ -5,7 +5,7 @@
       <el-col :span="12">
         <div class="d2-mb">
           <el-input v-model="text" style="width: 200px;"></el-input>
-          <el-button @click="copyText()">将左侧输入框内的文字复制进剪贴板</el-button>
+          <el-button class="d2-ml" @click="copyText()">将左侧输入框内的文字复制进剪贴板</el-button>
         </div>
         <el-button @click="copyHtml()">将 <span v-html="html"></span> 连带样式一起复制进剪贴板，然后去 Word 文档内粘贴</el-button>
       </el-col>

src/router/routes.js.REMOVED.git-id

@@ -1 +1 @@
-c908393a42fbdbb90006fb0e0678b5136c78908a
+9959ede956228cbc62b3dd35ea3c199b2d4d25d7