From a70940450c021a47e69abdf8fa8f7f98594601cc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 13 十二月 2019 17:36:54 +0800
Subject: [PATCH] 2019-12-13
---
src/templates/comtableconfig/dragelement/index.jsx | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/src/templates/comtableconfig/dragelement/index.jsx b/src/templates/comtableconfig/dragelement/index.jsx
index aef3aae..53de9b3 100644
--- a/src/templates/comtableconfig/dragelement/index.jsx
+++ b/src/templates/comtableconfig/dragelement/index.jsx
@@ -19,7 +19,7 @@
}
const findCard = id => {
- const card = cards.filter(c => `${c.id}` === id)[0]
+ const card = cards.filter(c => `${c.uuid}` === id)[0]
return {
card,
index: cards.indexOf(card),
@@ -42,13 +42,7 @@
copycard.uuid = Utils.getuuid()
copycard.origin = false
copycard.label = copycard.label + '(copy)'
-
- let indexes = cards.map(car => { return car.id })
- let newid = 0
- while (indexes.includes(newid)) {
- newid++
- }
- copycard.id = newid
+
copycard.originCard = card
copyElement(copycard)
@@ -127,16 +121,9 @@
}
}
- let indexes = cards.map(car => {return car.id})
- let newid = 0
- while (indexes.includes(newid)) {
- newid++
- }
- newcard.id = newid
-
- let targetId = indexes.length > 0 ? indexes[indexes.length - 1] : 0
+ let targetId = cards.length > 0 ? cards[cards.length - 1].uuid : 0
if (target) {
- targetId = target.id
+ targetId = target.uuid
}
const { index: overIndex } = findCard(`${targetId}`)
@@ -187,7 +174,7 @@
{type === 'action' && cards.map(card => (
<Card
key={card.uuid}
- id={`${card.id}`}
+ id={`${card.uuid}`}
type={type}
card={card}
moveCard={moveCard}
@@ -201,8 +188,7 @@
{type === 'search' && cards.map(card => (
<Col key={card.uuid} span={6}>
<Card
- key={card.uuid}
- id={`${card.id}`}
+ id={`${card.uuid}`}
type={type}
card={card}
moveCard={moveCard}
@@ -229,7 +215,7 @@
{column.map(card => (
<Card
key={card.uuid}
- id={`${card.id}`}
+ id={`${card.uuid}`}
type={type}
card={card}
moveCard={moveCard}
--
Gitblit v1.8.0