From 6afdec0062dacbded57e166230eb22cc55ced0c1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 08 五月 2021 14:30:21 +0800
Subject: [PATCH] 2021-05-08
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 175 ++++++++++++++++++++++++++++------------------------------
1 files changed, 84 insertions(+), 91 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 62deb90..01b98b4 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -29,7 +29,6 @@
class CardCellComponent extends Component {
static propTpyes = {
- seq: PropTypes.any, // 搴忓彿
cards: PropTypes.object, // 鑿滃崟閰嶇疆淇℃伅
cardCell: PropTypes.object,
data: PropTypes.object,
@@ -265,13 +264,13 @@
}
getContent = (card) => {
- const { data, cards, seq } = this.props
+ const { data, cards } = this.props
if (card.eleType === 'sequence') {
return (
<Col key={card.uuid} span={card.width}>
<div style={card.style}>
- <div className={'ant-mk-text'}>{seq}</div>
+ <div className={'ant-mk-text'}>{data.$Index || ''}</div>
</div>
</Col>
)
@@ -312,7 +311,7 @@
return (
<Col key={card.uuid} span={card.width}>
<div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
- <div className={'ant-mk-text line' + card.height} style={{height: card.innerHeight || 'auto'}}>{val}</div>
+ <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
</div>
</Col>
)
@@ -364,7 +363,7 @@
return (
<Col key={card.uuid} span={card.width}>
<div style={_style}>
- <div className={'ant-mk-text line' + card.height} style={{height: card.innerHeight || 'auto'}}>{val}</div>
+ <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
</div>
</Col>
)
@@ -535,128 +534,122 @@
</Col>
)
} else if (card.eleType === 'button') {
+ if (card.$type === 'tableButton' && card.controlField) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
+ if (data[card.controlField] === card.controlVal) {
+ return null
+ } else if (card.controlVal && card.controlVal.split(',').includes(data[card.controlField])) {
+ return null
+ }
+ }
+
if (['exec', 'prompt', 'pop'].includes(card.OpenType)) {
return (
- <Col key={card.uuid} span={card.width}>
- <div style={card.style}>
- <NormalButton
- BID={data.$$BID}
- btn={card}
- show={card.show}
- style={card.btnstyle}
- setting={cards.setting}
- columns={cards.columns}
- selectedData={[data]}
- />
- </div>
+ <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+ <NormalButton
+ BID={data.$$BID}
+ btn={card}
+ show={card.show}
+ style={card.style}
+ setting={cards.setting}
+ columns={cards.columns}
+ selectedData={[data]}
+ />
</Col>
)
} else if (card.OpenType === 'excelIn') {
return (
- <Col key={card.uuid} span={card.width}>
- <div style={card.style}>
- <ExcelInButton
- BID={data.$$BID}
- btn={card}
- show={card.show}
- style={card.btnstyle}
- setting={cards.setting}
- selectedData={[data]}
- />
- </div>
+ <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+ <ExcelInButton
+ BID={data.$$BID}
+ btn={card}
+ show={card.show}
+ style={card.style}
+ setting={cards.setting}
+ selectedData={[data]}
+ />
</Col>
)
} else if (card.OpenType === 'excelOut') {
return (
- <Col key={card.uuid} span={card.width}>
- <div style={card.style}>
- <ExcelOutButton
- BID={data.$$BID}
- btn={card}
- show={card.show}
- style={card.btnstyle}
- setting={cards.setting}
- />
- </div>
+ <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+ <ExcelOutButton
+ BID={data.$$BID}
+ btn={card}
+ show={card.show}
+ style={card.style}
+ setting={cards.setting}
+ />
</Col>
)
} else if (card.OpenType === 'popview') {
return (
- <Col key={card.uuid} span={card.width}>
- <div style={card.style}>
- <PopupButton
- BID={data.$$BID}
- btn={card}
- show={card.show}
- style={card.btnstyle}
- setting={cards.setting}
- selectedData={[data]}
- />
- </div>
+ <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+ <PopupButton
+ BID={data.$$BID}
+ btn={card}
+ show={card.show}
+ style={card.style}
+ setting={cards.setting}
+ selectedData={[data]}
+ />
</Col>
)
} else if (card.OpenType === 'tab') {
return (
- <Col key={card.uuid} span={card.width}>
- <div style={card.style}>
- <TabButton
- btn={card}
- show={card.show}
- style={card.btnstyle}
- setting={cards.setting}
- selectedData={[data]}
- />
- </div>
+ <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+ <TabButton
+ btn={card}
+ show={card.show}
+ style={card.style}
+ setting={cards.setting}
+ selectedData={[data]}
+ />
</Col>
)
} else if (card.OpenType === 'innerpage') {
return (
- <Col key={card.uuid} span={card.width}>
- <div style={card.style}>
- <NewPageButton
- btn={card}
- show={card.show}
- style={card.btnstyle}
- setting={cards.setting}
- selectedData={[data]}
- />
- </div>
+ <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+ <NewPageButton
+ btn={card}
+ show={card.show}
+ style={card.style}
+ setting={cards.setting}
+ selectedData={[data]}
+ />
</Col>
)
} else if (card.OpenType === 'funcbutton') {
if (card.funcType === 'changeuser') {
return (
- <Col key={card.uuid} span={card.width}>
- <div style={card.style}>
- <ChangeUserButton
- BID={data.$$BID}
- btn={card}
- show={card.show}
- style={card.btnstyle}
- setting={cards.setting}
- selectedData={[data]}
- />
- </div>
+ <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+ <ChangeUserButton
+ BID={data.$$BID}
+ btn={card}
+ show={card.show}
+ style={card.style}
+ setting={cards.setting}
+ selectedData={[data]}
+ />
</Col>
)
} else if (card.funcType === 'print') {
return (
- <Col key={card.uuid} span={card.width}>
- <div style={card.style}>
- <PrintButton
- BID={data.$$BID}
- btn={card}
- show={card.show}
- style={card.btnstyle}
- setting={cards.setting}
- selectedData={[data]}
- />
- </div>
+ <Col key={card.uuid} className="mk-cell-btn" span={card.width}>
+ <PrintButton
+ BID={data.$$BID}
+ btn={card}
+ show={card.show}
+ style={card.style}
+ setting={cards.setting}
+ selectedData={[data]}
+ />
</Col>
)
}
}
}
+
+ return null
}
render() {
--
Gitblit v1.8.0