From 526d2be8959e6e99c1afd31cf213f0f1e7a56a8b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 四月 2022 15:43:58 +0800
Subject: [PATCH] 2022-04-26
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 4b3f375..de5702b 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -585,14 +585,13 @@
</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 || ''}`
- }
+ let val = moment().format(card.dateFormat || 'YYYY-MM-DD')
+
+ 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 (
--
Gitblit v1.8.0