From af6486b3629d23e426ce85b87dbc20dfa15b1afe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 07 十一月 2022 18:50:27 +0800
Subject: [PATCH] 2022-11-07
---
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index bc181b0..f9657cf 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -40,7 +40,13 @@
const [, drop] = useDrop({
accept: 'action',
canDrop: () => true,
- drop({ id: draggedId }) {
+ drop(item) {
+ const { id: draggedId } = item
+
+ if (item.$init) {
+ item.overIndex = id
+ }
+
if (!draggedId || draggedId === id) return
const { index: originIndex } = findCard(draggedId)
@@ -51,10 +57,10 @@
},
})
- let _style = {opacity: isDragging ? 0 : 1}
+ let _style = {opacity: isDragging ? 0.3 : 1}
if (card.style) {
- _style = {...card.style, opacity: isDragging ? 0 : 1}
+ _style = {...card.style, opacity: isDragging ? 0.3 : 1}
_style = resetStyle(_style)
}
if (card.eleType === 'picture' && card.maxWidth) {
@@ -71,7 +77,7 @@
const getContent = () => {
if (card.eleType === 'sequence') {
return (
- <div className={'ant-mk-text'}>1</div>
+ <div style={{height: card.innerHeight || 'auto'}} 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 || ''}`
@@ -83,18 +89,7 @@
<div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
)
} else if (card.eleType === 'icon') {
- let fontSize = 14
- let lineHeight = 1.5
-
- if (card.style.fontSize) {
- fontSize = parseInt(card.style.fontSize)
- }
- if (card.style.lineHeight) {
- lineHeight = parseFloat(card.style.lineHeight)
- }
-
- let innerHeight = fontSize * lineHeight
- return (<MkIcon style={{height: innerHeight}} className="ant-mk-icon" type={card.icon}/>)
+ return (<MkIcon style={{height: card.innerHeight || 'auto'}} className="ant-mk-icon" type={card.icon || 'bell'}/>)
} else if (card.eleType === 'slider') {
let val = card.value ? (card.value / card.maxValue) * 100 : 30
return <MkProgress value={val} config={card}/>
@@ -110,6 +105,7 @@
let url = card.url !== '@icon@' ? card.url : sessionStorage.getItem('CloudAvatar')
if (url) {
+ url = url.replace(/@mywebsite@\//ig, window.GLOB.baseurl)
_imagestyle = {backgroundImage: `url('${url}')`}
} else {
let index = card.uuid.match(/\d{1}/g)
@@ -135,7 +131,7 @@
} else if (card.eleType === 'splitline') {
let _borderWidth = card.borderWidth === undefined ? 1 : card.borderWidth
return (
- <div style={{paddingTop: '1px'}}>
+ <div style={{paddingTop: _borderWidth ? '1px' : '10px'}}>
<div className="ant-mk-splitline" style={{borderColor: card.color, borderWidth: _borderWidth}}></div>
</div>
)
@@ -165,7 +161,7 @@
val = <><span style={_s}>{card.prefix || ''}</span>{moment().format(card.dateFormat)}<span style={_s}>{card.postfix || ''}</span></>
}
return (
- <div className="ant-mk-date">
+ <div className="ant-mk-text line1" style={{height: card.innerHeight || 'auto'}}>
{val}
</div>
)
@@ -176,7 +172,7 @@
val = <><span style={_s}>{card.prefix || ''}</span>{card.formula}<span style={_s}>{card.postfix || ''}</span></>
}
return (
- <div className="ant-mk-date">
+ <div className="ant-mk-text" style={{height: card.innerHeight || 'auto'}}>
{val}
</div>
)
@@ -186,14 +182,19 @@
const clickComponent = (e) => {
if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'cardcell') {
e.stopPropagation()
- MKEmitter.emit('clickComponent', card, parent, 'cardcell')
+ MKEmitter.emit('clickComponent', card.uuid, parent.uuid)
}
}
let able = true
- if ((appType === 'mob' || appType === 'pc') && parent && (parent.setting.click === 'menu' || parent.setting.click === 'menus')) {
- // if ((appType === 'mob' || appType === 'pc') && parent && parent.setting.click === 'menu') {
+ if ((appType === 'mob' || appType === 'pc') && (parent.setting.click === 'menu' || parent.setting.click === 'menus')) {
able = false
+ }
+
+ let _style_ = null
+
+ if (card.style && card.style.clear === 'left') {
+ _style_ = {clear: 'left'}
}
return (
@@ -203,10 +204,10 @@
<CopyOutlined className="copy" title="澶嶅埗" onClick={() => copyCard(id)} />
<CloseOutlined className="close" title="鍒犻櫎" onClick={() => delCard(id)} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)}/>
- {['text', 'number', 'slider', 'sequence', 'formula'].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 field={card.field || ''} 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 ref={node => drag(drop(node))} style={_style_} className={'ant-col card-cell ant-col-' + card.width}>
<div style={_style} onClick={clickComponent} onDoubleClick={() => able && editCard(id)} id={card.uuid}>
{getContent()}
</div>
--
Gitblit v1.8.0