From 41308b8a2788df7ed6225414c163f8611c7e8f69 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 16 九月 2022 10:25:32 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/share/searchcomponent/dragsearch/card.jsx | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/menu/components/share/searchcomponent/dragsearch/card.jsx b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
index 7961d92..2b6bbe1 100644
--- a/src/menu/components/share/searchcomponent/dragsearch/card.jsx
+++ b/src/menu/components/share/searchcomponent/dragsearch/card.jsx
@@ -21,14 +21,20 @@
const [, drop] = useDrop({
accept: 'search',
canDrop: () => true,
- drop: ({ id: draggedId }) => {
- if (!draggedId || draggedId === id) return
-
- const { index: originIndex } = findCard(draggedId)
- if (originIndex === -1) return
-
- const { index: overIndex } = findCard(id)
- moveCard(draggedId, overIndex)
+ drop: (item) => {
+ const { id: draggedId, originalIndex } = item
+
+ if (originalIndex === undefined) {
+ item.dropTargetId = id
+ } else {
+ 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.5 : 1
--
Gitblit v1.8.0