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

2023-06-12 16:53:58 +08:00
parent 99653fc87a 81bf5e78cc
commit eb0cf39cc2
2 changed files with 4 additions and 1 deletions
--- a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
@@ -140,6 +140,9 @@ export default {
    },
    clacTopoData (data, queryValues) { // 主要处理 属性为原始属性 处理动画属性对原始属性的影响
      return new Promise(resolve => { // 处理加载数据
+        if (!data) {
+          data = {}
+        }
        if (!data.pens) {
          data.pens = []
        }
--- a/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/otherChartConfig.vue
@@ -505,7 +505,7 @@ export default {
      // if (flag) {
      //   setTimeout(() => {
      //     this.$refs.rightBoxChartEdit.$refs.header.editMeta2d()
-      //   }, 1000)
+      //   }, 500)
      // }
      if (data) {
        this.chartConfig.param.topo = data