From 720ba0553cd0a39d6eb8102ca38d5bf9cc341445 Mon Sep 17 00:00:00 2001
From: renpy <peiyu_ren@163.com>
Date: Wed, 30 Aug 2023 13:46:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Modals/LoadFromFileModal.vue   | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
index 3a91f17..3d5c613 100644
--- a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
@@ -78,6 +78,7 @@
 
 <script>
 import JSZip from 'jszip'
+import FileSaver from 'file-saver'
 import PhdSelect from '../PHDSelect.vue'
 import { getAction,postAction } from '../../../../api/manage'
 const columns = [
@@ -232,11 +233,24 @@ export default {
     beforeUpload(file,fileList) {
       this.fileList = fileList
     },
-    async handleUpload({ file }) {
+    handleUpload({ file }) {
       this.uploading = true
       this.fileNum += 1
       if (this.fileNum == this.fileList.length) {
-        await this.zipFile(this.fileList, (added) => { }).then(content => {
+        this.zipFile(this.fileList)
+      }
+    },
+    async zipFile(fileList, onProgress) {
+      const zip = new JSZip()
+      const promises=[]
+      fileList.forEach(file => {
+        promises.push(this.readAsArrayBuffer(file))
+      })
+      Promise.all(promises).then(result => {
+        result.forEach(res => {
+          zip.file(res.fileName, res.data)
+        })
+        zip.generateAsync({ type: 'blob' }).then(content => {
           let file = new File([content], 'test.zip', { type: content.type })
           const formData = new FormData()
           formData.append("file",file)
@@ -244,37 +258,24 @@ export default {
             this.uploading = false
             this.fileNum = 0
             if (res.success) {
-              console.log(res);
               this.$message.success(res.message)
             } else {
               this.$message.warning(res.message)
             }
           })
         })
-      }
-    },
-    async zipFile(fileList, onProgress) {
-      const zip = new JSZip()
-      let i = 0
-      for await (let f of fileList) {
-        const fileData = await this.readAsArrayBuffer(f)
-        console.log(f.webkitRelativePath);
-        zip.file(f.webkitRelativePath, fileData, { createFolders: true })
-        i++
-        onProgress && onProgress(i)
-      }
-      return zip.generateAsync({ type: 'blob' })
+      })
     },
 
     async readAsArrayBuffer(file){
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve) => {
         let reader = new FileReader()
         reader.readAsArrayBuffer(file)
-        reader.onload = () => {
-          resolve(reader.result)
-        }
-        reader.onloadend = () => {
-          reject('FileReader failed')
+        reader.onload = (e) => {
+          resolve({
+            fileName: file.name,
+            data: e.target.result
+          })
         }
       })
     },