From 5b02458d14aa344d694fcc21cf6600c03e18c089 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Thu, 7 Nov 2024 16:24:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8B=E8=BF=9B=E5=85=A5=E6=9F=90=E4=B8=AA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E5=90=8E=E4=B8=8A=E4=BC=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF=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/ShowFile/ShowFile.vue             | 15 ++++++++++-----
 src/components/SimpleUploader/globalUploader.vue |  8 ++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index 9efece5..5a26856 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -1502,7 +1502,12 @@ export default {
           this.fileList[index].updateDate = fileDoc.updateDate
         }
       }
-      const isCurrentPath = (this.path + '/') === fileDoc
+      let thisPath = this.path
+      if (this.listModeSearchOpenDir) {
+        const row = this.pathList[this.pathList.length - 1]
+        thisPath = `${row.row.path}${row.folder}`
+      }
+      const isCurrentPath = (thisPath + '/') === fileDoc
       if ('deleteFile' === url && (isCurrentPath || this.$route.path.startsWith('/recently'))) {
         this.getFileListEnter()
       }
@@ -1513,18 +1518,18 @@ export default {
         if (fileDoc && fileDoc.name) {
           this.onCreateFilename = fileDoc.name
         }
-        if (!this.path) {
-          this.path = ''
+        if (!thisPath) {
+          thisPath = ''
         }
         if (fileDoc) {
           if (fileDoc.$set) {
             let path = fileDoc.$set.path
             path = path.replace(/\\/g, '/')
-            if (this.path + '/' === path) {
+            if (thisPath + '/' === path) {
               this.getFileListEnter()
             }
           } else {
-            if (this.path + '/' === fileDoc.path) {
+            if (thisPath + '/' === fileDoc.path) {
               this.getFileListEnter()
             }
           }
diff --git a/src/components/SimpleUploader/globalUploader.vue b/src/components/SimpleUploader/globalUploader.vue
index 80c6489..0432741 100755
--- a/src/components/SimpleUploader/globalUploader.vue
+++ b/src/components/SimpleUploader/globalUploader.vue
@@ -310,7 +310,7 @@ export default {
         currentDirectory: this.$route.query.path || '/',
         username: this.$store.state.user.name,
         userId: this.$store.state.user.userId,
-        folder: this.$route.query.folder
+        folder: this.$route.query.searchOpenFolder || this.$route.query.folder
       }
     },
     isPath(str) {
@@ -400,17 +400,17 @@ export default {
         this.uploader.resume()
       })
     },
-    setPageTitle() {
+    setPageTitle(netSpeed) {
       if (this.process === -10 || this.process === 100 || this.fileListLength === 0) {
         document.title = `${this.$route.meta.title}`
       } else {
-        document.title = `${this.process}% | ${this.$route.meta.title}`
+        document.title = `${this.process}% | ${netSpeed}`
       }
     },
     onFileProgress(rootFile, file, chunk) {
       this.netSpeed = formatNetSpeed(file.currentSpeed, false)
       this.process = Math.trunc(window.uploader.progress() * 100)
-      this.setPageTitle()
+      this.setPageTitle(this.netSpeed)
       if (rootFile.isFolder && this.process < 100) {
         this.statusSet(rootFile.id, 'progress', formatNetSpeed(file.currentSpeed, true))
       }