From f4a4087386de050780933c06345df5ce44febc2f Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sat, 7 Jul 2018 20:06:54 +0800 Subject: [PATCH] %full Former-commit-id: 6b6b6fe892101c8a02cc6a997faf7c2996be682a [formerly 1080932e0e0d080528a6f69d87cd0a04e54655bd] [formerly 6b6b6fe892101c8a02cc6a997faf7c2996be682a [formerly 1080932e0e0d080528a6f69d87cd0a04e54655bd] [formerly 6b6b6fe892101c8a02cc6a997faf7c2996be682a [formerly 1080932e0e0d080528a6f69d87cd0a04e54655bd] [formerly 1080932e0e0d080528a6f69d87cd0a04e54655bd [formerly bfd356388e4e7b888c38a8924e25cf27934fed81 [formerly f9cae0a6098f73a04976fbdec103232c34a45cdd]]]]] Former-commit-id: 4ab626b1631f3db9357c671260ea23acae3e26b5 Former-commit-id: 97c0f38ae0eddd5564f5b0d5092012974b241927 Former-commit-id: 37b4d8cfe57369e18bcf9c48101e0aa1c88f047a [formerly 89217d41cbd0ea3aa75d8b97e12d41427d13b553] Former-commit-id: 766e7a630892b2db1c4920c8cee8653de0ca41a6 Former-commit-id: a91c451781878b8f3cf6b3a4f9a8eecbe5b7644f Former-commit-id: 1e48587db872cf9ef30b5e90a9db8f97614d3e92 Former-commit-id: c0c38b9d639e9cbfc5b78101a2d14da315018b94 Former-commit-id: 663f8da447500cfed36211063002a5170cbe5a8d --- src/assets/style/fixed/base.scss | 6 +---- src/assets/style/theme/theme-base.scss | 24 ++++--------------- .../demo/d2-demo-page-cover/index.vue | 6 +---- .../demo/components/bigdata-table/index.vue | 5 ---- 4 files changed, 6 insertions(+), 35 deletions(-) diff --git a/src/assets/style/fixed/base.scss b/src/assets/style/fixed/base.scss index 00fe6b93..42507ac7 100644 --- a/src/assets/style/fixed/base.scss +++ b/src/assets/style/fixed/base.scss @@ -5,11 +5,7 @@ html, body { height: 100%; font-family: "Arial", "Microsoft YaHei", "黑体", "宋体", sans-serif; #app { - position: absolute; - top: 0px; - bottom: 0px; - left: 0px; - right: 0px; + @extend %full; overflow: hidden; a { text-decoration: none; diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss index e5d62ae5..a80eb9ff 100644 --- a/src/assets/style/theme/theme-base.scss +++ b/src/assets/style/theme/theme-base.scss @@ -8,19 +8,11 @@ position: relative; // 背景上面的半透明遮罩 .d2-layout-main-mask { - position: absolute; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; + @extend %full; } // 内容层 .d2-layout-main-content { - position: absolute; - top: 0px; - right: 0px; - bottom: 0px; - left: 0px; + @extend %full; $d2-theme-header-height: 60px; .d2-theme-header { position: absolute; @@ -42,11 +34,7 @@ flex-grow: 0; position: relative; .d2-layout-main-menu-side { - position: absolute; - top: 0px; - bottom: 0px; - left: 0px; - right: 0px; + @extend %full; overflow: hidden; } } @@ -256,11 +244,7 @@ .d2-theme-container-main-body { // 布局组件 .container-component { - position: absolute; - top: 0px; - bottom: 0px; - left: 0px; - right: 0px; + @extend %full; overflow: hidden; // 填充式布局组件 .d2-container-full { diff --git a/src/components/demo/d2-demo-page-cover/index.vue b/src/components/demo/d2-demo-page-cover/index.vue index 4454bf8e..e8142606 100644 --- a/src/components/demo/d2-demo-page-cover/index.vue +++ b/src/components/demo/d2-demo-page-cover/index.vue @@ -41,11 +41,7 @@ export default { } } .page-index-article-body { - position: absolute; - top: 0px; - bottom: 0px; - left: 0px; - right: 0px; + @extend %full; display: flex; flex-flow: column nowrap; justify-content: center; diff --git a/src/pages/demo/components/bigdata-table/index.vue b/src/pages/demo/components/bigdata-table/index.vue index 6e6dc30e..f0f80662 100644 --- a/src/pages/demo/components/bigdata-table/index.vue +++ b/src/pages/demo/components/bigdata-table/index.vue @@ -132,11 +132,6 @@ export default {