From 21d92eff0e23974d76e3e5a79ba50e3fc1c0b879 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 四月 2022 01:08:15 +0800
Subject: [PATCH] 2022-04-15
---
src/mob/components/menubar/normal-menubar/menucomponent/index.jsx | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
index 4cefea2..daac1c6 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
@@ -17,7 +17,6 @@
class MenuBoxComponent extends Component {
static propTpyes = {
- offset: PropTypes.any, // 鍋忕Щ閲�
cards: PropTypes.object, // 鍗＄墖琛岄厤缃俊鎭�
card: PropTypes.object, // 鍗＄墖閰嶇疆淇℃伅
move: PropTypes.func, // 鍗＄墖绉诲姩
@@ -118,7 +117,6 @@
}
render() {
- const { offset } = this.props
const { card } = this.state
let _style = {...card.style}
@@ -126,7 +124,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,15 +150,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 ? <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