diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index c4046fb34..478aee039 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -745,7 +745,8 @@ const cn = { add: "添加", update: "更新", del: "删除", - nameMaxLength:"长度应小于64" + nameMaxLength:"长度应小于64", + uriRequired:'请填写正确的网址' }, reset: { reset: "重置", diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 3b2682692..962d455b0 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -753,6 +753,7 @@ const en = { update: "Update", del: "Delete", nameMaxLength:'The length should be less than 64', + uriRequired:'Please fill in the correct url' }, reset:{ reset:'Reset', diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index cfaf926c1..a1385851d 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -374,7 +374,7 @@ this.showSubList = true; }, messageStyle(e) { - if (e.column.label == this.$t("alert.message")) { + if (e.column.label == 'Message' || e.column.label == this.$t('alert.message')) { if (e.row.alertNum > 0) { return 'danger'; } else { diff --git a/nezha-fronted/src/components/page/alert/nzAlertTag.vue b/nezha-fronted/src/components/page/alert/nzAlertTag.vue index d752ebfff..3e744b85d 100644 --- a/nezha-fronted/src/components/page/alert/nzAlertTag.vue +++ b/nezha-fronted/src/components/page/alert/nzAlertTag.vue @@ -28,6 +28,7 @@ line-height: 20px; border-radius: 4px; display: inline-block; + box-sizing: content-box; } .nz-alert-tag__label { border-radius: 3px 0 0 3px; @@ -40,6 +41,9 @@ overflow: hidden; word-break: break-all; display: inline-block; + height: 21px; + box-sizing: content-box; + margin-left: -1px; } .nz-alert-tag__content { border-radius: 0 3px 3px 0; diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index c7381fcca..803667ba0 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -638,7 +638,7 @@ }) }, messageStyle(e) { - if (e.column.label == 'Alerts') { + if (e.column.label == 'Alerts' || e.column.label == this.$t("asset.tableTitle.alerts")) { if (e.row.alertNum > 0) { return 'danger'; } else { diff --git a/nezha-fronted/src/components/page/config/system.vue b/nezha-fronted/src/components/page/config/system.vue index 125a4e080..c2234b94e 100644 --- a/nezha-fronted/src/components/page/config/system.vue +++ b/nezha-fronted/src/components/page/config/system.vue @@ -404,6 +404,7 @@ ], url:[ { required: true, message: this.$t('validate.required'), trigger: 'blur' }, + // { type: 'url', message: this.$t('config.system.link.uriRequired'), trigger: 'blur' } /*检验网址是否正确*/ ] }, resetRules:{