overflow_backup_2018_0455/overflow_app
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
insanity 2017-07-24 18:18:33 +09:00
parent 61627664a4
commit 4926f74986
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ts/@overflow/app/views/layout/AppLayout.tsx
View File

@ -3,7 +3,7 @@ import { Redirect, RouteComponentProps, RouteProps, Route, Switch } from 'react-
import { Container, Menu, Sidebar, Segment, Icon, Breadcrumb, Grid, Dropdown } from 'semantic-ui-react'; import { Container, Menu, Sidebar, Segment, Icon, Breadcrumb, Grid, Dropdown } from 'semantic-ui-react';
import { Header } from './Header'; import { Header } from './Header';
import { Footer } from './Footer'; import { Footer } from './Footer';
import { TitleBar } from './TitleBar'; import TitleBarContainer from './TitleBarContainer';
import LeftMenu from './LeftMenu'; import LeftMenu from './LeftMenu';
import Home from '../Home'; import Home from '../Home';
@ -38,7 +38,7 @@ export class AppLayout extends React.Component<Props, State> {
<LeftMenu /> <LeftMenu />
<Segment vertical style={{ margin: '0 0 0 210px', padding: '0' }}> <Segment vertical style={{ margin: '0 0 0 210px', padding: '0' }}>
<Header /> <Header />
<TitleBar /> <TitleBarContainer />
<Switch> <Switch>
<Route exact={true} path={`${this.props.match.url}`} component={Home}/> <Route exact={true} path={`${this.props.match.url}`} component={Home}/>
<Route exact={true} path={`${this.props.match.url}probes`} component={ProbeList}/> <Route exact={true} path={`${this.props.match.url}probes`} component={ProbeList}/>

6
src/ts/@overflow/app/views/layout/ProbeDetailLayout.tsx
View File

@ -13,6 +13,7 @@ import ProbeHistory from '../../views/monitoring/probe/History';
export interface Props extends RouteComponentProps<any> { export interface Props extends RouteComponentProps<any> {
} }
export interface State { export interface State {
currUrl: string;
} }
export class ProbeDetailLayout extends React.Component<Props, State> { export class ProbeDetailLayout extends React.Component<Props, State> {
@ -20,6 +21,7 @@ export class ProbeDetailLayout extends React.Component<Props, State> {
constructor(props: Props, context: State) { constructor(props: Props, context: State) {
super(props, context); super(props, context);
this.state = { this.state = {
currUrl: this.props.location.pathname,
}; };
} }
@ -28,11 +30,11 @@ export class ProbeDetailLayout extends React.Component<Props, State> {
const sub = [ const sub = [
{ {
'name': 'Info', 'name': 'Info',
'path': `${this.props.location.pathname}`, 'path': this.state.currUrl,
}, },
{ {
'name': 'History', 'name': 'History',
'path': `${this.props.location.pathname}/history`, 'path': this.state.currUrl + '/history',
}, },
]; ];
return ( return (

1
src/ts/@overflow/app/views/layout/TitleBar.tsx
View File

@ -24,7 +24,6 @@ export class TitleBar extends React.Component<Props, State> {
} }
public handleMenu(menu:any): any { public handleMenu(menu:any): any {
console.log(menu.path);
this.props.onRedirect(menu.path); this.props.onRedirect(menu.path);
} }