diff --git a/src/assets/style/theme/theme-base.scss b/src/assets/style/theme/theme-base.scss
index 86107cdc..97d9b8ae 100644
--- a/src/assets/style/theme/theme-base.scss
+++ b/src/assets/style/theme/theme-base.scss
@@ -321,6 +321,28 @@
padding: 20px;
}
}
+ // 隐形布局组件 - 滚动优化
+ .d2-container-ghost-bs {
+ position: absolute;
+ top: 0px;
+ right: 20px;
+ bottom: 0px;
+ left: 0px;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ .d2-container-ghost-bs__header {
+ padding: 20px;
+ }
+ .d2-container-ghost-bs__body {
+ flex-grow: 1;
+ overflow: hidden;
+ position: relative;
+ }
+ .d2-container-ghost-bs__footer {
+ padding: 20px;
+ }
+ }
}
}
}
diff --git a/src/assets/style/theme/theme.scss.REMOVED.git-id b/src/assets/style/theme/theme.scss.REMOVED.git-id
index 1f6c8548..5df23dbd 100644
--- a/src/assets/style/theme/theme.scss.REMOVED.git-id
+++ b/src/assets/style/theme/theme.scss.REMOVED.git-id
@@ -1 +1 @@
-9007ccbb78f811d506e941aa3ac902e2aca4b106
\ No newline at end of file
+865c9e62f0aee9a80f8771622b383a3273c790f3
\ No newline at end of file
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 f54c6e7f..426cac90 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
@@ -15,9 +15,7 @@
diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue
index 81029e31..258b721c 100644
--- a/src/components/core/d2-container/index.vue
+++ b/src/components/core/d2-container/index.vue
@@ -5,12 +5,18 @@
-
-
+
+
+
+
+
+
+
+
@@ -33,6 +39,7 @@ import BScroll from 'better-scroll'
import d2ContainerFull from './components/d2-container-full.vue'
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'
export default {
name: 'd2-container',
props: {
@@ -52,7 +59,8 @@ export default {
components: {
'd2-container-full': d2ContainerFull,
'd2-container-full-bs': d2ContainerFullBs,
- 'd2-container-ghost': d2ContainerGhost
+ 'd2-container-ghost': d2ContainerGhost,
+ 'd2-container-ghost-bs': d2ContainerGhostBs
},
data () {
return {
diff --git a/src/menu/modules/demo-components.js b/src/menu/modules/demo-components.js
index e864604b..bc22c20b 100644
--- a/src/menu/modules/demo-components.js
+++ b/src/menu/modules/demo-components.js
@@ -14,6 +14,7 @@ export default {
{ path: `${pre}container/full-bs`, title: '填充 滚动优化' },
{ path: `${pre}container/ghost`, title: '隐形' },
{ path: `${pre}container/ghost-slot`, title: '隐形 插槽' },
+ { path: `${pre}container/ghost-bs`, title: '隐形 滚动优化' },
{ path: `${pre}container/card`, title: '卡片' }
]
},
diff --git a/src/pages/demo/components/container/full-bs.vue b/src/pages/demo/components/container/full-bs.vue
index 7aec39bf..8b44dbad 100644
--- a/src/pages/demo/components/container/full-bs.vue
+++ b/src/pages/demo/components/container/full-bs.vue
@@ -1,12 +1,8 @@
-
- 我是插入到 header 中的内容
-
+ header
-
-
-
+ header
diff --git a/src/pages/demo/components/container/ghost-bs.vue b/src/pages/demo/components/container/ghost-bs.vue
new file mode 100644
index 00000000..93678ed5
--- /dev/null
+++ b/src/pages/demo/components/container/ghost-bs.vue
@@ -0,0 +1,22 @@
+
+
+ header
+
+
+
+
+
+ footer
+
+
+
+
diff --git a/src/pages/demo/components/container/ghost-slot.vue b/src/pages/demo/components/container/ghost-slot.vue
index 279ccc2c..7f95d77c 100644
--- a/src/pages/demo/components/container/ghost-slot.vue
+++ b/src/pages/demo/components/container/ghost-slot.vue
@@ -1,10 +1,12 @@
- 隐形页面容器 header
-
-
-
- 隐形页面容器 footer
+ header
+
+
+
+
+
+ footer
diff --git a/src/pages/demo/components/container/ghost.vue b/src/pages/demo/components/container/ghost.vue
index db91bd57..3d98ba4c 100644
--- a/src/pages/demo/components/container/ghost.vue
+++ b/src/pages/demo/components/container/ghost.vue
@@ -1,8 +1,10 @@
-
-
-
+
+
+
+
+
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index baae6647..f274fd0b 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-81f6e5ee660a2f3bb538685b20c34e46f1bd5690
\ No newline at end of file
+e4b510400fdb77d9d6d4489f26a59c847644472a
\ No newline at end of file