From aaa6ac0ea146ba9e26b1100b8be662b1d7ad8124 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 19 四月 2022 01:02:51 +0800 Subject: [PATCH] 2022-04-19 --- src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx index 8dd92c0..480b17c 100644 --- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx +++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx @@ -75,6 +75,10 @@ ) } else if (card.eleType === 'text' || card.eleType === 'number') { let val = `${card.prefix || ''}${card.datatype === 'static' ? (card.value || '') : (card.field || '')}${card.postfix || ''}` + if (card.fixStyle === 'alone') { + let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight} + val = <><span style={_s}>{card.prefix || ''}</span>{`${card.datatype === 'static' ? (card.value || '') : (card.field || '')}`}<span style={_s}>{card.postfix || ''}</span></> + } return ( <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div> ) @@ -142,15 +146,25 @@ </div> ) } else if (card.eleType === 'currentDate') { + let val = `${card.prefix || ''}${moment().format(card.dateFormat)}${card.postfix || ''}` + if (card.fixStyle === 'alone') { + let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight} + val = <><span style={_s}>{card.prefix || ''}</span>{moment().format(card.dateFormat)}<span style={_s}>{card.postfix || ''}</span></> + } return ( <div className="ant-mk-date"> - {`${card.prefix || ''}${moment().format(card.dateFormat)}${card.postfix || ''}`} + {val} </div> ) } else if (card.eleType === 'formula') { + let val = `${card.prefix || ''}${card.formula}${card.postfix || ''}` + if (card.fixStyle === 'alone') { + 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-date"> - {`${card.prefix || ''}${card.formula}${card.postfix || ''}`} + {val} </div> ) } -- Gitblit v1.8.0