diff --git a/frontend/src/views/Cluster/MachineDetail/Index.vue b/frontend/src/views/Cluster/MachineDetail/Index.vue index 09de6e3b194f6a23aa852962db8d1bde8ad15058..96d9b0ee1435493daefa7173ed39da6241398cee 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 63c9603f72bd747aa6c00b9eabbe0af6331ef130..4f564f288da993d0671cf2e0d3540fc9b6745197 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) => {