From c8804ceb1fe2dea76f9949c5ea04423876ee2c81 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 28 六月 2024 14:02:47 +0800
Subject: [PATCH] 2024-06-28
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 228 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 182 insertions(+), 46 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index d551b2b..ba48a45 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,19 @@
if (card.linkType === 'linkmenu') {
if (card.linkThdMenu) {
let __param = {
- $BID: data.$$uuid
+ $BID: data.$$uuid || ''
}
if (card.field) {
- __param.$searchkey = card.field
+ __param.$searchkey = card.field.toLowerCase()
__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
@@ -240,15 +235,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 +249,17 @@
}
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
+ let reg = new RegExp('@' + key + '@', 'ig')
+ url = url.replace(reg, data[key])
+ })
}
window.open(url)
@@ -867,14 +871,64 @@
_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)
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 = ''
@@ -904,6 +958,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])
@@ -925,15 +982,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') {
@@ -943,8 +991,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/ig, '<br/>')
+ }
+ if ((!card.evalchars || card.evalchars.includes('space')) && !/<(span|div|p|a|img)\s/g.test(val)) {
val = val.replace(/\s/ig, ' ')
}
@@ -984,14 +1034,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 = ''
@@ -1051,6 +1163,10 @@
} else if (data.$$empty) {
_data = []
}
+ let name = ''
+ if (card.showName) {
+ name = data[card.showName] || ' '
+ }
_style_ = _style_ || {}
if (card.wrapStyle) {
@@ -1058,11 +1174,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}
@@ -1073,6 +1192,7 @@
MkButton = <ExcelInButton
btn={card}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1082,6 +1202,7 @@
MkButton = <ExcelOutButton
btn={card}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1090,7 +1211,9 @@
} else if (card.OpenType === 'popview') {
MkButton = <PopupButton
btn={card}
+ name={name}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1099,7 +1222,9 @@
} else if (card.OpenType === 'tab') {
MkButton = <TabButton
btn={card}
+ name={name}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
selectedData={_data}
@@ -1107,7 +1232,10 @@
} else if (card.OpenType === 'innerpage') {
MkButton = <NewPageButton
btn={card}
+ name={name}
BID={data.$$BID}
+ LID={lid}
+ columns={cards.columns}
BData={data.$$BData || ''}
disabled={_disabled}
selectedData={_data}
@@ -1117,6 +1245,7 @@
MkButton = <ChangeUserButton
btn={card}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1126,6 +1255,7 @@
MkButton = <PrintButton
btn={card}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1136,6 +1266,7 @@
MkButton = <FuncMegvii
btn={card}
BID={data.$$BID}
+ LID={lid}
disabled={_disabled}
setting={cards.setting}
selectedData={_data}
@@ -1144,6 +1275,7 @@
MkButton = <FuncZip
btn={card}
BID={data.$$BID}
+ LID={lid}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
@@ -1152,12 +1284,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
@@ -1165,6 +1292,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