Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme

2021-11-16 09:43:06 +08:00
parent eeea7319e5 e4194fcadd
commit 721c290739
4 changed files with 17 additions and 13 deletions
--- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
+++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
@@ -781,7 +781,13 @@ export default {
    openTopologyData (data) {
      return new Promise(resolve => {
        if (!getTopology(this.topologyIndex)) {
-          const canvas = new Topology('topology-canvas' + this.topologyIndexF, canvasOptions)
+          const options = {
+            ...canvasOptions
+          }
+          if (this.isPanel) {
+            options.disableScale = true
+          }
+          const canvas = new Topology('topology-canvas' + this.topologyIndexF, options)
          setTopology(this.topologyIndex, canvas)
        } else {
          getTopology(this.topologyIndex).open(data)