From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/mob/components/topbar/normal-navbar/index.jsx | 145 +++++++++++++++++++++++++++++++++---------------
1 files changed, 99 insertions(+), 46 deletions(-)
diff --git a/src/mob/components/topbar/normal-navbar/index.jsx b/src/mob/components/topbar/normal-navbar/index.jsx
index f92afda..9f6efb1 100644
--- a/src/mob/components/topbar/normal-navbar/index.jsx
+++ b/src/mob/components/topbar/normal-navbar/index.jsx
@@ -1,17 +1,17 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Icon, Popover } from 'antd'
-import { ExpandOutlined, ReloadOutlined } from '@ant-design/icons'
+import { Popover } from 'antd'
+import { ExpandOutlined, ReloadOutlined, EllipsisOutlined, LogoutOutlined, ToolOutlined, ScanOutlined, LeftOutlined, EditOutlined, FontColorsOutlined, DeleteOutlined, SearchOutlined, MenuOutlined } from '@ant-design/icons'
import asyncIconComponent from '@/utils/asyncIconComponent'
import getWrapForm from './options'
import MKEmitter from '@/utils/events.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
+import avatar from '@/assets/img/avatar.jpg'
import './index.scss'
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
+const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
class NormalNavbar extends Component {
static propTpyes = {
@@ -21,7 +21,7 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
+ avatar: sessionStorage.getItem('CloudAvatar') || avatar,
card: null,
back: false
}
@@ -33,11 +33,12 @@
let _card = {
uuid: card.uuid,
type: card.type,
- floor: card.floor,
width: 24,
subtype: card.subtype,
- wrap: { type: 'navbar', height: 50, title: 'NavBar', back: 'true', search: 'false', logout: 'false' },
+ wrap: { type: 'navbar', height: 50, title: 'NavBar', back: 'true', logout: 'false' },
style: {boxShadow: '0 0 3px #D9D9D9', shadowColor: '#D9D9D9', shadowBlur: '3px', paddingLeft: '10px', paddingRight: '10px', lineHeight: '2.8', fontSize: '18px' },
+ searchStyle: {},
+ titleStyle: {}
}
if (card.config) {
@@ -52,14 +53,17 @@
})
this.props.updateConfig(_card)
} else {
+ let _card = fromJS(card).toJS()
+ if (_card.wrap.type === 'navbar' && _card.wrap.search === 'true') {
+ _card.wrap.type = 'searchIcon'
+ }
this.setState({
- card: fromJS(card).toJS()
+ card: _card
})
}
}
componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
MKEmitter.addListener('submitSearch', this.getSearch)
}
@@ -74,7 +78,6 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
MKEmitter.removeListener('submitSearch', this.getSearch)
}
@@ -89,12 +92,28 @@
this.props.updateConfig(component)
}
- getStyle = (comIds, style) => {
- const { card } = this.state
+ getStyle = (style) => {
+ let _card = {...this.state.card, style}
- if (comIds[0] !== card.uuid) return
+ this.setState({
+ card: _card
+ })
+
+ this.props.updateConfig(_card)
+ }
- let _card = {...card, style}
+ getSearchStyle = (style) => {
+ let _card = {...this.state.card, searchStyle: style}
+
+ this.setState({
+ card: _card
+ })
+
+ this.props.updateConfig(_card)
+ }
+
+ getTitleStyle = (style) => {
+ let _card = {...this.state.card, titleStyle: style}
this.setState({
card: _card
@@ -106,27 +125,19 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['font', 'background', 'border', 'padding', 'shadow'], card.style)
+ MKEmitter.emit('changeStyle', ['background', 'border', 'padding', 'shadow'], card.style, this.getStyle)
}
- clickComponent = (e) => {
- if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'component') {
- e.stopPropagation()
- MKEmitter.emit('clickComponent', this.state.card)
- }
+ changeTitleStyle = () => {
+ const { card } = this.state
+
+ MKEmitter.emit('changeStyle', ['font'], card.titleStyle || {}, this.getTitleStyle)
}
- changeMenu = (menu) => {
- if (menu.property === 'link') {
- window.open(menu.link)
- } else {
- MKEmitter.emit('changeEditMenu', {
- MenuID: menu.property === 'linkmenu' ? menu.linkMenuId : menu.MenuID,
- copyMenuId: menu.property === 'menu' ? menu.copyMenuId : '',
- MenuNo: menu.MenuNo,
- MenuName: menu.name,
- })
- }
+ changeSearchStyle = () => {
+ const { card } = this.state
+
+ MKEmitter.emit('changeStyle', ['font', 'background', 'border'], card.searchStyle || {}, this.getSearchStyle)
}
getSearch = (config) => {
@@ -147,7 +158,7 @@
if (!card.search) {
card.search = {
floor: 1,
- setting: { type: 'title', field: '', title: '', focus: 'true', btn: 'hidden' },
+ setting: { type: 'title', field: '', title: '', focus: 'true', btn: 'hidden', backgroundColor: sessionStorage.getItem('sysBgColor') },
groups: [],
fields: []
}
@@ -163,46 +174,88 @@
}
updateWrap = (res) => {
+ let funs = res.funs || []
+
+ delete res.funs
+
+ funs.forEach(n => {
+ res[n] = 'true'
+ })
+
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
+ const { card, avatar } = this.state
let right = null
if (card.wrap.logout === 'true') {
- right = <Icon type="logout" />
+ right = <LogoutOutlined />
}
if (card.wrap.scan === 'true') {
- right = !right ? <ExpandOutlined /> : <Icon type="ellipsis" />
+ right = !right ? <ExpandOutlined onDoubleClick={this.skip}/> : <EllipsisOutlined />
}
if (card.wrap.refresh === 'true') {
- right = !right ? <ReloadOutlined /> : <Icon type="ellipsis" />
+ right = !right ? <ReloadOutlined /> : <EllipsisOutlined onDoubleClick={this.skip}/>
+ }
+ if (card.wrap.menus && card.wrap.menus.length > 0) {
+ right = !right ? <MenuOutlined /> : <EllipsisOutlined onDoubleClick={this.skip}/>
}
return (
- <div className="normal-topbar-edit-box" style={card.style} onClick={this.clickComponent} id={card.uuid}>
+ <div className="normal-topbar-edit-box" style={card.style} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <NormalForm title="瀵艰埅鏍忚缃�" width={750} update={this.updateWrap} getForms={this.getWrapForms}>
- <Icon type="edit" style={{color: '#1890ff'}} title="缂栬緫"/>
+ <NormalForm title="瀵艰埅鏍忚缃�" width={900} update={this.updateWrap} getForms={this.getWrapForms}>
+ <EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
- <Icon className="close" title="鍒犻櫎缁勪欢" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
+ <CopyComponent type="topbar" card={card}/>
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
+ <DeleteOutlined className="close" title="鍒犻櫎缁勪欢" onClick={() => this.props.deletecomponent(card.uuid)} />
</div>
} trigger="hover">
- <Icon type="tool" />
+ <ToolOutlined />
</Popover>
<div className="am-navbar">
<div className="am-navbar-left">
- {card.wrap.back !== 'false' ? <Icon type="left" /> : null}
+ {card.wrap.back === 'true' && card.wrap.menuPosition !== 'left' ? <LeftOutlined /> : null}
+ {card.wrap.menuPosition === 'left' ? <div className="img" style={{backgroundImage: `url(${avatar})`}}></div> : null}
</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>
+ <Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+ <div className="mk-popover-control">
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeTitleStyle}/>
+ </div>
+ } trigger="hover">
+ <div className="am-navbar-title" style={card.titleStyle}>{card.wrap.title || ''}</div>
+ </Popover> :
+ <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">
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeSearchStyle}/>
+ </div>
+ } trigger="hover">
+ <div style={card.searchStyle} className="search-bar">
+ {card.search && card.search.setting.scan === 'true' ? <ScanOutlined /> : <SearchOutlined />}
+ </div>
+ </Popover>
+ </div>
}
<div className="am-navbar-right">
- {card.wrap.search === 'true' ? <Icon type="search" onDoubleClick={this.setSearch}/> : null}
+ {card.wrap.type === 'searchIcon' ? <SearchOutlined onDoubleClick={this.setSearch}/> : null}
{right}
</div>
</div>
--
Gitblit v1.8.0