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 + } + }) + } } } 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)"> 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()">