From 8f14b582133937fc581abfa722b37394fe2482b2 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Tue, 28 May 2024 17:50:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=A4=A7=E9=87=8F=E6=96=87=E4=BB=B6=E4=BC=A0=E8=BE=93=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E6=9D=A1=E5=8D=A1=E4=BD=8F=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          |  3 ---
 .../SimpleUploader/globalUploader.vue         | 25 ++++++++++++++-----
 src/store/index.js                            |  7 ------
 src/utils/request.js                          |  2 ++
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index 46c20f6..d58c6f0 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -1490,9 +1490,6 @@ export default {
           this.path = ''
         }
         if (fileDoc) {
-          if (this.$store.state.uploaderState) {
-            return
-          }
           if (fileDoc.$set) {
             let path = fileDoc.$set.path
             path = path.replace(/\\/g, '/')
diff --git a/src/components/SimpleUploader/globalUploader.vue b/src/components/SimpleUploader/globalUploader.vue
index e59a8be..4921e0f 100755
--- a/src/components/SimpleUploader/globalUploader.vue
+++ b/src/components/SimpleUploader/globalUploader.vue
@@ -112,7 +112,6 @@
 
 <script>
 
-// import { ACCEPT_CONFIG } from '@/assets/js/config'
 import store from '@/store'
 import $ from 'jquery'
 import SparkMD5 from 'spark-md5'
@@ -133,7 +132,7 @@ export default {
         // speedSmoothingFactor: 0.1,
         // progressCallbacksInterval: 500,
         maxChunkRetries: 3, // 最大重试次数
-        simultaneousUploads: 5, // 并发上传数
+        simultaneousUploads: 3, // 并发上传数
         testChunks: true, // 是否开启服务器分片校验
         // 服务器分片校验函数，秒传及断点续传基础
         checkChunkUploadedByResponse: function (chunk, message) {
@@ -230,6 +229,17 @@ export default {
             $('#folder-uploader-btn').click()
           }
           break
+        case 'request':
+          if (msg.data === 0) {
+            if (this.uploader.fileList.length  === 0 && this.panelShow) {
+              this.fileListLength = this.uploader.fileList.length
+              this.process = 100
+              this.setPageTitle()
+              this.uploader.cancel()
+              this.displayPanel(false)
+            }
+          }
+          break
       }
     }
   },
@@ -359,7 +369,6 @@ export default {
     },
     displayPanel(display) {
       this.panelShow = display
-      this.$store.dispatch('updateUploaderState', display)
     },
     doUploadBefore(files) {
       this.fileListLength = this.uploader.fileList.length
@@ -378,9 +387,6 @@ export default {
             currentDirectory: encodeIfNeeded(this.params.currentDirectory),
             username: this.params.username,
             userId: this.params.userId
-          }).then(() => {
-            this.getFileList()
-          }).catch(e => {
           })
         })
       }
@@ -404,6 +410,13 @@ export default {
         this.uploader.resume()
       })
     },
+    setPageTitle() {
+      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}`
+      }
+    },
     onFileProgress(rootFile, file, chunk) {
       this.netSpeed = formatNetSpeed(file.currentSpeed)
       this.process = Math.trunc(window.uploader.progress() * 100)
diff --git a/src/store/index.js b/src/store/index.js
index 7421af5..4247cbb 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -16,23 +16,16 @@ const store = new Vuex.Store({
   getters,
   state: {
     message: null,
-    uploaderState: null,
   },
   mutations: {
     setMessage(state, message) {
       state.message = message;
     },
-    setUploaderState(state, uploaderState) {
-      state.uploaderState = uploaderState;
-    },
   },
   actions: {
     updateMessage({ commit }, message) {
       commit('setMessage', message);
     },
-    updateUploaderState({ commit }, uploaderState) {
-      commit('setUploaderState', uploaderState);
-    },
   }
 })
 
diff --git a/src/utils/request.js b/src/utils/request.js
index 92a13c4..feec2f7 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -12,6 +12,7 @@ const service = axios.create({
 // request interceptor
 service.interceptors.request.use(
   config => {
+    store.dispatch('updateMessage', { event: 'request', data: 1})
     // do something before request is sent
     if (store.getters.token) {
       config.headers['jmal-token'] = getToken()
@@ -44,6 +45,7 @@ service.interceptors.response.use(
    * You can also judge the status by HTTP Status Code
    */
   response => {
+    store.dispatch('updateMessage', { event: 'request', data: 0})
     const res = response.data
     if (res.code !== 0) {
       if (res.code === -2) {