From 9ff5920c0a58771219b134a7b46b7d0c1e1542ad Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期三, 19 六月 2024 23:50:13 +0800 Subject: [PATCH] 2024-06-19 --- src/menu/components/card/cardcellcomponent/dragaction/index.jsx | 40 +++++++++++++++++++++++++++++++++------- 1 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/menu/components/card/cardcellcomponent/dragaction/index.jsx b/src/menu/components/card/cardcellcomponent/dragaction/index.jsx index 683cd5f..e55c040 100644 --- a/src/menu/components/card/cardcellcomponent/dragaction/index.jsx +++ b/src/menu/components/card/cardcellcomponent/dragaction/index.jsx @@ -1,6 +1,7 @@ import React, { useState } from 'react' import { useDrop } from 'react-dnd' import { is, fromJS } from 'immutable' +import { message } from 'antd' import update from 'immutability-helper' import Card from './card' @@ -53,12 +54,11 @@ } copycard.uuid = Utils.getuuid() - copycard.originCard = card try { delete _val.$srcId - let srcid = localStorage.getItem(window.location.href.split('#')[0] + 'srcId') + let srcid = localStorage.getItem(window.GLOB.sysSign + 'srcId') if (srcid) { _val.$srcId = srcid } @@ -76,12 +76,18 @@ oInput.select() document.execCommand('Copy') document.body.removeChild(oInput) + + message.success('澶嶅埗鎴愬姛銆�') + } else { + message.warning('澶嶅埗澶辫触銆�') } - _cards.push(copycard) - - handleList(_cards) - handleMenu(copycard) + if (card.eleType !== 'button') { + _cards.push(copycard) + + handleList(_cards) + handleMenu(copycard) + } } const changeStyle = id => { @@ -130,6 +136,26 @@ newcard.eleType = item.value newcard.datatype = 'dynamic' newcard.height = 1 + + if (item.value === 'splitline') { + newcard.width = 24 + newcard.color = '#EBE9E9' + } else if (item.value === 'tag') { + newcard.style = { + backgroundColor: 'var(--mk-sys-color1)', + color: 'var(--mk-sys-color)', + borderColor: 'var(--mk-sys-color)', + borderWidth: '1px', + borderRadius: '4px', + paddingLeft: '7px', + paddingRight: '7px', + marginRight: '8px', + marginBottom: '8px', + } + } else if (item.value === 'slider') { + newcard.width = 24 + newcard.color = '#1890ff' + } } else { newcard.eleType = 'button' newcard.label = 'button' @@ -141,7 +167,7 @@ if (newcard.OpenType === 'excelIn') { newcard.label = item.text - newcard.class = 'dgreen' + newcard.class = 'border-dgreen' newcard.Ot = 'notRequired' } else if (item.subType === 'excelOut') { newcard.label = item.text -- Gitblit v1.8.0