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 | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index 126104c..ce5e4d4 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -11,7 +11,7 @@
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 BarCode = asyncComponent(() => import('@/components/barcode'))
@@ -24,7 +24,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 },
@@ -50,6 +50,17 @@
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 = () => {
@@ -130,6 +141,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>
+ )
}
}
@@ -142,16 +159,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