From 73de15a92db6ca6a02dd3be1c94198ea3809a08e Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 29 Nov 2024 10:02:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E6=96=B9=E5=BC=8F=E8=AE=BE=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E9=A1=B5=E9=9D=A2=E6=89=93=E5=BC=80=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=96=B0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=B2=A1=E6=9C=89=E5=8F=91=E7=94=9F=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/hooks/web/useMoveLine.ts              |  9 +++++++++
 .../src/layout/components/CollapseBar.vue     | 19 +++++++++++++++++--
 .../src/views/share/share/ShareGrid.vue       |  3 +--
 .../src/views/workbranch/ShortcutTable.vue    |  2 +-
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/hooks/web/useMoveLine.ts b/core/core-frontend/src/hooks/web/useMoveLine.ts
index 9187bea56b..4b9970d033 100644
--- a/core/core-frontend/src/hooks/web/useMoveLine.ts
+++ b/core/core-frontend/src/hooks/web/useMoveLine.ts
@@ -1,11 +1,13 @@
 import { ref, onBeforeUnmount, onMounted } from 'vue'
 import { useCache } from '@/hooks/web/useCache'
+import { useEmitt } from '@/hooks/web/useEmitt'
 
 type Sidebar = 'DATASET' | 'DASHBOARD' | 'DATASOURCE' | 'DATA-FILLING'
 
 export const useMoveLine = (type: Sidebar) => {
   const { wsCache } = useCache('localStorage')
   const width = ref(wsCache.get(type) || 280)
+  wsCache.set('current-collapse_bar', width.value)
 
   const getCoordinates = () => {
     if (document.querySelector('.sidebar-move-line')) {
@@ -16,15 +18,22 @@ export const useMoveLine = (type: Sidebar) => {
     document.querySelector('body').style['user-select'] = 'none'
   }
 
+  const setCollapseBarWidth = () => {
+    wsCache.set('current-collapse_bar', width.value)
+    useEmitt().emitter.emit('current-collapse_bar')
+  }
+
   const setCoordinates = (e: MouseEvent) => {
     const x = e.clientX
     if (x > 401 || x < 279) {
       width.value = Math.max(Math.min(401, x), 279)
       ele.style.left = width.value - 5 + 'px'
+      setCollapseBarWidth()
       return
     }
     ele.style.left = width.value - 5 + 'px'
     width.value = x
+    setCollapseBarWidth()
   }
 
   const cancelEvent = () => {
diff --git a/core/core-frontend/src/layout/components/CollapseBar.vue b/core/core-frontend/src/layout/components/CollapseBar.vue
index 83f03b7075..5bdacf8668 100644
--- a/core/core-frontend/src/layout/components/CollapseBar.vue
+++ b/core/core-frontend/src/layout/components/CollapseBar.vue
@@ -1,7 +1,9 @@
 <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'
+import { useCache } from '@/hooks/web/useCache'
+import { useEmitt } from '@/hooks/web/useEmitt'
+import { ref, onMounted } from 'vue'
 const props = defineProps({
   isCollapse: Boolean
 })
@@ -9,7 +11,20 @@ const emits = defineEmits(['setCollapse'])
 const setCollapse = () => {
   emits('setCollapse', !props.isCollapse)
 }
-const { width } = useMoveLine('DATASET')
+const width = ref(280)
+const { wsCache } = useCache('localStorage')
+const setWidth = () => {
+  const num = wsCache.get('current-collapse_bar')
+  if (!num) return
+  width.value = num
+}
+onMounted(() => {
+  useEmitt({
+    name: 'current-collapse_bar',
+    callback: setWidth
+  })
+  setWidth()
+})
 </script>
 
 <template>
diff --git a/core/core-frontend/src/views/share/share/ShareGrid.vue b/core/core-frontend/src/views/share/share/ShareGrid.vue
index f5c1a1f69a..48b2038890 100644
--- a/core/core-frontend/src/views/share/share/ShareGrid.vue
+++ b/core/core-frontend/src/views/share/share/ShareGrid.vue
@@ -47,8 +47,7 @@ const triggerFilterPanel = () => {
 }
 const preview = id => {
   const routeUrl = `/#/preview?dvId=${id}`
-  const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
-  window.open(routeUrl, openType)
+  window.open(routeUrl, '_blank')
 }
 const formatterTime = (_, _column, cellValue) => {
   if (!cellValue) {
diff --git a/core/core-frontend/src/views/workbranch/ShortcutTable.vue b/core/core-frontend/src/views/workbranch/ShortcutTable.vue
index 8c99d2589a..3061fb2206 100644
--- a/core/core-frontend/src/views/workbranch/ShortcutTable.vue
+++ b/core/core-frontend/src/views/workbranch/ShortcutTable.vue
@@ -104,7 +104,7 @@ const preview = id => {
     path: '/preview',
     query: { dvId: id }
   })
-  window.open(routeUrl.href, openType)
+  window.open(routeUrl.href, '_blank')
 }
 
 const openDataset = id => {