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

2023-06-20 17:05:46 +08:00
parent c39e8d1ae8 2150fa71d1
commit f455d071a2
5 changed files with 84 additions and 63 deletions
--- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js
@@ -354,7 +354,9 @@ export default {
        this.chartParams = {
          ...pen.data.tooltip,
          unit: this.params.unit,
-          statistic: this.params.statistic
+          statistic: this.params.statistic,
+          legend: pen.data.legend,
+          parent: pen.data.parent
        }
        this.timer3 = setTimeout(() => {
          let ePosition = window.ePosition