From a6be5cfd9c6fb084af584b77f79100fe32b385c1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 30 十一月 2023 16:20:54 +0800
Subject: [PATCH] 2023-11-30
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 419 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 280 insertions(+), 139 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 94c16f6..c1e0fc5 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -5,8 +5,7 @@
import moment from 'moment'
// import Api from '@/api'
-import asyncComponent from './asyncButtonComponent'
-import asyncElementComponent from '@/utils/asyncComponent'
+import asyncComponent from '@/utils/asyncComponent'
import { getMark } from '@/utils/utils.js'
import MkIcon from '@/components/mk-icon'
import Encrypts from '@/components/encrypts'
@@ -24,15 +23,47 @@
const PrintButton = asyncComponent(() => import('@/tabviews/zshare/actionList/printbutton'))
const FuncMegvii = asyncComponent(() => import('@/tabviews/zshare/actionList/funcMegvii'))
const FuncZip = asyncComponent(() => import('@/tabviews/zshare/actionList/funczip'))
-const BarCode = asyncElementComponent(() => import('@/components/barcode'))
-const QrCode = asyncElementComponent(() => import('@/components/qrcode'))
-const MkProgress = asyncElementComponent(() => import('@/components/mkProgress'))
+const EditLine = asyncComponent(() => import('@/tabviews/zshare/actionList/editLine'))
+const BarCode = asyncComponent(() => import('@/components/barcode'))
+const QrCode = asyncComponent(() => import('@/components/qrcode'))
+const MkProgress = asyncComponent(() => import('@/components/mkProgress'))
const Video = asyncComponent(() => import('@/components/video'))
const MkPicture = asyncComponent(() => import('@/components/mkPicture'))
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 TextCell extends Component {
+ componentDidMount() {
+ if (this.node && this.node.scrollHeight > this.node.offsetHeight) {
+ this.node.style.display = 'block'
+ }
+ }
+
+ componentDidUpdate() {
+ if (this.node) {
+ if (this.node.scrollHeight > this.node.offsetHeight) {
+ this.node.style.display = 'block'
+ } else {
+ this.node.style.display = 'flex'
+ }
+ }
+ }
+
+ render() {
+ const { card, className, value } = this.props
+
+ let lineStyle = {height: card.innerHeight}
+ lineStyle.display = 'flex'
+ lineStyle.alignItems = card.alignItems
+ lineStyle.justifyContent = card.style.textAlign || 'left'
+
+ return (
+ <div ref={ref => this.node = ref} className={className} style={lineStyle}>{value}</div>
+ )
+ }
}
class CardCellComponent extends Component {
@@ -44,10 +75,8 @@
elements: PropTypes.array, // 鍏冪礌闆�
}
- state = {}
-
shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState)) || !is(fromJS(this.props), fromJS(nextProps))
+ return !is(fromJS(this.props.data), fromJS(nextProps.data)) || (nextProps.syncData ? !is(fromJS(this.props.syncData), fromJS(nextProps.syncData)) : false)
}
/**
@@ -70,7 +99,7 @@
node && node.scrollIntoView({behavior: 'smooth', block: 'center', inline: 'nearest'})
}
- if (!card.link) return
+ if (!card.link || (card.linkType === 'qywx' || card.linkType === 'linkmenu')) return
e.stopPropagation()
let url = ''
@@ -100,6 +129,8 @@
_url = _url + `?subject=鏉ヨ嚜${fullName}鐨勯偖浠禶
}
window.open(_url)
+ return
+ } else if (card.linkType === 'other' && /^@menuid@/ig.test(url)) {
return
}
@@ -166,25 +197,36 @@
// })
// return
// }
-
- let Id = ''
- let con = '?'
-
- if (/\?/ig.test(url)) {
- con = '&'
- }
-
- if (cards.subtype === 'propcard' && cardCell) {
- Id = cardCell.setting.primaryId || ''
- } else {
- Id = data[cards.setting.primaryKey] || ''
- }
- if (card.joint === 'true') {
- url = url + `${con}id=${Id}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
+ if (/^http.+(.txt|.doc|.docx|.pdf|.xlsx|.xls|.zip|.rar|.ppt)$/i.test(url)) {
+ let d = document.createElement('a')
+ d.href = url
+ d.setAttribute('download', 'download')
+ d.setAttribute('target', '_blank')
+ document.body.appendChild(d)
+ d.click()
+ d.remove()
+ } else {
+ if (card.joint === 'true') {
+ let Id = ''
+
+ if (cards.subtype === 'propcard' && cardCell) {
+ Id = cardCell.setting.primaryId || ''
+ } else {
+ Id = data[cards.setting.primaryKey] || ''
+ }
+
+ let con = '?'
+
+ if (/\?/ig.test(url)) {
+ con = '&'
+ }
+
+ url = url + `${con}id=${Id}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
+ }
+
+ window.open(url)
}
-
- window.open(url)
}
getColor = (marks) => {
@@ -233,6 +275,8 @@
if (card.style && card.style.clear === 'left') {
_style_ = {clear: 'left'}
+ } else if (card.style && card.style.clear === 'right') {
+ _style_ = {float: 'right'}
}
if (card.eleType === 'sequence') {
@@ -244,29 +288,29 @@
_style.lineHeight = card.innerHeight + 'px'
let mark = getMark(card.marks, data, _style)
-
- _style = mark.style
+
className = mark.signType
}
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<div style={card.style}>
<div className={'ant-mk-text line1' + className} style={{height: card.innerHeight || 'auto'}}><span className="sequence-wrap" style={_style}>{data.$Index || ''}</span></div>
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'text') {
let val = ''
- let _style = card.style ? {...card.style} : {}
+ let _style = {...card.style}
if (card.datatype === 'static') {
val = card.value || ''
- if (/@username@|@fullName@|@mk_city@|@bid@/ig.test(val)) {
+ if (/@username@|@fullName@|@mk_city@|@appname@|@bid@/ig.test(val)) {
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
let city = sessionStorage.getItem('city') || ''
+ let appname = sessionStorage.getItem('appname') || ''
let bid = data.$$BID || ''
- val = val.replace(/@username@/ig, userName).replace(/@fullName@/ig, fullName).replace(/@mk_city@/ig, city).replace(/@bid@/ig, bid)
+ val = val.replace(/@username@/ig, userName).replace(/@fullName@/ig, fullName).replace(/@mk_city@/ig, city).replace(/@appname@/ig, appname).replace(/@bid@/ig, bid)
} else if (/@month@/ig.test(val)) {
val = val.replace(/@month@/ig, new Date().toLocaleString('en-US', { month: 'long' }))
} else if (/@week@/ig.test(val)) {
@@ -285,7 +329,7 @@
val = data[card.field]
}
- if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
@@ -375,13 +419,14 @@
val = <Paragraph copyable={{ text: orival }}>{val}</Paragraph>
}
}
+ } else if (card.fixStyle === 'alone') {
+ let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+ val = <span style={_s}>{card.prefix || ''}{card.postfix || ''}</span>
}
let className = ''
if (card.marks) {
let mark = getMark(card.marks, data, _style)
-
- _style = mark.style
if (mark.icon) {
if (mark.position === 'front') {
@@ -389,8 +434,40 @@
} else {
val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
+ } else if (mark.space) {
+ val = <><span style={{float: 'left'}} dangerouslySetInnerHTML={{__html: mark.space}}></span>{val}</>
+ } else if (mark.point) {
+ if (mark.position === 'front') {
+ val = <>{mark.point}{val}</>
+ } else {
+ val = <>{val}{mark.point}</>
+ }
}
className = mark.signType
+ }
+
+ if (card.linkType === 'download') {
+ let url = ''
+
+ if (card.link === 'static') {
+ url = card.linkurl
+ } else {
+ url = data[card.linkurl]
+ }
+
+ if (/^http.+(.txt|.doc|.docx|.pdf|.xlsx|.xls|.zip|.rar)$/i.test(url)) {
+ if (/pdf$/i.test(url)) {
+ val = <><img src="/media/pdf.png" className="file-image" alt=""/> {val}</>
+ } else if (/(.doc|.docx)$/i.test(url)) {
+ val = <><img src="/media/word.png" className="file-image" alt=""/> {val}</>
+ } else if (/(.xlsx|.xls)$/i.test(url)) {
+ val = <><img src="/media/excel.png" className="file-image" alt=""/> {val}</>
+ } else if (/(.zip|.rar)$/i.test(url)) {
+ val = <><img src="/media/rar.png" className="file-image" alt=""/> {val}</>
+ } else {
+ val = <><img src="/media/txt.png" className="file-image" alt=""/> {val}</>
+ }
+ }
}
if (card.link || (card.anchors && card.anchors.length > 0)) {
@@ -400,24 +477,18 @@
if (card.bgImage && data[card.bgImage]) {
_style.backgroundImage = `url('${data[card.bgImage]}')`
}
-
- let lineStyle = {height: card.innerHeight || 'auto'}
- if (card.alignItems) {
- lineStyle.display = 'flex'
- lineStyle.alignItems = card.alignItems
- lineStyle.justifyContent = _style.textAlign || 'left'
- }
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <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)}}>
- <div className={'ant-mk-text line' + (card.height || '') + className} style={lineStyle}>{val}</div>
+ {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>
- </Col>
+ </div>
)
} else if (card.eleType === 'number') {
let val = ''
- let _style = card.style ? {...card.style} : {}
+ let _style = {...card.style}
if (card.datatype === 'static') {
val = card.value
@@ -460,13 +531,14 @@
} else {
val = `${card.prefix || ''}${val}${card.postfix || ''}`
}
+ } else if (card.fixStyle === 'alone') {
+ let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+ val = <span style={_s}>{card.prefix || ''}{card.postfix || ''}</span>
}
let className = ''
if (card.marks) {
let mark = getMark(card.marks, data, _style)
-
- _style = mark.style
if (mark.icon) {
if (mark.position === 'front') {
@@ -474,31 +546,34 @@
} else {
val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
+ } else if (mark.space) {
+ val = <><span style={{float: 'left'}} dangerouslySetInnerHTML={{__html: mark.space}}></span>{val}</>
+ } else if (mark.point) {
+ if (mark.position === 'front') {
+ val = <>{mark.point}{val}</>
+ } else {
+ val = <>{val}{mark.point}</>
+ }
}
className = mark.signType
}
- let lineStyle = {height: card.innerHeight || 'auto'}
- if (card.alignItems) {
- lineStyle.display = 'flex'
- lineStyle.alignItems = card.alignItems
- lineStyle.justifyContent = _style.textAlign || 'left'
- }
-
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<div style={_style}>
- <div className={'ant-mk-text line' + (card.height || '') + className} style={lineStyle}>{val}</div>
+ {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>
- </Col>
+ </div>
)
} else if (card.eleType === 'icon') {
let val = ''
let icon = ''
- let height = card.innerHeight
if (card.datatype === 'dynamic') {
icon = data[card.field] || ''
+ } else if (card.tipType === 'text') {
+ icon = card.value
} else {
icon = card.icon
}
@@ -506,36 +581,44 @@
if (!icon && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
-
- if (!height) { // 鍏煎
- let fontSize = 14
- let lineHeight = 1.5
-
- if (card.style.fontSize) {
- fontSize = parseInt(card.style.fontSize)
- }
- if (card.style.lineHeight) {
- lineHeight = parseFloat(card.style.lineHeight)
- }
-
- height = fontSize * lineHeight
- }
if (data.hasOwnProperty(card.tooltip)) {
val = data[card.tooltip]
} else {
val = card.tooltip
}
-
- contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
- <div style={card.style}>
- {val ? <Tooltip title={val}>
- <MkIcon className="ant-mk-icon" style={{height: height}} type={icon}/>
- </Tooltip> : <MkIcon className="ant-mk-icon" style={{height: height}} type={icon}/>}
+
+ if (/\\n|\n/.test(val)) {
+ val = val.replace(/(\\n|\n)$/, '')
+
+ if (val) {
+ val = val.split(/\\n|\n/)
+
+ val = <div>{val.map((cell, i) => <div style={{marginBottom: 2}} key={i}>{cell}</div>)}</div>
+ }
+ }
+
+ if (card.tipType === 'text') {
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={card.style}>
+ {val ? <Tooltip title={val}>
+ <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}}>{icon}</div>
+ </Tooltip> : <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}}>{icon}</div>}
+ </div>
</div>
- </Col>
- )
+ )
+ } else {
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={card.style}>
+ {val ? <Tooltip title={val}>
+ <MkIcon className="ant-mk-icon" style={{height: card.innerHeight}} type={icon}/>
+ </Tooltip> : <MkIcon className="ant-mk-icon" style={{height: card.innerHeight}} type={icon}/>}
+ </div>
+ </div>
+ )
+ }
} else if (card.eleType === 'slider') {
let val = 0
let color = card.color
@@ -558,15 +641,15 @@
}
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<div style={card.style}>
<MkProgress value={val} config={card} color={color}/>
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'picture') {
let _imagestyle = {}
- let _style = card.style ? {margin: '0 auto', ...card.style} : {}
+ let _style = {margin: '0 auto', ...card.style}
let url = ''
if (card.maxWidth) {
_style.maxWidth = card.maxWidth
@@ -605,27 +688,31 @@
if (card.link) {
_style.cursor = 'pointer'
}
+
+ if (_style.position === 'absolute') {
+ _style.width = '100%'
+ }
let scale = url && card.scale === 'true'
let urls = url ? url.split(',').filter(Boolean) : ['']
urls.forEach((u, i) => {
- contents.push(<Col key={card.uuid + i} style={_style_} span={card.width}>
+ contents.push(<div className={'ant-col ant-col-' + card.width} key={card.uuid + i} style={_style_} span={card.width}>
<div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
<MkPicture style={_imagestyle} scale={scale} url={u} urls={urls}/>
</div>
- </Col>)
+ </div>)
})
} else if (card.eleType === 'splitline') {
let _borderWidth = card.borderWidth === undefined ? 1 : card.borderWidth
_style_ = _style_ || {}
_style_.minHeight = _borderWidth
contents.push(
- <Col key={card.uuid} span={card.width} style={_style_}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} span={card.width} style={_style_}>
<div style={card.style}>
<div className="ant-mk-splitline" style={{borderColor: card.color, borderWidth: _borderWidth}}></div>
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'barcode') {
let val = ''
@@ -636,18 +723,18 @@
val = data[card.field] || ''
}
- if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<div style={card.style}>
<div style={{height: card.innerHeight || 25}}>
{val ? <BarCode card={card} value={val}/> : null}
</div>
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'video') {
let url = ''
@@ -658,7 +745,7 @@
url = data[card.field] || ''
}
- if (url === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!url && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
@@ -674,11 +761,11 @@
urls.forEach((u, i) => {
contents.push(
- <Col key={card.uuid + i} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid + i} style={_style_} span={card.width}>
<div className="video-wrap" style={card.style}>
<Video card={card} poster={poster} value={u}/>
</div>
- </Col>
+ </div>
)
})
} else if (card.eleType === 'qrcode') {
@@ -690,18 +777,18 @@
val = data[card.field] || ''
}
- if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<div style={card.style}>
<div style={{minHeight: card.qrWidth || 50}}>
{val ? <QrCode card={card} value={val}/> : null}
</div>
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'currentDate') {
let val = moment().format(card.dateFormat || 'YYYY-MM-DD')
@@ -714,17 +801,33 @@
}
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<div style={card.style}>
<div className="ant-mk-text line1" style={{height: card.innerHeight || 'auto'}}>{val}</div>
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'formula') {
let val = 0
- let _style = card.style ? {...card.style} : {}
+ let _style = {...card.style}
+
+ if (card.eval === 'func') {
+ let _data = []
+ if (card.$sync) {
+ _data = this.props.syncData
+ } else if (data && !data.$$empty) {
+ _data = [data]
+ }
- if (card.$sync) {
+ try {
+ // eslint-disable-next-line
+ let func = new Function('data', card.formula)
+ val = func(_data)
+ } catch (e) {
+ console.warn(e)
+ val = ''
+ }
+ } else if (card.$sync) {
if (card.eval === 'false') {
val = ''
}
@@ -739,6 +842,8 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
+ console.info(_val)
+ console.warn(e)
_val = 0
}
}
@@ -747,6 +852,8 @@
val += _val
})
+ } else if (data && data.$$empty && /@.*@/.test(card.formula)) {
+ val = ''
} else if (data) {
let _val = card.formula
Object.keys(data).forEach(key => {
@@ -759,6 +866,8 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
+ console.info(_val)
+ console.warn(e)
_val = ''
}
}
@@ -766,8 +875,22 @@
val = _val === undefined ? '' : _val
}
- if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
+ } else if (card.eval === 'func') {
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style}>
+ <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight}} dangerouslySetInnerHTML={{__html: val}}></div>
+ </div>
+ </div>
+ )
+ return
+ }
+
+ if (card.round && typeof(val) === 'number') {
+ val = Math.round(val * card.round) / card.round
+ val = val.toFixed(card.decimal)
}
if (val !== '') {
@@ -786,13 +909,14 @@
} else {
val = <>{card.prefix || ''}{val}{card.postfix || ''}</>
}
+ } else if (card.fixStyle === 'alone') {
+ let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+ val = <span style={_s}>{card.prefix || ''}{card.postfix || ''}</span>
}
let className = ''
if (card.marks) {
let mark = getMark(card.marks, data, _style)
-
- _style = mark.style
if (mark.icon) {
if (mark.position === 'front') {
@@ -800,23 +924,25 @@
} else {
val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
+ } else if (mark.space) {
+ val = <><span style={{float: 'left'}} dangerouslySetInnerHTML={{__html: mark.space}}></span>{val}</>
+ } else if (mark.point) {
+ if (mark.position === 'front') {
+ val = <>{mark.point}{val}</>
+ } else {
+ val = <>{val}{mark.point}</>
+ }
}
className = mark.signType
}
- let lineStyle = {height: card.innerHeight || 'auto'}
- if (card.alignItems) {
- lineStyle.display = 'flex'
- lineStyle.alignItems = card.alignItems
- lineStyle.justifyContent = _style.textAlign || 'left'
- }
-
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<div style={_style}>
- <div className={'ant-mk-text line' + (card.height || '') + className} style={lineStyle}>{val}</div>
+ {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>
- </Col>
+ </div>
)
} else if (card.eleType === 'color') {
let color = ''
@@ -827,7 +953,7 @@
color = data[card.field] || ''
}
- if (color === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!color && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
@@ -844,7 +970,7 @@
}
contents.push(
- <Col key={card.uuid} style={_style_} span={card.width}>
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<div className="ant-mk-color" style={card.style}>
<div style={_bgstyle} onClick={(e) => {
if (card.copyable === 'true') {
@@ -861,7 +987,7 @@
}
}}></div>
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'button') {
let _disabled = data.$disabled
@@ -869,6 +995,9 @@
if (data.$$type === 'extendCard') {
_data = data.$$selectedData || []
+ if (card.Ot === 'notRequired' && _data.length === 0) {
+ _data = [data]
+ }
} else if (card.$sync) {
_data = this.props.syncData || []
} else if (data.$$empty) {
@@ -882,7 +1011,7 @@
if (['exec', 'prompt', 'pop', 'form'].includes(card.OpenType)) {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<NormalButton
btn={card}
BID={data.$$BID}
@@ -892,11 +1021,11 @@
columns={cards.columns}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'excelIn') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<ExcelInButton
btn={card}
BID={data.$$BID}
@@ -905,11 +1034,11 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'excelOut') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<ExcelOutButton
btn={card}
BID={data.$$BID}
@@ -918,11 +1047,11 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'popview') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<PopupButton
btn={card}
BID={data.$$BID}
@@ -931,11 +1060,11 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'tab') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<TabButton
btn={card}
BID={data.$$BID}
@@ -943,23 +1072,24 @@
disabled={_disabled}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'innerpage') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<NewPageButton
btn={card}
+ BID={data.$$BID}
BData={data.$$BData || ''}
disabled={_disabled}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'funcbutton') {
if (card.funcType === 'changeuser' || card.funcType === 'closetab') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<ChangeUserButton
btn={card}
BID={data.$$BID}
@@ -968,11 +1098,11 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.funcType === 'print') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<PrintButton
btn={card}
BID={data.$$BID}
@@ -982,11 +1112,11 @@
columns={cards.columns}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.funcType === 'megvii') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<FuncMegvii
btn={card}
BID={data.$$BID}
@@ -994,11 +1124,11 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.funcType === 'filezip') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
<FuncZip
btn={card}
BID={data.$$BID}
@@ -1006,7 +1136,17 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
+ )
+ } else if (card.funcType === 'addline' || card.funcType === 'delline') {
+ contents.push(
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <EditLine
+ btn={card}
+ disabled={_disabled}
+ selectedData={_data}
+ />
+ </div>
)
}
}
@@ -1022,6 +1162,7 @@
return (
<div className={'card-cell-list ' + (cardCell && cardCell.setting && cardCell.setting.layout === 'flex' ? 'mk-flex' : '')}>
{this.getContent()}
+ <Col style={{display: 'none'}} span={24}></Col>
</div>
)
}
--
Gitblit v1.8.0