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.

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

[bugfix] fix search value not clear #2688

Merged
merged 7 commits into from
Sep 9, 2024
41 changes: 33 additions & 8 deletions web-app/src/app/layout/basic/widgets/search.component.ts
Original file line number Diff line number Diff line change
@@ -10,8 +10,9 @@ import {
OnDestroy,
Output
} from '@angular/core';
import { Router, NavigationEnd } from '@angular/router';
import { BehaviorSubject } from 'rxjs';
import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators';
import { debounceTime, distinctUntilChanged, tap, filter } from 'rxjs/operators';

import { Monitor } from '../../../pojo/Monitor';
import { MonitorService } from '../../../service/monitor.service';
@@ -38,12 +39,7 @@ import { MonitorService } from '../../../service/monitor.service';
/>
</nz-input-group>
<nz-autocomplete nzBackfill="false" nzDefaultActiveFirstOption #auto>
<nz-auto-option
*ngFor="let option of options"
[nzValue]="option.id"
[nzLabel]="option.name"
[routerLink]="['/monitors/' + option.id]"
>
<nz-auto-option *ngFor="let option of options" [nzValue]="option.id" [nzLabel]="option.name" (click)="onOptionSelect(option)">
<a>
{{ 'monitor.name' | i18n }} : {{ option.name }}
<span style="left:50% ; position: absolute;">{{ 'monitor.host' | i18n }} : {{ option.host }}</span>
@@ -79,10 +75,23 @@ export class HeaderSearchComponent implements AfterViewInit, OnDestroy {
}
@Output() readonly toggleChangeChange = new EventEmitter<boolean>();

constructor(private el: ElementRef<HTMLElement>, private cdr: ChangeDetectorRef, private monitorSvc: MonitorService) {}
constructor(
private router: Router,
private el: ElementRef<HTMLElement>,
private cdr: ChangeDetectorRef,
private monitorSvc: MonitorService
) {
this.router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe(() => {
this.resetSearch();
});
}

ngAfterViewInit(): void {
this.qIpt = this.el.nativeElement.querySelector('.ant-input') as HTMLInputElement;
this.initOptions();
}

initOptions() {
this.search$
.pipe(
debounceTime(500),
@@ -135,6 +144,22 @@ export class HeaderSearchComponent implements AfterViewInit, OnDestroy {
this.search$.next((ev.target as HTMLInputElement).value);
}

onOptionSelect(option: any) {
this.router.navigate([`/monitors/${option.id}`]);
this.resetSearch();
if (this.qIpt) {
this.qIpt.blur();
}
this.qBlur();
}

resetSearch() {
if (this.qIpt) {
this.qIpt!.value = '';
}
this.initOptions();
}

ngOnDestroy(): void {
this.search$.complete();
this.search$.unsubscribe();