From 2f95e9ca3984bba9bfe602596c2401e98e84f323 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 25 五月 2021 10:49:10 +0800 Subject: [PATCH] 2021-05-25 --- src/menu/components/card/cardcomponent/index.jsx | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx index 515c67b..2069058 100644 --- a/src/menu/components/card/cardcomponent/index.jsx +++ b/src/menu/components/card/cardcomponent/index.jsx @@ -15,6 +15,7 @@ const CardCellComponent = asyncComponent(() => import('../cardcellcomponent')) const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent')) +const PasteComponent = asyncIconComponent(() => import('./pastecomponent')) class CardBoxComponent extends Component { static propTpyes = { @@ -88,7 +89,7 @@ this.props.updateElement(_card) } - updateCard = (elements) => { + updateCard = (elements, type) => { const { card, side } = this.state let _card = {} @@ -99,9 +100,16 @@ _card = {...card, elements: elements} } - this.setState({ - card: _card - }) + if (type === 'paste') { + this.setState({ + card: _card, + elements: fromJS(elements).toJS() + }) + } else { + this.setState({ + card: _card + }) + } this.props.updateElement(_card) } @@ -246,6 +254,7 @@ <Icon className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} type="plus-square" /> <Icon className="edit" title="缂栬緫" type="edit" onClick={() => this.setState({settingVisible: true})} /> <CopyComponent type="cardcell" card={card}/> + <PasteComponent elements={elements} options={['action', 'customCardElement']} updateConfig={(list) => this.updateCard(list, 'paste')} /> <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" /> {cards.subtype === 'propcard' ? <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={ <div className="mk-popover-control"> -- Gitblit v1.8.0