From fc96a3ef9846ab95038f6bc115419e21eb5eeca7 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 30 Aug 2022 14:16:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=EF=BC=9A=E6=A0=A1=E9=AA=8C=E5=90=8E=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8A=E6=96=B9=E6=9C=AA=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C=20=E6=98=BE=E7=A4=BA=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page/dashboard/explore/promqlInput.scss | 8 ++++++++ .../components/common/rightBox/chart/chartConfig.vue | 3 +++ .../components/common/rightBox/chart/publicConfig.js | 11 +++++++++++ .../components/common/rightBox/editEndpointBoxNew.vue | 3 +++ .../src/components/common/rightBox/moduleBox.vue | 3 +++ 5 files changed, 28 insertions(+) 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 () { From 387338f37e776bc6fb394d5cc04f71b1a2615a3a Mon Sep 17 00:00:00 2001 From: likexuan Date: Tue, 30 Aug 2022 14:23:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20:=20MIB=20browser=20=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=88=90=E5=8A=9F=E5=90=8E=EF=BC=8C=E8=A1=A8=E5=A4=B4?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=A4=9A=E4=BD=99th?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/css/components/page/config/mibBrowser.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss b/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss index b1063245c..ac860a10d 100644 --- a/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss +++ b/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss @@ -230,3 +230,9 @@ border-color: unset; background-color: unset; } +.plTableBox.mib-browser-table{ + .el-table:not(.chart-table) .gutter{ + right: 53px !important; + height: 40px !important; + } +} \ No newline at end of file From 5da54824f8a0f15157e8fadbb4d7e3ad381f94c3 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 30 Aug 2022 14:29:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?style=EF=BC=9A=20=E5=BF=AB=E7=85=A7=20alert?= =?UTF-8?q?Message=20=E6=A0=B7=E5=BC=8F=E4=B8=8D=E5=AF=B9=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/components/chart/chart.scss | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/assets/css/components/chart/chart.scss b/nezha-fronted/src/assets/css/components/chart/chart.scss index f08d154b9..5cc61abbd 100644 --- a/nezha-fronted/src/assets/css/components/chart/chart.scss +++ b/nezha-fronted/src/assets/css/components/chart/chart.scss @@ -307,13 +307,18 @@ .basic-info-table-list { display: flex; .basic-info-table-title,.basic-info-table-value { - display: inline-block; + display: inline-flex; flex-wrap: wrap; width: 50%; line-height: 30px; padding-left: 10px; border-bottom: 1px solid $--border-color-light; border-right: 1px solid $--border-color-light; + .alert-days-info{ + div { + vertical-align: middle; + } + } } .basic-info-table-value { border-right: none;