From 72419e2f826031a158173f46d723a672064e37cd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 八月 2021 22:42:51 +0800
Subject: [PATCH] 2021-08-31
---
src/menu/components/card/cardcellcomponent/dragaction/index.jsx | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/index.jsx b/src/menu/components/card/cardcellcomponent/dragaction/index.jsx
index 49267a8..64bb8d9 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/index.jsx
@@ -8,7 +8,7 @@
import Action from './action'
import './index.scss'
-const Container = ({list, handleList, handleMenu, deleteMenu, profileAction, handleStyle, handleSubConfig }) => {
+const Container = ({list, parent, fields, handleList, handleMenu, deleteMenu, profileAction, handleStyle, updateMarks, dropButton, handleSubConfig }) => {
const [cards, setCards] = useState(list)
const moveCard = (id, atIndex) => {
const { card, index } = findCard(id)
@@ -34,17 +34,24 @@
}
const copyCard = id => {
- const { card, index: overIndex } = findCard(id)
+ const { card } = findCard(id)
let copycard = fromJS(card).toJS()
+ let _cards = fromJS(cards).toJS()
- copycard.uuid = Utils.getuuid()
- copycard.copyType = 'customCardElement'
+ if (card.eleType === 'button') {
+ copycard.copyType = 'action'
+ } else {
+ copycard.copyType = 'customCardElement'
+ }
copycard.focus = true
- let _val = ''
+ let _val = fromJS(copycard).toJS()
+
+ copycard.uuid = Utils.getuuid()
+ copycard.originCard = card
try {
- _val = window.btoa(window.encodeURIComponent(JSON.stringify(copycard)))
+ _val = window.btoa(window.encodeURIComponent(JSON.stringify(_val)))
} catch {
console.warn('Stringify Failure')
_val = ''
@@ -59,7 +66,7 @@
document.body.removeChild(oInput)
}
- const _cards = update(cards, { $splice: [[overIndex + 1, 0, copycard]] })
+ _cards.push(copycard)
handleList(_cards)
handleMenu(copycard)
@@ -77,9 +84,12 @@
const doubleClickCard = id => {
const { card } = findCard(id)
- if (card.OpenType === 'pop') {
- handleSubConfig(card)
+
+ if (card.eleType !== 'button') {
+ return
}
+
+ handleSubConfig(card)
}
const delCard = id => {
@@ -87,11 +97,13 @@
deleteMenu(card)
}
- let cardIds = cards.map(card => card.uuid)
-
const [, drop] = useDrop({
accept: 'action',
- drop() {}
+ drop(item) {
+ const { index } = findCard(item.id)
+ if (index > -1) return
+ dropButton(item.id)
+ }
})
return (
@@ -102,8 +114,9 @@
<Action
id={card.uuid}
key={card.uuid}
- cardIds={cardIds}
card={card}
+ parent={parent}
+ copyCard={copyCard}
moveCard={moveCard}
editCard={editCard}
changeStyle={changeStyle}
@@ -118,11 +131,13 @@
<Card
id={card.uuid}
key={card.uuid}
- cardIds={cardIds}
card={card}
+ parent={parent}
+ fields={fields}
moveCard={moveCard}
copyCard={copyCard}
editCard={editCard}
+ updateMarks={updateMarks}
changeStyle={changeStyle}
delCard={delCard}
findCard={findCard}
--
Gitblit v1.8.0