diff --git a/spug_api/apps/exec/transfer.py b/spug_api/apps/exec/transfer.py
index 0b1537d..f893e30 100644
--- a/spug_api/apps/exec/transfer.py
+++ b/spug_api/apps/exec/transfer.py
@@ -112,7 +112,7 @@ def _do_sync(rds, task, host):
fp.write(host.pkey or AppSetting.get('private_key'))
fp.flush()
- options = '-azv' if task.host_id else '-rzv'
+ options = '-azv --progress' if task.host_id else '-rzv --progress'
argument = f'{task.src_dir}/ {host.username}@{host.hostname}:{task.dst_dir}'
command = f'rsync {options} -h -e "ssh -p {host.port} -o StrictHostKeyChecking=no -i {fp.name}" {argument}'
task = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
diff --git a/spug_web/src/pages/exec/transfer/index.js b/spug_web/src/pages/exec/transfer/index.js
index b7d82da..06c1b43 100644
--- a/spug_web/src/pages/exec/transfer/index.js
+++ b/spug_web/src/pages/exec/transfer/index.js
@@ -6,7 +6,12 @@
import React, { useState, useEffect } from 'react';
import { observer } from 'mobx-react';
import {
- PlusOutlined, ThunderboltOutlined, QuestionCircleOutlined, UploadOutlined, CloudServerOutlined
+ PlusOutlined,
+ ThunderboltOutlined,
+ QuestionCircleOutlined,
+ UploadOutlined,
+ CloudServerOutlined,
+ BulbOutlined,
} from '@ant-design/icons';
import { Form, Button, Alert, Tooltip, Space, Card, Table, Input, Upload, message } from 'antd';
import { AuthDiv, Breadcrumb } from 'components';
@@ -119,7 +124,11 @@ function TransferIndex() {
)}/>
-
+
+ 小提示
+
+ )}>
setDir(e.target.value)} placeholder="请输入目标路径"/>
diff --git a/spug_web/src/pages/exec/transfer/index.module.less b/spug_web/src/pages/exec/transfer/index.module.less
index c0eba59..0cec33c 100644
--- a/spug_web/src/pages/exec/transfer/index.module.less
+++ b/spug_web/src/pages/exec/transfer/index.module.less
@@ -16,19 +16,16 @@
}
.tips {
- position: absolute;
- top: 10px;
- left: 180px;
+ font-size: 12px;
color: #999;
}
- .tips:hover {
- color: #777;
- }
-
- .editor {
- height: calc(100vh - 482px) !important;
- min-height: 152px;
+ :global(.ant-table-tbody) {
+ tr:last-child {
+ td {
+ border: none;
+ }
+ }
}
:global(.ant-empty-normal) {