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/tabviews/custom/components/card/cardcellList/index.jsx | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 64352f0..4b3f375 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -290,7 +290,12 @@
}
if (val !== '') {
- val = `${card.prefix || ''}${val}${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>{val}<span style={_s}>{card.postfix || ''}</span></>
+ } else {
+ val = `${card.prefix || ''}${val}${card.postfix || ''}`
+ }
}
if (card.marks) {
@@ -366,7 +371,12 @@
}
if (val !== '') {
- val = `${card.prefix || ''}${val}${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>{val}<span style={_s}>{card.postfix || ''}</span></>
+ } else {
+ val = `${card.prefix || ''}${val}${card.postfix || ''}`
+ }
}
if (card.marks) {
@@ -575,10 +585,20 @@
</Col>
)
} else if (card.eleType === 'currentDate') {
+ let val = card.dateFormat ? moment().format(card.dateFormat) : ''
+ if (val !== '') {
+ 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>{val}<span style={_s}>{card.postfix || ''}</span></>
+ } else {
+ val = `${card.prefix || ''}${val}${card.postfix || ''}`
+ }
+ }
+
return (
<Col key={card.uuid} span={card.width}>
<div className="ant-mk-date" style={card.style}>
- {card.dateFormat ? `${card.prefix || ''}${moment().format(card.dateFormat)}${card.postfix || ''}` : null}
+ {val}
</div>
</Col>
)
@@ -628,12 +648,22 @@
val = _val === undefined ? '' : _val
}
+ if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ return null
+ }
+
if (val !== '') {
- val = `${card.prefix || ''}${val}${card.postfix || ''}`
- if (card.eval === 'false') {
+ if (val && typeof(val) === 'string') {
val = val.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
val = <span dangerouslySetInnerHTML={{__html: val}}></span>
}
+
+ 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>{val}<span style={_s}>{card.postfix || ''}</span></>
+ } else {
+ val = `${card.prefix || ''}${val}${card.postfix || ''}`
+ }
}
if (card.marks) {
--
Gitblit v1.8.0