From 8cec010d47fa9cb9c7684f4c84dd31cfe20e7527 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 18 四月 2025 16:41:43 +0800
Subject: [PATCH] 2025-04-18
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 105 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 90 insertions(+), 15 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index ba48a45..49368fc 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -109,8 +109,11 @@
$BID: data.$$uuid || ''
}
- if (card.field) {
- __param.$searchkey = card.field.toLowerCase()
+ if (card.tsField) {
+ __param.$searchkey = card.tsField
+ __param.$searchval = data[card.tsField] || ''
+ } else if (card.field) {
+ __param.$searchkey = card.field
__param.$searchval = data[card.field] || ''
}
@@ -224,9 +227,17 @@
// })
// return
// }
-
- if (/^http.+(.txt|.doc|.docx|.pdf|.xlsx|.xls|.zip|.rar|.ppt)$/i.test(url)) {
- let name = url.replace(/.+\//g, '').replace(/\.{1}[^.]*$/g, '')
+
+ if (/^(http|\/\/).+(.txt|.doc|.docx|.pdf|.xlsx|.xls|.zip|.rar|.ppt)$/i.test(url) || card.linkType === 'download') {
+ let name = ''
+ if (card.datatype === 'static') {
+ name = card.value || ''
+ } else if (data.hasOwnProperty(card.field)) {
+ name = data[card.field] + ''
+ }
+ name = name.replace(/\.{1}[^.]*$/g, '')
+ name = name ? name + url.replace(/.+\./g, '.') : ''
+
let d = document.createElement('a')
d.href = url
d.setAttribute('download', name)
@@ -257,6 +268,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])
})
@@ -364,8 +376,19 @@
})())
}
}
+
+ if (card.noVField) {
+ if (!data[card.noVField]) {
+ val = ''
+ } else if (card.noVExtra && new RegExp('^(' + card.noVExtra.split(',').join('|') + ')$', 'ig').test(data[card.noVField])) {
+ val = ''
+ }
+ }
} else if (data.hasOwnProperty(card.field)) {
val = data[card.field] + ''
+ if (card.noVExtra && val && new RegExp('^(' + card.noVExtra.split(',').join('|') + ')$', 'ig').test(val)) {
+ val = ''
+ }
}
if (val && card.format && card.format !== 'encryption') {
@@ -442,7 +465,7 @@
url = data[card.linkurl]
}
- if (/^http.+(.txt|.doc|.docx|.pdf|.xlsx|.xls|.zip|.rar)$/i.test(url)) {
+ if (/^(http|\/\/).+(.txt|.doc|.docx|.pdf|.xlsx|.xls|.zip|.rar)$/i.test(url)) {
if (/pdf$/i.test(url)) {
val = <><img src="./media/pdf.png" className="file-image" alt=""/> {val}</>
} else if (/(.doc|.docx)$/i.test(url)) {
@@ -554,6 +577,9 @@
}
if (card.format === 'percent') {
val = val * 100
+ if (!card.round) {
+ val = +val.toFixed(2)
+ }
} else if (card.format === 'abs') {
val = Math.abs(val)
}
@@ -645,10 +671,21 @@
}
}
+ let _style = {...card.style}
+
+ if (card.marks) {
+ let _s = {}
+ getMark(card.marks, data, _s)
+
+ if (_s.color) {
+ _style.color = _s.color
+ }
+ }
+
if (card.tipType === 'text') {
contents.push(
<div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <div style={card.style}>
+ <div style={_style}>
{val ? <Tooltip title={val}>
<div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}}>{icon}</div>
</Tooltip> : <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}}>{icon}</div>}
@@ -658,7 +695,7 @@
} else {
contents.push(
<div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <div style={card.style}>
+ <div style={_style}>
{val ? <Tooltip title={val}>
<MkIcon className="ant-mk-icon" style={{height: card.innerHeight}} type={icon}/>
</Tooltip> : <MkIcon className="ant-mk-icon" style={{height: card.innerHeight}} type={icon}/>}
@@ -713,6 +750,7 @@
}
} else {
url = data[card.field] || ''
+ url = url.replace(/@mywebsite@\//ig, window.GLOB.baseurl)
}
if (url === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
@@ -944,7 +982,7 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
- console.info(_val)
+ window.mkInfo(_val)
console.warn(e)
_val = 0
}
@@ -958,12 +996,49 @@
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 || '')
- }
+ 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 if (/\d{4}-\d{2}-\d{2}\s00:00:00/.test(data[key])) {
+ _data[key.toLowerCase()] = data[key].replace(/\s00:00:00/g, '')
+ } 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') {
@@ -971,7 +1046,7 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
- console.info(_val)
+ window.mkInfo(_val)
console.warn(e)
_val = ''
}
@@ -992,7 +1067,7 @@
if (val !== '') {
if (val && typeof(val) === 'string') {
if (!card.evalchars || card.evalchars.includes('enter')) {
- val = val.replace(/\n/ig, '<br/>')
+ val = val.replace(/\\n|\n/ig, '<br/>')
}
if ((!card.evalchars || card.evalchars.includes('space')) && !/<(span|div|p|a|img)\s/g.test(val)) {
val = val.replace(/\s/ig, ' ')
--
Gitblit v1.8.0