From eebe63a6727e6495321d1433ebd2779b5a36d45a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 十二月 2020 22:08:14 +0800
Subject: [PATCH] 2020-12-31
---
src/menu/components/share/actioncomponent/index.jsx | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/index.jsx b/src/menu/components/share/actioncomponent/index.jsx
index a56e70d..6bcdbae 100644
--- a/src/menu/components/share/actioncomponent/index.jsx
+++ b/src/menu/components/share/actioncomponent/index.jsx
@@ -58,7 +58,6 @@
*/
UNSAFE_componentWillReceiveProps (nextProps) {
const { actionlist } = this.state
-
if (!is(fromJS(nextProps.config.action), fromJS(this.props.config.action)) && !is(fromJS(nextProps.config.action), fromJS(actionlist))) {
this.setState({actionlist: fromJS(nextProps.config.action).toJS()})
}
@@ -83,7 +82,7 @@
const { config } = this.props
const { card, actionlist } = this.state
- if (comIds.length !== 2 || comIds[0] !== config.uuid || comIds[1] === 'header') return
+ if (comIds[0] !== config.uuid || comIds[1] !== 'actionlist') return
let _card = fromJS(card).toJS()
_card.btnstyle = style
@@ -110,7 +109,7 @@
card: element
})
- MKEmitter.emit('changeStyle', [config.uuid, element.uuid], options, _style)
+ MKEmitter.emit('changeStyle', [config.uuid, 'actionlist', element.uuid], options, _style)
}
addButton = (cardId, element) => {
@@ -324,19 +323,19 @@
_actionlist = _actionlist.filter(item => item.uuid !== card.uuid)
- let delButtons = sessionStorage.getItem('delButtons')
- try {
- delButtons = JSON.parse(delButtons)
- delButtons.push(card.uuid)
- } catch {
- delButtons = [card.uuid]
+ if (!card.origin) {
+ MKEmitter.emit('delButtons', [card.uuid])
}
- sessionStorage.setItem('delButtons', JSON.stringify(delButtons))
+
+ let btnlog = config.btnlog || []
+ if (card.OpenType === 'popview' || card.verify || card.modal) {
+ btnlog.push(card)
+ }
_this.setState({
actionlist: _actionlist
}, () => {
- _this.props.updateaction({...config, action: _actionlist})
+ _this.props.updateaction({...config, action: _actionlist, btnlog})
})
},
onCancel() {}
--
Gitblit v1.8.0