From c98e45bfac25e9110ad0383faac54a54d98ea9d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 18 十一月 2021 20:47:04 +0800
Subject: [PATCH] 2021-11-18

---
 src/menu/components/share/normalheader/index.jsx |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/menu/components/share/normalheader/index.jsx b/src/menu/components/share/normalheader/index.jsx
index d5bc448..818b05b 100644
--- a/src/menu/components/share/normalheader/index.jsx
+++ b/src/menu/components/share/normalheader/index.jsx
@@ -5,16 +5,20 @@
 
 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'))
 
 class NormalHeader extends Component {
   static propTpyes = {
-    defaultshow: PropTypes.any,      // 鏍囬涓庢悳绱㈡潯浠朵笉瀛樺湪鏃堕殣钘�
     hideSearch: PropTypes.any,       // 闅愯棌鎼滅储鏉′欢
     config: PropTypes.object,        // 閰嶇疆淇℃伅
     updateComponent: PropTypes.func  // 閰嶇疆鏇存柊
+  }
+
+  state = {
+    appType: sessionStorage.getItem('appType')
   }
 
   componentDidMount () {
@@ -48,22 +52,32 @@
   changeStyle = () => {
     const { config } = this.props
 
-    MKEmitter.emit('changeStyle', [config.uuid, 'header'], ['font', 'border'], config.headerStyle)
+    let options = ['font', 'border']
+    if (config.type === 'menubar') {
+      options.push('padding')
+    }
+
+    MKEmitter.emit('changeStyle', [config.uuid, 'header'], options, config.headerStyle)
   }
 
   render() {
-    const { config, defaultshow, hideSearch } = this.props
+    const { config, hideSearch } = this.props
+    const { appType } = this.state
 
     let title = config.plot ? config.plot.title : config.wrap.title
     let show = true
-    if (defaultshow === 'hidden') {
-      if (!title && (!config.search || config.search.length === 0)) {
-        show = false
-      }
+
+    if (!title && appType === 'mob' && config.type === 'card' && config.subtype === 'datacard' && config.action && config.action.length) {
+      title = ' '
     }
 
+    if (!title && (!config.search || config.search.length === 0)) {
+      show = false
+    }
+    let _style = resetStyle(config.headerStyle)
+
     return (
-      <div className={'normal-header' + (!show ? ' hidden' : '')} style={config.headerStyle}>
+      <div className={'normal-header' + (!show ? ' hidden' : '') + (config.wrap && config.wrap.searchable === 'true' ? ' tree-search' : '')} 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" />
@@ -71,6 +85,7 @@
         } trigger="hover">
           <span className="title">{title}</span>
         </Popover>
+        {config.wrap && config.wrap.searchable === 'true' ? <span className="ant-input-search ant-input-affix-wrapper"><span className="ant-input-suffix"><Icon type="search" /></span></span> : null}
         {hideSearch !== 'true' && config.search ? <SearchComponent config={config} updatesearch={this.props.updateComponent}/> : null}
       </div>
     )

--
Gitblit v1.8.0