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/search/main-search/dragsearch/card.jsx | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/search/main-search/dragsearch/card.jsx b/src/menu/components/search/main-search/dragsearch/card.jsx
index e9d558a..4e36738 100644
--- a/src/menu/components/search/main-search/dragsearch/card.jsx
+++ b/src/menu/components/search/main-search/dragsearch/card.jsx
@@ -23,13 +23,19 @@
const [, drop] = useDrop({
accept: 'search',
canDrop: () => true,
- drop: ({ id: draggedId }) => {
- if (!draggedId || draggedId === id) return
- const { index: originIndex } = findCard(draggedId)
- if (originIndex === -1) return
+ 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 { index: overIndex } = findCard(id)
+ moveCard(draggedId, overIndex)
+ }
},
})
const opacity = isDragging ? 0.5 : 1
--
Gitblit v1.8.0