From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/mob/components/menubar/normal-menubar/menucomponent/index.jsx | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/index.jsx
index 3d90d4e..863c894 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}>
@@ -162,7 +160,7 @@
</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}>
+ {!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>
--
Gitblit v1.8.0