From a9b02f6862522b54d0824152017bf2acfec2af7b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 21 三月 2024 10:29:50 +0800
Subject: [PATCH] 2024-03-21
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index d551b2b..8a38647 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -110,7 +110,7 @@
}
if (card.field) {
- __param.$searchkey = card.field
+ __param.$searchkey = card.field.toLowerCase()
__param.$searchval = data[card.field] || ''
}
@@ -867,9 +867,14 @@
_data = [data]
}
+ let _val = card.formula
+ 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 || '')
+ }
+
try {
// eslint-disable-next-line
- let func = new Function('data', card.formula)
+ let func = new Function('data', _val)
val = func(_data)
} catch (e) {
console.warn(e)
@@ -904,6 +909,9 @@
val = ''
} else if (data) {
let _val = card.formula
+ 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 || '')
+ }
Object.keys(data).forEach(key => {
let reg = new RegExp('@' + key + '@', 'ig')
_val = _val.replace(reg, data[key])
@@ -1051,6 +1059,10 @@
} else if (data.$$empty) {
_data = []
}
+ let name = ''
+ if (card.showName) {
+ name = data[card.showName] || ' '
+ }
_style_ = _style_ || {}
if (card.wrapStyle) {
@@ -1062,6 +1074,7 @@
if (['exec', 'prompt', 'pop', 'form'].includes(card.OpenType)) {
MkButton = <NormalButton
btn={card}
+ name={name}
BID={data.$$BID}
BData={data.$$BData || ''}
disabled={_disabled}
@@ -1090,6 +1103,7 @@
} else if (card.OpenType === 'popview') {
MkButton = <PopupButton
btn={card}
+ name={name}
BID={data.$$BID}
BData={data.$$BData || ''}
disabled={_disabled}
@@ -1099,6 +1113,7 @@
} else if (card.OpenType === 'tab') {
MkButton = <TabButton
btn={card}
+ name={name}
BID={data.$$BID}
BData={data.$$BData || ''}
disabled={_disabled}
@@ -1107,6 +1122,7 @@
} else if (card.OpenType === 'innerpage') {
MkButton = <NewPageButton
btn={card}
+ name={name}
BID={data.$$BID}
BData={data.$$BData || ''}
disabled={_disabled}
--
Gitblit v1.8.0