From 159c5e9a212fb5dc651b1eeb1cd11f109ce790e4 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 1 Jun 2023 17:00:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?NEZ-2848=20fix=EF=BC=9Ahart-stat=20?=
 =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E6=BB=9A=E5=8A=A8=E6=9D=A1=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E9=94=99=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chartList.vue           | 7 +++++--
 .../src/components/common/bottomBox/tabs/dashboardTab.vue  | 2 +-
 nezha-fronted/src/components/page/dashboard/dashboard.vue  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index 9121c1008..f55922f74 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -1,5 +1,8 @@
 <template>
-  <div id="chart-list">
+  <div id="chart-list" :style="{
+    width: isGroup ? '100%': 'calc(100% - 10px)',
+    'margin-left' :isGroup ? '0': '10px'
+  }">
   <div :id='`chartList${(isGroup ? "Group" : "") + timestamp}`' class="chart-list" v-my-loading="gridLayoutLoading" ref="layoutBox">
     <grid-layout
       ref="layout"
@@ -10,7 +13,7 @@
       :is-draggable="!panelLock"
       :is-resizable="!panelLock"
       :layout.sync="copyDataList"
-      :margin="[10, 10]"
+      :margin="isGroup ? [10, 10] : [0, 10]"
       :row-height="stepWidth"
       :vertical-compact="true"
       :use-css-transforms="false"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
index e6ab96f42..e1b65e152 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
@@ -87,7 +87,7 @@
       <!--图表-->
       <div id="tableList" class="table-list" style="padding-top: 0;overflow: hidden">
         <div id="dashboardScrollbar" class="table-list-box">
-          <div class="box-content"  ref="dashboardScrollbar" v-my-loading="chartListLoading" style="overflow-y: auto;display: flex;flex-direction: column;overflow-x: hidden">
+          <div class="box-content"  ref="dashboardScrollbar" v-my-loading="chartListLoading" style="overflow-y: scroll;display: flex;flex-direction: column;overflow-x: hidden">
             <panel-variables :labelArrs="variables" :time-range="searchTime" @getPanelData="getPanelData"></panel-variables>
             <chart-list
               ref="chartList"
diff --git a/nezha-fronted/src/components/page/dashboard/dashboard.vue b/nezha-fronted/src/components/page/dashboard/dashboard.vue
index 930b69a42..14cb75ad8 100644
--- a/nezha-fronted/src/components/page/dashboard/dashboard.vue
+++ b/nezha-fronted/src/components/page/dashboard/dashboard.vue
@@ -95,7 +95,7 @@
         </div>
         <div id="tableList" class="table-list" style='overflow-y: unset'>
           <div class="table-list-box">
-            <div  id="dashboardScrollbar" class="box-content" v-my-loading="chartListLoading"  ref="dashboardScrollbar" style='overflow-y: auto;display: flex;flex-direction: column;overflow-x: hidden'>
+            <div  id="dashboardScrollbar" class="box-content" v-my-loading="chartListLoading"  ref="dashboardScrollbar" style='overflow-y: scroll;display: flex;flex-direction: column;overflow-x: hidden'>
               <panel-variables :labelArrs="variables" :time-range="searchTime" @getPanelData="getPanelData"></panel-variables>
               <chart-list
                 ref="chartList"

From 034c05b7df414ca39cdbd64f656f70b00d172450 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 2 Jun 2023 09:39:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?style=EF=BC=9A=20chartList=20=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chartList.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index f55922f74..14697890e 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -1,7 +1,6 @@
 <template>
   <div id="chart-list" :style="{
     width: isGroup ? '100%': 'calc(100% - 10px)',
-    'margin-left' :isGroup ? '0': '10px'
   }">
   <div :id='`chartList${(isGroup ? "Group" : "") + timestamp}`' class="chart-list" v-my-loading="gridLayoutLoading" ref="layoutBox">
     <grid-layout
@@ -13,7 +12,7 @@
       :is-draggable="!panelLock"
       :is-resizable="!panelLock"
       :layout.sync="copyDataList"
-      :margin="isGroup ? [10, 10] : [0, 10]"
+      :margin="isGroup ? [10, 10] : [10, 10]"
       :row-height="stepWidth"
       :vertical-compact="true"
       :use-css-transforms="false"