From 1a15d950422337b871e7f9c24f54a4f3d87510e1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Mon, 2 Jul 2018 09:03:25 +0800
Subject: [PATCH] no message

Former-commit-id: 5805aadc93264b3c5aa87ffc955c4f1b48f00750 [formerly 8bdb753cb8703c07f8ae340770338d3d23130ba5] [formerly 5805aadc93264b3c5aa87ffc955c4f1b48f00750 [formerly 8bdb753cb8703c07f8ae340770338d3d23130ba5] [formerly 5805aadc93264b3c5aa87ffc955c4f1b48f00750 [formerly 8bdb753cb8703c07f8ae340770338d3d23130ba5] [formerly 8bdb753cb8703c07f8ae340770338d3d23130ba5 [formerly 5994250766d06d7484a8ffe85aea646c23d07382 [formerly 5a89ce685e2b2da74e75e22488b1bcd73d8a5e50]]]]]
Former-commit-id: fa1baf35127d3e3110e92cc232f2fa99b045567b
Former-commit-id: 8cc23e52208fc66befe21fb88e6e434f0c4dc79e
Former-commit-id: 1389043b3fd6d688c817adc4f28e1fd72fb2d19f [formerly b2d8ee0ad34df4b52b252252c469bb3d95ab0d4c]
Former-commit-id: 7366655675b3764970acc20465174dd2c31b8c43
Former-commit-id: 17430795e77b31c80dcf56b5e1f7397a393c6577
Former-commit-id: 7cfc33889dfe0aa966d09b4b8ef9208ea278b552
Former-commit-id: 25e7ed8ecb7a66480b5b4b598a897e0387f942d2
Former-commit-id: 390b817f127ee5b442f05977758aab8374b60d03
---
 .../components/d2-container-full-bs.vue          |  2 +-
 src/components/core/d2-container/index.vue       | 16 +++++++++-------
 src/pages/demo/plugins/mock/dpd.vue              |  1 +
 src/pages/demo/plugins/mock/dtd.vue              |  1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/core/d2-container/components/d2-container-full-bs.vue b/src/components/core/d2-container/components/d2-container-full-bs.vue
index d58c5fec..81019358 100644
--- a/src/components/core/d2-container/components/d2-container-full-bs.vue
+++ b/src/components/core/d2-container/components/d2-container-full-bs.vue
@@ -52,7 +52,7 @@ export default {
   .d2-container-full__body {
     flex-grow: 1;
     padding: 0px 20px;
-    overflow: auto;
+    overflow: hidden;
     position: relative;
   }
   .d2-container-full__footer {
diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index 5bd15a90..b6521bcf 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -63,13 +63,15 @@ export default {
     }
   },
   mounted () {
-    this.BS = new BScroll(this.$refs.container, {
-      mouseWheel: true,
-      scrollbar: {
-        fade: true,
-        interactive: false
-      }
-    })
+    if (this.type !== 'full') {
+      this.BS = new BScroll(this.$refs.container, {
+        mouseWheel: true,
+        scrollbar: {
+          fade: true,
+          interactive: false
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/pages/demo/plugins/mock/dpd.vue b/src/pages/demo/plugins/mock/dpd.vue
index 6f4b050f..ec1234ba 100644
--- a/src/pages/demo/plugins/mock/dpd.vue
+++ b/src/pages/demo/plugins/mock/dpd.vue
@@ -8,6 +8,7 @@
       :title="item.title"
       :code="JSON.stringify(item.json, null, 2)"
       :mock="mockResult[index]"
+      style="margin-bottom: 0px !important;"
       @reload="doMock(index)">
     </d2-demo-mock-card>
   </d2-container>
diff --git a/src/pages/demo/plugins/mock/dtd.vue b/src/pages/demo/plugins/mock/dtd.vue
index 8612cecf..059e614c 100644
--- a/src/pages/demo/plugins/mock/dtd.vue
+++ b/src/pages/demo/plugins/mock/dtd.vue
@@ -20,6 +20,7 @@
       :title="regexp.title"
       :code="regexp.code"
       :mock="regexp.mocked"
+      style="margin-bottom: 0px !important;"
       @reload="regexpMock()">
     </d2-demo-mock-card>
   </d2-container>