diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/mibBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/mibBox.scss new file mode 100644 index 000000000..0dec8a09e --- /dev/null +++ b/nezha-fronted/src/assets/css/components/common/rightBox/mibBox.scss @@ -0,0 +1,16 @@ +.right-box.right-box-mib { + .el-tag--mini.el-tag--light { + background-color: $--alert-rule-background-color; + border-color: $--border-color-light; + .el-tag__close { + color: $--alert-rule-color; + } + .el-tag__close:hover { + color: #FFFFFF; + } + } + .el-upload-dragger { + background-color: $--background-color-empty; + border: 1px solid $--border-color-light; + } +} diff --git a/nezha-fronted/src/assets/css/components/common/threshold/threshold.scss b/nezha-fronted/src/assets/css/components/common/threshold/threshold.scss new file mode 100644 index 000000000..76145b094 --- /dev/null +++ b/nezha-fronted/src/assets/css/components/common/threshold/threshold.scss @@ -0,0 +1,14 @@ +.rich-text-editor { + .ql-toolbar { + border: 1px solid $--border-color-light; + } + .editor-core { + border: 1px solid $--border-color-light; + border-top: none; + } + .ql-editor { + p { + color: $--color-text-regular; + } + } +} diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss index 2558b45c6..d31aeba8b 100644 --- a/nezha-fronted/src/assets/css/components/index.scss +++ b/nezha-fronted/src/assets/css/components/index.scss @@ -43,7 +43,8 @@ @import './common/rightBox/locationCascader.scss'; @import './common/rightBox/menuBox.scss'; @import './common/rightBox/moduleBox.scss'; -@import './common/rightBox/chartRightBox/chartRightBox'; +@import './common/rightBox/chartRightBox/chartRightBox.scss'; +@import './common/rightBox/mibBox.scss'; @import './common/rightBox/assetBactchEditBox.scss'; @import './common/table/alert/alertMessageTable.scss'; @import './common/table/alert/alertRuleTable.scss'; @@ -92,4 +93,5 @@ @import './common/v-selectpagenew/selectpage.scss'; @import './common/paramBpx/paramBox.scss'; @import './common/picker/picker.scss'; +@import './common/threshold/threshold.scss'; diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss index 3d8df259e..d793d7590 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss @@ -48,7 +48,7 @@ overflow-y: auto; height: calc(100% - 60px); flex: 1; - background-color: $--dashboard-background-color-empty; + background-color: $--background-color-empty; .legend--table-cell,.legend-item { color: $--color-text-regular; } diff --git a/nezha-fronted/src/components/common/js/validate.js b/nezha-fronted/src/components/common/js/validate.js index 24f1af46b..d0445dd46 100644 --- a/nezha-fronted/src/components/common/js/validate.js +++ b/nezha-fronted/src/components/common/js/validate.js @@ -76,7 +76,7 @@ export function nzNumber (rule, value, callback) { } export function noSpecialChar (rule, value, callback) { - const charReg = /[\u0000-\uFFFF]/ + const charReg = /^[\u4e00-\u9fa5a-z0-9A-Z-_.]+$/ setTimeout(() => { if (charReg.test(value)) { callback() diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue index c73bb41ce..8cec21e60 100644 --- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue +++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue @@ -655,7 +655,6 @@ export default { name: [ { required: true, message: this.$t('validate.required'), trigger: 'change' }, { validator: this.optionType === 'batch' ? '' : noSpecialChar, trigger: 'change' } - ], assetId: [ { required: !(this.optionType === 'batch'), message: this.$t('validate.required'), trigger: 'change' }