From 5046d0d13dc6a8563b8e54e31913bc44cfa1072f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 四月 2022 19:23:18 +0800
Subject: [PATCH] 2022-04-26
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 20 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 5608b31..de5702b 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -290,7 +290,12 @@
}
if (val !== '') {
- val = `${card.prefix || ''}${val}${card.postfix || ''}`
+ if (card.fixStyle === 'alone') {
+ let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+ val = <><span style={_s}>{card.prefix || ''}</span>{val}<span style={_s}>{card.postfix || ''}</span></>
+ } else {
+ val = `${card.prefix || ''}${val}${card.postfix || ''}`
+ }
}
if (card.marks) {
@@ -311,6 +316,10 @@
_style.cursor = 'pointer'
}
+ if (card.bgImage && data[card.bgImage]) {
+ _style.backgroundImage = `url('${data[card.bgImage]}')`
+ }
+
return (
<Col key={card.uuid} span={card.width}>
<div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
@@ -328,6 +337,10 @@
val = data[card.field]
}
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ return null
+ }
+
if (typeof(val) === 'number') {
if (card.format === 'percent') {
val = val * 100
@@ -335,8 +348,8 @@
val = Math.abs(val)
}
- if (card.col && card.col.type === 'number') {
- let decimal = card.col.decimal || 0
+ if (typeof(card.decimal) === 'number') {
+ let decimal = card.decimal
if (card.format === 'percent') {
decimal = decimal - 2
@@ -358,7 +371,12 @@
}
if (val !== '') {
- val = `${card.prefix || ''}${val}${card.postfix || ''}`
+ if (card.fixStyle === 'alone') {
+ let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+ val = <><span style={_s}>{card.prefix || ''}</span>{val}<span style={_s}>{card.postfix || ''}</span></>
+ } else {
+ val = `${card.prefix || ''}${val}${card.postfix || ''}`
+ }
}
if (card.marks) {
@@ -567,10 +585,19 @@
</Col>
)
} else if (card.eleType === 'currentDate') {
+ let val = moment().format(card.dateFormat || 'YYYY-MM-DD')
+
+ if (card.fixStyle === 'alone') {
+ let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+ val = <><span style={_s}>{card.prefix || ''}</span>{val}<span style={_s}>{card.postfix || ''}</span></>
+ } else {
+ val = `${card.prefix || ''}${val}${card.postfix || ''}`
+ }
+
return (
<Col key={card.uuid} span={card.width}>
<div className="ant-mk-date" style={card.style}>
- {card.dateFormat ? `${card.prefix || ''}${moment().format(card.dateFormat)}${card.postfix || ''}` : null}
+ {val}
</div>
</Col>
)
@@ -597,7 +624,7 @@
}
}
- if (!val) return
+ // if (!val) return
val += _val
})
@@ -620,11 +647,21 @@
val = _val === undefined ? '' : _val
}
+ if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ return null
+ }
+
if (val !== '') {
- val = `${card.prefix || ''}${val}${card.postfix || ''}`
- if (card.eval === 'false' && /\s/ig.test(val)) {
- val = val.replace(/\s/ig, ' ')
+ if (val && typeof(val) === 'string') {
+ val = val.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
val = <span dangerouslySetInnerHTML={{__html: val}}></span>
+ }
+
+ if (card.fixStyle === 'alone') {
+ let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+ val = <><span style={_s}>{card.prefix || ''}</span>{val}<span style={_s}>{card.postfix || ''}</span></>
+ } else {
+ val = `${card.prefix || ''}${val}${card.postfix || ''}`
}
}
@@ -650,10 +687,16 @@
</Col>
)
} else if (card.eleType === 'button') {
+ let _disabled = data.$disabled
if (card.control === 'hidden') {
- let s = data[card.controlField]
+ let s = data[card.controlField] !== undefined ? data[card.controlField] + '' : ''
if (s === card.controlVal || (card.controlVal && card.controlVal.split(',').includes(s))) {
return null
+ }
+ } else if (card.control === 'disabled') {
+ let s = data[card.controlField] !== undefined ? data[card.controlField] + '' : ''
+ if (s === card.controlVal || (card.controlVal && card.controlVal.split(',').includes(s))) {
+ _disabled = true
}
}
@@ -661,10 +704,10 @@
if (data.$$type === 'extendCard') {
_data = data.$$selectedData || []
- } else if (data.$$empty) {
- _data = []
} else if (card.$sync) {
_data = this.props.syncData
+ } else if (data.$$empty) {
+ _data = []
}
if (['exec', 'prompt', 'pop', 'form'].includes(card.OpenType)) {
@@ -673,7 +716,7 @@
<NormalButton
BID={data.$$BID}
BData={data.$$BData || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
lineId={data.$$key || ''}
btn={card}
show={card.show}
@@ -690,7 +733,7 @@
<ExcelInButton
BID={data.$$BID}
BData={data.$$BData || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
lineId={data.$$key || ''}
btn={card}
show={card.show}
@@ -707,7 +750,7 @@
BID={data.$$BID}
BData={data.$$BData || ''}
lineId={data.$$key || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
btn={card}
show={card.show}
style={card.style}
@@ -721,7 +764,7 @@
<PopupButton
BID={data.$$BID}
BData={data.$$BData || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
lineId={data.$$key || ''}
btn={card}
show={card.show}
@@ -736,7 +779,7 @@
<Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
<TabButton
BData={data.$$BData || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
lineId={data.$$key || ''}
btn={card}
show={card.show}
@@ -751,7 +794,7 @@
<Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
<NewPageButton
BData={data.$$BData || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
lineId={data.$$key || ''}
btn={card}
show={card.show}
@@ -768,7 +811,7 @@
<ChangeUserButton
BID={data.$$BID}
BData={data.$$BData || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
lineId={data.$$key || ''}
btn={card}
show={card.show}
@@ -784,7 +827,7 @@
<PrintButton
BID={data.$$BID}
BData={data.$$BData || ''}
- disabled={data.$disabled}
+ disabled={_disabled}
lineId={data.$$key || ''}
btn={card}
show={card.show}
--
Gitblit v1.8.0