From 72419e2f826031a158173f46d723a672064e37cd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 八月 2021 22:42:51 +0800
Subject: [PATCH] 2021-08-31
---
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 127 +++++++++++++++++++++++++++++++++---------
1 files changed, 100 insertions(+), 27 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index ea6fb70..ce5e4d4 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -1,15 +1,30 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
import { Icon, Popover } from 'antd'
-import './index.scss'
+import moment from 'moment'
import demo1 from '@/assets/img/demo1.jpg'
import demo2 from '@/assets/img/demo2.jpg'
import demo3 from '@/assets/img/demo3.jpg'
import demo4 from '@/assets/img/demo4.jpg'
import demo5 from '@/assets/img/demo5.jpg'
+import MKEmitter from '@/utils/events.js'
+import asyncComponent from '@/utils/asyncComponent'
+import asyncIconComponent from '@/utils/asyncIconComponent'
+import { resetStyle } from '@/utils/utils-custom.js'
+import './index.scss'
-const Card = ({ id, cardIds, card, moveCard, findCard, editCard, delCard, changeStyle }) => {
+const BarCode = asyncComponent(() => import('@/components/barcode'))
+const QrCode = asyncComponent(() => import('@/components/qrcode'))
+const Video = asyncComponent(() => import('@/components/video'))
+const MarkColumn = asyncIconComponent(() => import('@/menu/components/share/markcomponent'))
+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%'
+}
+
+const Card = ({ id, parent, fields, card, moveCard, findCard, editCard, delCard, copyCard, changeStyle, updateMarks }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: 'action', id, originalIndex },
@@ -21,13 +36,13 @@
accept: 'action',
canDrop: () => true,
drop({ id: draggedId }) {
- if (!draggedId) return
- if (!cardIds.includes(draggedId)) return
+ if (!draggedId || draggedId === id) return
- if (draggedId !== id) {
- const { index: overIndex } = findCard(id)
- moveCard(draggedId, overIndex)
- }
+ const { index: originIndex } = findCard(draggedId)
+ if (originIndex === -1) return
+
+ const { index: overIndex } = findCard(id)
+ moveCard(draggedId, overIndex)
},
})
@@ -35,20 +50,38 @@
if (card.style) {
_style = {...card.style, opacity: isDragging ? 0 : 1}
+ _style = resetStyle(_style)
+ }
+ if (card.eleType === 'picture' && card.maxWidth) {
+ _style.maxWidth = card.maxWidth
+ let left = _style.marginLeft && _style.marginLeft !== '0px' ? _style.marginLeft : 'auto'
+ let right = _style.marginRight && _style.marginRight !== '0px' ? _style.marginRight : 'auto'
+ _style.margin = (_style.marginTop || 0) + ' ' + right + ' ' + (_style.marginBottom || 0) + ' ' + left
+ delete _style.marginLeft
+ delete _style.marginRight
+ delete _style.marginTop
+ delete _style.marginBottom
}
const getContent = () => {
- if (card.eleType === 'text' || card.eleType === 'number') {
+ if (card.eleType === 'sequence') {
+ return (
+ <div className={'ant-mk-text'}>1</div>
+ )
+ } else if (card.eleType === 'text' || card.eleType === 'number') {
let val = `${card.prefix || ''}${card.datatype === 'static' ? (card.value || '') : (card.field || '')}${card.postfix || ''}`
- return val
+ return (
+ <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
+ )
} else if (card.eleType === 'icon') {
return (<Icon type={card.icon}/>)
} else if (card.eleType === 'slider') {
+ let val = card.value ? (card.value / card.maxValue) * 100 : 30
return (
<div className="ant-mk-slider">
<div className="ant-mk-slider-rail"></div>
- <div className="ant-mk-slider-track" style={{width: '30%', backgroundColor: card.color}}></div>
- <div className="ant-mk-slider-handle" style={{left: '30%', borderColor: card.color}}></div>
+ <div className="ant-mk-slider-track" style={{width: `${val}%`, backgroundColor: card.color}}></div>
+ <div className="ant-mk-slider-handle" style={{left: `${val}%`, borderColor: card.color}}></div>
</div>
)
} else if (card.eleType === 'picture') {
@@ -58,22 +91,18 @@
_imagestyle = {backgroundImage: `url('${card.url}')`}
} else {
let index = card.uuid.match(/\d{1}/g)
- index = index[index.length - 1] % 5
+ index = index.slice(-1)[0] % 5
let demos = [demo1, demo2, demo3, demo4, demo5]
_imagestyle = {backgroundImage: `url('${demos[index]}')`}
}
- if (card.radius === 'true') {
- _imagestyle.borderRadius = '50%'
+ if (card.style && card.style.borderRadius) {
+ _imagestyle.borderRadius = card.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%'
}
@@ -82,22 +111,66 @@
<div className="ant-mk-picture" style={_imagestyle}></div>
)
} else if (card.eleType === 'splitline') {
+ let _borderWidth = card.borderWidth === undefined ? 1 : card.borderWidth
return (
- <div className="ant-mk-splitline" style={{backgroundColor: card.color}}></div>
+ <div style={{paddingTop: '1px'}}>
+ <div className="ant-mk-splitline" style={{borderColor: card.color, borderWidth: _borderWidth}}></div>
+ </div>
)
+ } else if (card.eleType === 'barcode') {
+ return (
+ <div style={{height: card.innerHeight || 25}}>
+ <BarCode card={card} value={card.value || 'mksoft'}/>
+ </div>
+ )
+ } else if (card.eleType === 'qrcode') {
+ return (
+ <div style={{minHeight: card.qrWidth || 50}}>
+ <QrCode card={card} value={card.value || 'mksoft'}/>
+ </div>
+ )
+ } else if (card.eleType === 'video') {
+ return (
+ <div>
+ <Video card={card} value={card.url || 'http://qingqiumarket.cn/mkwms/Content/images/upload/20210104/trailer.mp4'}/>
+ </div>
+ )
+ } else if (card.eleType === 'currentDate') {
+ return (
+ <div className="ant-mk-date">
+ {`${card.prefix || ''}${moment().format(card.dateFormat)}${card.postfix || ''}`}
+ </div>
+ )
+ } else if (card.eleType === 'formula') {
+ return (
+ <div className="ant-mk-date">
+ {`${card.prefix || ''}${card.formula}${card.postfix || ''}`}
+ </div>
+ )
+ }
+ }
+
+ const clickComponent = (e) => {
+ if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'cardcell') {
+ e.stopPropagation()
+ MKEmitter.emit('clickComponent', card, parent, 'cardcell')
}
}
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
- <div className="mk-popover-control">
- <Icon className="edit" title="edit" type="edit" onClick={() => editCard(id)} />
- <Icon className="close" title="close" type="close" onClick={() => delCard(id)} />
+ <div className="mk-popover-control" onDoubleClick={(e) => e.stopPropagation()}>
+ <Icon className="edit" title="缂栬緫" type="edit" onClick={() => editCard(id)} />
+ <Icon className="copy" title="澶嶅埗" type="copy" onClick={() => copyCard(id)} />
+ <Icon className="close" title="鍒犻櫎" type="close" onClick={() => delCard(id)} />
<Icon className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)} type="font-colors" />
+ {['text', 'number', 'slider', 'sequence', 'formula'].includes(card.eleType) ? <MarkColumn columns={fields} type={card.eleType} marks={card.marks} onSubmit={(vals) => updateMarks({...card, marks: vals})} /> : null }
</div>
} trigger="hover">
- <div ref={node => drag(drop(node))} className={'ant-col card-cell ant-col-' + card.width} style={_style}>
- {getContent()}
+ <div ref={node => drag(drop(node))} className={'ant-col card-cell ant-col-' + card.width}>
+ <div style={_style} onClick={clickComponent} id={card.uuid}>
+ {getContent()}
+ </div>
</div>
</Popover>
)
--
Gitblit v1.8.0