From 3150fbfdf930b3ad97b027e1191c6c99da9f8f2a Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Tue, 12 Nov 2024 17:57:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E5=88=86=E9=A1=B5=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=AD=97=E4=BD=93=E6=B8=B2=E6=9F=93=E6=A8=A1=E7=B3=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/components/ChartComponentS2.vue     | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
index f063ff8c4d..c5f2ba5e41 100644
--- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
+++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
@@ -197,17 +197,19 @@ const renderChart = (viewInfo: Chart, resetPageInfo: boolean) => {
     viewInfo.render,
     viewInfo.type
   ) as S2ChartView<any>
-  myChart = chartView.drawChart({
-    container: containerId,
-    chart: toRaw(actualChart),
-    chartObj: myChart,
-    pageInfo: state.pageInfo,
-    action,
-    resizeAction
-  })
-  myChart?.render()
-  dvMainStore.setViewInstanceInfo(viewInfo.id, myChart)
-  initScroll()
+  timer = setTimeout(() => {
+    myChart = chartView.drawChart({
+      container: containerId,
+      chart: toRaw(actualChart),
+      chartObj: myChart,
+      pageInfo: state.pageInfo,
+      action,
+      resizeAction
+    })
+    myChart?.render()
+    dvMainStore.setViewInstanceInfo(viewInfo.id, myChart)
+    initScroll()
+  }, 500)
 }
 
 const setupPage = (chart: ChartObj, resetPageInfo?: boolean) => {
@@ -573,8 +575,24 @@ const resize = (width, height) => {
     clearTimeout(timer)
   }
   timer = setTimeout(() => {
-    myChart?.changeSheetSize(width, height)
-    myChart?.facet.timer?.stop()
+    if (!myChart?.facet) {
+      const chartView = chartViewManager.getChartView(
+        actualChart.render,
+        actualChart.type
+      ) as S2ChartView<any>
+      myChart = chartView.drawChart({
+        container: containerId,
+        chart: toRaw(actualChart),
+        chartObj: myChart,
+        pageInfo: state.pageInfo,
+        action,
+        resizeAction
+      })
+      dvMainStore.setViewInstanceInfo(actualChart.id, myChart)
+    } else {
+      myChart?.facet?.timer?.stop()
+      myChart?.changeSheetSize(width, height)
+    }
     myChart?.render()
     initScroll()
   }, 500)
@@ -597,7 +615,7 @@ onMounted(() => {
     }
     preSize[0] = size.inlineSize
     preSize[1] = size.blockSize
-    resize(size.inlineSize, size.blockSize)
+    resize(size.inlineSize, Math.ceil(size.blockSize))
   })
 
   resizeObserver.observe(document.getElementById(containerId))