From fa381753ef2a2b25b1c0722549ac17e333da79be Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 22:50:54 +0800
Subject: [PATCH] 2022-09-06
---
src/pc/components/navbar/normal-navbar/index.jsx | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/src/pc/components/navbar/normal-navbar/index.jsx b/src/pc/components/navbar/normal-navbar/index.jsx
index 0c8d24e..18f8e48 100644
--- a/src/pc/components/navbar/normal-navbar/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/index.jsx
@@ -63,10 +63,6 @@
}
}
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
- }
-
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.state), fromJS(nextState))
}
@@ -78,7 +74,6 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
}
/**
@@ -94,17 +89,18 @@
this.props.updateConfig(component)
}
- getStyle = (comIds, style) => {
- const { card } = this.state
+ getStyle = (style) => {
+ let _card = {...this.state.card, style}
- if (comIds[0] !== card.uuid) return
+ this.setState({
+ card: _card
+ })
+
+ this.props.updateConfig(_card)
+ }
- let _card = {...card}
- if (comIds.length === 1) {
- _card = {...card, style}
- } else if (comIds[1] === 'logo') {
- _card = {...card, logoStyle: style}
- }
+ getLogoStyle = (style) => {
+ let _card = {...this.state.card, logoStyle: style}
this.setState({
card: _card
@@ -116,13 +112,13 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['font', 'background', 'shadow'], card.style)
+ MKEmitter.emit('changeStyle', ['font', 'background', 'shadow'], card.style, this.getStyle)
}
changeLogoStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid, 'logo'], ['width', 'margin'], card.logoStyle)
+ MKEmitter.emit('changeStyle', ['width', 'margin'], card.logoStyle, this.getLogoStyle)
}
clickComponent = (e) => {
@@ -141,7 +137,7 @@
MenuID: menu.property === 'linkmenu' ? menu.linkMenuId : menu.MenuID,
copyMenuId: menu.property === 'menu' ? menu.copyMenuId : '',
clearMenu: menu.clearMenu || 'true',
- MenuNo: menu.MenuNo,
+ // MenuNo: menu.MenuNo,
MenuName: menu.name,
})
}
@@ -153,7 +149,7 @@
MKEmitter.emit('changeEditMenu', {
MenuID: card.wrap.linkmenu,
copyMenuId: '',
- MenuNo: '',
+ // MenuNo: '',
MenuName: ''
})
}
--
Gitblit v1.8.0