diff --git a/src/assets/style/theme/theme-base.scss.REMOVED.git-id b/src/assets/style/theme/theme-base.scss.REMOVED.git-id index a496ea6e..8e0bab3a 100644 --- a/src/assets/style/theme/theme-base.scss.REMOVED.git-id +++ b/src/assets/style/theme/theme-base.scss.REMOVED.git-id @@ -1 +1 @@ -442203ddfcebd9494b61aab71c064cdf6f45377f \ No newline at end of file +8753c5c3722d98048d67724d566cc7ef16a566dd \ No newline at end of file diff --git a/src/assets/style/theme/theme.scss.REMOVED.git-id b/src/assets/style/theme/theme.scss.REMOVED.git-id index b699d10f..d4e8078e 100644 --- a/src/assets/style/theme/theme.scss.REMOVED.git-id +++ b/src/assets/style/theme/theme.scss.REMOVED.git-id @@ -1 +1 @@ -e9c21181f6bfd3c3600762179287cf8f81f5e2fc \ No newline at end of file +9f49557f8029c77acef8eacc459c15b813559da6 \ No newline at end of file diff --git a/src/components/core/d2-container/components/d2-container-card-bs.vue b/src/components/core/d2-container/components/d2-container-card-bs.vue new file mode 100644 index 00000000..f3194269 --- /dev/null +++ b/src/components/core/d2-container/components/d2-container-card-bs.vue @@ -0,0 +1,51 @@ + + + diff --git a/src/components/core/d2-container/components/d2-container-card.vue b/src/components/core/d2-container/components/d2-container-card.vue index 203ae575..8e7e5631 100644 --- a/src/components/core/d2-container/components/d2-container-card.vue +++ b/src/components/core/d2-container/components/d2-container-card.vue @@ -4,7 +4,7 @@
-
+
diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue index c7dfe0cb..be4cf3b4 100644 --- a/src/components/core/d2-container/index.vue +++ b/src/components/core/d2-container/index.vue @@ -6,6 +6,12 @@ + + + + + + @@ -40,6 +46,7 @@ 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' import d2ContainerCard from './components/d2-container-card.vue' +import d2ContainerCardBs from './components/d2-container-card-bs.vue' export default { name: 'd2-container', props: { @@ -61,7 +68,8 @@ export default { 'd2-container-full-bs': d2ContainerFullBs, 'd2-container-ghost': d2ContainerGhost, 'd2-container-ghost-bs': d2ContainerGhostBs, - 'd2-container-card': d2ContainerCard + 'd2-container-card': d2ContainerCard, + 'd2-container-card-bs': d2ContainerCardBs } } diff --git a/src/menu/modules/demo-components.js b/src/menu/modules/demo-components.js index 2a5dce87..362ba0b3 100644 --- a/src/menu/modules/demo-components.js +++ b/src/menu/modules/demo-components.js @@ -16,7 +16,8 @@ export default { { path: `${pre}container/ghost-slot`, title: '隐形 插槽' }, { path: `${pre}container/ghost-bs`, title: '隐形 滚动优化' }, { path: `${pre}container/card`, title: '卡片' }, - { path: `${pre}container/card-slot`, title: '卡片 插槽' } + { path: `${pre}container/card-slot`, title: '卡片 插槽' }, + { path: `${pre}container/card-bs`, title: '卡片 滚动优化' } ] }, { diff --git a/src/pages/demo/components/container/card-bs.vue b/src/pages/demo/components/container/card-bs.vue new file mode 100644 index 00000000..16bf12db --- /dev/null +++ b/src/pages/demo/components/container/card-bs.vue @@ -0,0 +1,16 @@ + + + diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id index edc02298..9d1ea352 100644 --- a/src/router/routes.js.REMOVED.git-id +++ b/src/router/routes.js.REMOVED.git-id @@ -1 +1 @@ -88c2df46092ca2d7bd7ea1d9422e6e825605027a \ No newline at end of file +778f82e9fa1924d95e2ffc6766eeefe0b17f09a3 \ No newline at end of file