From 01483332d8954723b9c6e2a5729e9af2ad2ffcf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <chenjinsong@zdjizhi.com>
Date: Fri, 20 Nov 2020 14:38:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E4=BF=AE=E5=A4=8Dpane?=
 =?UTF-8?q?l=E7=9A=84echart=E7=B1=BB=E5=9E=8B=E5=86=85=E5=AD=98=E6=BA=A2?=
 =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chartPreview.vue        | 3 ++-
 nezha-fronted/src/components/charts/line-chart-block.vue    | 3 ++-
 nezha-fronted/src/components/page/dashboard/chartBox.vue    | 2 +-
 .../src/components/page/dashboard/overview/chart.vue        | 6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue
index ec786b65f..66d907945 100644
--- a/nezha-fronted/src/components/charts/chartPreview.vue
+++ b/nezha-fronted/src/components/charts/chartPreview.vue
@@ -1396,7 +1396,8 @@
       this.clearChart();
       //const addChartBox = document.querySelector('.right-box-add-chart');
       //addChartBox.style.cssText =   this.oldChartBoxCss;
-      this.echartModalStore.off('magictypechanged')
+      this.echartModalStore.off('magictypechanged');
+      this.$refs.screenLegendArea._ps_.destroy();
     },
   };
 
diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue
index 2456f0dcd..c75299e33 100644
--- a/nezha-fronted/src/components/charts/line-chart-block.vue
+++ b/nezha-fronted/src/components/charts/line-chart-block.vue
@@ -58,7 +58,7 @@
         <div class="line-area"  ref="lineChartArea"  :id="'lineChartArea'+chartIndex" v-show="firstShow" style="width:100%;"></div>
         <div class="chart-no-data" v-show="noData">No Data</div>
         <template v-if="!hasLegendOptions">
-          <div class='legend-container'  ref="legendArea" v-show="firstShow">
+          <div class='legend-container'  ref="legendArea" v-show="firstShow" v-scrollBar:legend>
             <div v-for="(item, index) in legendListMore" :title="item.alias?item.alias:item.name"  @click="clickLegend(item.name,index)" class="legend-item" :class="{'ft-gr':isGrey[index]}" :key="'legend_' + item.name+'_'+index">
               <span class="legend-shape" :style="{background:(isGrey[index]?'#D3D3D3':item.color)}"></span>{{item.alias?item.alias:item.name}}
             </div>
@@ -1730,6 +1730,7 @@
       }
       setChart(this.chartIndex, null);
       window.removeEventListener('resize', this.chartResize);
+      this.$refs.legendArea._ps_.destroy();
     },
   };
 
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index ae2f630fd..d573f9030 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -1377,7 +1377,7 @@
         deep: true,
         immediate: true,
         handler(n) {
-          console.log(n);
+          //console.log(n);
           if(n.title){
             this.isEdit=true;
           }
diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
index 4143d53c8..5e468fadf 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
@@ -477,12 +477,12 @@
     watch:{
 
     },
-    destroyed() {
+    beforeDestroy() {
       if(this.chart){
         this.chart.clear();
-        this.chart.off('mouseover');
+        /*this.chart.off('mouseover');
         this.chart.off('mouseout');
-        EleResize.off(this.$el, this.resize, this.chartType);
+        EleResize.off(this.$el, this.resize, this.chartType);*/
       }
     }
   }