From b8e1395f02c929eaa96b949cf6027ee2a43856a6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 19:03:37 +0800
Subject: [PATCH] 2022-09-06
---
src/menu/components/card/cardcellcomponent/dragaction/index.jsx | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/index.jsx b/src/menu/components/card/cardcellcomponent/dragaction/index.jsx
index eda8cc2..f6cdeac 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/index.jsx
@@ -38,17 +38,33 @@
let copycard = fromJS(card).toJS()
let _cards = fromJS(cards).toJS()
- copycard.copyType = 'customCardElement'
+ if (card.eleType === 'button') {
+ copycard.copyType = 'action'
+ } else {
+ copycard.copyType = 'customCardElement'
+ }
copycard.focus = true
let _val = fromJS(copycard).toJS()
+
+ if (_val.control) {
+ delete _val.controlField
+ delete _val.controlVal
+ }
copycard.uuid = Utils.getuuid()
copycard.originCard = card
try {
+ 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 {
+ } catch (e) {
console.warn('Stringify Failure')
_val = ''
}
@@ -81,7 +97,7 @@
const doubleClickCard = id => {
const { card } = findCard(id)
- if (card.eleType !== 'button' && card.eleType !== 'text' && card.eleType !== 'picture') {
+ if (card.eleType !== 'button') {
return
}
@@ -112,6 +128,7 @@
key={card.uuid}
card={card}
parent={parent}
+ copyCard={copyCard}
moveCard={moveCard}
editCard={editCard}
changeStyle={changeStyle}
@@ -134,7 +151,6 @@
editCard={editCard}
updateMarks={updateMarks}
changeStyle={changeStyle}
- doubleClickCard={doubleClickCard}
delCard={delCard}
findCard={findCard}
/>
--
Gitblit v1.8.0