From 59f046d10c9fd324fc387a68b7c8e8542c6ead04 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Tue, 26 Mar 2024 18:00:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SimpleUploader/globalUploader.vue | 6 +++---
 src/utils/path.js                                | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/SimpleUploader/globalUploader.vue b/src/components/SimpleUploader/globalUploader.vue
index 73a02ec..84e871f 100755
--- a/src/components/SimpleUploader/globalUploader.vue
+++ b/src/components/SimpleUploader/globalUploader.vue
@@ -410,11 +410,11 @@ export default {
         // 文件状态设为“合并中”
         this.statusSet(file.id, 'merging')
         api.mergeSimpleUpload({
-          filename: encodeURI(file.name),
-          relativePath: encodeURI(file.relativePath),
+          filename: encodeIfNeeded(file.name),
+          relativePath: encodeIfNeeded(file.relativePath),
           identifier: file.uniqueIdentifier,
           folder: this.$route.query.folder,
-          currentDirectory: encodeURI(this.params.currentDirectory),
+          currentDirectory: encodeIfNeeded(this.params.currentDirectory),
           username: this.params.username,
           userId: this.params.userId,
           totalSize: file.size,
diff --git a/src/utils/path.js b/src/utils/path.js
index e733040..2c93595 100644
--- a/src/utils/path.js
+++ b/src/utils/path.js
@@ -32,6 +32,7 @@ function isEncoded(str) {
 }
 
 export function encodeIfNeeded(str) {
+  console.log('str:', str, isEncoded(str))
   if (isEncoded(str)) {
     return str;
   } else {