From 6ff914fd42a11864c1004fdb92481ee486738cf9 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 13:33:30 +0800
Subject: [PATCH] no message
Former-commit-id: a22b2390a5972390d882536130f22bad01fd1a88 [formerly a22b2390a5972390d882536130f22bad01fd1a88 [formerly a22b2390a5972390d882536130f22bad01fd1a88 [formerly a22b2390a5972390d882536130f22bad01fd1a88 [formerly 8cce48548aa6c9c1d61b7db0675271532bafc53d [formerly 786aebc8003c8490b04863c23b6c30c97985ea26]]]]]
Former-commit-id: fb0b9c360ffcc17f8bc711698abdf733eeae4a18
Former-commit-id: 1f223114c1a83a8312c29f68ede1eb8ca6cb01f2
Former-commit-id: 46740e01087534d24ba49ef064f347040225bb30 [formerly 83675948b4292d4a59e6a44d89fd8dd2eb0a9cb9]
Former-commit-id: ddf49cf7ec33c02d6266bc113d6e3046ac766a95
Former-commit-id: ba551afe3f7f02874d47a4c03e2b193a2f917106
Former-commit-id: 2e935780fe776ee6b2f4267f177751fc18f6bf04
Former-commit-id: c4312483e0ad931044791afe891bba2e0f7959f9
Former-commit-id: a17dae6f7e5c583641d8d7a5d90cbf9c147264a6
---
src/assets/style/theme/theme-base.scss | 28 +++++++++++++++++++
.../components/d2-container-full-bs.vue | 26 -----------------
.../components/d2-container-full.vue | 26 -----------------
src/components/core/d2-container/index.vue | 8 ------
4 files changed, 28 insertions(+), 60 deletions(-)
diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index 6226317d..e82bf601 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -256,6 +256,34 @@
.d2-theme-container-main-body {
// 布局组件
.container-component {
+ position: absolute;
+ top: 0px;
+ bottom: 0px;
+ left: 0px;
+ right: 0px;
+ overflow: hidden;
+ .d2-container-full {
+ position: absolute;
+ top: 0px;
+ right: 20px;
+ bottom: 0px;
+ left: 0px;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ .d2-container-full__header {
+ padding: 20px;
+ }
+ .d2-container-full__body {
+ flex-grow: 1;
+ padding: 0px 20px;
+ overflow: hidden;
+ position: relative;
+ }
+ .d2-container-full__footer {
+ padding: 20px;
+ }
+ }
// 卡片布局组件
.d2-container-card {
border-top-left-radius: 0px;
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 ee1235b1..c40c62bc 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
@@ -49,29 +49,3 @@ export default {
}
}
-
-
diff --git a/src/components/core/d2-container/components/d2-container-full.vue b/src/components/core/d2-container/components/d2-container-full.vue
index 2311589d..e789a244 100644
--- a/src/components/core/d2-container/components/d2-container-full.vue
+++ b/src/components/core/d2-container/components/d2-container-full.vue
@@ -17,29 +17,3 @@ export default {
name: 'd2-container-full'
}
-
-
diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index fe566049..0d6922ae 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -95,14 +95,6 @@ export default {