From 5c9810515de6611d7ccf752140bbeb0419584031 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 21 Jul 2018 15:09:30 +0800
Subject: [PATCH] card-bs

Former-commit-id: 6de2fd0ecd248346d5d11c082d39dce6a53b9cd2 [formerly 6de2fd0ecd248346d5d11c082d39dce6a53b9cd2 [formerly 6de2fd0ecd248346d5d11c082d39dce6a53b9cd2 [formerly 6de2fd0ecd248346d5d11c082d39dce6a53b9cd2 [formerly b57d4d8d6d3a1f0d272b0403a6ae8c9ad8e63900 [formerly 5153a7ccadbe584ba05d70c72c4aa05de8791ff7]]]]]
Former-commit-id: aa1884bc49a83014102224c523a18af93d9e6ba2
Former-commit-id: ce5f1363a4baa7b8af232a9f61ba999fc6f7b724
Former-commit-id: d0ce7cc910fc4f081495694d131e735438e5eef9 [formerly f73f94a7b840e38e1291833651223fc17cae25f3]
Former-commit-id: a4275db733c09bc9042eca5593561e86d481b92e
Former-commit-id: cd5da623baf61c1a2cdf234e4f425f7de049c180
Former-commit-id: 2248bea6688dae9bba2b21f0947522661762ddd1
Former-commit-id: 82f5352d821e5f8c64279b53e1188c8b9ec72ad6
Former-commit-id: 84035c7bbb1b6023dd48a7ab29ca6b1ea4f37b46
---
 .../theme/theme-base.scss.REMOVED.git-id      |  2 +-
 .../style/theme/theme.scss.REMOVED.git-id     |  2 +-
 .../components/d2-container-card-bs.vue       | 51 +++++++++++++++++++
 .../components/d2-container-card.vue          |  2 +-
 src/components/core/d2-container/index.vue    | 10 +++-
 src/menu/modules/demo-components.js           |  3 +-
 .../demo/components/container/card-bs.vue     | 16 ++++++
 src/router/routes.js.REMOVED.git-id           |  2 +-
 8 files changed, 82 insertions(+), 6 deletions(-)
 create mode 100644 src/components/core/d2-container/components/d2-container-card-bs.vue
 create mode 100644 src/pages/demo/components/container/card-bs.vue

diff --git a/src/assets/style/theme/theme-base.scss.REMOVED.git-id b/src/assets/style/theme/theme-base.scss.REMOVED.git-id
index a496ea6e..8e0bab3a 100644
--- a/src/assets/style/theme/theme-base.scss.REMOVED.git-id
+++ b/src/assets/style/theme/theme-base.scss.REMOVED.git-id
@@ -1 +1 @@
-442203ddfcebd9494b61aab71c064cdf6f45377f
\ No newline at end of file
+8753c5c3722d98048d67724d566cc7ef16a566dd
\ No newline at end of file
diff --git a/src/assets/style/theme/theme.scss.REMOVED.git-id b/src/assets/style/theme/theme.scss.REMOVED.git-id
index b699d10f..d4e8078e 100644
--- a/src/assets/style/theme/theme.scss.REMOVED.git-id
+++ b/src/assets/style/theme/theme.scss.REMOVED.git-id
@@ -1 +1 @@
-e9c21181f6bfd3c3600762179287cf8f81f5e2fc
\ No newline at end of file
+9f49557f8029c77acef8eacc459c15b813559da6
\ No newline at end of file
diff --git a/src/components/core/d2-container/components/d2-container-card-bs.vue b/src/components/core/d2-container/components/d2-container-card-bs.vue
new file mode 100644
index 00000000..f3194269
--- /dev/null
+++ b/src/components/core/d2-container/components/d2-container-card-bs.vue
@@ -0,0 +1,51 @@
+<template>
+  <div class="d2-container-card-bs">
+    <div v-if="$slots.header" class="d2-container-card-bs__header" ref="header">
+      <slot name="header"/>
+    </div>
+    <div class="d2-container-card-bs__body" ref="wrapper">
+      <div class="d2-container-card-bs__body-wrapper-inner">
+        <div class="d2-container-card-bs__body-card">
+          <slot/>
+        </div>
+      </div>
+    </div>
+    <div v-if="$slots.footer" class="d2-container-card-bs__footer" ref="footer">
+      <slot name="footer"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import BScroll from 'better-scroll'
+export default {
+  name: 'd2-container-card-bs',
+  data () {
+    return {
+      BS: null
+    }
+  },
+  mounted () {
+    this.scrollInit()
+  },
+  beforeDestroy () {
+    this.scrollDestroy()
+  },
+  methods: {
+    scrollInit () {
+      this.BS = new BScroll(this.$refs.wrapper, {
+        mouseWheel: true,
+        scrollbar: {
+          fade: true,
+          interactive: false
+        }
+      })
+    },
+    scrollDestroy () {
+      if (this.BS) {
+        this.BS.destroy()
+      }
+    }
+  }
+}
+</script>
diff --git a/src/components/core/d2-container/components/d2-container-card.vue b/src/components/core/d2-container/components/d2-container-card.vue
index 203ae575..8e7e5631 100644
--- a/src/components/core/d2-container/components/d2-container-card.vue
+++ b/src/components/core/d2-container/components/d2-container-card.vue
@@ -4,7 +4,7 @@
       <slot name="header"/>
     </div>
     <div class="d2-container-card__body">
-      <div class="d2-container-card__body-inner">
+      <div class="d2-container-card__body-card">
         <slot/>
       </div>
     </div>
diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index c7dfe0cb..be4cf3b4 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -6,6 +6,12 @@
       <slot/>
       <slot v-if="$slots.footer" name="footer" slot="footer"/>
     </d2-container-card>
+    <!-- [card] 卡片容器 滚动优化 -->
+    <d2-container-card-bs v-if="type === 'card' && scroll">
+      <slot v-if="$slots.header" name="header" slot="header"/>
+      <slot/>
+      <slot v-if="$slots.footer" name="footer" slot="footer"/>
+    </d2-container-card-bs>
     <!-- [ghost] 隐形容器 -->
     <d2-container-ghost v-if="type === 'ghost' && !scroll">
       <slot v-if="$slots.header" name="header" slot="header"/>
@@ -40,6 +46,7 @@ import d2ContainerFullBs from './components/d2-container-full-bs.vue'
 import d2ContainerGhost from './components/d2-container-ghost.vue'
 import d2ContainerGhostBs from './components/d2-container-ghost-bs.vue'
 import d2ContainerCard from './components/d2-container-card.vue'
+import d2ContainerCardBs from './components/d2-container-card-bs.vue'
 export default {
   name: 'd2-container',
   props: {
@@ -61,7 +68,8 @@ export default {
     'd2-container-full-bs': d2ContainerFullBs,
     'd2-container-ghost': d2ContainerGhost,
     'd2-container-ghost-bs': d2ContainerGhostBs,
-    'd2-container-card': d2ContainerCard
+    'd2-container-card': d2ContainerCard,
+    'd2-container-card-bs': d2ContainerCardBs
   }
 }
 </script>
diff --git a/src/menu/modules/demo-components.js b/src/menu/modules/demo-components.js
index 2a5dce87..362ba0b3 100644
--- a/src/menu/modules/demo-components.js
+++ b/src/menu/modules/demo-components.js
@@ -16,7 +16,8 @@ export default {
         { path: `${pre}container/ghost-slot`, title: '隐形 插槽' },
         { path: `${pre}container/ghost-bs`, title: '隐形 滚动优化' },
         { path: `${pre}container/card`, title: '卡片' },
-        { path: `${pre}container/card-slot`, title: '卡片 插槽' }
+        { path: `${pre}container/card-slot`, title: '卡片 插槽' },
+        { path: `${pre}container/card-bs`, title: '卡片 滚动优化' }
       ]
     },
     {
diff --git a/src/pages/demo/components/container/card-bs.vue b/src/pages/demo/components/container/card-bs.vue
new file mode 100644
index 00000000..16bf12db
--- /dev/null
+++ b/src/pages/demo/components/container/card-bs.vue
@@ -0,0 +1,16 @@
+<template>
+  <d2-container type="card" scroll>
+    <template slot="header">header</template>
+    <d2-demo-article/>
+    <template slot="footer">header</template>
+  </d2-container>
+</template>
+
+<script>
+import d2DemoArticle from './components/d2-demo-article'
+export default {
+  components: {
+    'd2-demo-article': d2DemoArticle
+  }
+}
+</script>
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index edc02298..9d1ea352 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-88c2df46092ca2d7bd7ea1d9422e6e825605027a
\ No newline at end of file
+778f82e9fa1924d95e2ffc6766eeefe0b17f09a3
\ No newline at end of file