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"> - -
-
- 上传至文件夹 - +
+ +
+
+ 上传至文件夹 + +
@@ -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); }