From 8e003c1a94d26cc4d477e7aa03593ccb4d7e6c61 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 11 十月 2024 17:47:40 +0800
Subject: [PATCH] 2024-10-11
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 15881fe..085f046 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -553,6 +553,9 @@
}
if (card.format === 'percent') {
val = val * 100
+ if (!card.round) {
+ val = +val.toFixed(2)
+ }
} else if (card.format === 'abs') {
val = Math.abs(val)
}
@@ -943,7 +946,7 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
- console.info(_val)
+ window.mkInfo(_val)
console.warn(e)
_val = 0
}
@@ -957,6 +960,29 @@
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 || '')
}
@@ -970,7 +996,7 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
- console.info(_val)
+ window.mkInfo(_val)
console.warn(e)
_val = ''
}
@@ -1033,14 +1059,26 @@
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 = ''
@@ -1222,6 +1260,7 @@
name={name}
BID={data.$$BID}
LID={lid}
+ columns={cards.columns}
BData={data.$$BData || ''}
disabled={_disabled}
selectedData={_data}
@@ -1284,6 +1323,7 @@
disabled={_disabled}
LID={lid}
btn={card}
+ columns={cards.columns}
selectedData={_data}
/>
}
--
Gitblit v1.8.0