From c98e45bfac25e9110ad0383faac54a54d98ea9d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 18 十一月 2021 20:47:04 +0800
Subject: [PATCH] 2021-11-18
---
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index 448cb6a..a4147f1 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -15,6 +15,7 @@
import './index.scss'
const BarCode = asyncComponent(() => import('@/components/barcode'))
+const MkProgress = asyncComponent(() => import('./mkProgress'))
const QrCode = asyncComponent(() => import('@/components/qrcode'))
const Video = asyncComponent(() => import('@/components/video'))
const MarkColumn = asyncIconComponent(() => import('@/menu/components/share/markcomponent'))
@@ -24,7 +25,7 @@
'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, doubleClickCard }) => {
+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 },
@@ -52,6 +53,16 @@
_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 === 'sequence') {
@@ -67,13 +78,14 @@
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: `${val}%`, backgroundColor: card.color}}></div>
- <div className="ant-mk-slider-handle" style={{left: `${val}%`, borderColor: card.color}}></div>
- </div>
- )
+ return <MkProgress value={val} config={card}/>
+ // return (
+ // <div className="ant-mk-slider">
+ // <div className="ant-mk-slider-rail"></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') {
let _imagestyle = {}
@@ -131,6 +143,12 @@
{`${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>
+ )
}
}
@@ -143,16 +161,16 @@
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
- <div className="mk-popover-control">
+ <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'].includes(card.eleType) ? <MarkColumn columns={fields} type={card.eleType} marks={card.marks} onSubmit={(vals) => updateMarks({...card, marks: vals})} /> : null }
+ {['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}>
- <div style={_style} onClick={clickComponent} onDoubleClick={() => doubleClickCard(id)} id={card.uuid}>
+ <div style={_style} onClick={clickComponent} id={card.uuid}>
{getContent()}
</div>
</div>
--
Gitblit v1.8.0