From 3c1c2a867f33819416cbf38d74a6edc91ca28df9 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Fri, 10 Jun 2022 11:42:44 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1912=20fix=EF=BC=9AExplore=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2Metrics=E6=97=B6=E8=BE=93=E5=85=A5=E6=A1=86=E4=BC=9A?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E9=87=8D=E5=A4=8D=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/popBox/selectPanel.vue  |  3 ++-
 .../page/dashboard/explore/exploreItem.vue    |  2 ++
 .../page/dashboard/explore/promqlInput.vue    | 25 +++++++++----------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/nezha-fronted/src/components/common/popBox/selectPanel.vue b/nezha-fronted/src/components/common/popBox/selectPanel.vue
index 02f91ab5b..b7bd2b309 100644
--- a/nezha-fronted/src/components/common/popBox/selectPanel.vue
+++ b/nezha-fronted/src/components/common/popBox/selectPanel.vue
@@ -114,7 +114,8 @@ export default {
     },
     filterNode (value, data) {
       if (!value) return true
-      return data.name.indexOf(value) !== -1
+      // 不区分大小写
+      return data.name.toLowerCase().indexOf(value.toLowerCase()) !== -1
     },
     updateWeight () {
       const toUpdate = []
diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
index 2cb9b6438..13306e537 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
@@ -61,6 +61,7 @@
               :metricOptionsParent="metricOptions"
               v-for="index of promqlKeys.length"
               :id="promqlKeys[index-1]"
+              :pqid="tabIndex.toString()"
               :key="promqlKeys[index-1]"
               :ref="'promql-'+(index-1)"
               :expression-list="expressions"
@@ -78,6 +79,7 @@
             <promql-input
               v-for="index of promqlKeys.length"
               :id="promqlKeys[index-1]"
+              :pqid="tabIndex.toString()"
               :key="promqlKeys[index-1]"
               :ref="'promql-'+(index-1)"
               :expression-list="expressions"
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index e111b634f..2c2f37d08 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -77,7 +77,7 @@
           @click="dropDownVisible = false"
         >
         <div
-          :id="'editor'+index"
+          :id="pqid + 'editor'+index"
           v-if="type !== 'log'"
           class="not-fixed-height no-resize no-close"
         >
@@ -238,8 +238,8 @@
               :id="pqid + 'editor'+index"
               v-if="type !== 'log'"
               class="not-fixed-height no-resize no-close"
-        >
-        </div>
+            >
+            </div>
             <!-- <div id="editor"
             class="not-fixed-height no-resize no-close"
                 ref="elInput"
@@ -438,7 +438,7 @@ export default {
     pqid: {
       type: String, default: ''
     },
-    expressionList: {},
+    expressionList: { type: Array },
     plugins: { type: Array },
     styleType: Number,
     historyParam: { type: Object },
@@ -1096,16 +1096,15 @@ export default {
       deep: true,
       immediate: true,
       handler (n, o) {
-        // console.log(n, n[this.index])
         this.codeMirrorValue[this.index] = n[this.index]
-        setTimeout(() => {
-          const text = this.newView.state.doc.toString()
-          this.newView.dispatch(
-            this.newView.state.update({
-              changes: { from: 0, to: text.length, insert: this.codeMirrorValue[this.index] }
-            })
-          )
-        }, 200)
+        // setTimeout(() => {
+        //   const text = this.newView.state.doc.toString()
+        //   this.newView.dispatch(
+        //     this.newView.state.update({
+        //       changes: { from: 0, to: text.length, insert: this.codeMirrorValue[this.index] }
+        //     })
+        //   )
+        // }, 200)
       }
     },