From 46aa44856bcb0e262d98918e06b4f83d2c11777a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 15 四月 2023 14:32:02 +0800
Subject: [PATCH] 2023-04-15
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 181 ++++++++++++++++++++++----------------------
1 files changed, 90 insertions(+), 91 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 89a6b8f..c1d3e1c 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -35,6 +35,37 @@
'10:1': '10%', '3:4': '133.33%', '2:3': '150%', '9:16': '177.78%'
}
+class TextCell extends Component {
+ componentDidMount() {
+ if (this.node && this.node.scrollHeight > this.node.offsetHeight) {
+ this.node.style.display = 'block'
+ }
+ }
+
+ componentDidUpdate() {
+ if (this.node) {
+ if (this.node.scrollHeight > this.node.offsetHeight) {
+ this.node.style.display = 'block'
+ } else {
+ this.node.style.display = 'flex'
+ }
+ }
+ }
+
+ render() {
+ const { card, className, value } = this.props
+
+ let lineStyle = {height: card.innerHeight}
+ lineStyle.display = 'flex'
+ lineStyle.alignItems = card.alignItems
+ lineStyle.justifyContent = card.style.textAlign || 'left'
+
+ return (
+ <div ref={ref => this.node = ref} className={className} style={lineStyle}>{value}</div>
+ )
+ }
+}
+
class CardCellComponent extends Component {
static propTpyes = {
cards: PropTypes.object, // 鑿滃崟閰嶇疆淇℃伅
@@ -249,15 +280,15 @@
className = mark.signType
}
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<div style={card.style}>
<div className={'ant-mk-text line1' + className} style={{height: card.innerHeight || 'auto'}}><span className="sequence-wrap" style={_style}>{data.$Index || ''}</span></div>
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'text') {
let val = ''
- let _style = card.style ? {...card.style} : {}
+ let _style = {...card.style}
if (card.datatype === 'static') {
val = card.value || ''
@@ -400,24 +431,18 @@
if (card.bgImage && data[card.bgImage]) {
_style.backgroundImage = `url('${data[card.bgImage]}')`
}
-
- let lineStyle = {height: card.innerHeight || 'auto'}
- if (card.alignItems) {
- lineStyle.display = 'flex'
- lineStyle.alignItems = card.alignItems
- lineStyle.justifyContent = _style.textAlign || 'left'
- }
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} 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 || '') + className} style={lineStyle}>{val}</div>
+ {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> :
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'number') {
let val = ''
- let _style = card.style ? {...card.style} : {}
+ let _style = {...card.style}
if (card.datatype === 'static') {
val = card.value
@@ -478,24 +503,17 @@
className = mark.signType
}
- let lineStyle = {height: card.innerHeight || 'auto'}
- if (card.alignItems) {
- lineStyle.display = 'flex'
- lineStyle.alignItems = card.alignItems
- lineStyle.justifyContent = _style.textAlign || 'left'
- }
-
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<div style={_style}>
- <div className={'ant-mk-text line' + (card.height || '') + className} style={lineStyle}>{val}</div>
+ {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> :
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'icon') {
let val = ''
let icon = ''
- let height = card.innerHeight
if (card.datatype === 'dynamic') {
icon = data[card.field] || ''
@@ -506,20 +524,6 @@
if (!icon && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
-
- if (!height) { // 鍏煎
- let fontSize = 14
- let lineHeight = 1.5
-
- if (card.style.fontSize) {
- fontSize = parseInt(card.style.fontSize)
- }
- if (card.style.lineHeight) {
- lineHeight = parseFloat(card.style.lineHeight)
- }
-
- height = fontSize * lineHeight
- }
if (data.hasOwnProperty(card.tooltip)) {
val = data[card.tooltip]
@@ -528,13 +532,13 @@
}
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} 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}/>
- </Tooltip> : <MkIcon className="ant-mk-icon" style={{height: height}} type={icon}/>}
+ <MkIcon className="ant-mk-icon" style={{height: card.innerHeight}} type={icon}/>
+ </Tooltip> : <MkIcon className="ant-mk-icon" style={{height: card.innerHeight}} type={icon}/>}
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'slider') {
let val = 0
@@ -558,15 +562,15 @@
}
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<div style={card.style}>
<MkProgress value={val} config={card} color={color}/>
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'picture') {
let _imagestyle = {}
- let _style = card.style ? {margin: '0 auto', ...card.style} : {}
+ let _style = {margin: '0 auto', ...card.style}
let url = ''
if (card.maxWidth) {
_style.maxWidth = card.maxWidth
@@ -610,22 +614,22 @@
let urls = url ? url.split(',').filter(Boolean) : ['']
urls.forEach((u, i) => {
- contents.push(<Col key={card.uuid + i} style={_style_} span={card.width}>
+ contents.push(<div className={'ant-col ant-col-' + card.width} 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>
- </Col>)
+ </div>)
})
} 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={_style_}>
+ <div className={'ant-col ant-col-' + card.width} 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>
- </Col>
+ </div>
)
} else if (card.eleType === 'barcode') {
let val = ''
@@ -641,13 +645,13 @@
}
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} 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}
</div>
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'video') {
let url = ''
@@ -674,11 +678,11 @@
urls.forEach((u, i) => {
contents.push(
- <Col key={card.uuid + i} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid + i} style={_style_} span={card.width}>
<div className="video-wrap" style={card.style}>
<Video card={card} poster={poster} value={u}/>
</div>
- </Col>
+ </div>
)
})
} else if (card.eleType === 'qrcode') {
@@ -695,13 +699,13 @@
}
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} 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}
</div>
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'currentDate') {
let val = moment().format(card.dateFormat || 'YYYY-MM-DD')
@@ -714,15 +718,15 @@
}
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} 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>
- </Col>
+ </div>
)
} else if (card.eleType === 'formula') {
let val = 0
- let _style = card.style ? {...card.style} : {}
+ let _style = {...card.style}
if (card.$sync) {
if (card.eval === 'false') {
@@ -804,19 +808,13 @@
className = mark.signType
}
- let lineStyle = {height: card.innerHeight || 'auto'}
- if (card.alignItems) {
- lineStyle.display = 'flex'
- lineStyle.alignItems = card.alignItems
- lineStyle.justifyContent = _style.textAlign || 'left'
- }
-
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<div style={_style}>
- <div className={'ant-mk-text line' + (card.height || '') + className} style={lineStyle}>{val}</div>
+ {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> :
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'color') {
let color = ''
@@ -844,7 +842,7 @@
}
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<div className="ant-mk-color" style={card.style}>
<div style={_bgstyle} onClick={(e) => {
if (card.copyable === 'true') {
@@ -861,7 +859,7 @@
}
}}></div>
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'button') {
let _disabled = data.$disabled
@@ -882,7 +880,7 @@
if (['exec', 'prompt', 'pop', 'form'].includes(card.OpenType)) {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<NormalButton
btn={card}
BID={data.$$BID}
@@ -892,11 +890,11 @@
columns={cards.columns}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'excelIn') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<ExcelInButton
btn={card}
BID={data.$$BID}
@@ -905,11 +903,11 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'excelOut') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<ExcelOutButton
btn={card}
BID={data.$$BID}
@@ -918,11 +916,11 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'popview') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<PopupButton
btn={card}
BID={data.$$BID}
@@ -931,11 +929,11 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'tab') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<TabButton
btn={card}
BID={data.$$BID}
@@ -943,23 +941,23 @@
disabled={_disabled}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'innerpage') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<NewPageButton
btn={card}
BData={data.$$BData || ''}
disabled={_disabled}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'funcbutton') {
if (card.funcType === 'changeuser' || card.funcType === 'closetab') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<ChangeUserButton
btn={card}
BID={data.$$BID}
@@ -968,11 +966,11 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.funcType === 'print') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<PrintButton
btn={card}
BID={data.$$BID}
@@ -982,11 +980,11 @@
columns={cards.columns}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.funcType === 'megvii') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<FuncMegvii
btn={card}
BID={data.$$BID}
@@ -994,11 +992,11 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.funcType === 'filezip') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<FuncZip
btn={card}
BID={data.$$BID}
@@ -1006,7 +1004,7 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
}
}
@@ -1022,6 +1020,7 @@
return (
<div className={'card-cell-list ' + (cardCell && cardCell.setting && cardCell.setting.layout === 'flex' ? 'mk-flex' : '')}>
{this.getContent()}
+ <Col style={{display: 'none'}} span={24}></Col>
</div>
)
}
--
Gitblit v1.8.0