From 510e660b1736eef4a73517205042278461f3fddd Mon Sep 17 00:00:00 2001
From: chaos-zhu <ggchaos1022@gmail.com>
Date: Tue, 20 Aug 2024 12:20:42 +0800
Subject: [PATCH] =?UTF-8?q?:new:=20=E9=99=90=E5=88=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E9=A2=9D=E5=A4=96=E7=9A=84=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/app/socket/sftp.js                     |  2 +
 web/src/assets/scss/element/dark.scss         |  5 ++
 web/src/views/terminal/components/sftp.vue    | 47 +++++++++++++++----
 .../terminal/components/terminal-tab.vue      |  4 +-
 .../views/terminal/components/terminal.vue    |  2 +-
 5 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/server/app/socket/sftp.js b/server/app/socket/sftp.js
index 1165452..c4986ae 100644
--- a/server/app/socket/sftp.js
+++ b/server/app/socket/sftp.js
@@ -36,6 +36,7 @@ function listenInput(sftpClient, socket) {
   socket.on('rm_dir', async (path) => {
     const exists = await sftpClient.exists(path)
     if (!exists) return socket.emit('not_exists_dir', '目录不存在或当前不可访问')
+    consola.info('rm_dir: ', path)
     try {
       let res = await sftpClient.rmdir(path, true) // 递归删除
       socket.emit('rm_success', res)
@@ -127,6 +128,7 @@ function listenInput(sftpClient, socket) {
       const exists = await sftpClient.exists(fullPath)
       if (exists) continue
       await sftpClient.mkdir(fullPath, true)
+      socket.emit('create_remote_dir_progress', fullPath)
       consola.info('创建目录:', fullPath)
     }
     socket.emit('create_remote_dir_success')
diff --git a/web/src/assets/scss/element/dark.scss b/web/src/assets/scss/element/dark.scss
index edb3016..37897a0 100644
--- a/web/src/assets/scss/element/dark.scss
+++ b/web/src/assets/scss/element/dark.scss
@@ -53,6 +53,11 @@ html.dark {
         background-color: #454242 !important;
       }
     }
+    section {
+      .left {
+        border: none !important;
+      }
+    }
   }
   .info_box {
     border-right: 1px solid #454242;
diff --git a/web/src/views/terminal/components/sftp.vue b/web/src/views/terminal/components/sftp.vue
index 08a59b3..d89a288 100644
--- a/web/src/views/terminal/components/sftp.vue
+++ b/web/src/views/terminal/components/sftp.vue
@@ -108,12 +108,15 @@
               :percentage="upFileProgress"
             />
           </div>
+          <div v-if="showDirProgress">
+            <span>文件夹创建: {{ curUploadDirName }}</span>
+          </div>
         </div>
         <ul
           v-if="fileList.length !== 0"
           ref="childDirRef"
           v-loading="childDirLoading"
-          element-loading-text="加载中..."
+          element-loading-text="操作中..."
           class="dir-list"
         >
           <li
@@ -187,11 +190,16 @@ const curTarget = ref(null)
 const showFileProgress = ref(false)
 const upFileProgress = ref(0)
 const curUploadFileName = ref('')
+
+const showDirProgress = ref(false)
+const curUploadDirName = ref(0)
+
 const adjustRef = ref(null)
 const sftpTabContainerRef = ref(null)
 const childDirRef = ref(null)
 const uploadFileRef = ref(null)
 const uploadDirRef = ref(null)
+const forbiddenAction = ref(false)
 
 const token = computed(() => $store.token)
 const curPath = computed(() => paths.value.join('/').replace(/\/{2,}/g, '/'))
@@ -308,6 +316,7 @@ const listenSftp = () => {
   socket.value.on('rm_success', (res) => {
     $message.success(res)
     childDirLoading.value = false
+    forbiddenAction.value = false
     handleRefresh()
   })
   socket.value.on('down_file_success', (res) => {
@@ -324,6 +333,7 @@ const listenSftp = () => {
   })
   socket.value.on('sftp_error', (res) => {
     $message.error(res)
+    forbiddenAction.value = false
     resetFileStatusFlag()
   })
   socket.value.on('up_file_progress', (res) => {
@@ -336,7 +346,7 @@ const listenSftp = () => {
 }
 
 const openRootChild = (item) => {
-  if (showFileProgress.value) return $message.warning('需等待当前任务完成')
+  if (forbiddenAction.value) return $message.warning('需等待当前任务完成')
   const { name, type } = item
   if (isDir(type)) {
     childDirLoading.value = true
@@ -353,7 +363,7 @@ const openRootChild = (item) => {
 }
 
 const openTarget = (item) => {
-  if (showFileProgress.value) return $message.warning('需等待当前任务完成')
+  if (forbiddenAction.value) return $message.warning('需等待当前任务完成')
   const { name, type, size } = item
   if (isDir(type)) {
     paths.value.push(name)
@@ -388,7 +398,7 @@ const selectFile = (item) => {
 }
 
 const handleReturn = () => {
-  if (showFileProgress.value) return $message.warning('需等待当前任务完成')
+  if (forbiddenAction.value) return $message.warning('需等待当前任务完成')
   if (paths.value.length === 1) return
   paths.value.pop()
   openDir()
@@ -399,7 +409,7 @@ const handleRefresh = () => {
 }
 
 const handleDownload = () => {
-  if (showFileProgress.value) return $message.warning('需等待当前任务完成')
+  if (forbiddenAction.value) return $message.warning('需等待当前任务完成')
   if (curTarget.value === null) return $message.warning('先选择一个文件')
   const { name, size, type } = curTarget.value
   if (isDir(type)) return $message.error('暂不支持下载文件夹')
@@ -422,7 +432,7 @@ const handleDownload = () => {
 }
 
 const handleDelete = () => {
-  if (showFileProgress.value) return $message.warning('需等待当前任务完成')
+  if (forbiddenAction.value) return $message.warning('需等待当前任务完成')
   if (curTarget.value === null) return $message.warning('先选择一个文件(夹)')
   const { name, type } = curTarget.value
   $messageBox.confirm(`确认删除：${ name }`, 'Warning', {
@@ -432,6 +442,7 @@ const handleDelete = () => {
   }).then(() => {
     childDirLoading.value = true
     const path = getPath(name)
+    forbiddenAction.value = true
     if (isDir(type)) {
       socket.value.emit('rm_dir', path)
     } else {
@@ -441,9 +452,10 @@ const handleDelete = () => {
 }
 
 const handleUploadFiles = async (event) => {
-  if (showFileProgress.value) return $message.warning('需等待当前任务完成')
+  if (forbiddenAction.value) return $message.warning('需等待当前任务完成')
   let { files } = event.target
 
+  forbiddenAction.value = true
   for (let file of files) {
     try {
       const targetFilePath = getPath(file.name)
@@ -452,14 +464,15 @@ const handleUploadFiles = async (event) => {
       $message.error(`${ file.name }上传失败: ${ error }`)
     }
   }
+  forbiddenAction.value = false
   event.target.value = ''
   uploadFileRef.value = null
 }
 
 const handleUploadDir = async (event) => {
-  if (showFileProgress.value) return $message.warning('需等待当前任务完成')
+  if (forbiddenAction.value) return $message.warning('需等待当前任务完成')
   let { files } = event.target
-  if(files.length === 0) return $message.warning('不允许上传空文件夹')
+  if (files.length === 0) return $message.warning('不允许上传空文件夹')
   files = Array.from(files)
   // console.log(files)
   // 文件夹可能嵌套, 需先创建文件夹
@@ -467,13 +480,27 @@ const handleUploadDir = async (event) => {
   if (foldersName.length === 0) return $message.warning('不允许上传空文件夹')
   // console.log(foldersName)
   let targetDirPath = curPath.value
+  forbiddenAction.value = true
   socket.value.emit('create_remote_dir', { targetDirPath, foldersName })
   socket.value.once('create_remote_dir_exists', (res) => {
     $message.error(res)
     event.target.value = ''
     uploadDirRef.value = null
+    forbiddenAction.value = false
   })
+  function computedUploadDirProgress(path) {
+    // $message.success('创建服务器文件夹中...')
+    // console.log(path)
+    showDirProgress.value = true
+    curUploadDirName.value = path
+  }
+  $message.success('创建服务器文件夹中...')
+  socket.value.on('create_remote_dir_progress', computedUploadDirProgress)
   socket.value.once('create_remote_dir_success', async () => {
+    socket.value.off('create_remote_dir_progress', computedUploadDirProgress)
+    showDirProgress.value = false
+    curUploadDirName.value = ''
+    $message.success('服务器文件夹创建成功, 开始上传文件')
     for (let [index, file,] of files.entries()) {
       let fullFilePath = getPath(`${ foldersName[index] }/${ file.name }`)
       console.log('fullFilePath: ', fullFilePath)
@@ -483,6 +510,7 @@ const handleUploadDir = async (event) => {
         $message.error(`${ file.name }上传失败: ${ error }`)
       }
     }
+    forbiddenAction.value = false
     event.target.value = ''
     uploadDirRef.value = null
   })
@@ -508,7 +536,6 @@ const uploadFile = (file, targetFilePath) => {
         try {
           upFileProgress.value = 0
           showFileProgress.value = true
-          // childDirLoading.value = true
           const totalSliceCount = Math.ceil(size / range)
           while (end < size) {
             fileIndex++
diff --git a/web/src/views/terminal/components/terminal-tab.vue b/web/src/views/terminal/components/terminal-tab.vue
index 6a9ac37..1b40b89 100644
--- a/web/src/views/terminal/components/terminal-tab.vue
+++ b/web/src/views/terminal/components/terminal-tab.vue
@@ -35,7 +35,7 @@ const props = defineProps({
   },
   fontSize: {
     required: false,
-    default: 18,
+    default: 16,
     type: Number
   },
   theme: {
@@ -370,7 +370,7 @@ const handleRightClick = async () => {
     // 移除多余空格与换行符
     const formattedText = clipboardText.trim().replace(/\s+/g, ' ')
     // console.log(formattedText)
-    if (formattedText.includes('rm -rf /')) return $message.warning(`高危指令,禁止粘贴: ${ formattedText }` )
+    if (formattedText.includes('rm -rf /')) return $message.warning(`高危指令,禁止粘贴: ${ formattedText }`)
     const safeText = formattedText.replace(/\r?\n|\r/g, '')
     // console.log(safeText)
     socket.value.emit('input', safeText)
diff --git a/web/src/views/terminal/components/terminal.vue b/web/src/views/terminal/components/terminal.vue
index 02c3435..d2ce16c 100644
--- a/web/src/views/terminal/components/terminal.vue
+++ b/web/src/views/terminal/components/terminal.vue
@@ -202,7 +202,7 @@ const themeName = ref(localStorage.getItem('themeName') || 'Afterglow')
 let localTerminalBackground = localStorage.getItem('terminalBackground')
 const terminalBackground = ref(localTerminalBackground || '/terminal/01.png')
 let localTerminalFontSize = localStorage.getItem('terminalFontSize')
-const terminalFontSize = ref(Number(localTerminalFontSize) || 18)
+const terminalFontSize = ref(Number(localTerminalFontSize) || 16)
 
 const terminalTabs = computed(() => props.terminalTabs)
 const terminalTabsLen = computed(() => props.terminalTabs.length)