From 53b9fb93d0376eb02bb996935f1720b4e95cd897 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 12 十月 2022 14:41:06 +0800
Subject: [PATCH] 2022-10-12
---
src/menu/components/card/cardsimplecomponent/index.jsx | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/menu/components/card/cardsimplecomponent/index.jsx b/src/menu/components/card/cardsimplecomponent/index.jsx
index eea36ff..67e71fb 100644
--- a/src/menu/components/card/cardsimplecomponent/index.jsx
+++ b/src/menu/components/card/cardsimplecomponent/index.jsx
@@ -43,10 +43,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 +54,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 +82,6 @@
}
addElement = () => {
- const { cards } = this.props
const { card } = this.state
let newcard = {}
@@ -106,11 +97,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 +109,7 @@
// 娉ㄥ唽浜嬩欢-娣诲姞鍏冪礌
- MKEmitter.emit('cardAddElement', [cards.uuid, card.uuid], newcard)
+ MKEmitter.emit('cardAddElement', card.uuid, newcard)
}
changeStyle = () => {
@@ -134,7 +124,7 @@
options = ['background', 'border', 'padding', 'margin', 'shadow']
}
- MKEmitter.emit('changeStyle', [cards.uuid, card.uuid], options, _style)
+ MKEmitter.emit('changeStyle', options, _style, this.getStyle)
}
getSettingForms = () => {
--
Gitblit v1.8.0