From 137fb8ea6af2789b3238b22bac31d80bced41dfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 七月 2021 11:39:39 +0800
Subject: [PATCH] 2021-07-28
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 200 +++++++++++++++++++++++++------------------------
1 files changed, 102 insertions(+), 98 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 525c471..8b5fa84 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -21,10 +21,14 @@
const BarCode = asyncElementComponent(() => import('@/components/barcode'))
const QrCode = asyncElementComponent(() => import('@/components/qrcode'))
const Video = asyncComponent(() => import('@/components/video'))
+const PicRadio = {
+ '4:3': '75%', '3:2': '66.67%', '16:9': '56.25%', '2:1': '50%', '3:1': '33.33%', '4:1': '25%',
+ '5:1': '20%', '6:1': '16.67%', '7:1': '14.29%', '8:1': '12.5%', '9:1': '11.11%',
+ '10:1': '10%', '3:4': '133.33%', '2:3': '150%', '9:16': '177.78%'
+}
class CardCellComponent extends Component {
static propTpyes = {
- seq: PropTypes.any, // 搴忓彿
cards: PropTypes.object, // 鑿滃崟閰嶇疆淇℃伅
cardCell: PropTypes.object,
data: PropTypes.object,
@@ -260,13 +264,20 @@
}
getContent = (card) => {
- const { data, cards, seq } = this.props
+ const { data, cards } = this.props
if (card.eleType === 'sequence') {
+ let _style = {}
+ if (card.marks) {
+ _style.width = card.innerHeight
+ _style.height = card.innerHeight
+ _style.lineHeight = card.innerHeight + 'px'
+ this.getMark(card.marks, _style)
+ }
return (
<Col key={card.uuid} span={card.width}>
<div style={card.style}>
- <div className={'ant-mk-text'}>{seq}</div>
+ <div className="ant-mk-text"><span className="sequence-wrap" style={_style}>{data.$Index || ''}</span></div>
</div>
</Col>
)
@@ -307,7 +318,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>
)
@@ -359,7 +370,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>
)
@@ -424,8 +435,17 @@
)
} else if (card.eleType === 'picture') {
let _imagestyle = {}
- let _style = card.style ? {...card.style} : {}
+ let _style = card.style ? {margin: '0 auto', ...card.style} : {}
let url = ''
+ if (card.maxWidth) {
+ _style.maxWidth = card.maxWidth
+ if (_style.marginLeft === '0px') {
+ delete _style.marginLeft
+ }
+ if (_style.marginRight === '0px') {
+ delete _style.marginRight
+ }
+ }
if (card.datatype === 'static') {
url = card.url
@@ -443,12 +463,8 @@
_imagestyle.borderRadius = _style.borderRadius
}
- if (card.lenWidRadio === '16:9') {
- _imagestyle.paddingTop = '56.25%'
- } else if (card.lenWidRadio === '3:2') {
- _imagestyle.paddingTop = '66.67%'
- } else if (card.lenWidRadio === '4:3') {
- _imagestyle.paddingTop = '75%'
+ if (PicRadio[card.lenWidRadio]) {
+ _imagestyle.paddingTop = PicRadio[card.lenWidRadio]
} else {
_imagestyle.paddingTop = '100%'
}
@@ -534,128 +550,116 @@
</Col>
)
} else if (card.eleType === 'button') {
+ let _data = data.$$type === 'extendCard' ? [] : [data]
+
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