Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed the bug of the status filter in the alert center. #2125

Merged
merged 2 commits into from
Jun 24, 2024
Merged

Fixed the bug of the status filter in the alert center. #2125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53998c4
Fixed the bug of the status filter in the alert center.
kerwin612 Jun 24, 2024
9f36c6c
Merge branch 'master' into patch-12
tomsun28 Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions web-app/src/app/routes/alert/alert-center/alert-center.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,24 +65,26 @@
style="margin-right: 10px; float: right"
nzAllowClear
[nzPlaceHolder]="'alert.center.filter-status' | i18n"
(ngModelChange)="loadAlertsTable()"
[(ngModel)]="filterStatus"
>
<nz-option [nzLabel]="'alert.status.all' | i18n" nzValue="9"></nz-option>
<nz-option [nzLabel]="'alert.status.0' | i18n" nzValue="0"></nz-option>
<nz-option [nzLabel]="'alert.status.2' | i18n" nzValue="2"></nz-option>
<nz-option [nzLabel]="'alert.status.3' | i18n" nzValue="3"></nz-option>
<nz-option [nzLabel]="'alert.status.all' | i18n" [nzValue]="9"></nz-option>
<nz-option [nzLabel]="'alert.status.0' | i18n" [nzValue]="0"></nz-option>
<nz-option [nzLabel]="'alert.status.2' | i18n" [nzValue]="2"></nz-option>
<nz-option [nzLabel]="'alert.status.3' | i18n" [nzValue]="3"></nz-option>
</nz-select>
<nz-select
class="mobile-hide"
style="margin-right: 10px; float: right"
nzAllowClear
[nzPlaceHolder]="'alert.center.filter-priority' | i18n"
(ngModelChange)="loadAlertsTable()"
[(ngModel)]="filterPriority"
>
<nz-option [nzLabel]="'alert.priority.all' | i18n" nzValue="9"></nz-option>
<nz-option [nzLabel]="'alert.priority.2' | i18n" nzValue="2"></nz-option>
<nz-option [nzLabel]="'alert.priority.1' | i18n" nzValue="1"></nz-option>
<nz-option [nzLabel]="'alert.priority.0' | i18n" nzValue="0"></nz-option>
<nz-option [nzLabel]="'alert.priority.all' | i18n" [nzValue]="9"></nz-option>
<nz-option [nzLabel]="'alert.priority.2' | i18n" [nzValue]="2"></nz-option>
<nz-option [nzLabel]="'alert.priority.1' | i18n" [nzValue]="1"></nz-option>
<nz-option [nzLabel]="'alert.priority.0' | i18n" [nzValue]="0"></nz-option>
</nz-select>
</div>

Expand Down
4 changes: 2 additions & 2 deletions web-app/src/app/routes/alert/alert-center/alert-center.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ export class AlertCenterComponent implements OnInit {
tableLoading: boolean = false;
checkedAlertIds = new Set<number>();
// 搜索过滤相关属性
filterStatus: number | undefined;
filterPriority: number | undefined;
filterStatus: number = 9;
filterPriority: number = 9;
filterContent: string | undefined;

ngOnInit(): void {
Expand Down
Loading