From a94b0a4d15b26ecf8fe99f0a1c3e60d60b97766d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 15 八月 2023 14:22:03 +0800
Subject: [PATCH] 2023-08-15
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 465 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 332 insertions(+), 133 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index ffe27b5..493a682 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -1,19 +1,17 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Col, Tooltip, notification, Typography } from 'antd'
+import { Col, Tooltip, notification, Typography, message } from 'antd'
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 MKEmitter from '@/utils/events.js'
-import LostPng from '@/assets/img/lost.png'
import Encrypts from '@/components/encrypts'
import './index.scss'
+moment.suppressDeprecationWarnings = true
const { Paragraph } = Typography
const NormalButton = asyncComponent(() => import('@/tabviews/zshare/actionList/normalbutton'))
const ExcelInButton = asyncComponent(() => import('@/tabviews/zshare/actionList/excelInbutton'))
@@ -25,14 +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)))
}
/**
@@ -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
}
@@ -168,11 +199,6 @@
// }
let Id = ''
- let con = '?'
-
- if (/\?/ig.test(url)) {
- con = '&'
- }
if (cards.subtype === 'propcard' && cardCell) {
Id = cardCell.setting.primaryId || ''
@@ -181,6 +207,12 @@
}
if (card.joint === 'true') {
+ let con = '?'
+
+ if (/\?/ig.test(url)) {
+ con = '&'
+ }
+
url = url + `${con}id=${Id}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
}
@@ -229,8 +261,17 @@
let contents = []
elements.forEach(card => {
+ let _style_ = null
+
+ 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') {
let _style = {}
+ let className = ''
if (card.marks) {
_style.width = card.innerHeight
_style.height = card.innerHeight
@@ -239,17 +280,18 @@
let mark = getMark(card.marks, data, _style)
_style = mark.style
+ className = mark.signType
}
contents.push(
- <Col key={card.uuid} 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"><span className="sequence-wrap" style={_style}>{data.$Index || ''}</span></div>
+ <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 || ''
@@ -259,12 +301,25 @@
let city = sessionStorage.getItem('city') || ''
let bid = data.$$BID || ''
val = val.replace(/@username@/ig, userName).replace(/@fullName@/ig, fullName).replace(/@mk_city@/ig, city).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)) {
+ val = val.replace(/@week@/ig, (() => {
+ let day = new Date().getDay()
+ let weeks = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�']
+ return weeks[day]
+ })())
+ } else if (/@day@/ig.test(val)) {
+ val = val.replace(/@day@/ig, (() => {
+ let day = new Date().getDate()
+ return day < 10 ? '0' + day : day
+ })())
}
} else if (data.hasOwnProperty(card.field)) {
val = data[card.field]
}
- if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
@@ -354,8 +409,12 @@
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)
@@ -368,6 +427,7 @@
val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
}
+ className = mark.signType
}
if (card.link || (card.anchors && card.anchors.length > 0)) {
@@ -379,15 +439,16 @@
}
contents.push(
- <Col key={card.uuid} 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 || '')} style={{height: card.innerHeight || 'auto'}}>{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
@@ -399,7 +460,8 @@
return null
}
- if (typeof(val) === 'number') {
+ if (!isNaN(val) && val !== '') {
+ val = +val
if (card.round) {
val = Math.round(val * card.round) / card.round
}
@@ -429,8 +491,12 @@
} 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)
@@ -443,33 +509,70 @@
val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
}
+ className = mark.signType
}
-
+
contents.push(
- <Col key={card.uuid} 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 || '')} style={{height: card.innerHeight || 'auto'}}>{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 = ''
-
- if (card.datatype === 'static') {
- val = card.tooltip
- } else if (data.hasOwnProperty(card.field)) {
- val = data[card.field]
+ let icon = ''
+
+ if (card.datatype === 'dynamic') {
+ icon = data[card.field] || ''
+ } else if (card.tipType === 'text') {
+ icon = card.value
+ } else {
+ icon = card.icon
+ }
+
+ if (!icon && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ return null
}
- contents.push(
- <Col key={card.uuid} span={card.width}>
- <div style={card.style}>
- {val ? <Tooltip title={val}>
- <MkIcon className="ant-mk-icon" style={{height: card.innerHeight || 'auto'}} type={card.icon}/>
- </Tooltip> : <MkIcon className="ant-mk-icon" style={{height: card.innerHeight || 'auto'}} type={card.icon}/>}
+ if (data.hasOwnProperty(card.tooltip)) {
+ val = data[card.tooltip]
+ } else {
+ val = card.tooltip
+ }
+
+ 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
@@ -492,15 +595,15 @@
}
contents.push(
- <Col key={card.uuid} 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
@@ -524,53 +627,42 @@
if (url === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
-
- if (_style.borderRadius) {
- _imagestyle.borderRadius = _style.borderRadius
- }
if (PicRadio[card.lenWidRadio]) {
_imagestyle.paddingTop = PicRadio[card.lenWidRadio]
} else {
_imagestyle.paddingTop = '100%'
}
+
+ _imagestyle.borderRadius = _style.borderRadius || 0
+ _imagestyle.backgroundSize = _style.backgroundSize || 'cover'
+ _imagestyle.backgroundPosition = _style.backgroundPosition || 'center'
+ _imagestyle.backgroundRepeat = _style.backgroundRepeat || 'no-repeat'
if (card.link) {
_style.cursor = 'pointer'
}
let scale = url && card.scale === 'true'
- let urls = url ? url.split(',').filter(Boolean) : [LostPng]
-
- if (!url) {
- _imagestyle = {backgroundSize: 'contain'}
- }
+ let urls = url ? url.split(',').filter(Boolean) : ['']
urls.forEach((u, i) => {
- contents.push(<Col key={card.uuid + i} 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)}}>
- <div
- className={'ant-mk-picture' + (scale ? ' scale' : '')}
- onClick={(e) => {
- if (!scale) return
-
- e.stopPropagation()
-
- MKEmitter.emit('mkImageScale', url, urls)
- }}
- style={{..._imagestyle, backgroundImage: `url('${u}')`}}
- ></div>
+ <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={{minHeight: _borderWidth}}>
+ <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 = ''
@@ -581,18 +673,18 @@
val = data[card.field] || ''
}
- if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
contents.push(
- <Col key={card.uuid} 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 = ''
@@ -603,7 +695,7 @@
url = data[card.field] || ''
}
- if (url === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!url && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
@@ -619,11 +711,11 @@
urls.forEach((u, i) => {
contents.push(
- <Col key={card.uuid + i} 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') {
@@ -635,18 +727,18 @@
val = data[card.field] || ''
}
- if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
contents.push(
- <Col key={card.uuid} 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')
@@ -659,17 +751,35 @@
}
contents.push(
- <Col key={card.uuid} span={card.width}>
- <div className="ant-mk-date" style={card.style}>
- {val}
+ <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} : {}
-
- if (card.$sync) {
+ let _style = {...card.style}
+
+ if (card.eval === 'func') {
+ let _data = []
+ if (card.$sync) {
+ _data = this.props.syncData
+ } else if (data && !data.$$empty) {
+ _data = [data]
+ }
+
+ try {
+ // eslint-disable-next-line
+ let func = new Function('data', card.formula)
+ val = func(_data)
+ } catch (e) {
+ if (window.GLOB.debugger === true) {
+ console.warn(e)
+ }
+ val = ''
+ }
+ } else if (card.$sync) {
if (card.eval === 'false') {
val = ''
}
@@ -684,6 +794,10 @@
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
+ if (window.GLOB.debugger === true) {
+ console.info(_val)
+ console.warn(e)
+ }
_val = 0
}
}
@@ -692,32 +806,56 @@
val += _val
})
+ } else if (data && data.$$empty) {
+ val = ''
} else if (data) {
let _val = card.formula
Object.keys(data).forEach(key => {
let reg = new RegExp('@' + key + '@', 'ig')
_val = _val.replace(reg, data[key])
})
-
+
if (card.eval !== 'false') {
try {
// eslint-disable-next-line
_val = eval(_val)
} catch (e) {
+ if (window.GLOB.debugger === true) {
+ console.info(_val)
+ console.warn(e)
+ }
_val = ''
}
}
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 !== '') {
if (val && typeof(val) === 'string') {
- val = val.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
+ val = val.replace(/\n/ig, '<br/>')
+ if (!/<(span|div|p|a|img)\s/g.test(val)) {
+ val = val.replace(/\s/ig, ' ')
+ }
+
val = <span dangerouslySetInnerHTML={{__html: val}}></span>
}
@@ -725,10 +863,14 @@
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 || ''}`
+ 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)
@@ -741,42 +883,85 @@
val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
}
+ className = mark.signType
+ }
+
+ contents.push(
+ <div className={'ant-col ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ <div style={_style}>
+ {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>
+ </div>
+ )
+ } else if (card.eleType === 'color') {
+ let color = ''
+
+ if (card.datatype === 'static') {
+ color = card.value
+ } else {
+ color = data[card.field] || ''
}
+ if (!color && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ return null
+ }
+
+ let _bgstyle = {backgroundColor: color}
+
+ if (PicRadio[card.lenWidRadio]) {
+ _bgstyle.paddingTop = PicRadio[card.lenWidRadio]
+ } else {
+ _bgstyle.paddingTop = '100%'
+ }
+
+ if (card.copyable === 'true') {
+ _bgstyle.cursor = 'pointer'
+ }
+
contents.push(
- <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-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') {
+ e.stopPropagation()
+
+ let oInput = document.createElement('input')
+ oInput.value = color
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand('Copy')
+ document.body.removeChild(oInput)
+
+ message.success('澶嶅埗鎴愬姛銆�')
+ }
+ }}></div>
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'button') {
let _disabled = data.$disabled
- if (card.control === 'hidden') {
- 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
- }
- }
-
let _data = [data]
if (data.$$type === 'extendCard') {
_data = data.$$selectedData || []
+ if (card.Ot === 'notRequired' && _data.length === 0) {
+ _data = [data]
+ }
} else if (card.$sync) {
- _data = this.props.syncData
+ _data = this.props.syncData || []
} else if (data.$$empty) {
_data = []
+ }
+
+ _style_ = _style_ || {}
+ if (card.wrapStyle) {
+ _style_ = {..._style_, ...card.wrapStyle}
}
if (['exec', 'prompt', 'pop', 'form'].includes(card.OpenType)) {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} 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}
@@ -786,11 +971,11 @@
columns={cards.columns}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'excelIn') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} 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}
@@ -799,11 +984,11 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'excelOut') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} 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}
@@ -812,11 +997,11 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'popview') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} 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}
@@ -825,36 +1010,36 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'tab') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} 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}
BData={data.$$BData || ''}
disabled={_disabled}
- setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.OpenType === 'innerpage') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} 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}
- setting={cards.setting}
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={card.wrapStyle} 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}
@@ -863,24 +1048,25 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.funcType === 'print') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} 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}
BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
+ columns={cards.columns}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.funcType === 'megvii') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} 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}
@@ -888,11 +1074,11 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
} else if (card.funcType === 'filezip') {
contents.push(
- <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} 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}
@@ -900,7 +1086,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>
)
}
}
@@ -911,9 +1107,12 @@
}
render() {
+ const { cardCell } = this.props
+
return (
- <div className="card-cell-list">
+ <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