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/mob/components/topbar/normal-navbar/index.jsx | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/src/mob/components/topbar/normal-navbar/index.jsx b/src/mob/components/topbar/normal-navbar/index.jsx
index f92afda..fc6c79b 100644
--- a/src/mob/components/topbar/normal-navbar/index.jsx
+++ b/src/mob/components/topbar/normal-navbar/index.jsx
@@ -12,6 +12,7 @@
import './index.scss'
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
+const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
class NormalNavbar extends Component {
static propTpyes = {
@@ -38,6 +39,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 +96,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 +115,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) => {
@@ -166,6 +180,19 @@
this.updateComponent({...this.state.card, wrap: res})
}
+ skip = () => {
+ const { wrap } = this.state.card
+
+ if (!wrap.linkmenu) return
+
+ MKEmitter.emit('changeEditMenu', {
+ MenuID: wrap.linkmenu,
+ copyMenuId: '',
+ MenuNo: '',
+ MenuName: '',
+ })
+ }
+
render() {
const { card } = this.state
@@ -174,10 +201,10 @@
right = <Icon type="logout" />
}
if (card.wrap.scan === 'true') {
- right = !right ? <ExpandOutlined /> : <Icon type="ellipsis" />
+ right = !right ? <ExpandOutlined onDoubleClick={this.skip}/> : <Icon type="ellipsis" />
}
if (card.wrap.refresh === 'true') {
- right = !right ? <ReloadOutlined /> : <Icon type="ellipsis" />
+ right = !right ? <ReloadOutlined /> : <Icon type="ellipsis" onDoubleClick={this.skip}/>
}
return (
@@ -187,6 +214,7 @@
<NormalForm title="瀵艰埅鏍忚缃�" width={750} update={this.updateWrap} getForms={this.getWrapForms}>
<Icon type="edit" style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
+ <CopyComponent type="topbar" card={card}/>
<Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
<Icon className="close" title="鍒犻櫎缁勪欢" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
</div>
@@ -199,7 +227,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