Merge pull request #13662 from dataease/pr@dev-v2_st

fix(仪表板): 基础设置页面打开方式为当前页面时，在仪表板编辑页面使用新页面预览功能，会在当前页面打开预览

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;

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 {