From 20185ab64a165df51515d9fa1c9b12a7a8c55f59 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 07 四月 2023 23:11:04 +0800
Subject: [PATCH] 2023-04-07
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 237 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 163 insertions(+), 74 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index a0eb57b..d997633 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -1,7 +1,7 @@
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'
@@ -237,6 +237,7 @@
if (card.eleType === 'sequence') {
let _style = {}
+ let className = ''
if (card.marks) {
_style.width = card.innerHeight
_style.height = card.innerHeight
@@ -245,13 +246,14 @@
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" style={{height: card.innerHeight || 'auto'}}><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 = ''
@@ -265,6 +267,19 @@
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]
@@ -362,6 +377,7 @@
}
}
+ let className = ''
if (card.marks) {
let mark = getMark(card.marks, data, _style)
@@ -374,6 +390,7 @@
val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
}
+ className = mark.signType
}
if (card.link || (card.anchors && card.anchors.length > 0)) {
@@ -383,13 +400,20 @@
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 || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={lineStyle}>{val}</div>
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'number') {
let val = ''
@@ -405,7 +429,8 @@
return null
}
- if (typeof(val) === 'number') {
+ if (!isNaN(val) && val !== '') {
+ val = +val
if (card.round) {
val = Math.round(val * card.round) / card.round
}
@@ -437,6 +462,7 @@
}
}
+ let className = ''
if (card.marks) {
let mark = getMark(card.marks, data, _style)
@@ -449,14 +475,22 @@
val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
}
+ 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 || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={lineStyle}>{val}</div>
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'icon') {
let val = ''
@@ -467,6 +501,10 @@
icon = data[card.field] || ''
} else {
icon = card.icon
+ }
+
+ if (!icon && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ return null
}
if (!height) { // 鍏煎
@@ -490,13 +528,13 @@
}
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}>
{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}/>}
</div>
- </Col>
+ </div>
)
} else if (card.eleType === 'slider') {
let val = 0
@@ -520,11 +558,11 @@
}
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 = {}
@@ -552,16 +590,17 @@
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'
@@ -571,22 +610,22 @@
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 = ''
@@ -602,13 +641,13 @@
}
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 = ''
@@ -635,11 +674,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') {
@@ -656,13 +695,13 @@
}
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')
@@ -675,16 +714,16 @@
}
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} : {}
-
+
if (card.$sync) {
if (card.eval === 'false') {
val = ''
@@ -714,7 +753,7 @@
let reg = new RegExp('@' + key + '@', 'ig')
_val = _val.replace(reg, data[key])
})
-
+
if (card.eval !== 'false') {
try {
// eslint-disable-next-line
@@ -726,14 +765,18 @@
val = _val === undefined ? '' : _val
}
-
+
if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
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>
}
@@ -741,10 +784,11 @@
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 || ''}</>
}
}
-
+
+ let className = ''
if (card.marks) {
let mark = getMark(card.marks, data, _style)
@@ -757,35 +801,76 @@
val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
}
+ 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 || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
+ <div className={'ant-mk-text line' + (card.height || '') + className} style={lineStyle}>{val}</div>
</div>
- </Col>
+ </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(
+ <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>
+ </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 || []
} else if (card.$sync) {
- _data = this.props.syncData
+ _data = this.props.syncData || []
} else if (data.$$empty) {
_data = []
}
@@ -797,7 +882,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}
@@ -807,11 +892,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}
@@ -820,11 +905,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}
@@ -833,11 +918,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}
@@ -846,11 +931,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}
@@ -858,23 +943,23 @@
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}
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}
@@ -883,24 +968,25 @@
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}
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={_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}
@@ -908,11 +994,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}
@@ -920,7 +1006,7 @@
setting={cards.setting}
selectedData={_data}
/>
- </Col>
+ </div>
)
}
}
@@ -931,9 +1017,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