From 1f313f18cd1635fccdb72d7404bb7d8e0d6c2942 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 18 Jul 2018 08:30:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=B9=E5=99=A8=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 584a9329d7868d9e9aac27af8bb8548899f6bb6a [formerly 584a9329d7868d9e9aac27af8bb8548899f6bb6a [formerly 584a9329d7868d9e9aac27af8bb8548899f6bb6a [formerly 584a9329d7868d9e9aac27af8bb8548899f6bb6a [formerly d9f7b6d61f9bca4dd01d9bdeaa3e05689a4c957b [formerly 685176322dd7a7c07d9adc1afe718ac8769c6e2b]]]]] Former-commit-id: 88308a03ec90c920658d225ca92d3d44329ae488 Former-commit-id: 658fe4466da6dfac5fca7f4d4f587300c297a6f4 Former-commit-id: e2f583b6a7c845b26d5713ab54427c1a30eae7c0 [formerly 7f060c7800831c725cce856ac0b97e64e8dc7df3] Former-commit-id: b4a0e21cd492e0c91637c94e9ab9cbf7e896c52d Former-commit-id: 52a1a9c80a6951a0341fbfe6ca6c748dae876747 Former-commit-id: 508b9083504c48c021f3664bd2f398aacce556f3 Former-commit-id: 5885f81448c937e04528c45ea8bd74f72dac37a9 Former-commit-id: e0337459e2f83705c4cf519840fd9532ed2a43e0 --- docs/zh/components/container.md | 58 +++++++++++-------- src/components/core/d2-container/index.vue | 31 +--------- src/pages/dashboard/page.vue | 2 +- src/pages/demo/charts/index/index.vue | 2 +- .../demo/charts/list/bar/demo1/index.vue | 2 +- .../demo/charts/list/bar/demo2/index.vue | 2 +- .../demo/charts/list/bar/demo3/index.vue | 2 +- .../demo/charts/list/bar/demo4/index.vue | 2 +- .../demo/charts/list/bar/demo5/index.vue | 2 +- .../demo/charts/list/candle/demo1/index.vue | 2 +- .../demo/charts/list/candle/demo2/index.vue | 2 +- .../demo/charts/list/candle/demo3/index.vue | 2 +- .../demo/charts/list/funnel/demo1/index.vue | 2 +- .../demo/charts/list/funnel/demo2/index.vue | 2 +- .../demo/charts/list/gauge/demo1/index.vue | 2 +- .../demo/charts/list/heatmap/demo1/index.vue | 2 +- .../demo/charts/list/heatmap/demo2/index.vue | 2 +- .../charts/list/histogram/demo1/index.vue | 2 +- .../charts/list/histogram/demo2/index.vue | 2 +- .../charts/list/histogram/demo3/index.vue | 2 +- .../charts/list/histogram/demo4/index.vue | 2 +- .../charts/list/histogram/demo5/index.vue | 2 +- .../charts/list/histogram/demo6/index.vue | 2 +- .../demo/charts/list/line/demo1/index.vue | 2 +- .../demo/charts/list/line/demo2/index.vue | 2 +- .../demo/charts/list/line/demo3/index.vue | 2 +- .../demo/charts/list/line/demo4/index.vue | 2 +- .../demo/charts/list/line/demo5/index.vue | 2 +- .../demo/charts/list/map/demo1/index.vue | 2 +- .../demo/charts/list/map/demo2/index.vue | 2 +- .../demo/charts/list/map/demo3/index.vue | 2 +- .../demo/charts/list/pie/demo1/index.vue | 2 +- .../demo/charts/list/pie/demo2/index.vue | 2 +- .../demo/charts/list/pie/demo3/index.vue | 2 +- .../demo/charts/list/pie/demo4/index.vue | 2 +- .../demo/charts/list/pie/demo5/index.vue | 2 +- .../demo/charts/list/pie/demo6/index.vue | 2 +- .../demo/charts/list/radar/demo1/index.vue | 2 +- .../demo/charts/list/ring/demo1/index.vue | 2 +- .../demo/charts/list/ring/demo2/index.vue | 2 +- .../demo/charts/list/ring/demo3/index.vue | 2 +- .../demo/charts/list/ring/demo4/index.vue | 2 +- .../demo/charts/list/ring/demo5/index.vue | 2 +- .../demo/charts/list/sankey/demo1/index.vue | 2 +- .../demo/charts/list/scatter/demo1/index.vue | 2 +- .../demo/charts/list/scatter/demo2/index.vue | 2 +- .../demo/charts/list/tree/demo1/index.vue | 2 +- .../charts/list/waterfall/demo1/index.vue | 2 +- src/pages/demo/components/container/card.vue | 2 +- .../demo/components/container/full-bs.vue | 2 +- src/pages/demo/components/container/full.vue | 2 +- .../demo/components/container/md/doc-card.md | 4 +- .../components/container/md/doc-full-bs.md | 2 +- .../demo/components/container/md/doc-full.md | 2 +- src/pages/demo/components/index/index.vue | 2 +- src/pages/demo/element/basic-button/index.vue | 2 +- src/pages/demo/element/basic-color/index.vue | 2 +- .../demo/element/basic-container/index.vue | 2 +- src/pages/demo/element/basic-icon/index.vue | 2 +- src/pages/demo/element/basic-layout/index.vue | 2 +- .../demo/element/basic-typography/index.vue | 2 +- src/pages/demo/element/data-badge/index.vue | 2 +- .../demo/element/data-pagination/index.vue | 2 +- .../demo/element/data-progress/index.vue | 2 +- src/pages/demo/element/data-table/index.vue | 2 +- src/pages/demo/element/data-tag/index.vue | 2 +- src/pages/demo/element/data-tree/index.vue | 2 +- .../demo/element/form-cascader/index.vue | 2 +- .../demo/element/form-checkbox/index.vue | 2 +- .../demo/element/form-color-picker/index.vue | 2 +- .../demo/element/form-date-picker/index.vue | 2 +- .../element/form-datetime-picker/index.vue | 2 +- src/pages/demo/element/form-form/index.vue | 2 +- .../demo/element/form-input-number/index.vue | 2 +- .../form-input/index.vue.REMOVED.git-id | 2 +- src/pages/demo/element/form-radio/index.vue | 2 +- src/pages/demo/element/form-rate/index.vue | 2 +- src/pages/demo/element/form-select/index.vue | 2 +- src/pages/demo/element/form-slider/index.vue | 2 +- src/pages/demo/element/form-switch/index.vue | 2 +- .../demo/element/form-time-picker/index.vue | 2 +- .../demo/element/form-transfer/index.vue | 2 +- src/pages/demo/element/form-upload/index.vue | 2 +- src/pages/demo/element/index/index.vue | 2 +- .../element/navigation-breadcrumb/index.vue | 2 +- .../element/navigation-dropdown/index.vue | 2 +- .../demo/element/navigation-menu/index.vue | 2 +- .../demo/element/navigation-steps/index.vue | 2 +- .../demo/element/navigation-tabs/index.vue | 2 +- src/pages/demo/element/notice-alert/index.vue | 2 +- .../demo/element/notice-loading/index.vue | 2 +- .../demo/element/notice-message-box/index.vue | 2 +- .../demo/element/notice-message/index.vue | 2 +- .../element/notice-notification/index.vue | 2 +- src/pages/demo/element/others-card/index.vue | 2 +- .../demo/element/others-carousel/index.vue | 2 +- .../demo/element/others-collapse/index.vue | 2 +- .../demo/element/others-dialog/index.vue | 2 +- .../demo/element/others-popover/index.vue | 2 +- .../demo/element/others-tooltip/index.vue | 2 +- src/pages/demo/playground/index/index.vue | 2 +- src/pages/demo/playground/page-argu/get.vue | 2 +- src/pages/demo/playground/page-argu/send.vue | 2 +- src/pages/demo/playground/page-cache/off.vue | 2 +- src/pages/demo/playground/page-cache/on.vue | 2 +- src/pages/demo/plugins/better-scroll/to.vue | 2 +- src/pages/demo/plugins/day/index.vue | 2 +- src/pages/demo/plugins/index/index.vue | 2 +- 108 files changed, 142 insertions(+), 161 deletions(-) diff --git a/docs/zh/components/container.md b/docs/zh/components/container.md index 741eb7f9..396b6e08 100644 --- a/docs/zh/components/container.md +++ b/docs/zh/components/container.md @@ -6,13 +6,8 @@ | 参数名 | 介绍 | 必选 | 值类型 | 可选值 | 默认值 | | --- | --- | --- | --- | --- | --- | -| type | 容器类型 | 非 | String | card ghost full | card | +| type | 容器类型 | 非 | String | card ghost full | full | | scroll | 滚动优化 | 非 | Boolean | | false | -| responsive | 响应式宽度 | 非 | Boolean | | false | - -::: tip -`responsive` 参数设置只在 `type` 等于 `card` 或 `ghost` 时生效 -::: ## 使用方法 @@ -40,25 +35,6 @@ export default { ``` -### 基础页面容器 - -高度根据内容适应 - -``` vue - - 主体内容 - -``` - -使用 `slot` - -``` vue - - - 主体内容 - -``` - ### 自适应填充页面容器 无论内容高度多少,都会自动撑满页面,并有可选的 `header` 和 `footer` 插槽 @@ -101,6 +77,27 @@ export default { ``` +### 卡片型页面容器 + +高度根据内容适应 + +``` vue + + 主体内容 + +``` + +使用 `slot` + +> 卡片型容器只有 header 插槽 + +``` vue + + + 主体内容 + +``` + ### 隐形页面容器 不显示任何背景色和边框,通常这个模式只有在极少情况下会使用 @@ -111,4 +108,15 @@ export default { ``` +使用 `slot` + +> 隐形页面容器只有 header 插槽 + +``` vue + + + 主体内容 + +``` + 如果你不希望内容紧贴上边,可以在内容外层容器设置 `class="d2-mt"` diff --git a/src/components/core/d2-container/index.vue b/src/components/core/d2-container/index.vue index 0d6922ae..191d4cc1 100644 --- a/src/components/core/d2-container/index.vue +++ b/src/components/core/d2-container/index.vue @@ -1,5 +1,5 @@