Merge branch 'develop'

king

2022-08-02 8d66ff34fae5b048a6b7923cc75d34f13a08be9d

 src/menu/components/card/cardcellcomponent/dragaction/index.jsx

@@ -38,17 +38,35 @@
    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) {
      _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 +99,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 +130,7 @@
              key={card.uuid}
              card={card}
              parent={parent}
              copyCard={copyCard}
              moveCard={moveCard}
              editCard={editCard}
              changeStyle={changeStyle}
@@ -134,7 +153,6 @@
              editCard={editCard}
              updateMarks={updateMarks}
              changeStyle={changeStyle}
              doubleClickCard={doubleClickCard}
              delCard={delCard}
              findCard={findCard}
            />