From e0aff8f4c0e9c8f16d1ba07863cf600638067514 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 四月 2021 15:08:47 +0800
Subject: [PATCH] 2021-04-13

---
 src/menu/components/share/normalheader/index.jsx |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/menu/components/share/normalheader/index.jsx b/src/menu/components/share/normalheader/index.jsx
index 7295929..adac673 100644
--- a/src/menu/components/share/normalheader/index.jsx
+++ b/src/menu/components/share/normalheader/index.jsx
@@ -5,6 +5,7 @@
 
 import asyncComponent from '@/utils/asyncComponent'
 import MKEmitter from '@/utils/events.js'
+import { resetStyle } from '@/utils/utils-custom.js'
 import './index.scss'
 
 const SearchComponent = asyncComponent(() => import('@/menu/components/share/searchcomponent'))
@@ -12,6 +13,7 @@
 class NormalHeader extends Component {
   static propTpyes = {
     defaultshow: PropTypes.any,      // 鏍囬涓庢悳绱㈡潯浠朵笉瀛樺湪鏃堕殣钘�
+    hideSearch: PropTypes.any,       // 闅愯棌鎼滅储鏉′欢
     config: PropTypes.object,        // 閰嶇疆淇℃伅
     updateComponent: PropTypes.func  // 閰嶇疆鏇存柊
   }
@@ -51,7 +53,7 @@
   }
 
   render() {
-    const { config, defaultshow } = this.props
+    const { config, defaultshow, hideSearch } = this.props
 
     let title = config.plot ? config.plot.title : config.wrap.title
     let show = true
@@ -60,9 +62,10 @@
         show = false
       }
     }
+    let _style = resetStyle(config.headerStyle)
 
     return (
-      <div className={'normal-header' + (!show ? ' hidden' : '')} style={config.headerStyle}>
+      <div className={'normal-header' + (!show ? ' hidden' : '')} style={_style}>
         <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
           <div className="mk-popover-control">
             <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
@@ -70,7 +73,7 @@
         } trigger="hover">
           <span className="title">{title}</span>
         </Popover>
-        {config.search ? <SearchComponent config={config} updatesearch={this.props.updateComponent}/> : null}
+        {hideSearch !== 'true' && config.search ? <SearchComponent config={config} updatesearch={this.props.updateComponent}/> : null}
       </div>
     )
   }

--
Gitblit v1.8.0