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

# Conflicts: # nezha-fronted/src/components/common/project/topologyL5.vue
2022-07-15 17:16:04 +08:00
parent d25045ea93 80e52ead27
commit ab7750cdfa
6 changed files with 7 additions and 90 deletions
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -315,7 +315,7 @@ export default {
        }
      }).catch(res => {
        this.$refs['childrenFrom' + this.editChart.datasource].showError()
-        console.info(res)
+        // console.info(res)
      })
    },
    selectPanel (panel) {