From 8ffdc354d93def23f046ad29dd5528b02444ec3d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 28 八月 2021 17:53:43 +0800
Subject: [PATCH] 2021-08-28

---
 src/mob/components/topbar/normal-navbar/index.jsx |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/mob/components/topbar/normal-navbar/index.jsx b/src/mob/components/topbar/normal-navbar/index.jsx
index f92afda..84a1fb9 100644
--- a/src/mob/components/topbar/normal-navbar/index.jsx
+++ b/src/mob/components/topbar/normal-navbar/index.jsx
@@ -38,6 +38,7 @@
         subtype: card.subtype,
         wrap: { type: 'navbar', height: 50, title: 'NavBar', back: 'true', search: 'false', logout: 'false' },
         style: {boxShadow: '0 0 3px #D9D9D9', shadowColor: '#D9D9D9', shadowBlur: '3px', paddingLeft: '10px', paddingRight: '10px', lineHeight: '2.8', fontSize: '18px' },
+        searchStyle: {}
       }
 
       if (card.config) {
@@ -94,7 +95,13 @@
 
     if (comIds[0] !== card.uuid) return
 
-    let _card = {...card, style}
+    let _card = fromJS(card).toJS()
+
+    if (comIds[1] === 'search') {
+      _card.searchStyle = style
+    } else {
+      _card.style = style
+    }
 
     this.setState({
       card: _card
@@ -107,6 +114,12 @@
     const { card } = this.state
 
     MKEmitter.emit('changeStyle', [card.uuid], ['font', 'background', 'border', 'padding', 'shadow'], card.style)
+  }
+
+  changeSearchStyle = () => {
+    const { card } = this.state
+
+    MKEmitter.emit('changeStyle', [card.uuid, 'search'], ['font', 'background', 'border'], card.searchStyle || {})
   }
 
   clickComponent = (e) => {
@@ -199,7 +212,17 @@
           </div>
           {card.wrap.type !== 'search' ?
             <div className="am-navbar-title">{card.wrap.title || ''}</div> :
-            <div className="am-navbar-search" onDoubleClick={this.setSearch}><div className="search-bar"><Icon type="search" /></div></div>
+            <div className="am-navbar-search" onDoubleClick={this.setSearch}>
+              <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+                <div className="mk-popover-control">
+                  <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeSearchStyle} type="font-colors" />
+                </div>
+              } trigger="hover">
+                <div style={card.searchStyle} className="search-bar">
+                  {card.search && card.search.setting.scan === 'true' ? <Icon type="scan" /> : <Icon type="search" />}
+                </div>
+              </Popover>
+            </div>
           }
           <div className="am-navbar-right">
             {card.wrap.search === 'true' ? <Icon type="search" onDoubleClick={this.setSearch}/> : null}

--
Gitblit v1.8.0