Commit 761e6d50 authored by Lijiao's avatar Lijiao Committed by Yan Ni
Browse files

fix bug of menu click (#1206)

parent 28999d44
...@@ -353,8 +353,10 @@ class Overview extends React.Component<OverviewProps, OverviewState> { ...@@ -353,8 +353,10 @@ class Overview extends React.Component<OverviewProps, OverviewState> {
const indexarr: Array<number> = []; const indexarr: Array<number> = [];
Object.keys(sourcePoint).map(item => { Object.keys(sourcePoint).map(item => {
const items = sourcePoint[item]; const items = sourcePoint[item];
accarr.push(items.acc.default); if (items.acc !== undefined) {
indexarr.push(items.sequenceId); accarr.push(items.acc.default);
indexarr.push(items.sequenceId);
}
}); });
const accOption = { const accOption = {
// support max show 0.0000000 // support max show 0.0000000
......
...@@ -29,7 +29,6 @@ class SlideBar extends React.Component<SliderProps, SliderState> { ...@@ -29,7 +29,6 @@ class SlideBar extends React.Component<SliderProps, SliderState> {
public _isMounted = false; public _isMounted = false;
public divMenu: HTMLDivElement | null; public divMenu: HTMLDivElement | null;
public countOfMenu: number = 0;
public selectHTML: Select | null; public selectHTML: Select | null;
constructor(props: SliderProps) { constructor(props: SliderProps) {
...@@ -208,7 +207,6 @@ class SlideBar extends React.Component<SliderProps, SliderState> { ...@@ -208,7 +207,6 @@ class SlideBar extends React.Component<SliderProps, SliderState> {
} }
menu = () => { menu = () => {
this.countOfMenu = 0;
return ( return (
<Menu onClick={this.handleMenuClick}> <Menu onClick={this.handleMenuClick}>
<Menu.Item key="1">Experiment Parameters</Menu.Item> <Menu.Item key="1">Experiment Parameters</Menu.Item>
...@@ -223,7 +221,7 @@ class SlideBar extends React.Component<SliderProps, SliderState> { ...@@ -223,7 +221,7 @@ class SlideBar extends React.Component<SliderProps, SliderState> {
const { version } = this.state; const { version } = this.state;
const feedBackLink = `https://github.com/Microsoft/nni/issues/new?labels=${version}`; const feedBackLink = `https://github.com/Microsoft/nni/issues/new?labels=${version}`;
return ( return (
<Menu onClick={this.handleMenuClick} mode="inline"> <Menu onClick={this.handleMenuClick} className="menuModal">
<Menu.Item key="overview"><Link to={'/oview'}>Overview</Link></Menu.Item> <Menu.Item key="overview"><Link to={'/oview'}>Overview</Link></Menu.Item>
<Menu.Item key="detail"><Link to={'/detail'}>Trials detail</Link></Menu.Item> <Menu.Item key="detail"><Link to={'/detail'}>Trials detail</Link></Menu.Item>
<Menu.Item key="fresh"> <Menu.Item key="fresh">
...@@ -250,18 +248,6 @@ class SlideBar extends React.Component<SliderProps, SliderState> { ...@@ -250,18 +248,6 @@ class SlideBar extends React.Component<SliderProps, SliderState> {
); );
} }
// nav bar <1299
showMenu = () => {
if (this.divMenu !== null) {
this.countOfMenu = this.countOfMenu + 1;
if (this.countOfMenu % 2 === 0) {
this.divMenu.setAttribute('class', 'hide');
} else {
this.divMenu.setAttribute('class', 'show');
}
}
}
select = () => { select = () => {
return ( return (
<Select <Select
...@@ -322,7 +308,7 @@ class SlideBar extends React.Component<SliderProps, SliderState> { ...@@ -322,7 +308,7 @@ class SlideBar extends React.Component<SliderProps, SliderState> {
</li> </li>
<li className="feedback"> <li className="feedback">
<span className="fresh" onClick={this.fresh}> <span className="fresh" onClick={this.fresh}>
<Icon type="sync"/><span>Fresh</span> <Icon type="sync" /><span>Fresh</span>
</span> </span>
<Dropdown <Dropdown
className="dropdown" className="dropdown"
...@@ -350,8 +336,9 @@ class SlideBar extends React.Component<SliderProps, SliderState> { ...@@ -350,8 +336,9 @@ class SlideBar extends React.Component<SliderProps, SliderState> {
<MediaQuery query="(max-width: 1299px)"> <MediaQuery query="(max-width: 1299px)">
<Row className="little"> <Row className="little">
<Col span={6} className="menu"> <Col span={6} className="menu">
<Icon type="unordered-list" className="more" onClick={this.showMenu} /> <Dropdown overlay={this.navigationBar()} trigger={['click']}>
<div ref={div => this.divMenu = div} className="hide">{this.navigationBar()}</div> <Icon type="unordered-list" className="more" />
</Dropdown>
</Col> </Col>
<Col span={10} className="logo"> <Col span={10} className="logo">
<Link to={'/oview'}> <Link to={'/oview'}>
......
...@@ -99,22 +99,29 @@ $drowHoverBgColor: #e2e2e2; ...@@ -99,22 +99,29 @@ $drowHoverBgColor: #e2e2e2;
padding: 0; padding: 0;
background-color: $drowBgColor; background-color: $drowBgColor;
border-radius: 0; border-radius: 0;
.ant-dropdown-menu-item:hover{ .ant-dropdown-menu-item{
font-size: 16px;
}
.ant-dropdown-menu-item:hover, .ant-dropdown-menu-submenu:hover{
background-color: $drowHoverBgColor; background-color: $drowHoverBgColor;
} }
} }
} }
.ant-dropdown-menu-sub{
padding: 0;
background-color: $drowBgColor;
border-radius: 0;
.ant-dropdown-menu-item:hover{
background-color: $drowHoverBgColor;
}
}
/* nav style*/ /* nav style*/
.little{ .little{
width: 100%; width: 100%;
.menu{ .menu{
.show{
display: block;
}
.hide{
display: none;
}
.more{ .more{
color: #fff; color: #fff;
font-size: 24px; font-size: 24px;
...@@ -128,3 +135,7 @@ $drowHoverBgColor: #e2e2e2; ...@@ -128,3 +135,7 @@ $drowHoverBgColor: #e2e2e2;
text-align: center; text-align: center;
} }
} }
.menuModal{
width: 180px;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment