From 944730f2794b87aa053f53084f0d082d4af6fd41 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 29 十月 2020 19:03:30 +0800
Subject: [PATCH] 2020-10-29
---
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index 8f39701..78676b6 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -40,7 +40,14 @@
const getContent = () => {
if (card.eleType === 'text' || card.eleType === 'number') {
let val = `${card.prefix || ''}${card.datatype === 'static' ? (card.value || '') : (card.field || '')}${card.postfix || ''}`
- return val
+ return (
+ <div className={'ant-mk-text line' + card.height} style={{height: card.innerHeight || 21}}>{val}</div>
+ )
+ } else if (card.eleType === 'link') {
+ let val = card.label || card.value || card.field
+ return (
+ <div className={'ant-mk-text line' + card.height} style={{height: card.innerHeight || 21}}>{val}</div>
+ )
} else if (card.eleType === 'icon') {
return (<Icon type={card.icon}/>)
} else if (card.eleType === 'slider') {
@@ -65,8 +72,8 @@
_imagestyle = {backgroundImage: `url('${demos[index]}')`}
}
- if (card.radius === 'true') {
- _imagestyle.borderRadius = '50%'
+ if (card.style && card.style.borderRadius) {
+ _imagestyle.borderRadius = card.style.borderRadius
}
if (card.lenWidRadio === '16:9') {
@@ -84,7 +91,9 @@
)
} else if (card.eleType === 'splitline') {
return (
- <div className="ant-mk-splitline" style={{backgroundColor: card.color}}></div>
+ <div style={{paddingTop: '1px'}}>
+ <div className="ant-mk-splitline" style={{borderColor: card.color}}></div>
+ </div>
)
}
}
--
Gitblit v1.8.0