From 049c0e7a0fbd8333582da646cd47ca0a159b5425 Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Thu, 8 Aug 2024 10:40:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BB=88=E7=AB=AF=E9=9D=A2=E6=9D=BFteln?=
 =?UTF-8?q?et=E5=86=85=E5=AE=B9=E8=A1=8C=E5=88=97=E6=95=B0=E8=87=AA?=
 =?UTF-8?q?=E9=80=82=E5=BA=94=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TerminalTelnet/index.vue | 11 ++++++++++-
 src/views/tool/terminal/index.vue       | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/components/TerminalTelnet/index.vue b/src/components/TerminalTelnet/index.vue
index 114bc14b..329907cd 100644
--- a/src/components/TerminalTelnet/index.vue
+++ b/src/components/TerminalTelnet/index.vue
@@ -155,6 +155,15 @@ function handleRanderXterm(container: HTMLElement | undefined) {
   // 自适应尺寸
   const fitAddon = new FitAddon();
   xterm.loadAddon(fitAddon);
+  // 终端尺寸变化触发
+  xterm.onResize(({ cols, rows }) => {
+    // console.log('尺寸', cols, rows);
+    ws.send({
+      requestId: `telnet_resize_${props.hostId}`,
+      type: 'telnet_resize',
+      data: { cols, rows },
+    });
+  });
 
   // 创建 ResizeObserver 实例
   var observer = new ResizeObserver(entries => {
@@ -280,7 +289,7 @@ defineExpose({
 
 <template>
   <div class="terminal">
-    <div ref="terminalDom" style="height: 78%" :id="id"></div>
+    <div ref="terminalDom" style="height: calc(100% - 36px)" :id="id"></div>
     <a-auto-complete
       v-model:value="terminalState.text"
       :dropdown-match-select-width="500"
diff --git a/src/views/tool/terminal/index.vue b/src/views/tool/terminal/index.vue
index cfd2e677..cfc85afa 100644
--- a/src/views/tool/terminal/index.vue
+++ b/src/views/tool/terminal/index.vue
@@ -226,10 +226,11 @@ function fnTabClose(id: string) {
 
 <template>
   <PageContainer>
-    <a-card :bordered="false" :body-style="{ padding: '12px' }">
+    <a-card :bordered="false" size="small" :body-style="{ padding: '12px' }">
       <a-tabs
         class="terminal-tabs"
         hide-add
+        size="small"
         tab-position="top"
         type="editable-card"
         :tab-bar-gutter="8"
@@ -343,7 +344,12 @@ function fnTabClose(id: string) {
               <template #title>
                 {{ t('views.tool.terminal.new') }}
               </template>
-              <a-button type="default" shape="circle" @click="fnTabMenu('new')">
+              <a-button
+                type="default"
+                shape="circle"
+                size="small"
+                @click="fnTabMenu('new')"
+              >
                 <template #icon><PlusOutlined /></template>
               </a-button>
             </a-tooltip>
@@ -354,7 +360,7 @@ function fnTabClose(id: string) {
                   {{ t('views.tool.terminal.more') }}
                 </template>
                 <a-dropdown trigger="click" placement="bottomRight">
-                  <a-button type="ghost" shape="circle">
+                  <a-button type="ghost" shape="circle" size="small">
                     <template #icon><EllipsisOutlined /></template>
                   </a-button>
                   <template #overlay>
@@ -385,8 +391,7 @@ function fnTabClose(id: string) {
 
 <style lang="less" scoped>
 .pane-box {
-  padding: 16px;
-  height: calc(100vh - 320px);
+  height: calc(100vh - 200px);
   overflow-x: hidden;
 }
 </style>