From fe5721c8efd837b13b7f2d2687da53637fc02919 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 05 八月 2021 15:05:02 +0800
Subject: [PATCH] 2021-08-05
---
src/menu/components/card/cardcomponent/index.jsx | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/menu/components/card/cardcomponent/index.jsx b/src/menu/components/card/cardcomponent/index.jsx
index de93665..895c2e3 100644
--- a/src/menu/components/card/cardcomponent/index.jsx
+++ b/src/menu/components/card/cardcomponent/index.jsx
@@ -14,7 +14,7 @@
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
const CardCellComponent = asyncComponent(() => import('../cardcellcomponent'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
-const PasteComponent = asyncIconComponent(() => import('./pastecomponent'))
+const PasteController = asyncIconComponent(() => import('@/components/paste'))
class CardBoxComponent extends Component {
static propTpyes = {
@@ -85,7 +85,7 @@
this.props.updateElement(_card)
}
- updateCard = (elements, type) => {
+ updateCard = (elements) => {
const { card, side } = this.state
let _card = {}
@@ -96,16 +96,9 @@
_card = {...card, elements: elements}
}
- if (type === 'paste') {
- this.setState({
- card: _card,
- elements: fromJS(elements).toJS()
- })
- } else {
- this.setState({
- card: _card
- })
- }
+ this.setState({
+ card: _card
+ })
this.props.updateElement(_card)
}
@@ -151,24 +144,9 @@
const { cards } = this.props
const { card } = this.state
- let newcard = {}
+ let newcard = {eleType: 'button', label: 'button', verify: null, show: 'link', sqlType: '', Ot: 'requiredSgl', OpenType: 'prompt', icon: '', class: 'primary', intertype: 'system', execSuccess: 'grid', execError: 'never', popClose: 'never'}
newcard.uuid = Utils.getuuid()
newcard.focus = true
-
- newcard.eleType = 'button'
- newcard.label = 'button'
- newcard.sqlType = ''
- newcard.Ot = 'requiredSgl'
- newcard.OpenType = 'prompt'
- newcard.icon = ''
- newcard.class = 'primary'
- newcard.intertype = 'system'
- newcard.execSuccess = 'grid'
- newcard.execError = 'never'
- newcard.popClose = 'never'
- newcard.errorTime = 10
- newcard.verify = null
- newcard.show = 'link'
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
MKEmitter.emit('cardAddElement', [cards.uuid, card.uuid], newcard)
@@ -202,8 +180,8 @@
if (res.appmenu) {
res.menu = res.appmenu
- delete res.appmenu
}
+ delete res.appmenu
this.setState({
card: {...card, setting: res}
@@ -217,6 +195,28 @@
}
this.props.updateElement({...card, setting: res})
+ }
+
+ paste = (element, resolve) => {
+ const { cards } = this.props
+ const { card } = this.state
+
+ let _uuid = Utils.getuuid()
+
+ if (element.copyType === 'action' && element.OpenType === 'popview') { // 寮圭獥鏍囩澶嶅埗
+ let _cell = fromJS(element).toJS()
+ _cell.$originUuid = element.uuid
+ _cell.uuid = _uuid
+ MKEmitter.emit('copyButtons', [_cell])
+ }
+
+ element.uuid = _uuid
+ element.focus = true
+
+ resolve({status: true})
+
+ // 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
+ MKEmitter.emit('cardAddElement', [cards.uuid, card.uuid], element)
}
clickComponent = (e) => {
@@ -265,7 +265,7 @@
<Icon type="edit" className="edit" title="缂栬緫"/>
</NormalForm>
<CopyComponent type="cardcell" card={card}/>
- <PasteComponent elements={elements} options={['action', 'customCardElement']} updateConfig={(list) => this.updateCard(list, 'paste')} />
+ <PasteController options={['action', 'customCardElement']} updateConfig={this.paste} />
<Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
--
Gitblit v1.8.0