From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/cardcellcomponent/dragaction/index.jsx | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/index.jsx b/src/menu/components/card/cardcellcomponent/dragaction/index.jsx
index fdd2796..bba223b 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/index.jsx
@@ -38,15 +38,35 @@
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()
+
+ if (_val.control) {
+ _val.control = ''
+
+ delete _val.controlField
+ delete _val.controlVal
+ }
+
+ copycard.uuid = Utils.getuuid()
+ copycard.originCard = card
try {
- _val = window.btoa(window.encodeURIComponent(JSON.stringify(copycard)))
- } catch {
+ delete _val.$srcId
+
+ let srcid = localStorage.getItem(window.location.href.split('#')[0] + 'srcId')
+ if (srcid) {
+ _val.$srcId = srcid
+ }
+
+ _val = window.btoa(window.encodeURIComponent(JSON.stringify(_val)))
+ } catch (e) {
console.warn('Stringify Failure')
_val = ''
}
@@ -78,6 +98,11 @@
const doubleClickCard = id => {
const { card } = findCard(id)
+
+ if (card.eleType !== 'button') {
+ return
+ }
+
handleSubConfig(card)
}
@@ -105,6 +130,7 @@
key={card.uuid}
card={card}
parent={parent}
+ copyCard={copyCard}
moveCard={moveCard}
editCard={editCard}
changeStyle={changeStyle}
--
Gitblit v1.8.0