This is an automated email from the ASF dual-hosted git repository.
zhaoqingran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new b9f8b7de7 Unified the search interaction of the list page. (#2207)
b9f8b7de7 is described below
commit b9f8b7de72fe53234e2f8dfab70a901698ed54a4
Author: Kerwin Bryant <[email protected]>
AuthorDate: Fri Jul 5 09:58:11 2024 +0800
Unified the search interaction of the list page. (#2207)
Co-authored-by: Logic <[email protected]>
---
.../routes/alert/alert-center/alert-center.component.html | 6 +-----
.../alert/alert-converge/alert-converge.component.html | 14 ++++----------
.../alert/alert-setting/alert-setting.component.html | 14 ++++----------
.../alert/alert-silence/alert-silence.component.html | 14 ++++----------
.../monitor/monitor-list/monitor-list.component.html | 8 ++------
.../app/routes/setting/collector/collector.component.html | 14 ++++----------
web-app/src/app/routes/setting/tags/tags.component.html | 14 ++++----------
7 files changed, 23 insertions(+), 61 deletions(-)
diff --git
a/web-app/src/app/routes/alert/alert-center/alert-center.component.html
b/web-app/src/app/routes/alert/alert-center/alert-center.component.html
index 651b40f45..84203ac8b 100644
--- a/web-app/src/app/routes/alert/alert-center/alert-center.component.html
+++ b/web-app/src/app/routes/alert/alert-center/alert-center.component.html
@@ -75,16 +75,12 @@
<nz-option [nzLabel]="'alert.status.3' | i18n" [nzValue]="3"></nz-option>
</nz-select>
<app-multi-func-input
- groupStyle="width: 200px;"
- inputStyle="text-align: center"
+ groupStyle="width: 250px;"
class="mobile-hide"
[placeholder]="'alert.center.search' | i18n"
[(value)]="filterContent"
(valueChange)="loadAlertsTable()"
/>
- <button nz-button nzType="primary" (click)="loadAlertsTable()"
class="mobile-hide">
- {{ 'common.search' | i18n }}
- </button>
</ng-template>
</app-toolbar>
diff --git
a/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html
b/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html
index 29f3a0f69..a7a86cc73 100644
--- a/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html
+++ b/web-app/src/app/routes/alert/alert-converge/alert-converge.component.html
@@ -41,18 +41,12 @@
</button>
</ng-template>
<ng-template #right>
- <input
- style="width: 200px; text-align: center"
- nz-input
- type="text"
+ <app-multi-func-input
+ groupStyle="width: 250px;"
[placeholder]="'alert.converge.name' | i18n"
- nzSize="default"
- (keyup.enter)="loadAlertConvergeTable()"
- [(ngModel)]="search"
+ [(value)]="search"
+ (valueChange)="loadAlertConvergeTable()"
/>
- <button nz-button nzType="primary" (click)="loadAlertConvergeTable()">
- {{ 'common.search' | i18n }}
- </button>
</ng-template>
</app-toolbar>
diff --git
a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
index e0beb9eba..b25c9978b 100755
--- a/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
+++ b/web-app/src/app/routes/alert/alert-setting/alert-setting.component.html
@@ -63,18 +63,12 @@
</nz-dropdown-menu>
</ng-template>
<ng-template #right>
- <input
- style="width: 200px; text-align: center"
- nz-input
- type="text"
+ <app-multi-func-input
+ groupStyle="width: 250px;"
[placeholder]="'alert.setting.search' | i18n"
- nzSize="default"
- (keyup.enter)="loadAlertDefineTable()"
- [(ngModel)]="search"
+ [(value)]="search"
+ (valueChange)="loadAlertDefineTable()"
/>
- <button nz-button nzType="primary" (click)="loadAlertDefineTable()">
- {{ 'common.search' | i18n }}
- </button>
</ng-template>
</app-toolbar>
diff --git
a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html
b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html
index f20ebb798..728c9e8b2 100755
--- a/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html
+++ b/web-app/src/app/routes/alert/alert-silence/alert-silence.component.html
@@ -41,18 +41,12 @@
</button>
</ng-template>
<ng-template #right>
- <input
- style="width: 200px; text-align: center"
- nz-input
- type="text"
+ <app-multi-func-input
+ groupStyle="width: 250px;"
[placeholder]="'alert.silence.name' | i18n"
- nzSize="default"
- (keyup.enter)="loadAlertSilenceTable()"
- [(ngModel)]="search"
+ [(value)]="search"
+ (valueChange)="loadAlertSilenceTable()"
/>
- <button nz-button nzType="primary" (click)="loadAlertSilenceTable()">
- {{ 'common.search' | i18n }}
- </button>
</ng-template>
</app-toolbar>
diff --git
a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
index ec3456704..172ead214 100755
--- a/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
+++ b/web-app/src/app/routes/monitor/monitor-list/monitor-list.component.html
@@ -30,6 +30,7 @@
[module_name]="'menu.monitor.center'"
[icon_name]="'laptop'"
></app-help-message-show>
+
<nz-divider></nz-divider>
<app-toolbar>
@@ -102,8 +103,7 @@
<nz-option [nzLabel]="'monitor.status.paused' | i18n"
[nzValue]="0"></nz-option>
</nz-select>
<app-multi-func-input
- groupStyle="width: 90px;"
- inputStyle="text-align: center"
+ groupStyle="width: 120px;"
class="mobile-hide"
[placeholder]="'monitors.search.tag' | i18n"
[(value)]="tag"
@@ -111,15 +111,11 @@
/>
<app-multi-func-input
groupStyle="width: 180px;"
- inputStyle="text-align: center"
class="mobile-hide"
[placeholder]="'monitors.search.placeholder' | i18n"
[(value)]="filterContent"
(valueChange)="onFilterSearchMonitors()"
/>
- <button class="mobile-hide" nz-button nzType="primary"
(click)="onFilterSearchMonitors()">
- {{ 'common.search' | i18n }}
- </button>
</ng-template>
</app-toolbar>
diff --git a/web-app/src/app/routes/setting/collector/collector.component.html
b/web-app/src/app/routes/setting/collector/collector.component.html
index 477759ebc..b2db37b77 100644
--- a/web-app/src/app/routes/setting/collector/collector.component.html
+++ b/web-app/src/app/routes/setting/collector/collector.component.html
@@ -53,19 +53,13 @@
</button>
</ng-template>
<ng-template #right>
- <input
+ <app-multi-func-input
class="mobile-hide"
- style="width: 300px; text-align: center"
- nz-input
- type="text"
+ groupStyle="width: 250px;"
[placeholder]="'collector.name' | i18n"
- nzSize="default"
- (keyup.enter)="loadCollectorsTable()"
- [(ngModel)]="search"
+ [(value)]="search"
+ (valueChange)="loadCollectorsTable()"
/>
- <button nz-button nzType="primary" (click)="loadCollectorsTable()"
class="mobile-hide">
- {{ 'common.search' | i18n }}
- </button>
</ng-template>
</app-toolbar>
diff --git a/web-app/src/app/routes/setting/tags/tags.component.html
b/web-app/src/app/routes/setting/tags/tags.component.html
index 84d8c5e39..3c7d26eed 100644
--- a/web-app/src/app/routes/setting/tags/tags.component.html
+++ b/web-app/src/app/routes/setting/tags/tags.component.html
@@ -42,19 +42,13 @@
</button>
</ng-template>
<ng-template #right>
- <input
+ <app-multi-func-input
class="mobile-hide"
- style="width: 300px; text-align: center"
- nz-input
- type="text"
+ groupStyle="width: 250px;"
[placeholder]="'tag.search' | i18n"
- nzSize="default"
- (keyup.enter)="loadTagsTable()"
- [(ngModel)]="search"
+ [(value)]="search"
+ (valueChange)="loadTagsTable()"
/>
- <button nz-button nzType="primary" (click)="loadTagsTable()"
class="mobile-hide">
- {{ 'common.search' | i18n }}
- </button>
</ng-template>
</app-toolbar>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
