From c986f2f56bb153a9b6cebc74b4d9334c85ddfdda Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 04 一月 2021 18:54:02 +0800
Subject: [PATCH] 2020-01-04
---
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 67 insertions(+), 20 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index ea6fb70..dc42ad7 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -1,15 +1,24 @@
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 asyncComponent from '@/utils/asyncComponent'
+import asyncIconComponent from '@/utils/asyncIconComponent'
-const Card = ({ id, cardIds, card, moveCard, findCard, editCard, delCard, changeStyle }) => {
+import './index.scss'
+
+const BarCode = asyncComponent(() => import('@/components/barcode'))
+const QrCode = asyncComponent(() => import('@/components/qrcode'))
+const Video = asyncComponent(() => import('@/components/video'))
+const MarkColumn = asyncIconComponent(() => import('@/menu/components/table/normal-table/columns/markcolumn'))
+
+const Card = ({ id, 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 +30,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)
},
})
@@ -38,17 +47,24 @@
}
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 || 21}}>{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,14 +74,14 @@
_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') {
@@ -82,8 +98,35 @@
<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>
)
}
}
@@ -91,13 +134,17 @@
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)} />
+ <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'].includes(card.eleType) ? <MarkColumn columns={fields} 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}>
+ {getContent()}
+ </div>
</div>
</Popover>
)
--
Gitblit v1.8.0