From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/mob/components/topbar/normal-navbar/index.jsx | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/mob/components/topbar/normal-navbar/index.jsx b/src/mob/components/topbar/normal-navbar/index.jsx
index 9579b7e..9f6efb1 100644
--- a/src/mob/components/topbar/normal-navbar/index.jsx
+++ b/src/mob/components/topbar/normal-navbar/index.jsx
@@ -64,7 +64,6 @@
}
componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
MKEmitter.addListener('submitSearch', this.getSearch)
}
@@ -79,7 +78,6 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
MKEmitter.removeListener('submitSearch', this.getSearch)
}
@@ -94,20 +92,28 @@
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 = fromJS(card).toJS()
+ getSearchStyle = (style) => {
+ let _card = {...this.state.card, searchStyle: style}
- if (comIds[1] === 'search') {
- _card.searchStyle = style
- } else if (comIds[1] === 'title') {
- _card.titleStyle = style
- } else {
- _card.style = style
- }
+ this.setState({
+ card: _card
+ })
+
+ this.props.updateConfig(_card)
+ }
+
+ getTitleStyle = (style) => {
+ let _card = {...this.state.card, titleStyle: style}
this.setState({
card: _card
@@ -119,26 +125,19 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['font', 'background', 'border', 'padding', 'shadow'], card.style)
+ MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'shadow'], card.style, this.getStyle)
}
changeTitleStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid, 'title'], ['font'], card.titleStyle || {})
+ MKEmitter.emit('changeStyle', ['font'], card.titleStyle || {}, this.getTitleStyle)
}
changeSearchStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid, 'search'], ['font', 'background', 'border'], card.searchStyle || {})
- }
-
- clickComponent = (e) => {
- if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
- e.stopPropagation()
- MKEmitter.emit('clickComponent', this.state.card)
- }
+ MKEmitter.emit('changeStyle', ['font', 'background', 'border'], card.searchStyle || {}, this.getSearchStyle)
}
getSearch = (config) => {
@@ -217,7 +216,7 @@
}
return (
- <div className="normal-topbar-edit-box" style={card.style} onClick={this.clickComponent} id={card.uuid}>
+ <div className="normal-topbar-edit-box" style={card.style} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<NormalForm title="瀵艰埅鏍忚缃�" width={900} update={this.updateWrap} getForms={this.getWrapForms}>
--
Gitblit v1.8.0