From 3b103caa6bfc9ed410e67156c3ca1785bf1cecc9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 19 八月 2022 01:15:31 +0800
Subject: [PATCH] 2022-08-19

---
 src/mob/components/topbar/normal-navbar/index.jsx |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/mob/components/topbar/normal-navbar/index.jsx b/src/mob/components/topbar/normal-navbar/index.jsx
index 9579b7e..123fa23 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,19 +125,19 @@
   changeStyle = () => {
     const { card } = this.state
 
-    MKEmitter.emit('changeStyle', [card.uuid], ['font', 'background', 'border', 'padding', 'shadow'], card.style)
+    MKEmitter.emit('changeStyle', ['font', '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 || {})
+    MKEmitter.emit('changeStyle', ['font', 'background', 'border'], card.searchStyle || {}, this.getSearchStyle)
   }
 
   clickComponent = (e) => {

--
Gitblit v1.8.0