From 72419e2f826031a158173f46d723a672064e37cd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 八月 2021 22:42:51 +0800
Subject: [PATCH] 2021-08-31
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 9b4d0fd..57972fe 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -299,6 +299,10 @@
val = data[card.field]
}
+ if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ return null
+ }
+
if (val !== '' && card.format) {
if (card.format === 'YYYY-MM-DD' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1])/.test(val)) {
val = `${val.substr(0, 4)}-${val.substr(5, 2)}-${val.substr(8, 2)}`
@@ -476,6 +480,7 @@
}
let scale = url && card.scale === 'true'
+
return (
<Col key={card.uuid} span={card.width}>
<div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
@@ -630,6 +635,7 @@
<Col key={card.uuid} className="mk-cell-btn" span={card.width}>
<NormalButton
BID={data.$$BID}
+ BData={data.$$BData || ''}
btn={card}
show={card.show}
style={card.style}
@@ -669,6 +675,7 @@
<Col key={card.uuid} className="mk-cell-btn" span={card.width}>
<PopupButton
BID={data.$$BID}
+ BData={data.$$BData || ''}
btn={card}
show={card.show}
style={card.style}
@@ -702,7 +709,7 @@
</Col>
)
} else if (card.OpenType === 'funcbutton') {
- if (card.funcType === 'changeuser') {
+ if (card.funcType === 'changeuser' || card.funcType === 'closetab') {
return (
<Col key={card.uuid} className="mk-cell-btn" span={card.width}>
<ChangeUserButton
@@ -720,6 +727,7 @@
<Col key={card.uuid} className="mk-cell-btn" span={card.width}>
<PrintButton
BID={data.$$BID}
+ BData={data.$$BData || ''}
btn={card}
show={card.show}
style={card.style}
--
Gitblit v1.8.0