feature: add new field description in hertzbeat tag detail (#1489)

apache · Jan 16, 2024 · b2ed658 · b2ed658
1 parent 4f2015f
commit b2ed658
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 0 deletions.
diff --git a/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Tag.java b/common/src/main/java/org/dromara/hertzbeat/common/entity/manager/Tag.java
@@ -67,6 +67,9 @@ public class Tag {
     @Schema(title = "Tag Color | 标签颜色", example = "#ffff", accessMode = READ_WRITE)
     private String color;
 
+    @Schema(title = "Tag Color | 标签描述", example = "用于监控mysql", accessMode = READ_WRITE)
+    private String description;
+
     @Schema(title = "标记类型 0:监控自动生成(monitorId,monitorName) 1: 用户生成 2: 系统预置", accessMode = READ_WRITE)
     @Min(0)
     @Max(3)

diff --git a/script/sql/schema.sql b/script/sql/schema.sql
@@ -96,6 +96,7 @@ CREATE TABLE  hzb_tag
     `value`      varchar(100)     comment 'TAG标签值(可为空)',
     type         tinyint          not null default 0 comment '标记类型 0:监控自动生成(monitorId,monitorName) 1: 用户生成 2: 系统预制',
     color        varchar(100)     default '#ffffff' comment '标签颜色' ,
+    description  varchar(255)     comment '标签描述(可为空)',
     creator      varchar(100)     comment '创建者',
     modifier     varchar(100)     comment '最新修改者',
     gmt_create   timestamp        default current_timestamp comment 'create time',

diff --git a/web-app/src/app/pojo/Tag.ts b/web-app/src/app/pojo/Tag.ts
@@ -3,6 +3,7 @@ export class Tag {
   name!: string;
   value!: string;
   color: string = this.getRandomColor();
+  description!: string;
   // 标记类型 0:监控自动生成(monitorId,monitorName) 1: 用户生成 2: 系统预置
   type!: number;
   creator!: string;

diff --git a/web-app/src/app/routes/setting/tags/tags.component.html b/web-app/src/app/routes/setting/tags/tags.component.html
@@ -57,6 +57,7 @@
       <th nzAlign="center" nzWidth="15%">{{ 'tag.name' | i18n }}</th>
       <th nzAlign="center" nzWidth="15%">{{ 'tag.value' | i18n }}</th>
       <th nzAlign="center" nzWidth="15%">{{ 'tag.color' | i18n }}</th>
+      <th nzAlign="center" nzWidth="15%">{{ 'tag.description' | i18n }}</th>
       <th nzAlign="center" nzWidth="20%">{{ 'tag.update-time' | i18n }}</th>
       <th nzAlign="center" nzWidth="17%">{{ 'common.edit' | i18n }}</th>
     </tr>
@@ -76,6 +77,7 @@
       <td nzAlign="center">
         <nz-tag [nzColor]="data.color" style="font-weight: bold; font-size: larger">{{ data.color }}</nz-tag>
       </td>
+      <td nzAlign="center">{{ data.description }}</td>
       <td nzAlign="center">{{ data.gmtUpdate | date : 'YYYY-MM-dd HH:mm:ss' }}</td>
       <td nzAlign="center">
         <button nz-button nzType="primary" (click)="onEditOneTag(data)" nz-tooltip [nzTooltipTitle]="'tag.edit' | i18n">
@@ -130,6 +132,12 @@
           />
         </nz-form-control>
       </nz-form-item>
+      <nz-form-item>
+        <nz-form-label [nzSpan]="7" nzFor="description">{{ 'tag.description' | i18n }}</nz-form-label>
+        <nz-form-control [nzSpan]="12" [nzErrorTip]="'validation.required' | i18n">
+          <input [(ngModel)]="tag.description" nz-input name="description" type="text" id="description" />
+        </nz-form-control>
+      </nz-form-item>
       <nz-form-item *ngIf="tag.name != undefined">
         <nz-form-label [nzSpan]="7" nzFor="color">{{ 'tag.display' | i18n }}</nz-form-label>
         <nz-form-control [nzSpan]="12" [nzErrorTip]="'validation.required' | i18n">

diff --git a/web-app/src/app/routes/setting/tags/tags.component.ts b/web-app/src/app/routes/setting/tags/tags.component.ts
@@ -163,6 +163,9 @@ export class SettingTagsComponent implements OnInit {
     if (this.tag.value != undefined) {
       this.tag.value = this.tag.value.trim();
     }
+    if (this.tag.description != undefined) {
+      this.tag.description = this.tag.description.trim();
+    }
     if (this.isManageModalAdd) {
       const modalOk$ = this.tagService
         .newTag(this.tag)

diff --git a/web-app/src/assets/i18n/en-US.json b/web-app/src/assets/i18n/en-US.json
@@ -496,6 +496,7 @@
   "tag.name": "Tag Name",
   "tag.value": "Tag Value",
   "tag.color": "Color",
+  "tag.description": "Description",
   "tag.update-time": "Update Time",
   "tag.display": "Display",
   "tag.bind": "Bind Tags",

diff --git a/web-app/src/assets/i18n/zh-CN.json b/web-app/src/assets/i18n/zh-CN.json
@@ -495,6 +495,7 @@
   "tag.name": "标签名",
   "tag.value": "标签值",
   "tag.color": "颜色",
+  "tag.description": "标签描述",
   "tag.update-time": "更新时间",
   "tag.display": "效果",
   "tag.bind": "绑定标签",

diff --git a/web-app/src/assets/i18n/zh-TW.json b/web-app/src/assets/i18n/zh-TW.json
@@ -494,6 +494,7 @@
   "tag.name": "標簽名",
   "tag.value": "標簽值",
   "tag.color": "顔色",
+  "tag.description": "標簽描述",
   "tag.update-time": "更新時間",
   "tag.display": "效果",
   "tag.bind": "綁定標簽",