From cdaa47e84ce70ad467b5784bac33830679ada75e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 24 Mar 2023 14:06:08 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2727=20fix=EF=BC=9AChart=20Metric=20?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6&=E9=A2=84=E8=A7=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/chart/chartConfig.vue     |  2 +-
 .../common/rightBox/chart/publicConfig.js     | 36 ++++++-------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
index a49b70fe2..c6115b122 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue
@@ -33,7 +33,7 @@
           class="element-item form-row-item thresholds-from-item"
           style="margin-bottom: 10px !important"
           v-for="index of chartConfig.elements.length"
-          :key="index"
+          :key="expressionName[index-1] + index"
         >
           <div class="chart-title chart-title-config">
             <span class="chart-title-content el-form-item" :class="{
diff --git a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
index 0c068328d..de52008be 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
+++ b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
@@ -386,15 +386,17 @@ export default {
       if (this.expressions.length) {
         this.chartConfig.elements = []
         this.expressions.forEach((expr, i) => {
-          this.chartConfig.elements.push({
-            id: this.expressionsShow[i].elementId,
-            expression: expr,
-            type: 'expert',
-            legend: this.expressionsShow[i].legend,
-            name: this.expressionName[i],
-            state: this.expressionsShow[i].state,
-            orderNum: i
-          })
+          if (this.expressionsShow[i]) {
+            this.chartConfig.elements.push({
+              id: this.expressionsShow[i].elementId,
+              expression: expr,
+              type: 'expert',
+              legend: this.expressionsShow[i].legend,
+              name: this.expressionName[i],
+              state: this.expressionsShow[i].state,
+              orderNum: i
+            })
+          }
         })
       } else {
         this.chartConfig.elements = []
@@ -500,14 +502,6 @@ export default {
           elementId: ''
         }
       )
-      this.$nextTick(() => {
-        this.expressions.forEach((ex, index) => {
-          if (ex) {
-            this.$refs[`promql-${index}`][0].metricChange(ex)
-            this.$refs[`promql-${index}`][0].promqlInputChange(ex)
-          }
-        })
-      })
       this.expressionChange()
     },
     removeExpression (index) {
@@ -518,14 +512,6 @@ export default {
         this.chartConfig.elements.forEach((item, index) => {
           this.$refs.chartForm.validateField('elements.' + index + '.expression')
         })
-        this.$nextTick(() => {
-          this.expressions.forEach((ex, index) => {
-            if (ex) {
-              this.$refs[`promql-${index}`][0].metricChange(ex)
-              this.$refs[`promql-${index}`][0].promqlInputChange(ex)
-            }
-          })
-        })
         this.expressionChange()
       }
     },