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 | 311 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 253 insertions(+), 58 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 8a38647..49368fc 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -25,7 +25,7 @@
const FuncMegvii = asyncComponent(() => import('@/tabviews/zshare/actionList/funcMegvii'))
const FuncZip = asyncComponent(() => import('@/tabviews/zshare/actionList/funczip'))
const ExportPdf = asyncComponent(() => import('@/tabviews/zshare/actionList/exportPdf'))
-const ShareLink = asyncComponent(() => import('@/tabviews/zshare/actionList/shareLink'))
+const FuncButton = asyncComponent(() => import('@/tabviews/zshare/actionList/funcbutton'))
const EditLine = asyncComponent(() => import('@/tabviews/zshare/actionList/editLine'))
const BarCode = asyncComponent(() => import('@/components/barcode'))
const QrCode = asyncComponent(() => import('@/components/qrcode'))
@@ -106,24 +106,22 @@
if (card.linkType === 'linkmenu') {
if (card.linkThdMenu) {
let __param = {
- $BID: data.$$uuid
+ $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] || ''
}
- if (card.joint === 'true' && card.linkThdMenu.urlFields) {
- let lower = {}
- Object.keys(data).forEach(key => {
- lower[key.toLowerCase()] = data[key]
- })
-
- card.linkThdMenu.urlFields.split(',').forEach(field => {
- __param[field] = lower[field.toLowerCase()] || ''
- })
- }
+ Object.keys(data).forEach(key => {
+ if (/^\$/.test(key)) return
+ if (key === 'children') return
+ __param[key] = data[key]
+ })
let tabmenu = card.linkThdMenu
@@ -229,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)
@@ -240,15 +246,13 @@
d.click()
d.remove()
} else {
+ let Id = data.$$uuid || ''
+
+ if (cards.subtype === 'propcard' && cardCell) {
+ Id = cardCell.setting.primaryId || ''
+ }
+
if (card.joint === 'true') {
- let Id = ''
-
- if (cards.subtype === 'propcard' && cardCell) {
- Id = cardCell.setting.primaryId || ''
- } else {
- Id = data[cards.setting.primaryKey] || ''
- }
-
let con = '?'
if (/\?/ig.test(url)) {
@@ -256,6 +260,18 @@
}
url = url + `${con}id=${Id}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
+ } else if (/@/.test(url)) {
+ url = url.replace(/@id@/ig, Id)
+ url = url.replace(/@appkey@/ig, window.GLOB.appkey)
+ url = url.replace(/@userid@/ig, sessionStorage.getItem('UserID'))
+ url = url.replace(/@LoginUID@/ig, sessionStorage.getItem('LoginUID'))
+
+ 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])
+ })
}
window.open(url)
@@ -360,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') {
@@ -438,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)) {
@@ -550,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)
}
@@ -641,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>}
@@ -654,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}/>}
@@ -709,6 +750,7 @@
}
} else {
url = data[card.field] || ''
+ url = url.replace(/@mywebsite@\//ig, window.GLOB.baseurl)
}
if (url === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
@@ -880,6 +922,51 @@
console.warn(e)
val = ''
}
+
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ return null
+ } else if (typeof(val) === 'object' && val.type === 'linkmenu') {
+ // type: 'linkmenu', linkThdMenu: null, menuId: '', value: ``, defaultValue: '', onclick: 'inner'
+ let item = {linkType: 'linkmenu', linkThdMenu: val.linkThdMenu}
+ let _val_ = val.value || ''
+
+ if (!item.linkThdMenu && val.menuId) {
+ item.linkThdMenu = window.GLOB.mkThdMenus.get(val.menuId) || ''
+ }
+ if (!item.linkThdMenu && val.defaultValue) {
+ _val_ = val.defaultValue
+ }
+
+ if (val.onclick === 'inner') {
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style}>
+ <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}}>
+ <span onClick={(e) => {this.openNewView(e, item)}} dangerouslySetInnerHTML={{__html: _val_}}></span>
+ </div>
+ </div>
+ </div>
+ )
+ } else {
+ _style.cursor = 'pointer'
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style} onClick={(e) => {this.openNewView(e, item)}}>
+ <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}} dangerouslySetInnerHTML={{__html: _val_}}></div>
+ </div>
+ </div>
+ )
+ }
+ } else {
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style}>
+ <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}} dangerouslySetInnerHTML={{__html: val}}></div>
+ </div>
+ </div>
+ )
+ }
+ return
} else if (card.$sync) {
if (card.eval === 'false') {
val = ''
@@ -895,7 +982,7 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
- console.info(_val)
+ window.mkInfo(_val)
console.warn(e)
_val = 0
}
@@ -909,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') {
@@ -922,7 +1046,7 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
- console.info(_val)
+ window.mkInfo(_val)
console.warn(e)
_val = ''
}
@@ -933,15 +1057,6 @@
if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
- } else if (card.eval === 'func') {
- contents.push(
- <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <div style={_style}>
- <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}} dangerouslySetInnerHTML={{__html: val}}></div>
- </div>
- </div>
- )
- return
}
if (card.round && typeof(val) === 'number') {
@@ -951,8 +1066,10 @@
if (val !== '') {
if (val && typeof(val) === 'string') {
- val = val.replace(/\n/ig, '<br/>')
- if (!/<(span|div|p|a|img)\s/g.test(val)) {
+ if (!card.evalchars || card.evalchars.includes('enter')) {
+ 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, ' ')
}
@@ -992,14 +1109,76 @@
className = mark.signType
}
- contents.push(
- <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <div style={_style}>
- {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> :
- <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
+ if (card.link && !data.$disabled) {
+ _style.cursor = 'pointer'
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
+ {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> :
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
+ </div>
</div>
- </div>
- )
+ )
+ } else {
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style}>
+ {card.alignItems ? <TextCell card={card} className={'ant-mk-text line' + (card.height || '') + className} value={val}/> :
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={{height: card.innerHeight}}>{val}</div>}
+ </div>
+ </div>
+ )
+ }
+ } else if (card.eleType === 'tag') {
+ let vals = ''
+
+ if (card.datatype === 'static') {
+ vals = card.value
+ } else {
+ vals = data[card.field] || ''
+ }
+
+ if (!vals && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ return null
+ }
+
+ vals = vals.split(',').filter(Boolean)
+
+ if (card.signs) {
+ vals = vals.map(val => {
+ let sign = card.signs.filter(s => s.value === val)[0]
+ let cell = {value: val, style: {...card.style}}
+
+ if (sign) {
+ cell.style.backgroundColor = sign.background
+ cell.style.color = sign.color
+ cell.style.borderColor = sign.border
+
+ // delete cell.style.borderTopColor
+ // delete cell.style.borderBottomColor
+ // delete cell.style.borderLeftColor
+ // delete cell.style.borderRightColor
+ }
+
+ return cell
+ })
+
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div className="ant-mk-tag">
+ {vals.map((item, index) => <span key={index} className="tag-item" style={item.style}>{item.value}</span>)}
+ </div>
+ </div>
+ )
+ } else {
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div className="ant-mk-tag">
+ {vals.map((val, index) => <span key={index} className="tag-item" style={card.style}>{val}</span>)}
+ </div>
+ </div>
+ )
+ }
} else if (card.eleType === 'color') {
let color = ''
@@ -1070,12 +1249,14 @@
}
let MkButton = null
+ let lid = (data.$$uuid || '') + (data.$Index || '')
if (['exec', 'prompt', 'pop', 'form'].includes(card.OpenType)) {
MkButton = <NormalButton
btn={card}
name={name}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1086,6 +1267,7 @@
MkButton = <ExcelInButton
btn={card}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1095,6 +1277,7 @@
MkButton = <ExcelOutButton
btn={card}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1105,6 +1288,7 @@
btn={card}
name={name}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1115,6 +1299,7 @@
btn={card}
name={name}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
selectedData={_data}
@@ -1124,6 +1309,8 @@
btn={card}
name={name}
BID={data.$$BID}
+ LID={lid}
+ columns={cards.columns}
BData={data.$$BData || ''}
disabled={_disabled}
selectedData={_data}
@@ -1133,6 +1320,7 @@
MkButton = <ChangeUserButton
btn={card}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1142,6 +1330,7 @@
MkButton = <PrintButton
btn={card}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1152,6 +1341,7 @@
MkButton = <FuncMegvii
btn={card}
BID={data.$$BID}
+ LID={lid}
disabled={_disabled}
setting={cards.setting}
selectedData={_data}
@@ -1160,6 +1350,7 @@
MkButton = <FuncZip
btn={card}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1168,12 +1359,7 @@
} else if (card.funcType === 'expPdf') {
MkButton = <ExportPdf
btn={card}
- />
- } else if (card.funcType === 'shareLink') {
- MkButton = <ShareLink
- BID={data.$$BID}
- btn={card}
- selectedData={_data}
+ LID={lid}
/>
} else if (card.funcType === 'addline' || card.funcType === 'delline') {
MkButton = <EditLine
@@ -1181,6 +1367,15 @@
disabled={_disabled}
selectedData={_data}
/>
+ } else {
+ MkButton = <FuncButton
+ BID={data.$$BID}
+ disabled={_disabled}
+ LID={lid}
+ btn={card}
+ columns={cards.columns}
+ selectedData={_data}
+ />
}
}
--
Gitblit v1.8.0