summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangyu <[email protected]>2022-08-30 14:16:03 +0800
committerzhangyu <[email protected]>2022-08-30 14:16:03 +0800
commitfc96a3ef9846ab95038f6bc115419e21eb5eeca7 (patch)
treef543331a966e859b49eedac9eba13042d663b347
parent84e69a606eeaf567d8dc1c1d6cf9ed7bc67c2ab2 (diff)
fix:校验后 删除上方未通过的校验 显示错误的问题
-rw-r--r--nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss8
-rw-r--r--nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue3
-rw-r--r--nezha-fronted/src/components/common/rightBox/chart/publicConfig.js11
-rw-r--r--nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue3
-rw-r--r--nezha-fronted/src/components/common/rightBox/moduleBox.vue3
5 files changed, 28 insertions, 0 deletions
diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
index bf5f4e331..f48884261 100644
--- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
+++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
@@ -169,3 +169,11 @@
}
}
+.topo-page {
+ .promqlInput {
+ .el-cascader-menu {
+ width: 200px;
+ height: 100%;
+ }
+ }
+}
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index 19a4dae26..2cd9d5274 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -1187,6 +1187,9 @@ export default {
return
}
this.chartConfig.param.thresholds.splice(index, 1)
+ this.chartConfig.param.thresholds.forEach((item, index) => {
+ this.$refs.chartForm.validateField('param.thresholds.' + index + '.value')
+ })
this.change()
},
move () {
diff --git a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
index c51cf46db..fe76cebde 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
+++ b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
@@ -468,6 +468,9 @@ export default {
this.expressions.splice(index, 1)
this.expressionName.splice(index, 1)
this.expressionsShow.splice(index, 1)
+ this.chartConfig.elements.forEach((item, index) => {
+ this.$refs.chartForm.validateField('elements.' + index + '.expression')
+ })
this.$nextTick(() => {
this.expressions.forEach((ex, index) => {
if (ex) {
@@ -537,6 +540,14 @@ export default {
},
removeMapping (index) {
this.chartConfig.param.valueMapping.splice(index, 1)
+ this.chartConfig.param.valueMapping.forEach((item, index) => {
+ this.$refs.chartForm.validateField('param.valueMapping.' + index + '.value')
+ this.$refs.chartForm.validateField('param.valueMapping.' + index + '.from')
+ this.$refs.chartForm.validateField('param.valueMapping.' + index + '.to')
+ this.$refs.chartForm.validateField('param.valueMapping.' + index + '.regx')
+ this.$refs.chartForm.validateField('param.valueMapping.' + index + '.column')
+ this.$refs.chartForm.validateField('param.valueMapping.' + index + '.display')
+ })
this.change()
},
showMapping (index) {
diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
index 795b8b899..21120604f 100644
--- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
+++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
@@ -1311,6 +1311,7 @@ export default {
// 删除pipeline
delPipeline (logsIndex, pipeLineIndex) {
this.editEndpoint.configs[1].config[logsIndex].pipeline.splice(pipeLineIndex, 1)
+ this.$refs.moduleForm.clearValidate()
},
// 添加pipelineItem
addPipelineItem (logsIndex, pipelineIndex) {
@@ -1354,6 +1355,7 @@ export default {
} else if (val === 'labels') {
this.editEndpoint.configs[1].config[logsIndex].pipeline[pipelineIndex].labels.splice(itemIndex, 1)
}
+ this.$refs.moduleForm.clearValidate()
},
resultFormat (resp) {
if (resp && resp.data) {
@@ -1457,6 +1459,7 @@ export default {
// return
// }
this.editEndpoint.configs[0].config.relabel_config.splice(index, 1)
+ this.$refs.moduleForm.clearValidate()
},
tagsChangeRelabel (newTags, index) {
this.editEndpoint.configs[0].config.relabel_config[index].source_labels = newTags.map(item => item.text)
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
index 37b43f44f..6b14d9bd5 100644
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -1064,6 +1064,7 @@ export default {
// return
// }
this.editModule.configs[0].config.relabel_config.splice(index, 1)
+ this.$refs.moduleForm.clearValidate()
},
tagsChange (newTags, index) {
this.editModule.paramObj[index].value = newTags.map(item => item.text)
@@ -1259,6 +1260,7 @@ export default {
// 删除pipeline
delPipeline (logsIndex, pipeLineIndex) {
this.editModule.configs[1].config[logsIndex].pipeline.splice(pipeLineIndex, 1)
+ this.$refs.moduleForm.clearValidate()
},
// 添加pipelineItem
addPipelineItem (logsIndex, pipelineIndex) {
@@ -1292,6 +1294,7 @@ export default {
} else if (val === 'labels') {
this.editModule.configs[1].config[logsIndex].pipeline[pipelineIndex].labels.splice(itemIndex, 1)
}
+ this.$refs.moduleForm.clearValidate()
}
},
mounted () {