From 9809322f61234c14527dbba570a2672e72efadd1 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Mon, 4 Aug 2025 15:57:45 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89=E9=A1=B5=E9=9D=A2=E6=8B=96?=
 =?UTF-8?q?=E6=8B=BD=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ShowFile/ShowFile.vue          | 30 ++++++++++---------
 .../SimpleUploader/globalUploader.vue         | 15 ++++++----
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index 2efadba..5cccb3b 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -1209,6 +1209,12 @@ export default {
         case 'msg/file/change':
           this.onmessage(msg.data)
           break
+        case 'getUploadParams':
+          this.$store.dispatch('updateMessage', {
+            event: 'onUploadParams',
+            data: this.getUploadParams(),
+          })
+          break
       }
     },
     searchFileName(newValue) {
@@ -2325,26 +2331,14 @@ export default {
       // 打开文件选择框
       this.$store.dispatch('updateMessage', {
         event: 'openUploader',
-        data: {
-          // 传入的参数
-          folder: this.$route.query.searchOpenFolder || this.$route.query.folder,
-          currentDirectory: this.getQueryPath(),
-          username: this.$store.state.user.name,
-          userId: this.$store.state.user.userId,
-        },
+        data: this.getUploadParams(),
       })
     },
     uploadFolder() {
       if (window.uploader.supportDirectory) {
         this.$store.dispatch('updateMessage', {
           event: 'uploadFolder',
-          data: {
-            // 传入的参数
-            folder: this.$route.query.searchOpenFolder || this.$route.query.folder,
-            currentDirectory: this.getQueryPath(),
-            username: this.$store.state.user.name,
-            userId: this.$store.state.user.userId,
-          },
+          data: this.getUploadParams(),
         })
       } else {
         this.$message({
@@ -2353,6 +2347,14 @@ export default {
         })
       }
     },
+    getUploadParams() {
+      return {
+        folder: this.$route.query.searchOpenFolder || this.$route.query.folder,
+        currentDirectory: this.getQueryPath(),
+        username: this.$store.state.user.name,
+        userId: this.$store.state.user.userId,
+      }
+    },
     // 浏览器的返回事件
     goBack() {
       if (this.pathList.length <= 1) {
diff --git a/src/components/SimpleUploader/globalUploader.vue b/src/components/SimpleUploader/globalUploader.vue
index a50eecd..fc4513a 100755
--- a/src/components/SimpleUploader/globalUploader.vue
+++ b/src/components/SimpleUploader/globalUploader.vue
@@ -229,6 +229,9 @@ export default {
             $('#folder-uploader-btn').click()
           }
           break
+        case 'onUploadParams':
+          this.params = msg.data || {}
+          break
       }
     }
   },
@@ -309,18 +312,17 @@ export default {
       });
     },
     onDragenter(e) {
-      this.params = {
-        currentDirectory: this.$route.query.path || '/',
-        username: this.$store.state.user.name,
-        userId: this.$store.state.user.userId,
-        folder: this.$route.query.searchOpenFolder || this.$route.query.folder
-      }
+      this.$store.dispatch('updateMessage', {event: 'getUploadParams'})
     },
     isPath(str) {
       // 这个正则表达式检测路径中的斜杠字符
       return /[/\\]/.test(str);
     },
     async onFilesAdded(files) {
+      // 等待50ms
+      setTimeout(async () => await this.doFilesAdded(files), 50)
+    },
+    async doFilesAdded(files) {
       if (files.length === 0) {
         return
       }
@@ -337,6 +339,7 @@ export default {
         filenames: filenames,
         ...this.params
       }
+      console.log('上传文件', query)
       const res = await api.checkExist(query)
       if (res.data.exist) {
         this.$confirm('文件已存在，是否覆盖？', '提示', {