This is an automated email from the ASF dual-hosted git repository. gongchao pushed a commit to branch alarm-1-3 in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit 00a1cdc93302234ef0e4c79aa89640ee654e54f6 Author: tomsun28 <[email protected]> AuthorDate: Fri Jan 3 16:13:40 2025 +0800 [webapp] update labels Signed-off-by: tomsun28 <[email protected]> --- .../monitor/monitor-edit/monitor-edit.component.ts | 3 --- .../monitor/monitor-form/monitor-form.component.html | 20 +++++++++++--------- .../monitor/monitor-form/monitor-form.component.ts | 3 ++- .../monitor/monitor-list/monitor-list.component.html | 2 +- .../monitor/monitor-new/monitor-new.component.ts | 1 - 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts index bd313128f..5eae28f83 100644 --- a/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts +++ b/web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts @@ -92,9 +92,6 @@ export class MonitorEditComponent implements OnInit { }); this.paramValueMap = paramValueMap; } - if (this.monitor.tags == undefined) { - this.monitor.tags = []; - } } else { console.warn(message.msg); this.notifySvc.error(this.i18nSvc.fanyi('monitors.not-found'), message.msg); diff --git a/web-app/src/app/routes/monitor/monitor-form/monitor-form.component.html b/web-app/src/app/routes/monitor/monitor-form/monitor-form.component.html index 293b026d3..601688714 100644 --- a/web-app/src/app/routes/monitor/monitor-form/monitor-form.component.html +++ b/web-app/src/app/routes/monitor/monitor-form/monitor-form.component.html @@ -129,16 +129,18 @@ </nz-form-item> <nz-form-item> - <nz-form-label nzSpan="7" [nzFor]="'tags'" [nzTooltipTitle]="'label.bind.tip' | i18n">{{ 'label.bind' | i18n }} </nz-form-label> + <nz-form-label nzSpan="7" [nzFor]="'labels'" [nzTooltipTitle]="'label.bind.tip' | i18n">{{ 'label.bind' | i18n }} </nz-form-label> <nz-form-control nzSpan="8" [nzErrorTip]="'validation.required' | i18n"> - <app-form-field - [item]="{ - field: 'tags', - type: 'tags-selection' - }" - [name]="'tags'" - [(ngModel)]="monitor.tags" - /> + <app-labels-input [(ngModel)]="monitor.labels" name="labels"></app-labels-input> + </nz-form-control> + </nz-form-item> + + <nz-form-item> + <nz-form-label nzSpan="7" [nzFor]="'annotation'" [nzTooltipTitle]="'annotation.bind.tip' | i18n" + >{{ 'annotation.bind' | i18n }} + </nz-form-label> + <nz-form-control nzSpan="8" [nzErrorTip]="'validation.required' | i18n"> + <app-labels-input [(ngModel)]="monitor.annotations" name="annotation"></app-labels-input> </nz-form-control> </nz-form-item> diff --git a/web-app/src/app/routes/monitor/monitor-form/monitor-form.component.ts b/web-app/src/app/routes/monitor/monitor-form/monitor-form.component.ts index e08653f57..b301f713d 100644 --- a/web-app/src/app/routes/monitor/monitor-form/monitor-form.component.ts +++ b/web-app/src/app/routes/monitor/monitor-form/monitor-form.component.ts @@ -24,6 +24,7 @@ import { ALAIN_I18N_TOKEN } from '@delon/theme'; import { NzNotificationService } from 'ng-zorro-antd/notification'; import { Collector } from '../../../pojo/Collector'; +import { Monitor } from '../../../pojo/Monitor'; import { Param } from '../../../pojo/Param'; import { ParamDefine } from '../../../pojo/ParamDefine'; @@ -33,7 +34,7 @@ import { ParamDefine } from '../../../pojo/ParamDefine'; styleUrls: ['./monitor-form.component.less'] }) export class MonitorFormComponent implements OnChanges { - @Input() monitor!: any; + @Input() monitor!: Monitor; @Input() grafanaDashboard!: any; @Input() loading!: boolean; @Input() loadingTip!: string; 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 35cba1480..65e9407bf 100644 --- 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 @@ -150,7 +150,7 @@ <th nzAlign="center" nzWidth="10%" nzColumnKey="status" [nzSortFn]="true">{{ 'monitor.status' | i18n }}</th> <th nzAlign="center" nzWidth="12%">{{ 'monitor.host' | i18n }}</th> <th nzAlign="center" nzWidth="10%">{{ 'monitor.app' | i18n }}</th> - <th nzAlign="center" nzWidth="21%">{{ 'tag' | i18n }}</th> + <th nzAlign="center" nzWidth="21%">{{ 'label' | i18n }}</th> <th nzAlign="center" nzWidth="14%" nzColumnKey="gmtUpdate" [nzSortFn]="true">{{ 'common.edit-time' | i18n }}</th> <th nzAlign="center" nzWidth="10%">{{ 'common.edit' | i18n }}</th> </tr> diff --git a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts index 03a20449a..e626afa4d 100644 --- a/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts +++ b/web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts @@ -64,7 +64,6 @@ export class MonitorNewComponent implements OnInit { private collectorSvc: CollectorService ) { this.monitor = new Monitor(); - this.monitor.tags = []; this.grafanaDashboard = new GrafanaDashboard(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
