Browse Source

修改上传小问题

dusenyao 1 year ago
parent
commit
47d8eeb5c4
2 changed files with 10 additions and 12 deletions
  1. 8 10
      src/api/app.js
  2. 2 2
      src/store/modules/app.js

+ 8 - 10
src/api/app.js

@@ -62,7 +62,7 @@ export function SaveFileByteBase64Text(data) {
  * @param {function} option.handleUploadProgress 上传进度回调
  * @param {boolean} option.isGlobalprogress 是否使用全局进度条
  */
-export function fileUpload(
+export async function fileUpload(
   SecurityLevel,
   file,
   { handleUploadProgress, isGlobalprogress = false } = { isGlobalprogress: false },
@@ -88,8 +88,8 @@ export function fileUpload(
   const controller = new AbortController();
   store.commit(`app/${app.SET_UPLOAD_CONTROLLER}`, controller);
 
-  return http
-    .postForm('/GCLSFileServer/WebFileUpload', formData, {
+  try {
+    const res = await http.postForm('/GCLSFileServer/WebFileUpload', formData, {
       params: {
         SecurityLevel,
       },
@@ -97,14 +97,12 @@ export function fileUpload(
       transformRequest: [(data) => data],
       onUploadProgress,
       timeout: 0,
-    })
-    .then((res) => {
-      store.commit(`app/${app.SET_UPLOAD_INFO}`, { loaded: 0, progress: 1, total: 0 });
-      return res;
-    })
-    .finally(() => {
-      store.commit(`app/${app.SET_UPLOAD_CONTROLLER}`, null);
     });
+    store.commit(`app/${app.SET_UPLOAD_INFO}`, { progress: 1 });
+    return res;
+  } finally {
+    store.commit(`app/${app.SET_UPLOAD_CONTROLLER}`, null);
+  }
 }
 
 export function GetStaticResources(MethodName, data) {

+ 2 - 2
src/store/modules/app.js

@@ -36,9 +36,9 @@ const mutations = {
   },
   [app.SET_UPLOAD_INFO]: (state, { loaded, progress, total }) => {
     state.uploadInfo = {
-      loaded: conversionSize(loaded),
+      loaded: loaded ? conversionSize(loaded) : state.uploadInfo.loaded,
       progress: parseInt(String(progress * 100).replace(/(\d+)\.\d+/, '$1')),
-      total: conversionSize(total),
+      total: total ? conversionSize(total) : state.uploadInfo.total,
     };
   },
 };