Merge pull request #1419 from jumpserver/pr@dev@fix_message_repeat

fixed: fixed issue where multiple tabs would cause message to be written to another
jumpserver · Aug 21, 2024 · 65e82ee · 65e82ee
2 parents 7afb146 + 43f7592
commit 65e82ee
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 23 deletions.
diff --git a/ui/src/components/Kubernetes/MainContent/index.vue b/ui/src/components/Kubernetes/MainContent/index.vue
@@ -366,15 +366,6 @@ onMounted(() => {
 
         sendTerminalData();
 
-        // watch(
-        //     () => terminalRef.value,
-        //     newValue => {
-        //         if (newValue) {
-        //             sendTerminalData();
-        //         }
-        //     }
-        // );
-
         const key: string = currentNode.key as string;
 
         nameRef.value = key;

diff --git a/ui/src/directive/sidebarDraggable.ts b/ui/src/directive/sidebarDraggable.ts
@@ -29,8 +29,6 @@ export const draggable = {
                 startX = event.clientX;
                 startWidth = el.offsetWidth;
 
-                console.log(startX, startWidth);
-
                 document.addEventListener('mousemove', mouseMoveHandler);
                 document.addEventListener('mouseup', mouseUpHandler);
             }

diff --git a/ui/src/hooks/useTerminal.ts b/ui/src/hooks/useTerminal.ts
@@ -1,5 +1,5 @@
 // 导入外部库
-import { ref, watch } from 'vue';
+import { ref } from 'vue';
 import { nextTick, Ref } from 'vue';
 import { storeToRefs } from 'pinia';
 import { Terminal } from '@xterm/xterm';
@@ -92,22 +92,21 @@ export const useTerminal = (callbackOptions: ICallbackOptions): ITerminalReturn
 
             const { currentTab } = storeToRefs(useTerminalStore());
 
-            nextTick(() => {
-                watch(
-                    () => k8s_id.value,
-                    newId => {
-                        console.log(newId);
-                    }
-                );
+            const messageHandlers = {
+                [currentTab.value]: (e: MessageEvent) => {
+                    handleK8sMessage(JSON.parse(e.data));
+                }
+            };
 
+            nextTick(() => {
                 sentry = createSentry(callbackOptions.transSocket!, terminalRef.value!);
 
-                console.log(currentTab.value);
-
                 if (callbackOptions.transSocket) {
-                    // 现在相当于给所有的 socket 加上了 message
                     callbackOptions.transSocket.addEventListener('message', (e: MessageEvent) => {
-                        return handleK8sMessage(JSON.parse(e.data));
+                        const handler = messageHandlers[currentTab.value];
+                        if (handler) {
+                            handler(e);
+                        }
                     });
                 }
             }).then();