From d59f518f466274b2caeb2e01c10c92deafe7c93b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 09 二月 2022 11:48:29 +0800
Subject: [PATCH] 2022-02-09
---
src/menu/components/share/normalheader/index.jsx | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/menu/components/share/normalheader/index.jsx b/src/menu/components/share/normalheader/index.jsx
index adac673..72a5d5e 100644
--- a/src/menu/components/share/normalheader/index.jsx
+++ b/src/menu/components/share/normalheader/index.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Popover, Icon } from 'antd'
+import { Popover } from 'antd'
+import { FontColorsOutlined, SearchOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
@@ -12,10 +13,13 @@
class NormalHeader extends Component {
static propTpyes = {
- defaultshow: PropTypes.any, // 鏍囬涓庢悳绱㈡潯浠朵笉瀛樺湪鏃堕殣钘�
hideSearch: PropTypes.any, // 闅愯棌鎼滅储鏉′欢
config: PropTypes.object, // 閰嶇疆淇℃伅
updateComponent: PropTypes.func // 閰嶇疆鏇存柊
+ }
+
+ state = {
+ appType: sessionStorage.getItem('appType')
}
componentDidMount () {
@@ -49,30 +53,40 @@
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 || hideSearch === 'true')) {
+ show = false
}
let _style = resetStyle(config.headerStyle)
return (
- <div className={'normal-header' + (!show ? ' hidden' : '')} style={_style}>
+ <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" />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
</div>
} 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"><SearchOutlined /></span></span> : null}
{hideSearch !== 'true' && config.search ? <SearchComponent config={config} updatesearch={this.props.updateComponent}/> : null}
</div>
)
--
Gitblit v1.8.0