From 66cc7818cf5e13c44f4372e7d47fb72df7d2f752 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 16 九月 2022 10:30:14 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index b5f393b..e0c82a5 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)
@@ -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}/>)
} else if (card.eleType === 'slider') {
let val = card.value ? (card.value / card.maxValue) * 100 : 30
return <MkProgress value={val} config={card}/>
@@ -165,7 +160,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 +171,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>
)
@@ -191,8 +186,7 @@
}
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
}
--
Gitblit v1.8.0