From 5cfe6db94c1449810a44660b299dba8e7e98e5c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 10 六月 2021 14:43:39 +0800
Subject: [PATCH] 2021-06-10
---
src/pc/components/navbar/normal-navbar/index.jsx | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/src/pc/components/navbar/normal-navbar/index.jsx b/src/pc/components/navbar/normal-navbar/index.jsx
index 388f226..6978c0b 100644
--- a/src/pc/components/navbar/normal-navbar/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/index.jsx
@@ -13,8 +13,6 @@
const WrapComponent = asyncIconComponent(() => import('./wrapsetting'))
const MenuComponent = asyncIconComponent(() => import('./menusetting'))
const LinkComponent = asyncIconComponent(() => import('./linksetting'))
-const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
-const UserComponent = asyncIconComponent(() => import('@/menu/components/share/usercomponent'))
const { SubMenu } = Menu
@@ -101,22 +99,6 @@
this.props.updateConfig(component)
}
- /**
- * @description 鍗曚釜鍗＄墖淇℃伅鏇存柊
- */
- updateCard = (cell) => {
- let card = fromJS(this.state.card).toJS()
-
- card.subcards = card.subcards.map(item => {
- if (item.uuid === cell.uuid) return cell
- return item
- })
-
- this.setState({card})
-
- this.props.updateConfig(card)
- }
-
getStyle = (comIds, style) => {
const { card } = this.state
@@ -156,9 +138,16 @@
}
changeMenu = (menu) => {
+ if (menu.property === 'link') {
+ window.open(menu.link)
+ return
+ }
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,
})
}
@@ -185,9 +174,7 @@
<MenuComponent config={card} updateConfig={this.updateComponent} />
<LinkComponent config={card} updateConfig={this.updateComponent} />
<WrapComponent config={card} updateConfig={this.updateComponent} />
- <CopyComponent type="normalnarbar" card={card}/>
<Icon className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle} type="font-colors" />
- <UserComponent config={card}/>
<Icon className="close" title="鍒犻櫎缁勪欢" type="delete" onClick={() => this.props.deletecomponent(card.uuid)} />
</div>
} trigger="hover">
@@ -232,7 +219,7 @@
)
} else {
return (
- <Menu.Item key={fst.MenuID} onClick={(e) => e.stopPropagation()}>
+ <Menu.Item key={fst.MenuID}>
<span onClick={(e) => e.stopPropagation()} onDoubleClick={() => this.changeMenu(fst)}>{fst.name}</span>
</Menu.Item>
)
--
Gitblit v1.8.0