From aa421498026c14c296894fcae9d6d637b91f2534 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 21 Mar 2024 15:20:15 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF/=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=B5=8C=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dashboard/index.vue              | 18 +++++++++++++++++-
 .../src/views/data-visualization/index.vue     | 13 +++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/dashboard/index.vue b/core/core-frontend/src/views/dashboard/index.vue
index 830bd804f1..f264c9b67d 100644
--- a/core/core-frontend/src/views/dashboard/index.vue
+++ b/core/core-frontend/src/views/dashboard/index.vue
@@ -6,6 +6,7 @@ import findComponent from '../../utils/components'
 import DvSidebar from '../../components/visualization/DvSidebar.vue'
 import router from '@/router'
 import MobileConfigPanel from './MobileConfigPanel.vue'
+import { useAppStoreWithOut } from '@/store/modules/app'
 import { useEmitt } from '@/hooks/web/useEmitt'
 import DbToolbar from '@/components/dashboard/DbToolbar.vue'
 import ViewEditor from '@/views/chart/components/editor/index.vue'
@@ -47,6 +48,8 @@ const {
   dvInfo
 } = storeToRefs(dvMainStore)
 const dataInitState = ref(false)
+const appStore = useAppStoreWithOut()
+const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
 
 const state = reactive({
   datasetTree: [],
@@ -174,7 +177,11 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <div class="dv-common-layout dv-teleport-query" v-if="loadFinish && !mobileConfig">
+  <div
+    class="dv-common-layout dv-teleport-query"
+    :class="isDataEaseBi && 'dataease-w-h'"
+    v-if="loadFinish && !mobileConfig"
+  >
     <DbToolbar />
     <el-container
       class="dv-layout-container"
@@ -255,6 +262,7 @@ onUnmounted(() => {
 .dv-common-layout {
   height: 100vh;
   width: 100vw;
+
   .dv-layout-container {
     height: calc(100vh - @top-bar-height);
     .left-sidebar {
@@ -283,6 +291,14 @@ onUnmounted(() => {
       height: 100%;
     }
   }
+
+  &.dataease-w-h {
+    height: 100%;
+    width: 100%;
+    .dv-layout-container {
+      height: calc(100% - @top-bar-height);
+    }
+  }
 }
 
 .preview-aside {
diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue
index 90e79ec49c..e4c5fd2d1d 100644
--- a/core/core-frontend/src/views/data-visualization/index.vue
+++ b/core/core-frontend/src/views/data-visualization/index.vue
@@ -5,6 +5,7 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
 import { contextmenuStoreWithOut } from '@/store/modules/data-visualization/contextmenu'
 import { composeStoreWithOut } from '@/store/modules/data-visualization/compose'
+import { useAppStoreWithOut } from '@/store/modules/app'
 import { storeToRefs } from 'pinia'
 import DvToolbar from '../../components/data-visualization/DvToolbar.vue'
 import ComponentToolBar from '../../components/data-visualization/ComponentToolBar.vue'
@@ -45,7 +46,8 @@ const eventCheck = e => {
   }
 }
 const mainCanvasCoreRef = ref(null)
-
+const appStore = useAppStoreWithOut()
+const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
 const dvMainStore = dvMainStoreWithOut()
 const snapshotStore = snapshotStoreWithOut()
 const contextmenuStore = contextmenuStoreWithOut()
@@ -300,7 +302,7 @@ eventBus.on('handleNew', handleNew)
 </script>
 
 <template>
-  <div ref="dvLayout" class="dv-common-layout">
+  <div ref="dvLayout" class="dv-common-layout" :class="isDataEaseBi && 'dataease-w-h'">
     <DvToolbar />
     <div class="custom-dv-divider" />
     <el-container
@@ -423,6 +425,13 @@ eventBus.on('handleNew', handleNew)
       height: 100%;
     }
   }
+  &.dataease-w-h {
+    height: 100%;
+    width: 100%;
+    .dv-layout-container {
+      height: calc(100% - @top-bar-height);
+    }
+  }
 }
 
 .preview-aside {