From 8b9effb98612ee8a00d76d639a5733d12e9ecce6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 13 十一月 2019 22:09:35 +0800
Subject: [PATCH] 2019-11-13
---
src/components/sidemenu/comtableconfig/dragelement/card.jsx | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/components/sidemenu/comtableconfig/dragelement/card.jsx b/src/components/sidemenu/comtableconfig/dragelement/card.jsx
index a155017..9cc00e2 100644
--- a/src/components/sidemenu/comtableconfig/dragelement/card.jsx
+++ b/src/components/sidemenu/comtableconfig/dragelement/card.jsx
@@ -5,7 +5,7 @@
import ItemTypes from './itemtypes'
import './index.scss'
-const Card = ({ id, type, card, moveCard, findCard, editCard }) => {
+const Card = ({ id, type, card, moveCard, findCard, editCard, hasDrop }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: ItemTypes[type], id, originalIndex },
@@ -15,8 +15,14 @@
})
const [, drop] = useDrop({
accept: ItemTypes[type],
- canDrop: () => false,
+ canDrop: () => true,
+ drop: (item) => {
+ if (!item.hasOwnProperty('originalIndex')) {
+ hasDrop(card)
+ }
+ },
hover({ id: draggedId }) {
+ if (!draggedId) return
if (draggedId !== id) {
const { index: overIndex } = findCard(id)
moveCard(draggedId, overIndex)
@@ -28,7 +34,6 @@
const edit = () => {
editCard(id)
}
-
return (
<div className="page-card" style={type === 'columns' ? { flex: card.Width, opacity: opacity} : { opacity: opacity}}>
<div ref={node => drag(drop(node))}>
--
Gitblit v1.8.0