diff --git a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue index 925af9e82..cdadfaf83 100644 --- a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue @@ -37,9 +37,7 @@ :expression-list.sync="expressions" :index="0" :styleType="2" - :plugins="['metric']" - @change="expressionChange" - @removeExpression="removeExpression" + :plugins="['metric-input']" > @@ -142,7 +140,11 @@ }, data() { return { - expressions: [], + promqlCount: 1, + promqlKeys: [0], + expressions: [''], + legends: [''], + alertRule: {id: '', receiverShow: [], receiver: ''}, rightBox: {show: false, isEdit: false, title: ''}, rules:{ @@ -248,6 +250,7 @@ this.rightBox.isEdit = isEdit; }, save: function() { + this.alertRule.expr = this.expressions[0]; this.$refs.alertRuleForm.validate((valid) => { if (valid) { this.alertRule.receiver = this.alertRule.receiverShow.join(","); @@ -353,6 +356,14 @@ } else if (this.alertRule.type == 3) { this.getAssetList(); } + this.expressions = [this.alertRule.expr]; + this.$nextTick(() => { + this.expressions.forEach((ex, index) => { + if (ex) { + this.$refs.promql.metricChange(ex); + } + }); + }); } if (this.rightBox.show) { if (this.rightBox.isEdit && this.alertRule.id) { diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue index 66e588993..ef554cec3 100644 --- a/nezha-fronted/src/components/page/dashboard/chartBox.vue +++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue @@ -199,7 +199,7 @@ :expression-list.sync="expressions" :index="index-1" :styleType="2" - :plugins="['metric', 'remove']" + :plugins="['metric-selector', 'metric-input', 'remove']" @change="expressionChange" @removeExpression="removeExpression" > diff --git a/nezha-fronted/src/components/page/dashboard/explore/explore.vue b/nezha-fronted/src/components/page/dashboard/explore/explore.vue index 3fa1cbac7..67ca20388 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/explore.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/explore.vue @@ -36,7 +36,7 @@ :expression-list="expressions" :index="index-1" :styleType="1" - :plugins="['metric', 'add', 'remove']" + :plugins="['metric-selector', 'metric-input', 'add', 'remove']" @change="expressionChange" @addExpression="addExpression" @removeExpression="removeExpression" diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue index 9b708597f..194dce8f0 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue @@ -20,16 +20,17 @@