From 56233d26b06bfafd652746f8007430d33304bc54 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 28 Nov 2024 18:10:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E6=96=B9=E5=BC=8F=E4=B8=BA=E5=BD=93=E5=89=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=97=B6=EF=BC=8C=E5=9C=A8=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=E4=BD=BF=E7=94=A8=E6=96=B0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=9A=E5=9C=A8=E5=BD=93=E5=89=8D=E9=A1=B5=E9=9D=A2=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/components/dashboard/DbToolbar.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue
index a50e549b17..49731a7ff0 100644
--- a/core/core-frontend/src/components/dashboard/DbToolbar.vue
+++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue
@@ -139,8 +139,7 @@ const previewOuter = () => {
   }
   canvasSave(() => {
     const url = '#/preview?dvId=' + dvInfo.value.id + '&ignoreParams=true'
-    const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
-    const newWindow = window.open(url, openType)
+    const newWindow = window.open(url, '_blank')
     initOpenHandler(newWindow)
   })
 }

From 57ab4f8e0efb5d70f107275a3228e7196f10b574 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 28 Nov 2024 18:29:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E6=94=B6=E8=B5=B7=E5=AF=BC=E8=88=AA=E8=8F=9C=E5=8D=95=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layout/components/CollapseBar.vue       | 17 +++++++++++++++--
 core/core-frontend/src/layout/index.vue         | 12 +-----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/core/core-frontend/src/layout/components/CollapseBar.vue b/core/core-frontend/src/layout/components/CollapseBar.vue
index f0dae5ed95..83f03b7075 100644
--- a/core/core-frontend/src/layout/components/CollapseBar.vue
+++ b/core/core-frontend/src/layout/components/CollapseBar.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import icon_sideFold_outlined from '@/assets/svg/icon_side-fold_outlined.svg'
 import icon_sideExpand_outlined from '@/assets/svg/icon_side-expand_outlined.svg'
+import { useMoveLine } from '@/hooks/web/useMoveLine'
 const props = defineProps({
   isCollapse: Boolean
 })
@@ -8,10 +9,11 @@ const emits = defineEmits(['setCollapse'])
 const setCollapse = () => {
   emits('setCollapse', !props.isCollapse)
 }
+const { width } = useMoveLine('DATASET')
 </script>
 
 <template>
-  <div class="de-collapse-bar" @click="setCollapse">
+  <div class="de-collapse-bar" :style="{ width: (width || 280) + 'px' }" @click="setCollapse">
     <el-icon style="color: #646a73">
       <Icon
         ><component
@@ -19,7 +21,7 @@ const setCollapse = () => {
         ></component
       ></Icon>
     </el-icon>
-    {{ !isCollapse ? '收起导航' : '' }}
+    {{ !isCollapse ? $t('commons.collapse_navigation') : '' }}
   </div>
 </template>
 
@@ -37,6 +39,17 @@ const setCollapse = () => {
   line-height: 22px;
   display: flex;
   align-items: center;
+  background: #fff;
+
+  &::after {
+    content: '';
+    width: 100%;
+    height: 1px;
+    background: #1f232926;
+    position: absolute;
+    top: 0;
+    left: 0;
+  }
 
   .ed-icon {
     font-size: 20px;
diff --git a/core/core-frontend/src/layout/index.vue b/core/core-frontend/src/layout/index.vue
index a1f09d5f60..60e0fd0924 100644
--- a/core/core-frontend/src/layout/index.vue
+++ b/core/core-frontend/src/layout/index.vue
@@ -82,17 +82,7 @@ const { t } = useI18n()
 
   .layout-container {
     .layout-sidebar {
-      height: calc(100vh - 56px);
-      position: relative;
-      &::after {
-        content: '';
-        width: 100%;
-        height: 1px;
-        background: #1f232926;
-        position: absolute;
-        bottom: 48px;
-        left: 0;
-      }
+      height: calc(100vh - 106px);
     }
 
     .layout-sidebar-collapse {