From f38ce444ed4a28a4e632f9972a77512fd28b5ab4 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 8 Oct 2021 10:17:48 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1035=20fix=EF=BC=9Agroup=20chart=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=B3=95=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E7=9A=84=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/chart-group.vue             | 2 ++
 nezha-fronted/src/components/charts/chart-list.vue              | 1 +
 .../src/components/common/bottomBox/tabs/chartTempPreview.vue   | 2 +-
 nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue | 2 +-
 .../src/components/common/bottomBox/tabs/panelTabNew.vue        | 2 +-
 nezha-fronted/src/components/page/dashboard/panel.vue           | 2 +-
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-group.vue b/nezha-fronted/src/components/charts/chart-group.vue
index 59fbaf716..dd45ed8d7 100644
--- a/nezha-fronted/src/components/charts/chart-group.vue
+++ b/nezha-fronted/src/components/charts/chart-group.vue
@@ -294,6 +294,8 @@ export default {
           this.$refs.listGroup.resize()
         })
       }
+      const scrollbarWrap = document.getElementById('dashboardScrollbar')
+      this.$emit('loadChartData', scrollbarWrap.scrollTop)
     }
   },
   watch: {
diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue
index 6440e6d2d..eb5dd438b 100644
--- a/nezha-fronted/src/components/charts/chart-list.vue
+++ b/nezha-fronted/src/components/charts/chart-list.vue
@@ -233,6 +233,7 @@
                       @on-duplicate-group-chart="duplicateChartGroup"
                       @on-add-group-item-chart="addGroupItem"
                       @moveGroupItem="moveGroupItem"
+                      @loadChartData="loadChartData"
                       :panel-id="filter.panelId"
                       :chart-data="item"
                       :dataList='dataList'
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/chartTempPreview.vue b/nezha-fronted/src/components/common/bottomBox/tabs/chartTempPreview.vue
index 89550a9c8..af21180b2 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/chartTempPreview.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/chartTempPreview.vue
@@ -12,7 +12,7 @@
         <div class="panel">
           <!--图表-->
           <div class="table-list" id="tableList">
-            <div ref="dashboardScrollbar" style="height: 100%; overflow: auto;">
+            <div ref="dashboardScrollbar" id="dashboardScrollbar" style="height: 100%; overflow: auto;">
               <div class="box-content">
                 <chart-list :additional-info="obj" :detail="detail" :draggable="draggable" :from="from" :is-model="from == $CONSTANTS.fromRoute.model" @on-edit-chart="editChart"
                             @on-refresh-time="refreshTime" @on-remove-chart="delChart" ref="chartList" :panel-lock="panelLock"></chart-list>
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
index b5d6918b5..ed78c0a90 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
@@ -86,7 +86,7 @@
 
     <!--图表-->
     <div class="table-list" id="tableList">
-      <div ref="dashboardScrollbar" style="height: 100%; overflow: auto;">
+      <div ref="dashboardScrollbar" id="dashboardScrollbar" style="height: 100%; overflow: auto;">
         <div class="box-content">
           <chart-list :additional-info="obj" :detail="detail" :draggable="draggable" :from="from" :is-model="from == $CONSTANTS.fromRoute.model" @on-edit-chart="editChart"
                       @on-refresh-time="refreshTime" @on-remove-chart="delChart" ref="chartList" :panel-lock="panelLock"></chart-list>
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index f01ba357c..b36a0d0a1 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -88,7 +88,7 @@
         <div class="panel">
           <!--图表-->
           <div class="table-list" id="tableList">
-            <div ref="dashboardScrollbar" style="height: 100%; overflow: auto;">
+            <div ref="dashboardScrollbar" id="dashboardScrollbar" style="height: 100%; overflow: auto;">
               <div class="box-content">
                 <chart-list :draggable="draggable" :from="from" :is-model="from === fromRoute.model" :obj="obj" @on-edit-chart="editChart"
                             @on-refresh-time="refreshTime" @on-remove-chart="delChart" ref="chartList" :panel-lock="panelLock" :panel-data-list="panelDataList"
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index cfc0415a9..2cfdba305 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -79,7 +79,7 @@
           </template>
         </div>
         <div id="tableList" class="table-list">
-          <div ref="dashboardScrollbar" :class="overScroll10?'border-t-1-de':'border-t-1-tr'" style="height: calc(100% - 20px); overflow: auto;">
+          <div ref="dashboardScrollbar" :class="overScroll10?'border-t-1-de':'border-t-1-tr'" id="dashboardScrollbar" style="height: calc(100% - 20px); overflow: auto;">
             <div class="box-content">
               <chart-list ref="chartList" :class="{'show-top':showTopBtn}" :from="fromRoute.panel" :panel-lock="panelLock" @on-edit-chart="editChart" @on-refresh-time="refreshTime"  @on-remove-chart="delChart" @on-add-group-item-chart="addGroupItem"></chart-list>
             </div>