diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index d90e13334..e1a8ee8df 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -605,3 +605,6 @@ textarea { border-color: $--border-color-light; color: $--color-text-secondary; } +.el-tabs--border-card { + background: $--background-color-empty; +} diff --git a/nezha-fronted/src/components/common/deleteButton.vue b/nezha-fronted/src/components/common/deleteButton.vue index 2752d99d2..fbf148133 100644 --- a/nezha-fronted/src/components/common/deleteButton.vue +++ b/nezha-fronted/src/components/common/deleteButton.vue @@ -270,6 +270,8 @@ export default { case 'alertRule' : return 'nz-icon monitorColor nz-icon-Alertrule' case 'alertMessage' : return 'nz-icon monitorColor nz-icon-overview-alert' case 'agent' : return 'nz-icon monitorColor nz-icon-agent' + case 'assetMeta' : return 'nz-icon monitorColor nz-icon-label' + case 'model' : return 'nz-icon monitorColor nz-icon-model' } return ' ' } diff --git a/nezha-fronted/src/components/common/filterSearch/filterSearch.vue b/nezha-fronted/src/components/common/filterSearch/filterSearch.vue index 4dee25e5b..c132901fc 100644 --- a/nezha-fronted/src/components/common/filterSearch/filterSearch.vue +++ b/nezha-fronted/src/components/common/filterSearch/filterSearch.vue @@ -57,7 +57,7 @@
- +
{{meta.value}}
@@ -194,7 +194,23 @@ export default { this.$refs.operSelect[0].focus() }) }, + valueEnter (meta, index) { + console.log(123) + meta.valueIsEditing = false + for (let i = 0; i < this.rule.length; i++) { + const item = this.rule[i] + const reg = new RegExp(item.regex) + if (!reg.test(meta.value)) { + meta.value = '' + // this.$message.error(this.$t('FILTER_PROJECT_IS_NULL')) + break + } + } + this.$emit('update:valueList', this.metaList) + this.$emit('change') + }, valueBlur (meta, index, type) { + console.log(456) meta.valueIsEditing = false for (let i = 0; i < this.rule.length; i++) { const item = this.rule[i] diff --git a/nezha-fronted/src/components/common/multipleTime.vue b/nezha-fronted/src/components/common/multipleTime.vue index e04732431..c78c9363f 100644 --- a/nezha-fronted/src/components/common/multipleTime.vue +++ b/nezha-fronted/src/components/common/multipleTime.vue @@ -76,10 +76,10 @@ export default { text: this.$t('dashboard.panel.noDate') }, timeData: [ - { - id: 0, - text: this.$t('dashboard.panel.customTimeRange') - }, + // { + // id: 0, + // text: this.$t('dashboard.panel.customTimeRange') + // }, { id: 12, text: this.$t('dashboard.panel.noDate')