From 84e69a606eeaf567d8dc1c1d6cf9ed7bc67c2ab2 Mon Sep 17 00:00:00 2001 From: likexuan Date: Tue, 30 Aug 2022 11:44:06 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix=20:=20=E9=BB=91=E8=89=B2=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=20Explore=20Unit=E4=B8=8B=E6=8B=89=E6=A1=86=E6=97=A0?= =?UTF-8?q?=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/css/components/common/chartUnit.scss | 3 ++- .../css/components/page/dashboard/explore/explore.scss | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/assets/css/components/common/chartUnit.scss b/nezha-fronted/src/assets/css/components/common/chartUnit.scss index fed06acfb..21d47f2ff 100644 --- a/nezha-fronted/src/assets/css/components/common/chartUnit.scss +++ b/nezha-fronted/src/assets/css/components/common/chartUnit.scss @@ -20,6 +20,7 @@ } .chart-unit .el-input__inner { border-top-left-radius: 0 !important; - border-color: $--border-color-base; + border-color: $--explore-border-color-bottom; + // border-color: $--button-icon-border-color; border-bottom-left-radius: 0 !important; } diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss index 35e2c1fa2..ef716e04f 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss @@ -207,6 +207,11 @@ } } } + .top-tools { + .chart-unit .el-input__inner { + border-color: $--button-icon-border-color; + } + } } /*外部引用 样式start*/ .doc-content { From 5d1a01f8e373cb9c3f5f3346ab7571f647a0f267 Mon Sep 17 00:00:00 2001 From: zyh Date: Tue, 30 Aug 2022 14:12:47 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8DMIB=20browser?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=95=BF=E6=96=87=E5=AD=97=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/package-lock.json | 12 ++++++------ .../css/components/page/config/mibBrowser.scss | 1 + .../src/components/page/config/mibBrowser.vue | 9 +++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/nezha-fronted/package-lock.json b/nezha-fronted/package-lock.json index eecff5474..733cf7072 100644 --- a/nezha-fronted/package-lock.json +++ b/nezha-fronted/package-lock.json @@ -3988,7 +3988,7 @@ }, "clipboard": { "version": "2.0.11", - "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz", + "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz", "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==", "requires": { "good-listener": "^1.2.2", @@ -6133,7 +6133,7 @@ }, "delegate": { "version": "3.2.0", - "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz", + "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" }, "delegates": { @@ -8445,7 +8445,7 @@ }, "good-listener": { "version": "1.2.2", - "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz", + "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==", "requires": { "delegate": "^3.1.2" @@ -16361,7 +16361,7 @@ }, "select": { "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz", + "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==" }, "select-hose": { @@ -17837,7 +17837,7 @@ }, "tiny-emitter": { "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz", + "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==" }, "tinycolor2": { @@ -18521,7 +18521,7 @@ }, "vue-clipboard2": { "version": "0.3.3", - "resolved": "https://registry.npmmirror.com/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz", + "resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.3.tgz", "integrity": "sha512-aNWXIL2DKgJyY/1OOeITwAQz1fHaCIGvUFHf9h8UcoQBG5a74MkdhS/xqoYe7DNZdQmZRL+TAdIbtUs9OyVjbw==", "requires": { "clipboard": "^2.0.0" 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..c7205a7f5 100644 --- a/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss +++ b/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss @@ -139,6 +139,7 @@ } .mib-browser-detail-row>div { padding-left: 5px; + box-sizing: border-box; } .mib-browser-detail-description { padding: 0 14px 0 0; diff --git a/nezha-fronted/src/components/page/config/mibBrowser.vue b/nezha-fronted/src/components/page/config/mibBrowser.vue index a94888aae..4758b3241 100644 --- a/nezha-fronted/src/components/page/config/mibBrowser.vue +++ b/nezha-fronted/src/components/page/config/mibBrowser.vue @@ -578,3 +578,12 @@ export default { } } + From fc96a3ef9846ab95038f6bc115419e21eb5eeca7 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 30 Aug 2022 14:16:03 +0800 Subject: [PATCH 3/6] =?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 4/6] =?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 5/6] =?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; From faa8831db6a39fb7793402984eb811dd4368788f Mon Sep 17 00:00:00 2001 From: zyh Date: Tue, 30 Aug 2022 14:43:05 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4=E7=A6=81=E7=94=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9C=89hover=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/bottomBox/tabs/IpDetails.vue | 2 +- .../components/common/bottomBox/tabs/cabinetTab.vue | 2 +- .../src/components/common/deleteButton.vue | 13 ++++++++----- .../src/components/page/alert/alertMessage.vue | 2 +- .../src/components/page/alert/alertRule.vue | 2 +- nezha-fronted/src/components/page/asset/asset.vue | 2 +- nezha-fronted/src/components/page/config/dc.vue | 2 +- nezha-fronted/src/components/page/config/ipam.vue | 2 +- nezha-fronted/src/components/page/config/model.vue | 2 +- .../components/page/config/template/chartTemp.vue | 2 +- .../components/page/config/template/exprTemp.vue | 2 +- .../page/monitor/endpoint/endpointList.vue | 2 +- .../components/page/monitor/module/moduleList.vue | 2 +- 13 files changed, 20 insertions(+), 17 deletions(-) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue index 79b3806b7..8fdff752e 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue @@ -36,7 +36,7 @@ >