Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3

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 = []

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"

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"
         >
@@ -239,8 +239,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"
@@ -439,7 +439,7 @@ export default {
     pqid: {
       type: String, default: ''
     },
-    expressionList: {},
+    expressionList: { type: Array },
     plugins: { type: Array },
     styleType: Number,
     historyParam: { type: Object },
@@ -1097,16 +1097,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)
       }
     },