diff --git a/nezha-fronted/src/components/charts/chart-bar-statistics.vue b/nezha-fronted/src/components/charts/chart-bar-statistics.vue
index 8bebcb95e..ae8713258 100644
--- a/nezha-fronted/src/components/charts/chart-bar-statistics.vue
+++ b/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
         })
diff --git a/nezha-fronted/src/components/charts/chart-pie.vue b/nezha-fronted/src/components/charts/chart-pie.vue
index bfae34647..4eab8e2ab 100644
--- a/nezha-fronted/src/components/charts/chart-pie.vue
+++ b/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
         })
diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue
index b194ba58a..ec477bea7 100644
--- a/nezha-fronted/src/components/charts/chart-table.vue
+++ b/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
         })
diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue
index 99c8278e8..4430dc283 100644
--- a/nezha-fronted/src/components/charts/chartPreview.vue
+++ b/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
         })
diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index 46cff7ab0..a20ab69b2 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/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
         })
diff --git a/nezha-fronted/src/components/charts/logs.vue b/nezha-fronted/src/components/charts/logs.vue
index a39938cdd..2a1e99d65 100644
--- a/nezha-fronted/src/components/charts/logs.vue
+++ b/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
         })
diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
index 924e13914..3d730aac7 100644
--- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
+++ b/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
         })
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index 8b3d1f21c..9f1128ef1 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/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
         })
diff --git a/nezha-fronted/src/components/page/dashboard/explore/logTab.vue b/nezha-fronted/src/components/page/dashboard/explore/logTab.vue
index ecc9d6bc2..2ed36898f 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/logTab.vue
+++ b/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
         })