diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
index 0780fbdd9..567b01f29 100644
--- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
+++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss
@@ -132,7 +132,14 @@
border-color: $--border-color-light-focus;
}
}
- .el-form-item.is-error .el-input__inner, .el-form-item.is-error .el-input__inner:focus, .el-form-item.is-error .el-textarea__inner, .el-form-item.is-error .el-textarea__inner:focus, .el-message-box__input input.invalid, .el-message-box__input input.invalid:focus {
+ .el-form-item.is-error .el-input__inner,
+ .el-form-item.is-error .el-input__inner:focus,
+ .el-form-item.is-error .el-textarea__inner,
+ .el-form-item.is-error .el-textarea__inner:focus,
+ .el-message-box__input input.invalid,
+ .el-message-box__input input.invalid:focus,
+
+ {
border-color: #F56C6C
}
diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss
index de815de3c..c4edea307 100644
--- a/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss
+++ b/nezha-fronted/src/assets/css/components/common/rightBox/chartRightBox/chartRightBox.scss
@@ -103,6 +103,9 @@
cursor: pointer;
}
}
+ .is-item-box-error .chart-title-config {
+ border-color: #F56C6C
+ }
.chart-title .nz-icon-arrow-down{
display: inline-block;
transition: transform .3s;
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index cf0b28d96..04934b38a 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -461,7 +461,7 @@
{{$t('dashboard.panel.chartForm.columns')}}
-
+
@@ -489,7 +489,7 @@
Title
-
+
Unit
@@ -508,7 +508,7 @@
Display
-
+
@@ -533,6 +533,7 @@
@@ -597,7 +598,7 @@
size="small"
v-model.number="item.value"
placeholder="value"
- @change="change"
+ @change="change('valueMapping', index)"
>
@@ -638,7 +639,7 @@
size="small"
v-model="item.regx"
placeholder="regx"
- @change="change"
+ @change="change('valueMapping', index)"
>
@@ -647,13 +648,13 @@
Columns
-
+
-
+
{colorChange(val, key, index)}"/>
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index cdf294693..463e7fd9c 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -267,6 +267,7 @@ export default {
})
}
}).catch(res => {
+ this.$refs['childrenFrom' + this.editChart.datasource].showError()
console.info(res)
})
},
diff --git a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
index 1fb702d7e..3a240a8c8 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
+++ b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
@@ -389,8 +389,11 @@ export default {
}
this.change()
},
- change () {
+ change (key, index) {
this.$nextTick(() => {
+ if (key) {
+ this.hideError(key, index)
+ }
this.$emit('change', this.chartConfig)
})
},
@@ -429,6 +432,27 @@ export default {
break
}
this.change()
+ },
+ showError () {
+ this.$refs.chartForm.validate((blooen, object) => {
+ console.log(blooen, object)
+ Object.keys(object).forEach(item => {
+ const keyArr = item.split('.')
+ if (keyArr.length >= 4) {
+ this.chartConfig[keyArr[0]][keyArr[1]][keyArr[2]].error = true
+ }
+ })
+ if (!blooen) {
+ this.$forceUpdate()
+ }
+ })
+ },
+ hideError (key, index) {
+ if (!this.chartConfig.param[key] || !this.chartConfig.param[key].length) {
+ return
+ }
+ this.chartConfig.param[key][index].error = false
+ this.$forceUpdate()
}
}
}
diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
index a7e0c73ff..00c18d399 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue
@@ -378,7 +378,7 @@
{{$t('dashboard.panel.chartForm.columns')}}
-
+
@@ -406,7 +406,7 @@
Title
-
+
Unit
@@ -425,7 +425,7 @@
Display
-
+
@@ -450,6 +450,7 @@
@@ -514,7 +515,7 @@
size="small"
v-model.number="item.value"
placeholder="value"
- @change="change"
+ @change="change('valueMapping', index)"
>
@@ -555,7 +556,7 @@
size="small"
v-model="item.regx"
placeholder="regx"
- @change="change"
+ @change="change('valueMapping', index)"
>
@@ -564,13 +565,13 @@
Columns
-
+
-
+
{colorChange(val, key, index)}"/>