fixed：Fixed connection timeout shareable issue

jumpserver · Aug 28, 2024 · 9264408 · 9264408
1 parent 4e21538
commit 9264408
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/ui/package.json b/ui/package.json
@@ -4,7 +4,6 @@
   "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
@@ -63,7 +63,7 @@ import CustomTerminal from '@/components/CustomTerminal/index.vue';
 // import TabSuffix from '@/components/Kubernetes/MainContent/components/TabSuffix/index.vue';
 
 // 引入 type
-import { NMessageProvider, TabPaneProps, useDialog } from 'naive-ui';
+import { NMessageProvider, TabPaneProps, useDialog, useNotification } from 'naive-ui';
 
 import type { Ref } from 'vue';
 import type { ISettingProp, shareUser } from '@/views/interface';
@@ -90,6 +90,8 @@ const treeStore = useTreeStore();
 
 const { t } = useI18n();
 const dialog = useDialog();
+const notification = useNotification();
+
 const paramsStore = useParamsStore();
 const terminalStore = useTerminalStore();
 
@@ -268,8 +270,11 @@ const onSocketData = (msgType: string, msg: any, terminal: Terminal) => {
             break;
         }
         case 'CLOSE': {
-            sessionId.value = '';
-            message.error(t('WebSocketClosed'));
+            enableShare.value = false;
+            notification.error({
+                content: t('WebSocketClosed'),
+                duration: 50000
+            });
             break;
         }
         default:

diff --git a/ui/src/hooks/useTerminal.ts b/ui/src/hooks/useTerminal.ts
@@ -113,7 +113,6 @@ export const useTerminal = async (el: HTMLElement, option: ICallbackOptions): Pr
                 break;
             }
             case 'CLOSE': {
-                terminal?.writeln('Receive Connection Closed');
                 socket.close();
                 sendEventToLuna('CLOSE', '');
                 break;
@@ -150,8 +149,6 @@ export const useTerminal = async (el: HTMLElement, option: ICallbackOptions): Pr
             }
             case 'TERMINAL_ERROR':
             case 'ERROR': {
-                message.error(msg.err);
-                terminal?.writeln(msg.err);
                 break;
             }
             case 'MESSAGE_NOTIFY': {
@@ -273,7 +270,6 @@ export const useTerminal = async (el: HTMLElement, option: ICallbackOptions): Pr
                 break;
             }
             case 'TERMINAL_ERROR': {
-                // message.error(`Socket Error ${socketData.err}`);
                 terminal?.write(socketData.err);
                 break;
             }

diff --git a/ui/src/views/Connection/index.vue b/ui/src/views/Connection/index.vue
@@ -12,7 +12,7 @@
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n';
 import { useLogger } from '@/hooks/useLogger.ts';
-import { useDialog, useMessage } from 'naive-ui';
+import { useDialog, useMessage, useNotification } from 'naive-ui';
 import { useParamsStore } from '@/store/modules/params.ts';
 import { useTerminalStore } from '@/store/modules/terminal.ts';
 
@@ -50,6 +50,7 @@ const { setting } = storeToRefs(paramsStore);
 
 const dialog = useDialog();
 const message = useMessage();
+const notification = useNotification();
 
 const terminalType = ref<string>('common');
 const sessionId = ref<string>('');
@@ -238,8 +239,11 @@ const onSocketData = (msgType: string, msg: any, terminal: Terminal) => {
             break;
         }
         case 'ClOSE': {
-            sessionId.value = '';
-            message.error(t('WebSocketClosed'));
+            enableShare.value = false;
+            notification.error({
+                content: t('WebSocketClosed'),
+                duration: 50000
+            });
             break;
         }
         default: