From e6ae9e556ccbcb61a602586f09ae81f61727382e Mon Sep 17 00:00:00 2001 From: zhanghan Date: Mon, 31 Mar 2025 16:12:29 +0800 Subject: [PATCH] Fix machine detail page index sinking and inconsistent terminal connection data format --- frontend/src/views/Cluster/MachineDetail/Index.vue | 1 - frontend/src/views/Terminal/connect.vue | 12 +++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/Cluster/MachineDetail/Index.vue b/frontend/src/views/Cluster/MachineDetail/Index.vue index 09de6e3b..96d9b0ee 100644 --- a/frontend/src/views/Cluster/MachineDetail/Index.vue +++ b/frontend/src/views/Cluster/MachineDetail/Index.vue @@ -57,7 +57,6 @@ onMounted(() => { width: 100%; height: 100%; display: flex; - flex-direction: column; :deep(.el-tabs__content) { flex: 1; diff --git a/frontend/src/views/Terminal/connect.vue b/frontend/src/views/Terminal/connect.vue index 63c9603f..4f564f28 100644 --- a/frontend/src/views/Terminal/connect.vue +++ b/frontend/src/views/Terminal/connect.vue @@ -48,15 +48,21 @@ const runRealTerminal = () => { loading.value = false; }; -const onWSReceive = (message: any) => { +const onWSReceive = (event: any) => { // 首次接收消息,发送给后端,进行同步适配 if (first.value === true) { first.value = false; resizeRemoteTerminal(); } - const data = message.data; + term.value.element && term.value.focus(); - term.value.write(data.toString(Utf8)); + if (event.data instanceof Blob) { + const reader = new FileReader(); + reader.onload = (e: any) => { + term.value.write(e.target.result); + }; + reader.readAsText(event.data); + } }; const errorRealTerminal = (ex: any) => { -- Gitee