From 947d0ed1a628353f42ac4c2aa817a4579cdf126d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 05 十一月 2023 11:29:04 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 6e0c8a1..4f8747d 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -294,12 +294,13 @@
if (card.datatype === 'static') {
val = card.value || ''
- if (/@username@|@fullName@|@mk_city@|@bid@/ig.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(/@bid@/ig, 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)) {
@@ -813,7 +814,7 @@
val += _val
})
- } else if (data && data.$$empty) {
+ } else if (data && data.$$empty && /@.*@/.test(card.formula)) {
val = ''
} else if (data) {
let _val = card.formula
--
Gitblit v1.8.0