From 305312cc26e95f1d21c493a0e2fb62fd8d0b06cd Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Thu, 25 Jul 2024 13:46:48 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/sftp/sftp-upload-modal.vue     | 28 +++++++++++++------
 .../host/terminal/handler/sftp-session.ts     | 26 ++++++++++++++---
 .../terminal/handler/sftp-transfer-manager.ts |  1 -
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-upload-modal.vue b/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-upload-modal.vue
index 4e2972f7..b517328f 100644
--- a/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-upload-modal.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/sftp/sftp-upload-modal.vue
@@ -10,13 +10,15 @@
            :unmount-on-close="true"
            :on-before-ok="handlerOk"
            @cancel="handleClose">
-    <!-- 上传目录 -->
-    <div class="item-wrapper">
-      <div class="form-item">
-        <span class="item-label">上传至文件夹</span>
-        <a-input class="item-input"
-                 v-model="parentPath"
-                 placeholder="上传目录" />
+    <div class="upload-container">
+      <!-- 上传目录 -->
+      <div class="item-wrapper">
+        <div class="form-item">
+          <span class="item-label">上传至文件夹</span>
+          <a-input class="item-input"
+                   v-model="parentPath"
+                   placeholder="上传目录" />
+        </div>
       </div>
       <a-space>
         <!-- 选择文件 -->
@@ -112,7 +114,7 @@
     }
     // 获取上传的文件
     const files = fileList.value.map(s => s.file as File);
-    // 上传
+    // 普通上传
     transferManager.addUpload(hostId.value, parentPath.value, files);
     Message.success('已开始上传, 点击右侧传输列表查看进度');
     // 清空
@@ -136,6 +138,11 @@
   @file-size-width: 82px;
   @item-label: 104px;
 
+  .upload-container {
+    width: 100%;
+    padding: 20px;
+  }
+
   .item-wrapper {
     margin-bottom: 24px;
     display: flex;
@@ -163,6 +170,11 @@
       width: 376px;
     }
 
+    .form-help {
+      margin: 4px 0 0 @item-label;
+      font-size: 12px;
+      color: var(--color-text-2);
+    }
   }
 
   .file-list-uploader {
diff --git a/orion-visor-ui/src/views/host/terminal/handler/sftp-session.ts b/orion-visor-ui/src/views/host/terminal/handler/sftp-session.ts
index b2fc5573..c5c3f9fb 100644
--- a/orion-visor-ui/src/views/host/terminal/handler/sftp-session.ts
+++ b/orion-visor-ui/src/views/host/terminal/handler/sftp-session.ts
@@ -1,4 +1,5 @@
 import type { ISftpSession, ISftpSessionResolver, ITerminalChannel, TerminalPanelTabItem } from '../types/define';
+import { h } from 'vue';
 import { InputProtocol } from '@/types/protocol/terminal.protocol';
 import { PanelSessionType } from '../types/const';
 import { Modal } from '@arco-design/web-vue';
@@ -77,15 +78,32 @@ export default class SftpSession extends BaseSession implements ISftpSession {
   };
 
   // 删除文件
-  remove(path: string[]) {
+  remove(paths: string[]) {
+    // 内容
+    const contentNode = h('div', {
+        style: {
+          display: 'flex',
+          flexDirection: 'column',
+          maxHeight: '40vh',
+          overflowY: 'auto'
+        }
+      },
+      paths.map(s => {
+        return h('span', { style: { marginTop: '4px' } }, s);
+      }));
+    // 提示
     Modal.confirm({
-      title: '删除确认',
-      content: `确定要删除 ${path.join(',')} 吗? 确定后将立即删除且无法恢复!`,
+      title: '确定后将立即删除这些文件且无法恢复!',
+      modalStyle: { padding: '24px 32px' },
+      bodyStyle: { marginTop: '-14px' },
+      okButtonProps: { status: 'danger' },
+      okText: '删除',
+      content: () => contentNode,
       onOk: () => {
         this.resolver.setLoading(true);
         this.channel.send(InputProtocol.SFTP_REMOVE, {
           sessionId: this.sessionId,
-          path: path.join('|')
+          path: paths.join('|')
         });
       }
     });
diff --git a/orion-visor-ui/src/views/host/terminal/handler/sftp-transfer-manager.ts b/orion-visor-ui/src/views/host/terminal/handler/sftp-transfer-manager.ts
index 1beef917..8888f49f 100644
--- a/orion-visor-ui/src/views/host/terminal/handler/sftp-transfer-manager.ts
+++ b/orion-visor-ui/src/views/host/terminal/handler/sftp-transfer-manager.ts
@@ -43,7 +43,6 @@ export default class SftpTransferManager implements ISftpTransferManager {
         file: s
       };
     });
-    this.transferList.push(...items);
     // 开始传输
     this.startTransfer(items);
   }