From bbcb3f45ad0ef4c808bf5a68ec10c0464c094e2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 27 十月 2021 11:51:40 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/mob/components/navbar/normal-navbar/index.jsx | 74 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/src/mob/components/navbar/normal-navbar/index.jsx b/src/mob/components/navbar/normal-navbar/index.jsx
index 7f03f32..21cf498 100644
--- a/src/mob/components/navbar/normal-navbar/index.jsx
+++ b/src/mob/components/navbar/normal-navbar/index.jsx
@@ -8,10 +8,12 @@
import MKEmitter from '@/utils/events.js'
import zhCN from '@/locales/zh-CN/model.js'
import enUS from '@/locales/en-US/model.js'
+import getWrapForm from './options'
import './index.scss'
-const WrapComponent = asyncIconComponent(() => import('./wrapsetting'))
+const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
const MenuComponent = asyncIconComponent(() => import('./menusetting'))
+const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
class NormalNavbar extends Component {
static propTpyes = {
@@ -34,13 +36,18 @@
uuid: card.uuid,
type: card.type,
floor: card.floor,
- dataName: '',
- width: card.width || 24,
+ format: 'object', // 缁勪欢灞炴�� - 鏁版嵁鏍煎紡
+ pageable: false, // 缁勪欢灞炴�� - 鏄惁鍙垎椤�
+ switchable: false, // 缁勪欢灞炴�� - 鏁版嵁鏄惁鍙垏鎹�
+ dataName: card.dataName || '',
name: card.name,
subtype: card.subtype,
- wrap: { name: card.name, width: card.width || 1200 },
- style: { },
+ setting: { interType: 'system' },
+ wrap: { name: card.name, datatype: 'static', height: 50 },
+ style: {boxShadow: '0 0 3px #D9D9D9', shadowColor: '#D9D9D9', shadowBlur: '3px', paddingTop: '5px', fontSize: '13px' },
menus: [],
+ columns: [],
+ scripts: [],
}
if (card.config) {
@@ -88,7 +95,6 @@
card: component
})
- component.width = component.wrap.width
component.name = component.wrap.name
this.props.updateConfig(component)
@@ -99,10 +105,7 @@
if (comIds[0] !== card.uuid) return
- let _card = {...card}
- if (comIds.length === 1) {
- _card = {...card, style}
- }
+ let _card = {...card, style}
this.setState({
card: _card
@@ -114,7 +117,7 @@
changeStyle = () => {
const { card } = this.state
- MKEmitter.emit('changeStyle', [card.uuid], ['font', 'background', 'shadow'], card.style)
+ MKEmitter.emit('changeStyle', [card.uuid], ['font', 'background', 'border', 'padding', 'shadow'], card.style)
}
clickComponent = (e) => {
@@ -127,33 +130,44 @@
changeMenu = (menu) => {
if (menu.property === 'link') {
window.open(menu.link)
- return
+ } else {
+ MKEmitter.emit('changeEditMenu', {
+ MenuID: menu.property === 'linkmenu' ? menu.linkMenuId : menu.MenuID,
+ copyMenuId: menu.property === 'menu' ? menu.copyMenuId : '',
+ MenuNo: menu.MenuNo,
+ MenuName: menu.name,
+ })
}
- MKEmitter.emit('changeEditMenu', {
- fixed: menu.property === 'menu',
- MenuID: menu.property === 'linkmenu' ? menu.linkMenuId : menu.MenuID,
- copyMenuId: menu.property === 'menu' ? menu.copyMenuId : '',
- MenuNo: menu.MenuNo,
- MenuName: menu.name,
- })
+ }
+
+ getWrapForms = () => {
+ const { wrap } = this.state.card
+
+ return getWrapForm(wrap)
+ }
+
+ updateWrap = (res) => {
+ this.updateComponent({...this.state.card, wrap: res})
}
render() {
const { card } = this.state
let _style = {...card.style}
- if (_style.shadow) {
- _style.boxShadow = '0 0 4px ' + _style.shadow
- }
+ _style.height = card.wrap.height
return (
<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">
<MenuComponent config={card} updateConfig={this.updateComponent} />
- <WrapComponent config={card} updateConfig={this.updateComponent} />
+ <NormalForm title="鑿滃崟鏍忚缃�" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
+ <Icon type="edit" 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)} />
+ {card.wrap.datatype !== 'static' ? <SettingComponent config={card} updateConfig={this.updateComponent} /> : null}
+ {card.wrap.datatype === 'static' ? <Icon style={{color: '#eeeeee', cursor: 'not-allowed'}} type="setting"/> : null}
</div>
} trigger="hover">
<Icon type="tool" />
@@ -161,14 +175,14 @@
<div className="menu">
{card.menus.map(menu => {
return (
- <div class="am-tab-bar-tab">
- <div class="am-tab-bar-tab-icon">
- <span class="am-badge am-tab-bar-tab-badge tab-badge">
- <Icon type="font-colors" />
- <sup class="am-badge-text">1</sup>
+ <div key={menu.MenuID} className="am-tab-bar-tab" onDoubleClick={() => this.changeMenu(menu)}>
+ {menu.icon ? <div className="am-tab-bar-tab-icon">
+ <span className="am-badge am-tab-bar-tab-badge tab-badge">
+ <Icon type={menu.icon} />
+ {menu.tip ? <sup className="am-badge-text"></sup> : null}
</span>
- </div>
- <p class="am-tab-bar-tab-title">{menu.name}</p>
+ </div> : null}
+ <p className="am-tab-bar-tab-title">{menu.name}</p>
</div>
)
})}
--
Gitblit v1.8.0