From 9cfccf5bd28a860fad48fe74ad7ea49d8af40dec Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 03 十一月 2022 12:52:27 +0800
Subject: [PATCH] 2022-11-03
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 57 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 0fa2b24..a0eb57b 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -229,6 +229,12 @@
let contents = []
elements.forEach(card => {
+ let _style_ = null
+
+ if (card.style && card.style.clear === 'left') {
+ _style_ = {clear: 'left'}
+ }
+
if (card.eleType === 'sequence') {
let _style = {}
if (card.marks) {
@@ -241,7 +247,7 @@
_style = mark.style
}
contents.push(
- <Col key={card.uuid} span={card.width}>
+ <Col key={card.uuid} style={_style_} span={card.width}>
<div style={card.style}>
<div className="ant-mk-text line1" style={{height: card.innerHeight || 'auto'}}><span className="sequence-wrap" style={_style}>{data.$Index || ''}</span></div>
</div>
@@ -379,7 +385,7 @@
}
contents.push(
- <Col key={card.uuid} span={card.width}>
+ <Col key={card.uuid} style={_style_} span={card.width}>
<div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
<div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
</div>
@@ -446,7 +452,7 @@
}
contents.push(
- <Col key={card.uuid} span={card.width}>
+ <Col key={card.uuid} style={_style_} span={card.width}>
<div style={_style}>
<div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
</div>
@@ -484,7 +490,7 @@
}
contents.push(
- <Col key={card.uuid} span={card.width}>
+ <Col key={card.uuid} style={_style_} span={card.width}>
<div style={card.style}>
{val ? <Tooltip title={val}>
<MkIcon className="ant-mk-icon" style={{height: height}} type={icon}/>
@@ -514,7 +520,7 @@
}
contents.push(
- <Col key={card.uuid} span={card.width}>
+ <Col key={card.uuid} style={_style_} span={card.width}>
<div style={card.style}>
<MkProgress value={val} config={card} color={color}/>
</div>
@@ -565,7 +571,7 @@
let urls = url ? url.split(',').filter(Boolean) : ['']
urls.forEach((u, i) => {
- contents.push(<Col key={card.uuid + i} span={card.width}>
+ contents.push(<Col key={card.uuid + i} style={_style_} span={card.width}>
<div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
<MkPicture style={_imagestyle} scale={scale} url={u} urls={urls}/>
</div>
@@ -573,8 +579,10 @@
})
} else if (card.eleType === 'splitline') {
let _borderWidth = card.borderWidth === undefined ? 1 : card.borderWidth
+ _style_ = _style_ || {}
+ _style_.minHeight = _borderWidth
contents.push(
- <Col key={card.uuid} span={card.width} style={{minHeight: _borderWidth}}>
+ <Col key={card.uuid} span={card.width} style={_style_}>
<div style={card.style}>
<div className="ant-mk-splitline" style={{borderColor: card.color, borderWidth: _borderWidth}}></div>
</div>
@@ -594,7 +602,7 @@
}
contents.push(
- <Col key={card.uuid} span={card.width}>
+ <Col key={card.uuid} style={_style_} span={card.width}>
<div style={card.style}>
<div style={{height: card.innerHeight || 25}}>
{val ? <BarCode card={card} value={val}/> : null}
@@ -627,7 +635,7 @@
urls.forEach((u, i) => {
contents.push(
- <Col key={card.uuid + i} span={card.width}>
+ <Col key={card.uuid + i} style={_style_} span={card.width}>
<div className="video-wrap" style={card.style}>
<Video card={card} poster={poster} value={u}/>
</div>
@@ -648,7 +656,7 @@
}
contents.push(
- <Col key={card.uuid} span={card.width}>
+ <Col key={card.uuid} style={_style_} span={card.width}>
<div style={card.style}>
<div style={{minHeight: card.qrWidth || 50}}>
{val ? <QrCode card={card} value={val}/> : null}
@@ -667,7 +675,7 @@
}
contents.push(
- <Col key={card.uuid} span={card.width}>
+ <Col key={card.uuid} style={_style_} span={card.width}>
<div style={card.style}>
<div className="ant-mk-text line1" style={{height: card.innerHeight || 'auto'}}>{val}</div>
</div>
@@ -752,7 +760,7 @@
}
contents.push(
- <Col key={card.uuid} span={card.width}>
+ <Col key={card.uuid} style={_style_} span={card.width}>
<div style={_style}>
<div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
</div>
@@ -781,10 +789,15 @@
} else if (data.$$empty) {
_data = []
}
+
+ _style_ = _style_ || {}
+ if (card.wrapStyle) {
+ _style_ = {..._style_, ...card.wrapStyle}
+ }
if (['exec', 'prompt', 'pop', 'form'].includes(card.OpenType)) {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+ <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
<NormalButton
btn={card}
BID={data.$$BID}
@@ -798,7 +811,7 @@
)
} else if (card.OpenType === 'excelIn') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+ <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
<ExcelInButton
btn={card}
BID={data.$$BID}
@@ -811,7 +824,7 @@
)
} else if (card.OpenType === 'excelOut') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+ <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
<ExcelOutButton
btn={card}
BID={data.$$BID}
@@ -824,7 +837,7 @@
)
} else if (card.OpenType === 'popview') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+ <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
<PopupButton
btn={card}
BID={data.$$BID}
@@ -837,7 +850,7 @@
)
} else if (card.OpenType === 'tab') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+ <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
<TabButton
btn={card}
BID={data.$$BID}
@@ -849,7 +862,7 @@
)
} else if (card.OpenType === 'innerpage') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+ <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
<NewPageButton
btn={card}
BData={data.$$BData || ''}
@@ -861,7 +874,7 @@
} else if (card.OpenType === 'funcbutton') {
if (card.funcType === 'changeuser' || card.funcType === 'closetab') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+ <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
<ChangeUserButton
btn={card}
BID={data.$$BID}
@@ -874,7 +887,7 @@
)
} else if (card.funcType === 'print') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+ <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
<PrintButton
btn={card}
BID={data.$$BID}
@@ -887,7 +900,7 @@
)
} else if (card.funcType === 'megvii') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+ <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
<FuncMegvii
btn={card}
BID={data.$$BID}
@@ -899,7 +912,7 @@
)
} else if (card.funcType === 'filezip') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+ <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
<FuncZip
btn={card}
BID={data.$$BID}
--
Gitblit v1.8.0