fixed：Fixed an issue where the request tree would go white when the S…

…ocket was closed
jumpserver · Aug 27, 2024 · 1afaff1 · 1afaff1
1 parent b5f25e6
commit 1afaff1
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 10 deletions.
diff --git a/ui/package.json b/ui/package.json
@@ -4,6 +4,7 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
+    "dev": "vite",
     "serve": "vite",
     "build": "vue-tsc -b && vite build",
     "preview": "vite preview",

diff --git a/ui/src/components/Kubernetes/MainContent/index.vue b/ui/src/components/Kubernetes/MainContent/index.vue
@@ -269,7 +269,7 @@ const onSocketData = (msgType: string, msg: any, terminal: Terminal) => {
         }
         case 'CLOSE': {
             sessionId.value = '';
-            message.error(t('TerminalClosed'));
+            message.error(t('WebSocketClosed'));
             break;
         }
         default:

diff --git a/ui/src/components/Kubernetes/Tree/index.vue b/ui/src/components/Kubernetes/Tree/index.vue
@@ -3,7 +3,7 @@
         <n-descriptions label-placement="top" class="tree-wrapper">
             <template #header>
                 <n-flex align="center" justify="space-between">
-                    {{ t('List of Assets') }}
+                    {{ t('KubernetesManagement') }}
                     <n-icon size="16px" :component="EllipsisHorizontal" class="mr-2.5 cursor-pointer" />
                 </n-flex>
             </template>

diff --git a/ui/src/hooks/helper/index.ts b/ui/src/hooks/helper/index.ts
@@ -287,7 +287,7 @@ export const generateWsURL = () => {
             break;
         }
         case 'kubernetes': {
-            connectURL = `${BASE_WS_URL}/koko/ws/terminal/?token=${route.query.token}`;
+            connectURL = `${BASE_WS_URL}/koko/ws/terminal/?token=${route.query.token}&type=k8s`;
             break;
         }
         case 'Share': {
@@ -322,11 +322,11 @@ export const generateWsURL = () => {
 export const onWebsocketWrong = (event: Event, type: string, terminal?: Terminal) => {
     switch (type) {
         case 'error': {
-            terminal ? terminal.write('Connection Websocket Error') : message.error('Error');
+            terminal ? terminal.write('Connection Websocket Error') : '';
             break;
         }
         case 'disconnected': {
-            terminal ? terminal.write('Connection Websocket Closed') : message.error('Disconnected');
+            terminal ? terminal.write('Connection Websocket Closed') : '';
             break;
         }
     }

diff --git a/ui/src/hooks/useK8s.ts b/ui/src/hooks/useK8s.ts
@@ -206,8 +206,6 @@ export const useK8s = () => {
             }
             case 'CLOSE':
             case 'ERROR': {
-                message.error('Receive Connection Closed');
-
                 socket.close();
                 break;
             }

diff --git a/ui/src/hooks/useTerminal.ts b/ui/src/hooks/useTerminal.ts
@@ -113,7 +113,7 @@ export const useTerminal = async (el: HTMLElement, option: ICallbackOptions): Pr
                 break;
             }
             case 'CLOSE': {
-                terminal?.writeln('Receive Connection closed');
+                terminal?.writeln('Receive Connection Closed');
                 socket.close();
                 sendEventToLuna('CLOSE', '');
                 break;
@@ -273,7 +273,7 @@ export const useTerminal = async (el: HTMLElement, option: ICallbackOptions): Pr
                 break;
             }
             case 'TERMINAL_ERROR': {
-                message.error(`Socket Error ${socketData.err}`);
+                // message.error(`Socket Error ${socketData.err}`);
                 terminal?.write(socketData.err);
                 break;
             }
@@ -526,6 +526,17 @@ export const useTerminal = async (el: HTMLElement, option: ICallbackOptions): Pr
         });
 
         mittBus.on('sync-theme', ({ type, data }) => {
+            if (option.type === 'k8s') {
+                return socket.send(
+                    JSON.stringify({
+                        k8s_id: k8s_id.value,
+                        id: terminalId.value,
+                        type,
+                        data: JSON.stringify(data)
+                    })
+                );
+            }
+
             sendWsMessage(type, data);
         });
     };

diff --git a/ui/src/views/Connection/index.vue b/ui/src/views/Connection/index.vue
@@ -239,7 +239,7 @@ const onSocketData = (msgType: string, msg: any, terminal: Terminal) => {
         }
         case 'ClOSE': {
             sessionId.value = '';
-            message.error(t('TerminalClosed'));
+            message.error(t('WebSocketClosed'));
             break;
         }
         default: