From 5a5e07a0ce81d064038ece372e7e8844157a7d1b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 05 六月 2022 22:59:20 +0800
Subject: [PATCH] 2022-06-05
---
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index b5ae599..61b0c90 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -83,7 +83,18 @@
<div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
)
} else if (card.eleType === 'icon') {
- return (<MkIcon type={card.icon}/>)
+ 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)
+ }
+
+ let innerHeight = fontSize * lineHeight
+ return (<MkIcon style={{height: innerHeight}} className="ant-mk-icon" type={card.icon}/>)
} else if (card.eleType === 'slider') {
let val = card.value ? (card.value / card.maxValue) * 100 : 30
return <MkProgress value={val} config={card}/>
--
Gitblit v1.8.0