fixed: Fixed command duplication issues

jumpserver · Oct 14, 2024 · cc815b9 · cc815b9
1 parent 993cd06
commit cc815b9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/ui/src/components/Kubernetes/MainContent/index.vue b/ui/src/components/Kubernetes/MainContent/index.vue
@@ -662,6 +662,10 @@ const handleClose = (name: string) => {
         findNodeById(nameRef.value);
         terminalStore.setTerminalConfig('currentTab', nameRef.value);
     }
+
+    if (panelLength === 0) {
+        mittBus.emit('remove-event');
+    }
 };
 
 /**

diff --git a/ui/src/hooks/useTerminal.ts b/ui/src/hooks/useTerminal.ts
@@ -84,6 +84,7 @@ export const useTerminal = async (el: HTMLElement, option: ICallbackOptions): Pr
     let lastReceiveTime: Ref<Date> = ref(new Date());
 
     let messageHandlers = {};
+    let handleSocketMessage: any;
 
     const dispatch = (data: string) => {
         if (!data) return;
@@ -560,14 +561,16 @@ export const useTerminal = async (el: HTMLElement, option: ICallbackOptions): Pr
                 }
             };
 
-            option.transSocket?.addEventListener('message', (e: MessageEvent) => {
+            handleSocketMessage = (e: MessageEvent) => {
                 // @ts-ignore
-                const handler = messageHandlers[currentTab.value as string];
+                const handler = messageHandlers[currentTab.value];
 
                 if (handler) {
                     handler(e);
                 }
-            });
+            };
+
+            option.transSocket?.addEventListener('message', handleSocketMessage);
         } else {
             initSocketEvent();
         }
@@ -577,6 +580,11 @@ export const useTerminal = async (el: HTMLElement, option: ICallbackOptions): Pr
      * 初始化事件总线相关事件
      */
     const initMittBusEvents = () => {
+        mittBus.on('remove-event', () => {
+            // @ts-ignore
+            option.transSocket.removeEventListener('message', handleSocketMessage);
+        });
+
         mittBus.on('terminal-search', ({ keyword, type = '' }) => {
             searchKeyWord(keyword, type);
         });

diff --git a/ui/src/utils/mittBus.ts b/ui/src/utils/mittBus.ts
@@ -3,6 +3,7 @@ import { customTreeOption } from '@/hooks/interface';
 import { shareUser } from '@/views/interface';
 
 type Event = {
+    'remove-event': void;
     'alt-shift-right': void;
     'alt-shift-left': void;
     'open-setting': void;