From cb9ade2afd2a367ad767bc605ab7086c695dd010 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 09 十二月 2022 15:53:32 +0800
Subject: [PATCH] 2022-12-09
---
src/menu/components/card/cardsimplecomponent/index.jsx | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/src/menu/components/card/cardsimplecomponent/index.jsx b/src/menu/components/card/cardsimplecomponent/index.jsx
index 07f6588..e46f414 100644
--- a/src/menu/components/card/cardsimplecomponent/index.jsx
+++ b/src/menu/components/card/cardsimplecomponent/index.jsx
@@ -16,6 +16,7 @@
const NodesWrap = asyncComponent(() => import('./node-wrap'))
const CardCellComponent = asyncComponent(() => import('../cardcellcomponent'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
+const PasteController = asyncIconComponent(() => import('@/components/paste'))
class CardBoxComponent extends Component {
static propTpyes = {
@@ -43,10 +44,6 @@
})
}
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
- }
-
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.props.cards), fromJS(nextProps.cards)) || !is(fromJS(this.state), fromJS(nextState))
}
@@ -58,14 +55,10 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
}
- getStyle = (comIds, style) => {
- const { cards } = this.props
+ getStyle = (style) => {
const { card } = this.state
-
- if (comIds.length !== 2 || comIds[0] !== cards.uuid || comIds[1] !== card.uuid) return
let _card = fromJS(card).toJS()
_card.style = style
@@ -90,7 +83,6 @@
}
addElement = () => {
- const { cards } = this.props
const { card } = this.state
let newcard = {}
@@ -106,11 +98,10 @@
window.GLOB.$lock = false
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
- MKEmitter.emit('cardAddElement', [cards.uuid, card.uuid], newcard)
+ MKEmitter.emit('cardAddElement', card.uuid, newcard)
}
addButton = () => {
- const { cards } = this.props
const { card } = this.state
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'}
@@ -119,7 +110,7 @@
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
- MKEmitter.emit('cardAddElement', [cards.uuid, card.uuid], newcard)
+ MKEmitter.emit('cardAddElement', card.uuid, newcard)
}
changeStyle = () => {
@@ -134,7 +125,7 @@
options = ['background', 'border', 'padding', 'margin', 'shadow']
}
- MKEmitter.emit('changeStyle', [cards.uuid, card.uuid], options, _style)
+ MKEmitter.emit('changeStyle', options, _style, this.getStyle)
}
getSettingForms = () => {
@@ -151,7 +142,7 @@
})
}
})
- return getTableSetting(card.setting, cards.columns, buttons)
+ return getTableSetting(card.setting, cards.columns, buttons, cards.action)
} else {
return getCarouselSetting(card.setting, cards.subtype === 'propcard')
}
@@ -196,6 +187,24 @@
this.props.updateElement(_card)
}
+ paste = (element, resolve) => {
+ const { card } = this.state
+
+ let _uuid = Utils.getuuid()
+
+ if (element.copyType === 'action') {
+ element.eleType = 'button'
+ }
+
+ element.uuid = _uuid
+ element.focus = true
+
+ resolve({status: true})
+
+ // 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
+ MKEmitter.emit('cardAddElement', card.uuid, element)
+ }
+
render() {
const { cards } = this.props
const { card } = this.state
@@ -226,6 +235,7 @@
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm> : <NodesWrap card={card} updateMenus={this.updateNodes}/>}
{cards.type !== 'timeline' ? <CopyComponent type="cardcell" card={card}/> : null}
+ <PasteController options={['action', 'customCardElement']} updateConfig={this.paste} />
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
{control ? <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
--
Gitblit v1.8.0