From e36eb1999794bd71e76482b92a0b0b20f49d0032 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 05 三月 2021 19:37:03 +0800
Subject: [PATCH] 2021-03-05
---
src/pc/components/navbar/normal-navbar/index.jsx | 373 +++++++++++++----------------------------------------
1 files changed, 92 insertions(+), 281 deletions(-)
diff --git a/src/pc/components/navbar/normal-navbar/index.jsx b/src/pc/components/navbar/normal-navbar/index.jsx
index 1ce4fff..35ef413 100644
--- a/src/pc/components/navbar/normal-navbar/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/index.jsx
@@ -1,31 +1,26 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
-import { Icon, Popover, Modal, Pagination, notification } from 'antd'
+import { Icon, Popover, Menu } from 'antd'
-import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
import MKEmitter from '@/utils/events.js'
-import Utils from '@/utils/utils.js'
+// import Utils from '@/utils/utils.js'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
import './index.scss'
-const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
const WrapComponent = asyncIconComponent(() => import('./wrapsetting'))
-const CardComponent = asyncComponent(() => import('../cardcomponent'))
-const LogComponent = asyncIconComponent(() => import('@/menu/components/share/logcomponent'))
+const MenuComponent = asyncIconComponent(() => import('./menusetting'))
+// const CardComponent = asyncComponent(() => import('../cardcomponent'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
-const PasteComponent = asyncIconComponent(() => import('@/menu/components/share/pastecomponent'))
-const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
-const ActionComponent = asyncComponent(() => import('@/menu/components/share/actioncomponent'))
-const { confirm } = Modal
+// const { confirm } = Modal
+const { SubMenu } = Menu
-class DataCardEditComponent extends Component {
+class NormalNavbar extends Component {
static propTpyes = {
card: PropTypes.object,
deletecomponent: PropTypes.func,
@@ -46,36 +41,15 @@
uuid: card.uuid,
type: card.type,
floor: card.floor,
- tabId: card.tabId || '',
- parentId: card.parentId || '',
- format: 'array', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
- pageable: true, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
- switchable: true, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
dataName: card.dataName || '',
width: card.width || 24,
name: card.name,
subtype: card.subtype,
- setting: { interType: 'system' },
- wrap: { name: card.name, width: card.width || 24, title: '', pagestyle: 'page', switch: 'false' },
- style: { marginLeft: '0px', marginRight: '0px', marginTop: '8px', marginBottom: '8px' },
- headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
- columns: [],
- scripts: [],
- action: [],
- search: [],
- btnlog: [],
- subcards: [{
- uuid: Utils.getuuid(),
- setting: { width: 6, type: 'simple'},
- style: {
- borderWidth: '1px', borderColor: '#e8e8e8',
- paddingTop: '15px', paddingBottom: '15px', paddingLeft: '15px', paddingRight: '15px',
- marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px'
- },
- backStyle: {},
- elements: [],
- backElements: []
- }]
+ wrap: { name: card.name, width: card.width || 1200 },
+ logoStyle: { width: '100px' },
+ style: { },
+ links: [],
+ menus: [],
}
if (card.config) {
@@ -84,28 +58,6 @@
_card.wrap = config.wrap
_card.wrap.name = card.name
_card.style = config.style
- _card.headerStyle = config.headerStyle
-
- _card.subcards = config.subcards.map(scard => {
- scard.uuid = Utils.getuuid()
- scard.elements = scard.elements.map(elem => {
- elem.uuid = Utils.getuuid()
- return elem
- })
- scard.backElements = scard.backElements.map(elem => {
- elem.uuid = Utils.getuuid()
- return elem
- })
- return scard
- })
- _card.action = config.action.map(col => {
- col.uuid = Utils.getuuid()
- return col
- })
- _card.search = config.search.map(col => {
- col.uuid = Utils.getuuid()
- return col
- })
}
this.setState({
@@ -113,9 +65,6 @@
})
this.props.updateConfig(_card)
} else {
- card.action = card.action || [] // 鍏煎
- card.search = card.search || [] // 鍏煎
-
this.setState({
card: fromJS(card).toJS()
})
@@ -124,12 +73,10 @@
componentDidMount () {
MKEmitter.addListener('submitStyle', this.getStyle)
- MKEmitter.addListener('submitModal', this.handleSave)
- MKEmitter.addListener('logButton', this.logButton)
}
shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState)) || (!this.props.menu && nextProps.menu)
+ return !is(fromJS(this.state), fromJS(nextState))
}
/**
@@ -140,22 +87,6 @@
return
}
MKEmitter.removeListener('submitStyle', this.getStyle)
- MKEmitter.removeListener('submitModal', this.handleSave)
- MKEmitter.removeListener('logButton', this.logButton)
- }
-
- logButton = (id, item) => {
- const { card } = this.state
-
- if (id !== card.uuid) return
-
- let btnlog = card.btnlog || []
- btnlog.push(item)
-
- this.setState({
- card: {...card, btnlog}
- })
- this.props.updateConfig({...card, btnlog})
}
/**
@@ -188,54 +119,17 @@
this.props.updateConfig(card)
}
- /**
- * @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
- */
- deleteCard = (cell) => {
- let card = fromJS(this.state.card).toJS()
- let _this = this
-
- confirm({
- content: '纭畾鍒犻櫎鍗＄墖鍚楋紵',
- onOk() {
- card.subcards = card.subcards.filter(item => item.uuid !== cell.uuid)
-
- let uuids = []
- cell.elements && cell.elements.forEach(c => {
- if (c.eleType === 'button') {
- uuids.push(c.uuid)
- }
- })
- cell.backElements && cell.backElements.forEach(c => {
- if (c.eleType === 'button') {
- uuids.push(c.uuid)
- }
- })
- MKEmitter.emit('delButtons', uuids)
-
- if (card.btnlog) {
- card.btnlog = card.btnlog.filter(c => c.$parentId !== cell.uuid)
- }
-
- _this.setState({card})
- _this.props.updateConfig(card)
- },
- onCancel() {}
- })
- }
-
- changeStyle = () => {
- const { card } = this.state
-
- MKEmitter.emit('changeStyle', [card.uuid], ['background', 'border', 'padding', 'margin'], card.style)
- }
-
getStyle = (comIds, style) => {
const { card } = this.state
- if (comIds.length !== 1 || comIds[0] !== card.uuid) return
+ if (comIds[0] !== card.uuid) return
- let _card = {...card, style}
+ let _card = {...card}
+ if (comIds.length === 1) {
+ _card = {...card, style}
+ } else if (comIds[1] === 'logo') {
+ _card = {...card, logoStyle: style}
+ }
this.setState({
card: _card
@@ -244,134 +138,16 @@
this.props.updateConfig(_card)
}
- addSearch = () => {
+ changeStyle = () => {
const { card } = this.state
- let newcard = {}
- newcard.uuid = Utils.getuuid()
- newcard.focus = true
-
- newcard.label = 'label'
- newcard.type = 'select'
- newcard.resourceType = '0'
- newcard.options = []
- newcard.setAll = 'false'
- newcard.orderType = 'asc'
- newcard.display = 'dropdown'
- newcard.match = '='
-
- // 娉ㄥ唽浜嬩欢-娣诲姞鎼滅储
- MKEmitter.emit('addSearch', card.uuid, newcard)
+ MKEmitter.emit('changeStyle', [card.uuid], ['font', 'background', 'shadow'], card.style)
}
- addButton = () => {
+ changeLogoStyle = () => {
const { card } = this.state
- let newcard = {}
- newcard.uuid = Utils.getuuid()
- newcard.focus = true
-
- newcard.label = 'label'
- newcard.Ot = 'requiredSgl'
- newcard.OpenType = 'pop'
- newcard.icon = ''
- newcard.class = 'green'
- newcard.intertype = card.setting.interType || 'system'
- newcard.innerFunc = card.setting.innerFunc || ''
- newcard.sysInterface = card.setting.sysInterface || ''
- newcard.outerFunc = card.setting.outerFunc || ''
- newcard.interface = card.setting.interface || ''
- newcard.execSuccess = 'grid'
- newcard.execError = 'never'
- newcard.verify = null
- newcard.show = 'button'
- newcard.btnstyle = {marginRight: '15px'}
-
- // 娉ㄥ唽浜嬩欢-娣诲姞鎸夐挳
- MKEmitter.emit('addButton', card.uuid, newcard)
- }
-
- setSubConfig = (item) => {
- const { card } = this.state
- let btn = fromJS(item).toJS()
-
- if (btn.OpenType === 'pop' || btn.execMode === 'pop') {
- if (!btn.modal) {
- btn.modal = {
- setting: { title: btn.label, width: 60, cols: '2', container: 'view', focus: '', finish: 'close', clickouter: 'unclose', display: 'modal' },
- tables: [],
- groups: [],
- fields: []
- }
- }
- MKEmitter.emit('changeModal', card, btn)
- } else if (btn.OpenType === 'popview') {
- MKEmitter.emit('changePopview', card, btn)
- }
- }
-
- handleSave = (_cards, btn, modal) => {
- let card = fromJS(this.state.card).toJS()
-
- if (card.uuid !== _cards.uuid) return
-
- let _index = card.action.findIndex(cell => cell.uuid === btn.uuid)
-
- if (_index === -1) return
-
- card.action = card.action.map(cell => {
- if (cell.uuid === btn.uuid) {
- cell.modal = modal
- }
-
- return cell
- })
-
- this.setState({card})
- this.props.updateConfig(card)
- }
-
- handleLog = (type, logs, item) => {
- let card = fromJS(this.state.card).toJS()
-
- if (type === 'revert') {
- let done = false
- if (item.$parentId) {
- card.subcards.forEach(col => {
- if (item.$parentId === col.uuid) {
- if (item.$side !== 'back') {
- col.elements = col.elements ? [...col.elements, item] : [item]
- } else {
- col.backElements = col.backElements ? [...col.backElements, item] : [item]
- }
- done = true
- }
- })
- }
-
- if (!done) {
- card.action = card.action ? [...card.action, item] : [item]
- }
-
- card.btnlog = logs
-
- this.setState({ card })
- this.props.updateConfig(card)
- notification.success({
- top: 92,
- message: '鎭㈠鎴愬姛锛�',
- duration: 2
- })
- } else {
- card.btnlog = logs
- this.setState({ card })
- this.props.updateConfig(card)
- notification.success({
- top: 92,
- message: '娓呴櫎鎴愬姛锛�',
- duration: 2
- })
- }
+ MKEmitter.emit('changeStyle', [card.uuid, 'logo'], ['width', 'margin'], card.logoStyle)
}
clickComponent = (e) => {
@@ -381,57 +157,92 @@
}
}
+ changeMenu = (menu) => {
+ MKEmitter.emit('changeEditMenu', menu)
+ }
+
+ changeLogoMenu = () => {
+ const { card } = this.state
+
+ if (!card.wrap.logolink) return
+
+ MKEmitter.emit('changeEditMenu', {MenuID: card.wrap.logolink})
+ }
+
render() {
const { card } = this.state
- let offset = 0
- if (card.wrap.cardFloat && card.wrap.cardFloat !== 'left') {
- let _width = 0
- card.subcards.forEach(card => {
- _width += card.setting.width
- })
- offset = _width < 24 ? 24 - _width : 0
- if (card.wrap.cardFloat === 'center') {
- offset = Math.floor(offset / 2)
- }
+ let _style = {...card.style}
+ if (_style.shadow) {
+ _style.boxShadow = '0 0 4px ' + _style.shadow
}
return (
- <div className="menu-data-card-edit-box" style={{...card.style}} onClick={this.clickComponent} id={card.uuid}>
- <NormalHeader defaultshow="hidden" config={card} updateComponent={this.updateComponent}/>
+ <div className="normal-navbar-edit-box" style={_style} onClick={this.clickComponent} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="plus" title="娣诲姞鎼滅储" onClick={this.addSearch} type="plus-circle" />
- <Icon className="plus" title="娣诲姞鎸夐挳" onClick={this.addButton} type="plus-square" />
+ <MenuComponent config={card} updateConfig={this.updateComponent} />
<WrapComponent config={card} updateConfig={this.updateComponent} />
- <CopyComponent type="datacard" card={card}/>
- <PasteComponent config={card} options={['action', 'search', 'form']} updateConfig={this.updateComponent} />
+ <CopyComponent type="normalnarbar" card={card}/>
<Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
- <LogComponent btnlog={card.btnlog || []} handlelog={this.handleLog} />
<UserComponent config={card}/>
<Icon className="close" title="鍒犻櫎缁勪欢" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
- <SettingComponent config={card} updateConfig={this.updateComponent} />
</div>
} trigger="hover">
<Icon type="tool" />
</Popover>
- <ActionComponent config={card} setSubConfig={this.setSubConfig} updateaction={this.updateComponent}/>
- {card.subcards.map((subcard, index) => (<CardComponent key={subcard.uuid} offset={!index ? offset : 0} cards={card} card={subcard} updateElement={this.updateCard} deleteElement={this.deleteCard}/>))}
- <div style={{clear: 'both'}}></div>
- {card.wrap.pagestyle !== 'switch' && card.setting.laypage === 'true' ? <Pagination total={85} size="small" showTotal={total => `鍏� ${total} 鏉} pageSize={20} defaultCurrent={1}/> : null}
+ <div className="navbar-wrap" style={{width: card.wrap.width + 'px', height: card.wrap.height + 'px', lineHeight: card.wrap.height + 'px'}}>
+ {card.wrap.logo ? <Popover overlayClassName="mk-popover-control-wrap top-menu-popover" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
+ <div className="mk-popover-control">
+ <Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeLogoStyle} type="font-colors" />
+ </div>
+ } trigger="hover">
+ <div className={'logo' + (card.wrap.logolink ? ' pointer' : '')} style={card.logoStyle} onDoubleClick={this.changeLogoMenu}><img src={card.wrap.logo} alt=""/></div>
+ </Popover> : null}
+ <div className="menu">
+ <Menu mode="horizontal">
+ {card.menus.map(fst => {
+ if (fst.property === 'classify' && fst.sublist.length > 0) {
+ return (
+ <SubMenu title={fst.name} key={fst.MenuID} popupClassName="normal-navbar-submenu">
+ {fst.sublist.map(scd => {
+ if (scd.property === 'classify' && scd.sublist.length > 0) {
+ return (
+ <Menu.ItemGroup key={scd.MenuID} title={scd.name}>
+ {scd.sublist.map(thd => {
+ return (
+ <Menu.Item key={thd.MenuID} >
+ <span onClick={(e) => e.stopPropagation()} onDoubleClick={() => this.changeMenu(thd)}>{thd.name}</span>
+ </Menu.Item>
+ )
+ })}
+ </Menu.ItemGroup>
+ )
+ } else {
+ return (
+ <Menu.Item key={scd.MenuID} onClick={(e) => e.stopPropagation()}>
+ <span onClick={(e) => e.stopPropagation()} onDoubleClick={() => this.changeMenu(scd)}>{scd.name}</span>
+ </Menu.Item>
+ )
+ }
+ })}
+ </SubMenu>
+ )
+ } else {
+ return (
+ <Menu.Item key={fst.MenuID} onClick={(e) => e.stopPropagation()}>
+ <span onClick={(e) => e.stopPropagation()} onDoubleClick={() => this.changeMenu(fst)}>{fst.name}</span>
+ </Menu.Item>
+ )
+ }
+ })}
+ </Menu>
+ </div>
+ <div className="link">asdfds</div>
+ </div>
</div>
)
}
}
-const mapStateToProps = (state) => {
- return {
- menu: state.customMenu
- }
-}
-
-const mapDispatchToProps = () => {
- return {}
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(DataCardEditComponent)
\ No newline at end of file
+export default NormalNavbar
\ No newline at end of file
--
Gitblit v1.8.0