From 40c6a6fac1ef45c175440515899a081d14fffb28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Tue, 8 Oct 2024 19:56:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=8D=A1=E7=89=87=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E7=BB=98=E5=88=B6=E4=B8=BA=E5=8D=A1=E7=89=87=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/data-view/data-view.scss | 29 +++++++++++----- src/control/data-view/data-view.tsx | 52 +++++++++++++++++++--------- 2 files changed, 57 insertions(+), 24 deletions(-) diff --git a/src/control/data-view/data-view.scss b/src/control/data-view/data-view.scss index 1f6b2d9c..4d3db9db 100644 --- a/src/control/data-view/data-view.scss +++ b/src/control/data-view/data-view.scss @@ -1,11 +1,14 @@ $control-dataview: (text-color: getCssVar(color, text, 0), - padding: rem(10px), - margin: getCssVar(spacing, base-tight) getCssVar(spacing, base), + item-padding: rem(10px), + padding: getCssVar(spacing, base-tight) getCssVar(spacing, base), card-margin:getCssVar(spacing, base-tight), + item-margin: calc( getCssVar(spacing, base, tight) / 2 ), ); @include b(control-dataview-item) { - padding: getCssVar(control-dataview, padding); + padding: getCssVar(control-dataview, item-padding); + // 主题缺失，后续补充 + box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.12) } @include b(control-dataview) { @@ -15,18 +18,28 @@ $control-dataview: (text-color: getCssVar(color, text, 0), --van-card-thumb-size: auto; - .van-list { + @include e(content) { display: flex; - flex-direction: column; + flex-wrap: wrap; height: 100%; - margin: getCssVar(control-dataview, margin); + width: 100%; + padding: getCssVar(control-dataview, padding); + overflow: hidden auto; - .van-cell { - padding: getCssVar(control-dataview, padding); + &>*{ + margin: getCssVar(control-dataview, item-margin); + flex: none; } } .van-card:not(:first-child) { margin-top: getCssVar(control-dataview, card-margin); } + + @include e(item-row) { + width: 100%; + } + @include e(item-col) { + margin: getCssVar(control-dataview, item-margin) 0; + } } \ No newline at end of file diff --git a/src/control/data-view/data-view.tsx b/src/control/data-view/data-view.tsx index d2ab62a2..d66fe9d9 100644 --- a/src/control/data-view/data-view.tsx +++ b/src/control/data-view/data-view.tsx @@ -82,6 +82,20 @@ export const DataViewControl = defineComponent({ ); }; + const renderDefaultItem = (item: IData) => { + return ( + c.onRowClick(item)} + > + {{ + footer: () => renderFooter(item), + }} + + ); + }; + // 绘制卡片 const renderCard = (item: IData) => { const model: IDEDataView = c.model; @@ -89,6 +103,7 @@ export const DataViewControl = defineComponent({ const findIndex = c.state.selectedData.findIndex(data => { return data.srfkey === item.srfkey; }); + const panel = props.modelData.itemLayoutPanel; const cardClass = [ns.b('item'), ns.is('active', findIndex !== -1)]; const cardStyle = {}; if (model.cardWidth) { @@ -102,23 +117,33 @@ export const DataViewControl = defineComponent({ }); } return ( - c.onRowClick(item)} > - {{ - footer: () => renderFooter(item), - }} - + {panel ? renderPanelItem(item, panel) : renderDefaultItem(item)} + ); }; const renderDefault = () => { - const panel = props.modelData.itemLayoutPanel; + const { cardColMD } = c.model; + if (cardColMD) { + return ( + + {c.state.items.map(item => { + return ( + + {renderCard(item)} + + ); + })} + + ); + } return c.state.items.map(item => { - return panel ? renderPanelItem(item, panel) : renderCard(item); + return renderCard(item); }); }; @@ -141,14 +166,9 @@ export const DataViewControl = defineComponent({ const renderMDContent = () => { const model: IDEDataView = c.model; return ( - c.loadMore()} - > +
{model.groupMode !== 'NONE' ? renderGroup() : renderDefault()} - +
); }; -- Gitee From 4d06fa89083f6c63c50122e80c007d532fc8a568 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Tue, 8 Oct 2024 19:57:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?style:=20=E4=BF=AE=E5=A4=8D=E5=A4=9A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E=E9=A1=B6=E9=83=A8=E6=B6=88?= =?UTF-8?q?=E5=A4=B1=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/list/md-ctrl/md-ctrl.scss | 13 ++++++++++++- .../view-content-panel-container.scss | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/control/list/md-ctrl/md-ctrl.scss b/src/control/list/md-ctrl/md-ctrl.scss index de10dd40..63504379 100644 --- a/src/control/list/md-ctrl/md-ctrl.scss +++ b/src/control/list/md-ctrl/md-ctrl.scss @@ -30,7 +30,6 @@ $control-mobmdctrl: ( .van-list { height: 100%; - overflow-y: auto; .van-cell { padding: getCssVar(control-mobmdctrl, padding); @@ -65,6 +64,18 @@ $control-mobmdctrl: ( @include m(right) { margin-right: getCssVar(control-mobmdctrl, right-icon-margin-right); } + + padding: 0.875rem 0; + &::after { + content: ''; + position: relative; + display: block; + bottom: -0.875rem; + left: 1rem; + height: rem(1px); + width: calc(100% - 2rem); + background-color: getCssVar(color, border); + } } @include b(control-mobmdctrl-image) { diff --git a/src/panel-component/view-content-panel-container/view-content-panel-container.scss b/src/panel-component/view-content-panel-container/view-content-panel-container.scss index 0879ec77..5b716f3b 100644 --- a/src/panel-component/view-content-panel-container/view-content-panel-container.scss +++ b/src/panel-component/view-content-panel-container/view-content-panel-container.scss @@ -6,6 +6,7 @@ $panel-component-view-content: ('margin': 0); height: 100%; margin-top: getCssVar('panel-component-view-content', 'margin'); overflow: visible; + background-color: getCssVar(view, bg, color); @include when(scroll) { overflow-y: auto; -- Gitee From 98ff27464601ccf5c0784046e55976508bc57f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E6=94=BF=E6=9D=83?= <1978141412@qq.com> Date: Tue, 8 Oct 2024 20:00:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e053620..3263a3e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,14 @@ - 添加富文本编辑器 +### Change + +- 卡片视图绘制为卡片样式 + +### Fixed + +- 修复多数据返回顶部消失异常 + ## [0.0.24] - 2024-09-29 ### Added -- Gitee