From 7b01bec1609710729a868093ad69484ebea82d80 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 十月 2020 10:16:26 +0800
Subject: [PATCH] 2020-10-20
---
src/templates/modalconfig/dragelement/index.jsx | 69 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 23 deletions(-)
diff --git a/src/templates/modalconfig/dragelement/index.jsx b/src/templates/modalconfig/dragelement/index.jsx
index e1937b7..20ddba6 100644
--- a/src/templates/modalconfig/dragelement/index.jsx
+++ b/src/templates/modalconfig/dragelement/index.jsx
@@ -8,8 +8,6 @@
import './index.scss'
const Container = ({list, group, setting, placeholder, handleList, handleForm, closeForm }) => {
- let target = null
-
const [cards, setCards] = useState(list)
const moveCard = (id, atIndex) => {
const { card, index } = findCard(id)
@@ -39,7 +37,7 @@
const editCard = id => {
const { card } = findCard(id)
- handleForm(card, 'edit')
+ handleForm(card)
}
const closeCard = id => {
@@ -48,12 +46,34 @@
}
const copyCard = id => {
- const { card } = findCard(id)
- handleForm(card, 'copy')
- }
-
- const hasDrop = (item) => {
- target = item
+ const { card, index: overIndex } = findCard(id)
+
+ let _card = fromJS(card).toJS()
+ _card.uuid = Utils.getuuid()
+ _card.focus = true
+
+ // 澶嶅埗鍒板壀鍒囨澘
+ let oInput = document.createElement('input')
+ let val = JSON.parse(JSON.stringify(_card))
+ val.copyType = 'form'
+
+ oInput.value = window.btoa(window.encodeURIComponent(JSON.stringify(val)))
+ document.body.appendChild(oInput)
+ oInput.select()
+ document.execCommand('Copy')
+ oInput.className = 'oInput'
+ oInput.style.display = 'none'
+ document.body.removeChild(oInput)
+
+ const _cards = update(cards, { $splice: [[overIndex + 1, 0, _card]] })
+
+ setCards(_cards)
+
+ if (!group) {
+ handleList(_cards, null, null, _card)
+ } else {
+ handleList(_cards, group, null, _card)
+ }
}
const [, drop] = useDrop({
@@ -79,17 +99,17 @@
newcard.required = 'true'
newcard.focus = true
- let targetId = cards.length > 0 ? cards[cards.length - 1].uuid : 0
- if (target) {
- targetId = target.uuid
+ let targetId = '0'
+
+ if (item.dropTargetId) {
+ targetId = item.dropTargetId
+ } else if (cards.length > 0) {
+ targetId = cards[cards.length - 1].uuid
}
- const { index: overIndex } = findCard(`${targetId}`)
- let targetIndex = overIndex
+ const { index: overIndex } = findCard(`${targetId}`) // cards涓虹┖鏃� overIndex 涓� -1
+ const _cards = update(cards, { $splice: [[overIndex + 1, 0, newcard]] })
- targetIndex++
-
- const _cards = update(cards, { $splice: [[targetIndex, 0, newcard]] })
setCards(_cards)
if (!group) {
@@ -97,8 +117,6 @@
} else {
handleList(_cards, group, null, newcard)
}
-
- target = null
}
})
@@ -106,8 +124,14 @@
return (
<div ref={drop} className="ant-row modal-fields-row">
- {cards.map(card => (
- <Col key={card.uuid} className={card.type === 'textarea' ? 'textarea' + setting.cols : ''} span={card.type !== 'textarea' ? _cols : 24}>
+ {cards.map(card => {
+ let isEntireLine = false
+
+ if (card.entireLine === 'true' || ['textarea', 'hint', 'checkcard'].includes(card.type)) {
+ isEntireLine = true
+ }
+
+ return <Col key={card.uuid} className={isEntireLine ? 'textarea' + setting.cols : ''} span={isEntireLine ? 24 : _cols}>
<Card
id={card.uuid}
cols={setting.cols}
@@ -117,10 +141,9 @@
closeCard={closeCard}
copyCard={copyCard}
findCard={findCard}
- hasDrop={hasDrop}
/>
</Col>
- ))}
+ })}
{cards.length === 0 &&
<div className="modal-drawarea-placeholder">
{placeholder}
--
Gitblit v1.8.0