From c1171f3efc1ca44a41969f1f56c393bb5856133d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 9 Aug 2024 10:42:12 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E5=85=A8=E5=B1=8F=E9=80=80=E5=87=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=9B=A0=E9=94=80=E6=AF=81=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E9=80=80=E5=87=BA=E5=85=A8?=
 =?UTF-8?q?=E5=B1=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/components/ChartComponentG2Plot.vue      |  8 ++++++--
 .../views/components/ChartComponentS2.vue          | 12 ++++++++----
 .../src/views/data-visualization/DvPreview.vue     | 14 +++++++++++++-
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue
index d0c81edb3e..855df7707b 100644
--- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue
+++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentG2Plot.vue
@@ -530,8 +530,12 @@ onMounted(() => {
   resizeObserver.observe(containerDom)
 })
 onBeforeUnmount(() => {
-  myChart?.destroy()
-  resizeObserver?.disconnect()
+  try {
+    myChart?.destroy()
+    resizeObserver?.disconnect()
+  } catch (e) {
+    console.log(e)
+  }
 })
 </script>
 
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 512deeccfc..3bb7de47d3 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
@@ -561,10 +561,14 @@ onMounted(() => {
   resizeObserver.observe(document.getElementById(containerId))
 })
 onBeforeUnmount(() => {
-  myChart?.facet.timer?.stop()
-  myChart?.destroy()
-  myChart = null
-  resizeObserver?.disconnect()
+  try {
+    myChart?.facet.timer?.stop()
+    myChart?.destroy()
+    myChart = null
+    resizeObserver?.disconnect()
+  } catch (e) {
+    console.log(e)
+  }
 })
 
 const autoStyle = computed(() => {
diff --git a/core/core-frontend/src/views/data-visualization/DvPreview.vue b/core/core-frontend/src/views/data-visualization/DvPreview.vue
index fd15220189..4b1f5573bd 100644
--- a/core/core-frontend/src/views/data-visualization/DvPreview.vue
+++ b/core/core-frontend/src/views/data-visualization/DvPreview.vue
@@ -3,6 +3,7 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { computed, ref } from 'vue'
 import DePreview from '@/components/data-visualization/canvas/DePreview.vue'
 import { storeToRefs } from 'pinia'
+import { ElScrollbar } from 'element-plus-secondary'
 
 const dvMainStore = dvMainStoreWithOut()
 const { fullscreenFlag } = storeToRefs(dvMainStore)
@@ -57,13 +58,24 @@ const contentInnerClass = computed(() => {
   }
 })
 
+const outerStyle = computed(() => {
+  return {
+    flexDirection: props.canvasStylePreview.screenAdaptor === 'heightFirst' ? 'row' : 'column'
+  }
+})
+
 defineExpose({
   restore
 })
 </script>
 
 <template>
-  <div id="de-preview-content" :class="{ 'de-screen-full': fullscreenFlag }" class="content-outer">
+  <div
+    id="de-preview-content"
+    :class="{ 'de-screen-full': fullscreenFlag }"
+    :style="outerStyle"
+    class="content-outer"
+  >
     <div class="content-inner" :class="contentInnerClass">
       <de-preview
         ref="dePreviewRef"