From 41308b8a2788df7ed6225414c163f8611c7e8f69 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 16 九月 2022 10:25:32 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index ffe27b5..b5ebd9f 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -243,7 +243,7 @@
contents.push(
<Col key={card.uuid} span={card.width}>
<div style={card.style}>
- <div className="ant-mk-text"><span className="sequence-wrap" style={_style}>{data.$Index || ''}</span></div>
+ <div className="ant-mk-text line1" style={{height: card.innerHeight || 'auto'}}><span className="sequence-wrap" style={_style}>{data.$Index || ''}</span></div>
</div>
</Col>
)
@@ -454,6 +454,21 @@
)
} else if (card.eleType === 'icon') {
let val = ''
+ let height = card.innerHeight
+
+ 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 (card.datatype === 'static') {
val = card.tooltip
@@ -465,8 +480,8 @@
<Col key={card.uuid} span={card.width}>
<div style={card.style}>
{val ? <Tooltip title={val}>
- <MkIcon className="ant-mk-icon" style={{height: card.innerHeight || 'auto'}} type={card.icon}/>
- </Tooltip> : <MkIcon className="ant-mk-icon" style={{height: card.innerHeight || 'auto'}} type={card.icon}/>}
+ <MkIcon className="ant-mk-icon" style={{height: height}} type={card.icon}/>
+ </Tooltip> : <MkIcon className="ant-mk-icon" style={{height: height}} type={card.icon}/>}
</div>
</Col>
)
@@ -660,8 +675,8 @@
contents.push(
<Col key={card.uuid} span={card.width}>
- <div className="ant-mk-date" style={card.style}>
- {val}
+ <div style={card.style}>
+ <div className="ant-mk-text line1" style={{height: card.innerHeight || 'auto'}}>{val}</div>
</div>
</Col>
)
--
Gitblit v1.8.0