From 71c1fa3bfa21baaf733189495cdd64deb0cf6551 Mon Sep 17 00:00:00 2001
From: liuwh <liuwh@hugeinfo.com.cn>
Date: Thu, 27 Feb 2020 08:44:52 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/nsjcy/frontEnd/nsjcy
---
SunshineIns/src/view/MenuView/index.jsx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/SunshineIns/src/view/MenuView/index.jsx b/SunshineIns/src/view/MenuView/index.jsx
index b6a1357..0028dd1 100644
--- a/SunshineIns/src/view/MenuView/index.jsx
+++ b/SunshineIns/src/view/MenuView/index.jsx
@@ -34,7 +34,7 @@
title={
<span>
<img src={item.icon} className='icon' />
- <span><Badge count={item.count || 0} offset={[12, 0]}>{item.name}</Badge></span>
+ <span><Badge count={item.count || 0} offset={[12, 0]}>{item.name}</Badge></span>
</span>
}>
{this.map(item.children, onClick)}
@@ -47,7 +47,7 @@
{shorten(item.name)}
</a>
: item.path.charAt(0) == '/'
- ? <Link to={item.path} replace> <img src={sks.indexOf(item.path) > -1 ? item.iconCheck : item.icon} className='icon' /><Badge count={item.count || 0} offset={[12, 0]}>{item.name}</Badge></Link>
+ ? <Link to={item.path} replace> <img src={sks.indexOf(item.path) > -1 ? item.iconCheck : item.icon} className='icon' /><Badge count={item.count || 0} offset={[12, 0]}>{item.name}</Badge></Link>
: <a href={item.path} target="_blank"> <img src={sks.indexOf(item.path) > -1 ? item.iconCheck : item.icon} className='icon' />{item.name}</a>
}
</Menu.Item>
@@ -70,7 +70,9 @@
</div>
</div>
</div>
- <Menu selectedKeys={this.props.defaultSelectedKeys}
+ <Menu
+ style={{ flex: '1', overflowX: 'hidden' }}
+ selectedKeys={this.props.defaultSelectedKeys}
defaultOpenKeys={this.props.defaultOpenKeys}
theme={this.props.theme || 'light'}
className="tree-menu-main"
--
Gitblit v1.8.0