From e8edfdadb561cd83bf6e1c3e00d55b8cc2aee6d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 17 十月 2022 17:57:34 +0800
Subject: [PATCH] 2022-10-17
---
src/mob/components/menubar/normal-menubar/menucomponent/index.jsx | 34 ++++++++++++++--------------------
1 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
index 45740d0..53aa073 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
import { Popover, Col } from 'antd'
-import { SwapOutlined, ArrowLeftOutlined, ArrowRightOutlined, EditOutlined, FontColorsOutlined, DeleteOutlined } from '@ant-design/icons'
+import { SwapOutlined, ArrowLeftOutlined, ArrowRightOutlined, EditOutlined, FontColorsOutlined, DeleteOutlined, RightOutlined } from '@ant-design/icons'
import asyncIconComponent from '@/utils/asyncIconComponent'
import Utils from '@/utils/utils.js'
@@ -17,7 +17,6 @@
class MenuBoxComponent extends Component {
static propTpyes = {
- offset: PropTypes.any, // 鍋忕Щ閲�
cards: PropTypes.object, // 鍗＄墖琛岄厤缃俊鎭�
card: PropTypes.object, // 鍗＄墖閰嶇疆淇℃伅
move: PropTypes.func, // 鍗＄墖绉诲姩
@@ -37,10 +36,6 @@
})
}
- componentDidMount () {
- MKEmitter.addListener('submitStyle', this.getStyle)
- }
-
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.state), fromJS(nextState))
}
@@ -52,14 +47,10 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('submitStyle', this.getStyle)
}
- getStyle = (comIds, style) => {
- const { cards } = this.props
+ getStyle = (style) => {
const { card } = this.state
-
- if (comIds.length !== 2 || comIds[0] !== cards.uuid || comIds[1] !== card.uuid) return
let _card = fromJS(card).toJS()
_card.style = style
@@ -72,13 +63,12 @@
}
changeStyle = () => {
- const { cards } = this.props
const { card } = this.state
let _style = card.style ? fromJS(card.style).toJS() : {}
- let options = ['font', 'border', 'padding']
+ let options = ['font', 'border', 'padding', 'margin', 'background']
- MKEmitter.emit('changeStyle', [cards.uuid, card.uuid], options, _style)
+ MKEmitter.emit('changeStyle', options, _style, this.getStyle)
}
getSettingForms = () => {
@@ -111,14 +101,13 @@
MenuID: card.setting.type === 'linkmenu' ? card.setting.linkMenuId : card.uuid,
copyMenuId: card.setting.type === 'menu' ? card.setting.copyMenuId : '',
clearMenu: card.setting.clearMenu || 'true',
- MenuNo: card.setting.MenuNo || '',
+ // MenuNo: card.setting.MenuNo || '',
MenuName: card.setting.name,
})
}
}
render() {
- const { offset } = this.props
const { card } = this.state
let _style = {...card.style}
@@ -126,7 +115,7 @@
_style = resetStyle(_style)
return (
- <Col span={card.setting.width || 6} offset={offset || 0}>
+ <Col span={card.setting.width || 6}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<NormalForm title="鑿滃崟缂栬緫" width={900} update={this.updateSetting} getForms={this.getSettingForms}>
@@ -152,14 +141,19 @@
padding: card.setting.padding,
background: card.setting.background,
color: card.setting.color,
- borderRadius: card.setting.borderRadius || '15%'
- }} type={card.setting.icon}/>
+ borderRadius: card.setting.borderRadius || '15%',
+ opacity: !card.setting.icon ? 0 : 1
+ }} type={card.setting.icon || 'cloud'}/>
{card.setting.tip ? <sup className="am-badge-text"></sup> : null}
</div> : <div className="menu-sign">
<img style={{width: card.setting.imgWidth, height: card.setting.imgWidth, borderRadius: card.setting.borderRadius || '15%'}} src={card.setting.url} alt=""/>
{card.setting.tip ? <sup className="am-badge-text"></sup> : null}
</div>}
- <div className="menu-name">{card.setting.name}</div>
+ <div className="menu-name" style={{opacity: !card.setting.name ? 0 : 1}}>{card.setting.name || '鏄庣'}</div>
+ <RightOutlined className="menu-right" />
+ {!card.setting.name || (card.setting.type === 'linkmenu' && card.setting.linkMenuId === '') ? <NormalForm title="鑿滃崟缂栬緫" width={900} update={this.updateSetting} cancel={() => this.props.deleteElement(card, 'direct')} getForms={this.getSettingForms}>
+ <span id={card.uuid}></span>
+ </NormalForm> : null}
</div>
</Popover>
</Col>
--
Gitblit v1.8.0