From 238987f2d0765dd5d7f5978ed71793632c4eff5f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 12 七月 2023 12:06:49 +0800
Subject: [PATCH] 2023-07-12
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index 422b892..08f6dd9 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -93,6 +93,14 @@
}
}
+ if (item.style.clear === 'left') {
+ item.wStyle = {clear: 'left'}
+ } else if (item.style.clear === 'right') {
+ item.wStyle = {float: 'right'}
+ }
+
+ delete item.style.clear
+
if (item.$cardType !== 'extendCard') {
_card = item
} else if (!_card) {
@@ -1038,7 +1046,7 @@
<div className={`data-zoom ${config.wrap.wrapClass}`} style={config.wrap.minWidth ? {minWidth: config.wrap.minWidth} : null}>
<Row className={'card-row-list '}>
{precards.map((item, index) => (
- <Col key={'pre' + index} className="extend-card" span={item.setting.width || 6}>
+ <Col key={'pre' + index} className="extend-card" style={item.wStyle} span={item.setting.width || 6}>
{item.setting.cardRole === 'header' ? <TableHeader card={item} data={extendData} refresh={this.refreshByHeader}>
{item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
</TableHeader> : <CardItem card={item} cards={config} data={extendData}>
@@ -1070,7 +1078,7 @@
}
return (
- <Col key={index} span={card.setting.width}>
+ <Col key={index} span={card.setting.width} style={card.wStyle}>
<div className={className} style={wrapStyle}>
<CardItem card={card} cards={config} data={item} onDoubleClick={() => this.onDoubleClick(index, subClass)} onClick={() => {this.changeCard(index, item, subClass)}}>
<span className="circle-select"></span>
@@ -1087,7 +1095,7 @@
)
})}
{nextcards.map((item, index) => (
- <Col key={'next' + index} className="extend-card" span={item.setting.width || 6}>
+ <Col key={'next' + index} className="extend-card" style={item.wStyle} span={item.setting.width || 6}>
{item.setting.cardRole === 'header' ? <TableHeader card={item} data={extendData} refresh={this.refreshByHeader}>
{item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
</TableHeader> : <CardItem card={item} cards={config} data={extendData}>
--
Gitblit v1.8.0