From dc349bff332e75f8dfc948b4225c8e0f6581fc22 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 26 Sep 2023 16:25:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/demo' into demo

---
 src/pages/page-web/projects/workspace.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/page-web/projects/workspace.vue b/src/pages/page-web/projects/workspace.vue
index 7ec0794..b1b5e5d 100644
--- a/src/pages/page-web/projects/workspace.vue
+++ b/src/pages/page-web/projects/workspace.vue
@@ -10,7 +10,7 @@
 </template>
 <script lang="ts" setup>
 import Sidebar from '/@/components/common/sidebar.vue'
-import { EBizCode, ERouterName } from '/@/types'
+import { EBizCode, ELocalStorageKey, ERouterName } from '/@/types'
 import { getRoot } from '/@/root'
 import { useMyStore } from '/@/store'
 import { useConnectWebSocket } from '/@/hooks/use-connect-websocket'
@@ -20,7 +20,7 @@
 
 const root = getRoot()
 const store = useMyStore()
-const workspace_id = computed(() => store.state.common.projectId)
+const workspace_id = computed(() => store.state.common.projectId || localStorage.getItem(ELocalStorageKey.WorkspaceId))
 const messageHandler = async (payload: any) => {
   if (!payload) {
     return

--
Gitblit v1.9.3