From 137fb8ea6af2789b3238b22bac31d80bced41dfe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 七月 2021 11:39:39 +0800
Subject: [PATCH] 2021-07-28
---
src/menu/components/card/cardcomponent/index.jsx | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index f32968a..af376d8 100644
--- a/src/menu/components/card/cardcomponent/index.jsx
+++ b/src/menu/components/card/cardcomponent/index.jsx
@@ -8,13 +8,14 @@
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
import SettingForm from './settingform'
-
+import { resetStyle } from '@/utils/utils-custom.js'
import Utils from '@/utils/utils.js'
import MKEmitter from '@/utils/events.js'
import './index.scss'
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)
}
@@ -213,6 +221,14 @@
}
}
+ doubleClickCard = () => {
+ const { card } = this.state
+
+ if (card.setting.click === 'menu' && card.setting.menu) {
+ MKEmitter.emit('changeEditMenu', {MenuID: card.setting.menu})
+ }
+ }
+
render() {
const { cards, offset } = this.props
const { card, elements, side, settingVisible, dict } = this.state
@@ -233,10 +249,11 @@
marginTop: card.style.marginTop
}
}
+ _style = resetStyle(_style)
return (
<Col span={card.setting.width || 6} offset={offset || 0}>
- <div className="card-item" style={_style} onClick={this.clickComponent} id={card.uuid}>
+ <div className="card-item" style={_style} onClick={this.clickComponent} onDoubleClick={(e) => {e.stopPropagation(); this.doubleClickCard()}} id={card.uuid}>
<CardCellComponent cards={cards} cardCell={card} side={side} elements={elements} updateElement={this.updateCard}/>
<div className="card-control">
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
@@ -245,16 +262,17 @@
<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={
+ <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="plus" title="宸︾Щ" type="arrow-left" onClick={() => this.props.move(card, 'left')} />
- <Icon className="close" title="鍙崇Щ" type="arrow-right" onClick={() => this.props.move(card, 'right')} />
+ <Icon className="plus" title="鍓嶇Щ" type="arrow-left" onClick={() => this.props.move(card, 'left')} />
+ <Icon className="close" title="鍚庣Щ" type="arrow-right" onClick={() => this.props.move(card, 'right')} />
</div>
} trigger="hover" getPopupContainer={() => document.getElementById(card.uuid + 'swap')}>
<Icon type="swap" id={card.uuid + 'swap'}/>
- </Popover> : null}
- {cards.subtype === 'propcard' ? <Icon className="close" title="鍒犻櫎鍗＄墖" type="delete" onClick={() => this.props.deleteElement(card)} /> : null}
+ </Popover>
+ {cards.subtype === 'propcard' || card.$cardType === 'extendCard' ? <Icon className="close" title="鍒犻櫎鍗＄墖" type="delete" onClick={() => this.props.deleteElement(card)} /> : null}
{card.setting.type === 'multi' ? <Switch size="small" onClick={this.changeSide} defaultChecked /> : null}
</div>
} trigger="hover">
@@ -266,7 +284,7 @@
wrapClassName="popview-modal"
title={'鍗＄墖璁剧疆'}
visible={settingVisible}
- width={700}
+ width={800}
maskClosable={false}
okText={dict['model.submit']}
onOk={this.settingSubmit}
--
Gitblit v1.8.0