innov
/
nightingale1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

fix: type and query filter does not work (#104)

This commit is contained in:
jsers 2020-04-27 13:56:29 +08:00
parent 8b0e2b8042
commit a30e6d6be7
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/src/locales/en.ts
View File

@ -106,6 +106,7 @@ export default {
'7天': '7days',
'30天': '30days',
'其它': 'other',
'自定义': 'custom',
'menu.endpoints': 'Endpoints',
'menu.endpoints.all': 'All endpoints',

1
web/src/locales/zh.ts
View File

@ -106,6 +106,7 @@ export default {
'7天': '7天',
'30天': '30天',
'其它': '其它',
'自定义': '自定义',
'menu.endpoints': '监控对象',
'menu.endpoints.all': '全部对象',

24
web/src/pages/Monitor/History/List.tsx
View File

@ -89,9 +89,9 @@ class index extends Component<Props & WrappedComponentProps, State> {
getQuery() {
const { nodepath } = this.props;
const { stime, etime, priorities } = this.state;
const { stime, etime, priorities, type, searchValue } = this.state;
return { stime, etime, priorities, nodepath };
return { stime, etime, priorities, nodepath, type, query: searchValue };
}
updateTime = (cbk?: () => void) => {
@ -268,9 +268,7 @@ class index extends Component<Props & WrappedComponentProps, State> {
const now = moment();
const nStime = now.clone().subtract(val, 'hours').unix();
const nEtime = now.clone().unix();
this.setState({ customTime: false, stime: nStime, etime: nEtime }, () => {
this.fetchTable.reload();
});
this.setState({ customTime: false, stime: nStime, etime: nEtime });
} else {
this.setState({ customTime: true });
}
@ -293,9 +291,7 @@ class index extends Component<Props & WrappedComponentProps, State> {
placeholder="Start"
onChange={(val) => {
if (val) {
this.setState({ stime: val.unix() }, () => {
this.fetchTable.reload();
});
this.setState({ stime: val.unix() });
}
}}
/>
@ -307,9 +303,7 @@ class index extends Component<Props & WrappedComponentProps, State> {
placeholder="End"
onChange={(val) => {
if (val) {
this.setState({ etime: val.unix() }, () => {
this.fetchTable.reload();
});
this.setState({ etime: val.unix() });
}
}}
/>
@ -324,9 +318,7 @@ class index extends Component<Props & WrappedComponentProps, State> {
value={type}
onChange={(value: string) => {
this.updateTime(() => {
this.setState({ type: value }, () => {
this.fetchTable.reload();
});
this.setState({ type: value });
});
}}
>
@ -345,9 +337,7 @@ class index extends Component<Props & WrappedComponentProps, State> {
value={priorities ? _.map(_.split(priorities, ','), _.toNumber) : []}
onChange={(value: number) => {
this.updateTime(() => {
this.setState({ priorities: !_.isEmpty(value) ? _.join(value, ',') : undefined }, () => {
this.fetchTable.reload();
});
this.setState({ priorities: !_.isEmpty(value) ? _.join(value, ',') : undefined });
});
}}
>