From 71a0e75ecb56ae643fe1e86188d45f93f48388c9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 28 八月 2020 14:07:41 +0800
Subject: [PATCH] 2020-08-28
---
src/menu/actioncomponent/dragaction/index.jsx | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/menu/actioncomponent/dragaction/index.jsx b/src/menu/actioncomponent/dragaction/index.jsx
index 5f310c0..e7e215c 100644
--- a/src/menu/actioncomponent/dragaction/index.jsx
+++ b/src/menu/actioncomponent/dragaction/index.jsx
@@ -8,7 +8,7 @@
import Card from './card'
import './index.scss'
-const Container = ({list, handleList, handleMenu, deleteMenu, profileMenu, doubleClickCard }) => {
+const Container = ({type, list, handleList, handleMenu, deleteMenu, profileMenu, doubleClickCard }) => {
const [cards, setCards] = useState(list)
const moveCard = (id, atIndex) => {
const { card, index } = findCard(id)
@@ -90,13 +90,11 @@
handleList(_cards, copycard)
}
+ let cardIds = cards.map(card => card.uuid)
+
const [, drop] = useDrop({
accept: 'action',
- drop(item) {
- if (item.hasOwnProperty('originalIndex')) {
- return
- }
- }
+ drop() {}
})
const addaction = () => {
@@ -107,8 +105,7 @@
newcard.label = 'button'
newcard.sqlType = ''
newcard.Ot = 'requiredSgl'
- newcard.OpenType = 'excelIn'
- newcard.tabType = 'SubTable'
+ newcard.OpenType = 'prompt'
newcard.icon = ''
newcard.class = 'default'
newcard.intertype = 'inner'
@@ -138,6 +135,8 @@
<Card
id={card.uuid}
key={card.uuid}
+ cardIds={cardIds}
+ type={type}
card={card}
moveCard={moveCard}
copyCard={copyCard}
--
Gitblit v1.8.0