From a02fc6a77fa1b35c6516b2d37108d80e260c6c85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 十一月 2024 22:05:08 +0800
Subject: [PATCH] 2024-11-07
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 67 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 085f046..7b5fffe 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -256,6 +256,7 @@
Object.keys(data).forEach(key => {
if (/^\$/.test(key)) return
+ if (key === 'children') return
let reg = new RegExp('@' + key + '@', 'ig')
url = url.replace(reg, data[key])
})
@@ -960,35 +961,47 @@
val = ''
} else if (data) {
let _val = card.formula
-
- if (card.$keys && card.noValue === 'hide') { // 绌哄�奸殣钘�
- let _data = {}
- let empty = true
-
- Object.keys(data).forEach(key => {
- _data[key.toLowerCase()] = data[key]
- })
- _data.username = sessionStorage.getItem('User_Name') || ''
- _data.fullname = sessionStorage.getItem('Full_Name') || ''
- _data.bid = data.$$BID || ''
-
- card.$keys.forEach(key => {
- if (!_data.hasOwnProperty(key)) {
- empty = false
- } else if (_data[key] && !/^1949-10-01/.test(_data[key])) {
- empty = false
- }
- })
-
- if (empty) return null
- }
-
- if (/@username@|@fullName@|@bid@/ig.test(_val)) {
- _val = _val.replace(/@username@/ig, sessionStorage.getItem('User_Name') || '').replace(/@fullName@/ig, sessionStorage.getItem('Full_Name') || '').replace(/@bid@/ig, data.$$BID || '')
- }
+ let _data = {}
Object.keys(data).forEach(key => {
+ if (/^\$/.test(key)) return
+ if (key === 'children') return
+ if (/^1949-10-01/.test(data[key])) {
+ _data[key.toLowerCase()] = ''
+ } else {
+ _data[key.toLowerCase()] = data[key]
+ }
+ })
+ _data.username = sessionStorage.getItem('User_Name') || ''
+ _data.fullname = sessionStorage.getItem('Full_Name') || ''
+ _data.bid = data.$$BID || ''
+
+ if (card.eval === 'false' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (card.$keys) {
+ let empty = true
+
+ card.$keys.forEach(key => {
+ if (!_data.hasOwnProperty(key)) {
+ empty = false
+ } else if (_data[key]) {
+ empty = false
+ }
+ })
+
+ if (empty) return null
+ }
+
+ Object.keys(_data).forEach(key => {
+ if (_data[key]) return
+
+ _val = _val.replace(new RegExp('[^@]*@' + key + '@', 'ig'), '')
+ })
+
+ if (!_val) return null
+ }
+
+ Object.keys(_data).forEach(key => {
let reg = new RegExp('@' + key + '@', 'ig')
- _val = _val.replace(reg, data[key])
+ _val = _val.replace(reg, _data[key])
})
if (card.eval !== 'false') {
--
Gitblit v1.8.0