From 50b49c1b760489c3430fc382656d57c5fbbab07c Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 29 四月 2024 16:07:24 +0800 Subject: [PATCH] 2024-04-29 --- src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx index 7395d2a..abe02a7 100644 --- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx +++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx @@ -59,7 +59,7 @@ let _style = {opacity: isDragging ? 0.3 : 1} - if (card.style) { + if (card.style && card.eleType !== 'tag') { _style = {...card.style, opacity: isDragging ? 0.3 : 1} _style = resetStyle(_style) } @@ -184,11 +184,27 @@ let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight} val = <><span style={_s}>{card.prefix || ''}</span>{card.formula}<span style={_s}>{card.postfix || ''}</span></> } + return ( <div className="ant-mk-text" style={{height: card.innerHeight || 'auto'}}> {val} </div> ) + } else if (card.eleType === 'tag') { + let vals = [] + if (card.datatype === 'static') { + vals = card.value.split(',').filter(Boolean) + } else { + vals = [card.field || ''] + } + + let _style = resetStyle(card.style) + + return ( + <div className="ant-mk-tag"> + {vals.map((val, index) => <span key={index} className="tag-item" style={_style}>{val}</span>)} + </div> + ) } else if (card.eleType === 'color') { _style.overflow = 'hidden' let _bgstyle = {backgroundColor: card.value || '#1890ff'} -- Gitblit v1.8.0