From 42f767867b2b084bbc0309852dd88aee3ca99953 Mon Sep 17 00:00:00 2001 From: GeMing <1328922121@qq.com> Date: Fri, 6 Sep 2024 14:45:13 +0800 Subject: [PATCH 1/6] feat: add sftp feature --- src/router.js | 2 + src/settings.js | 5 + src/views/devops/explorer/index.vue | 3 +- src/views/devops/host/explorer.vue | 280 ++++++++++++++++++++++++++++ src/views/devops/host/index.vue | 8 +- 5 files changed, 294 insertions(+), 4 deletions(-) create mode 100644 src/views/devops/host/explorer.vue diff --git a/src/router.js b/src/router.js index 9778c50..b00163d 100644 --- a/src/router.js +++ b/src/router.js @@ -18,6 +18,7 @@ import Performance from "./views/devops/monitor/performance/index.vue" import PerformanceDetail from "./views/devops/monitor/performance/detail.vue" import Host from "./views/devops/host/index.vue" import HostXterm from "./views/devops/host/xterm.vue" +import HostExplorer from "./views/devops/host/explorer.vue" import Group from "./views/devops/group/index.vue" import App from "./views/devops/app/index.vue" import Script from "./views/devops/script/index.vue" @@ -43,6 +44,7 @@ const router = [ {path: "/devops/monitor/performance/detail", component: PerformanceDetail}, {path: "/devops/host", component: Host}, {path: "/devops/host/terminal", component: HostXterm}, + {path: "/devops/host/explorer", component: HostExplorer}, {path: "/devops/group", component: Group}, {path: "/devops/app", component: App}, {path: "/devops/script", component: Script}, diff --git a/src/settings.js b/src/settings.js index 5e3c25a..7e45d26 100644 --- a/src/settings.js +++ b/src/settings.js @@ -121,6 +121,11 @@ const serverPaths = { explorerDelete: serverContextPath + "/devops/explorer/entry", explorerUpload: serverContextPath + "/devops/explorer/upload", explorerDownload: serverContextPath + "/devops/explorer/download", + // host explorer + hostExplorerEntries: serverContextPath + "/devops/explorer/sftp/entries", + hostExplorerDelete: serverContextPath + "/devops/explorer/sftp/entry", + hostExplorerUpload: serverContextPath + "/devops/explorer/sftp/upload", + hostExplorerDownload: serverContextPath + "/devops/explorer/sftp/download", } export { serverPaths, diff --git a/src/views/devops/explorer/index.vue b/src/views/devops/explorer/index.vue index c72460b..b06389c 100644 --- a/src/views/devops/explorer/index.vue +++ b/src/views/devops/explorer/index.vue @@ -63,8 +63,7 @@ + \ No newline at end of file diff --git a/src/views/devops/host/index.vue b/src/views/devops/host/index.vue index 69a08b0..73876ca 100644 --- a/src/views/devops/host/index.vue +++ b/src/views/devops/host/index.vue @@ -15,11 +15,12 @@ - + @@ -254,7 +255,10 @@ function connectTest() { function openShell(host) { router.push("/devops/host/terminal?id=" + host.id) } + +function openExplorer(host) { + router.push("/devops/host/explorer?id=" + host.id + "&user=" + host.user + "&ip=" + host.ip) +} \ No newline at end of file -- Gitee From b2c0c1a14f02eb1095f59870919d750ddca3a3bb Mon Sep 17 00:00:00 2001 From: GeMing <1328922121@qq.com> Date: Fri, 6 Sep 2024 18:51:21 +0800 Subject: [PATCH 2/6] feat: explorer add create dir func --- src/assets/css/devops/explorer.css | 6 ++-- src/settings.js | 2 ++ src/views/devops/explorer/index.vue | 42 ++++++++++++++++++++-- src/views/devops/host/explorer.vue | 54 +++++++++++++++++++++++++---- 4 files changed, 92 insertions(+), 12 deletions(-) diff --git a/src/assets/css/devops/explorer.css b/src/assets/css/devops/explorer.css index 3671e47..edc854a 100644 --- a/src/assets/css/devops/explorer.css +++ b/src/assets/css/devops/explorer.css @@ -1,3 +1,4 @@ +@import "../dialog_common.css"; .container { display: flex; flex-direction: column; @@ -8,6 +9,7 @@ flex-wrap: nowrap; padding: 10px; border-bottom: 1px solid #cccccc; + flex: none; } .head .arrow-icon { margin: 0 6px; @@ -32,14 +34,12 @@ margin: 0 15px; cursor: pointer; } -.head .upload_btn { - margin-right: 20px; -} .list { padding: 20px; display: flex; flex-wrap: wrap; align-content: flex-start; + flex: 1; } .item_v { width: 100px; diff --git a/src/settings.js b/src/settings.js index 7e45d26..9ed3104 100644 --- a/src/settings.js +++ b/src/settings.js @@ -121,11 +121,13 @@ const serverPaths = { explorerDelete: serverContextPath + "/devops/explorer/entry", explorerUpload: serverContextPath + "/devops/explorer/upload", explorerDownload: serverContextPath + "/devops/explorer/download", + explorerCreate: serverContextPath + "/devops/explorer/create", // host explorer hostExplorerEntries: serverContextPath + "/devops/explorer/sftp/entries", hostExplorerDelete: serverContextPath + "/devops/explorer/sftp/entry", hostExplorerUpload: serverContextPath + "/devops/explorer/sftp/upload", hostExplorerDownload: serverContextPath + "/devops/explorer/sftp/download", + hostExplorerCreate: serverContextPath + "/devops/explorer/sftp/create", } export { serverPaths, diff --git a/src/views/devops/explorer/index.vue b/src/views/devops/explorer/index.vue index b06389c..8c84cc2 100644 --- a/src/views/devops/explorer/index.vue +++ b/src/views/devops/explorer/index.vue @@ -10,6 +10,7 @@ 上传 + 创建目录
@@ -58,6 +59,17 @@
+ + +
+ 名称 + +
+ +
\ No newline at end of file diff --git a/src/views/devops/group/index.vue b/src/views/devops/group/index.vue index b160997..0bc6b91 100644 --- a/src/views/devops/group/index.vue +++ b/src/views/devops/group/index.vue @@ -9,8 +9,8 @@ 新增 - - + + diff --git a/src/views/devops/host/index.vue b/src/views/devops/host/index.vue index 73876ca..9993aa5 100644 --- a/src/views/devops/host/index.vue +++ b/src/views/devops/host/index.vue @@ -9,8 +9,8 @@ 新增 - - + + diff --git a/src/views/devops/monitor/performance/index.vue b/src/views/devops/monitor/performance/index.vue index 6917d65..0023b45 100644 --- a/src/views/devops/monitor/performance/index.vue +++ b/src/views/devops/monitor/performance/index.vue @@ -8,7 +8,7 @@ 搜索 - + diff --git a/src/views/devops/script/index.vue b/src/views/devops/script/index.vue index fa99364..5e27dfe 100644 --- a/src/views/devops/script/index.vue +++ b/src/views/devops/script/index.vue @@ -9,7 +9,7 @@ 新增 - + - + diff --git a/src/views/devops/task/index.vue b/src/views/devops/task/index.vue index 113c86a..2eb6706 100644 --- a/src/views/devops/task/index.vue +++ b/src/views/devops/task/index.vue @@ -9,9 +9,9 @@ 新增 - - - + + + diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 3c381d9..4925f81 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -9,8 +9,8 @@ 新增 - - + +