From e8edfdadb561cd83bf6e1c3e00d55b8cc2aee6d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 十月 2022 17:57:34 +0800
Subject: [PATCH] 2022-10-17
---
src/menu/components/card/cardcellcomponent/dragaction/index.jsx | 87 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 81 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/index.jsx b/src/menu/components/card/cardcellcomponent/dragaction/index.jsx
index fdd2796..683cd5f 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/index.jsx
@@ -38,15 +38,33 @@
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) {
+ 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 +96,11 @@
const doubleClickCard = id => {
const { card } = findCard(id)
+
+ if (card.eleType !== 'button') {
+ return
+ }
+
handleSubConfig(card)
}
@@ -89,6 +112,58 @@
const [, drop] = useDrop({
accept: 'action',
drop(item) {
+ if (item.$init) { // 鎷栨嫿娣诲姞
+ let newcard = {}
+ newcard.uuid = Utils.getuuid()
+ newcard.focus = true
+
+ // 鏄剧ず鍒楄繃婊�
+ if (parent.type === 'custom' && item.class !== 'element') {
+ delete item.overIndex
+ return
+ } else if (parent.type === 'action' && item.class === 'element') {
+ delete item.overIndex
+ return
+ }
+
+ if (item.class === 'element') {
+ newcard.eleType = item.value
+ newcard.datatype = 'dynamic'
+ newcard.height = 1
+ } else {
+ newcard.eleType = 'button'
+ newcard.label = 'button'
+ newcard.verify = null
+ newcard.show = 'link'
+ newcard.Ot = 'requiredSgl'
+ newcard.OpenType = item.value
+ newcard.class = 'primary'
+
+ if (newcard.OpenType === 'excelIn') {
+ newcard.label = item.text
+ newcard.class = 'dgreen'
+ newcard.Ot = 'notRequired'
+ } else if (item.subType === 'excelOut') {
+ newcard.label = item.text
+ newcard.execSuccess = 'never'
+ newcard.class = 'dgreen'
+ }
+ }
+
+ if (item.overIndex) {
+ const { index } = findCard(item.overIndex)
+ const _cards = update(cards, { $splice: [[index + 1, 0, newcard]] })
+ handleList(_cards)
+ } else {
+ handleList([...cards, newcard])
+ }
+
+ handleMenu(newcard)
+
+ delete item.overIndex
+ return
+ }
+
const { index } = findCard(item.id)
if (index > -1) return
dropButton(item.id)
@@ -104,7 +179,7 @@
id={card.uuid}
key={card.uuid}
card={card}
- parent={parent}
+ copyCard={copyCard}
moveCard={moveCard}
editCard={editCard}
changeStyle={changeStyle}
--
Gitblit v1.8.0