From c7c3b0cd51c2c9251a11e4b5bc5057cc92f6e9a7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 02 十一月 2020 09:18:43 +0800
Subject: [PATCH] 2020-11-02
---
src/menu/searchcomponent/dragsearch/card.jsx | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/menu/searchcomponent/dragsearch/card.jsx b/src/menu/searchcomponent/dragsearch/card.jsx
index 9b8708d..8258e97 100644
--- a/src/menu/searchcomponent/dragsearch/card.jsx
+++ b/src/menu/searchcomponent/dragsearch/card.jsx
@@ -8,7 +8,7 @@
const { MonthPicker, WeekPicker, RangePicker } = DatePicker
-const Card = ({ id, cardIds, card, moveCard, findCard, copyCard, editCard, delCard }) => {
+const Card = ({ id, card, moveCard, findCard, copyCard, editCard, delCard }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: 'search', id, originalIndex },
@@ -21,12 +21,14 @@
canDrop: () => true,
drop: () => {},
hover({ id: draggedId }) {
- if (!draggedId) return
- if (!cardIds.includes(draggedId)) return
- if (draggedId !== id) {
- const { index: overIndex } = findCard(id)
- moveCard(draggedId, overIndex)
- }
+ if (!draggedId || draggedId === id) return
+
+ const { index: originIndex } = findCard(draggedId)
+
+ if (originIndex === -1) return
+
+ const { index: overIndex } = findCard(id)
+ moveCard(draggedId, overIndex)
},
})
const opacity = isDragging ? 0 : 1
--
Gitblit v1.8.0