From 88678527a0fc4c8cf07c142800aa2ea9646fc67c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 02 十二月 2023 20:47:05 +0800
Subject: [PATCH] 2023-12-02
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 63 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 2cecc45..5535c30 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -305,39 +305,39 @@
if (card.datatype === 'static') {
val = card.value || ''
- if (/@username@|@fullName@|@mk_city@|@appname@|@bid@/ig.test(val)) {
- let userName = sessionStorage.getItem('User_Name') || ''
- let fullName = sessionStorage.getItem('Full_Name') || ''
- let city = sessionStorage.getItem('city') || ''
- let appname = sessionStorage.getItem('appname') || ''
- let bid = data.$$BID || ''
- val = val.replace(/@username@/ig, userName).replace(/@fullName@/ig, fullName).replace(/@mk_city@/ig, city).replace(/@appname@/ig, appname).replace(/@bid@/ig, bid)
- } else if (/@month@/ig.test(val)) {
- val = val.replace(/@month@/ig, new Date().toLocaleString('en-US', { month: 'long' }))
- } else if (/@week@/ig.test(val)) {
- val = val.replace(/@week@/ig, (() => {
- let day = new Date().getDay()
- let weeks = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�']
- return weeks[day]
- })())
- } else if (/@day@/ig.test(val)) {
- val = val.replace(/@day@/ig, (() => {
- let day = new Date().getDate()
- return day < 10 ? '0' + day : day
- })())
+ if (/@.+@/g.test(val)) {
+ if (/@username@|@fullName@|@mk_city@|@appname@|@bid@/ig.test(val)) {
+ let userName = sessionStorage.getItem('User_Name') || ''
+ let fullName = sessionStorage.getItem('Full_Name') || ''
+ let city = sessionStorage.getItem('city') || ''
+ let appname = sessionStorage.getItem('appname') || ''
+ let bid = data.$$BID || ''
+ val = val.replace(/@username@/ig, userName).replace(/@fullName@/ig, fullName).replace(/@mk_city@/ig, city).replace(/@appname@/ig, appname).replace(/@bid@/ig, bid)
+ } else if (/@month@/ig.test(val)) {
+ val = val.replace(/@month@/ig, new Date().toLocaleString('en-US', { month: 'long' }))
+ } else if (/@week@/ig.test(val)) {
+ val = val.replace(/@week@/ig, (() => {
+ let day = new Date().getDay()
+ let weeks = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�']
+ return weeks[day]
+ })())
+ } else if (/@day@/ig.test(val)) {
+ val = val.replace(/@day@/ig, (() => {
+ let day = new Date().getDate()
+ return day < 10 ? '0' + day : day
+ })())
+ }
}
} else if (data.hasOwnProperty(card.field)) {
- val = data[card.field]
+ val = data[card.field] + ''
}
- if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
- return null
- }
-
- if (val !== '' && card.format) {
+ if (val && card.format && card.format !== 'encryption') {
let _val = null
- if (card.format === 'calendar1') {
+ if (val < '1949-10-02') {
+ val = ''
+ } else if (card.format === 'calendar1') {
_val = moment(val).calendar(null, {
sameDay: '[浠婂ぉ] ahh:mm',
nextDay: '[鏄庡ぉ] ahh:mm',
@@ -384,14 +384,15 @@
} else {
_val = moment(val).format(card.format)
}
-
- // if (card.format === 'YYYY-MM-DD' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1])/.test(val)) {
- // val = `${val.substr(0, 4)}-${val.substr(5, 2)}-${val.substr(8, 2)}`
- // }
+
if (_val && _val !== 'Invalid date') {
val = _val
}
}
+
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ return null
+ }
if (val !== '') {
let orival = val
--
Gitblit v1.8.0