NEZ-1263 fix： Chart legend 匹配内容有误

nezha-fronted/src/components/charts/chart-bar-statistics.vue

@@ -640,15 +640,19 @@ export default {
         }, 100)
       })
     },
-    dealLegendAlias (legend, expression) {
+    dealLegendAlias: function (legend, expression) {
       if (/\{\{.+\}\}/.test(expression)) {
         const labelValue = expression.replace(/(\{\{.+?\}\})/g, function (i) {
           const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2)
-          const reg = new RegExp(label + '=".+?"')
+          const reg = new RegExp(',' + label + '=".+?"')
+          const reg1 = new RegExp('{' + label + '=".+?"')
           let value = null
           if (reg.test(legend)) {
             const find = legend.match(reg)[0]
             value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
+          } else if (reg1.test(legend)) {
+            const find = legend.match(reg1)[0]
+            value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
           }
           return value || label
         })

nezha-fronted/src/components/charts/chart-pie.vue

@@ -542,11 +542,15 @@ export default {
       if (/\{\{.+\}\}/.test(expression)) {
         const labelValue = expression.replace(/(\{\{.+?\}\})/g, function (i) {
           const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2)
-          const reg = new RegExp(label + '=".+?"')
+          const reg = new RegExp(',' + label + '=".+?"')
+          const reg1 = new RegExp('{' + label + '=".+?"')
           let value = null
           if (reg.test(legend)) {
             const find = legend.match(reg)[0]
             value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
+          } else if (reg1.test(legend)) {
+            const find = legend.match(reg1)[0]
+            value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
           }
           return value || label
         })

nezha-fronted/src/components/charts/chart-table.vue

@@ -618,11 +618,15 @@ export default {
       if (/\{\{.+\}\}/.test(expression)) {
         const labelValue = expression.replace(/(\{\{.+?\}\})/g, function (i) {
           const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2)
-          const reg = new RegExp(label + '=".+?"')
+          const reg = new RegExp(',' + label + '=".+?"')
+          const reg1 = new RegExp('{' + label + '=".+?"')
           let value = null
           if (reg.test(legend)) {
             const find = legend.match(reg)[0]
             value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
+          } else if (reg1.test(legend)) {
+            const find = legend.match(reg1)[0]
+            value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
           }
           return value || label
         })

nezha-fronted/src/components/charts/chartPreview.vue

@@ -1784,11 +1784,15 @@ export default {
       if (/\{\{.+\}\}/.test(expression)) {
         const labelValue = expression.replace(/(\{\{.+?\}\})/g, function (i) {
           const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2)
-          const reg = new RegExp(label + '=".+?"')
+          const reg = new RegExp(',' + label + '=".+?"')
+          const reg1 = new RegExp('{' + label + '=".+?"')
           let value = null
           if (reg.test(legend)) {
             const find = legend.match(reg)[0]
             value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
+          } else if (reg1.test(legend)) {
+            const find = legend.match(reg1)[0]
+            value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
           }
           return value || label
         })

nezha-fronted/src/components/charts/line-chart-block.vue

@@ -1579,7 +1579,7 @@ export default {
             this.echartModalStore.showLoading();
           }
           */
-      let self = this
+      const self = this
       let axiosArr = []
       this.$nextTick(() => {
         let startTime = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss')
@@ -1827,11 +1827,15 @@ export default {
       if (/\{\{.+\}\}/.test(expression)) {
         const labelValue = expression.replace(/(\{\{.+?\}\})/g, function (i) {
           const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2)
-          const reg = new RegExp(label + '=".+?"')
+          const reg = new RegExp(',' + label + '=".+?"')
+          const reg1 = new RegExp('{' + label + '=".+?"')
           let value = null
           if (reg.test(legend)) {
             const find = legend.match(reg)[0]
             value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
+          } else if (reg1.test(legend)) {
+            const find = legend.match(reg1)[0]
+            value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
           }
           return value || label
         })

nezha-fronted/src/components/charts/logs.vue

@@ -696,11 +696,15 @@ export default {
       if (/\{\{.+\}\}/.test(expression)) {
         const labelValue = expression.replace(/(\{\{.+?\}\})/g, function (i) {
           const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2)
-          const reg = new RegExp(label + '=".+?"')
+          const reg = new RegExp(',' + label + '=".+?"')
+          const reg1 = new RegExp('{' + label + '=".+?"')
           let value = null
           if (reg.test(legend)) {
             const find = legend.match(reg)[0]
             value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
+          } else if (reg1.test(legend)) {
+            const find = legend.match(reg1)[0]
+            value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
           }
           return value || label
         })

nezha-fronted/src/components/common/ChartDiagram/diagram.vue

@@ -1010,11 +1010,15 @@ export default {
       if (/\{\{.+\}\}/.test(expression)) {
         const labelValue = expression.replace(/(\{\{.+?\}\})/g, function (i) {
           const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2)
-          const reg = new RegExp(label + '=".+?"')
+          const reg = new RegExp(',' + label + '=".+?"')
+          const reg1 = new RegExp('{' + label + '=".+?"')
           let value = null
           if (reg.test(legend)) {
             const find = legend.match(reg)[0]
             value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
+          } else if (reg1.test(legend)) {
+            const find = legend.match(reg1)[0]
+            value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
           }
           return value || label
         })

nezha-fronted/src/components/common/project/topologyL5.vue

@@ -1023,11 +1023,15 @@ export default {
       if (/\{\{.+\}\}/.test(expression)) {
         const labelValue = expression.replace(/(\{\{.+?\}\})/g, function (i) {
           const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2)
-          const reg = new RegExp(label + '=".+?"')
+          const reg = new RegExp(',' + label + '=".+?"')
+          const reg1 = new RegExp('{' + label + '=".+?"')
           let value = null
           if (reg.test(legend)) {
             const find = legend.match(reg)[0]
             value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
+          } else if (reg1.test(legend)) {
+            const find = legend.match(reg1)[0]
+            value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
           }
           return value || label
         })

nezha-fronted/src/components/page/dashboard/explore/logTab.vue

@@ -494,11 +494,15 @@ export default {
       if (/\{\{.+\}\}/.test(expression)) {
         const labelValue = expression.replace(/(\{\{.+?\}\})/g, function (i) {
           const label = i.substr(i.indexOf('{{') + 2, i.indexOf('}}') - i.indexOf('{{') - 2)
-          const reg = new RegExp(label + '=".+?"')
+          const reg = new RegExp(',' + label + '=".+?"')
+          const reg1 = new RegExp('{' + label + '=".+?"')
           let value = null
           if (reg.test(legend)) {
             const find = legend.match(reg)[0]
             value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
+          } else if (reg1.test(legend)) {
+            const find = legend.match(reg1)[0]
+            value = find.substr(find.indexOf('"') + 1, find.lastIndexOf('"') - find.indexOf('"') - 1)
           }
           return value || label
         })