n20-common-lib 1.3.28 → 1.3.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.3.28",
+  "version": "1.3.29",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/FileExportAsync/index.vue

@@ -55,8 +55,10 @@ export default {
       pgsVal: 0,
       status: undefined, //init progress success error
       timer: undefined,
-      elapsedTimeout: 0,
-      waitPopV: false
+
+      waitPopV: false,
+      waitTimer: undefined,
+      waitClass: ''
     }
   },
   computed: {
@@ -70,13 +72,17 @@ export default {
   },
   methods: {
     export() {
+      clearTimeout(this.timer)
+      clearTimeout(this.waitTimer)
+
       this.pgsVal = 0
       this.status = 'init'
-      clearTimeout(this.timer)
-      this.elapsedTimeout = 0
+      this.pgsV = true
+
+      this.waitClass = 'ex-waitime-' + Date.now()
       this.waitPopV = false
+      this.waitPop()
 
-      this.pgsV = true
       this.exportReq()
     },
     // 导出请求
@@ -92,6 +98,7 @@ export default {
       this.$emit('export-pgs', (pgs, error) => {
         if (error) {
           this.status = 'error'
+          this.closeWaitPop()
           console.error('导出失败')
           return
         }
@@ -101,24 +108,22 @@ export default {
           this.status = 'progress'
 
           clearTimeout(this.timer)
-          this.timer = setTimeout(() => {
-            this.elapsedTimeout = this.elapsedTimeout + this.stepTime
-            this.exportPgs()
-          }, this.stepTime)
+          this.timer = setTimeout(this.exportPgs, this.stepTime)
         } else {
           this.pgsVal = parseInt(pgs)
           this.status = 'success'
 
           this.exportRes()
         }
-        this.waitPop()
       })
     },
     // 导出响应
     exportRes() {
       this.$emit('export-res', (data, error) => {
+        clearTimeout(this.waitTimer)
         if (error) {
           this.status = 'error'
+          this.closeWaitPop()
           console.error('导出失败')
           return
         }
@@ -126,12 +131,11 @@ export default {
         this.status = 'success'
         this.pgsVal = 100
 
+        this.closeWaitPop()
         downloadBlob(data, this.fileName)
-        this.pgsV = false
-        let confirmBtn = document.querySelector(
-          '.ex-waitime-msg .el-button--primary'
-        )
-        confirmBtn && confirmBtn.click()
+        setTimeout(() => {
+          this.pgsV = false
+        }, 500)
       })
     },
     // 导出取消
@@ -156,22 +160,31 @@ export default {
     },
     // 时间太长提示
     waitPop() {
-      if (!this.waitPopV && this.elapsedTimeout > this.waitTime) {
-        this.waitPopV = true
-
-        this.$msgboxPor({
-          title: '提示',
-          message: '您的数据导出时间可能会比较长，是否继续导出？',
-          type: 'warning',
-          customClass: 'question ex-waitime-msg',
-          confirmButtonText: '继续导出',
-          cancelButtonText: '取消'
-        }).catch(() => {
-          clearTimeout(this.timer)
-          this.pgsV = false
-          this.$emit('export-cancel')
-        })
-      }
+      clearTimeout(this.waitTimer)
+      this.waitTimer = setTimeout(() => {
+        if (!this.waitPopV) {
+          this.waitPopV = true
+          this.$msgboxPor({
+            title: '提示',
+            message: '您的数据导出时间可能会比较长，是否继续导出？',
+            type: 'warning',
+            customClass: `question ${this.waitClass}`,
+            confirmButtonText: '继续导出',
+            cancelButtonText: '取消'
+          }).catch(() => {
+            clearTimeout(this.timer)
+            this.pgsV = false
+            this.$emit('export-cancel')
+          })
+        }
+      }, this.waitTime)
+    },
+    closeWaitPop() {
+      clearTimeout(this.waitTimer)
+      let confirmBtn = document.querySelector(
+        `.${this.waitClass} .el-button--primary`
+      )
+      confirmBtn && confirmBtn.click()
     }
   }
 }

package/src/components/FileUploadTable/index.vue

@@ -167,7 +167,11 @@
                 :disabled="!row[keys.type]"
                 :accept="row[keys.type] | acceptFilter(typeOptions, fileAccept)"
                 :size="row[keys.type] | sizeFilter(typeOptions, fileSize)"
-                :http-request="uploadHttpRequest"
+                :http-request="
+                  uploadHttpRequest
+                    ? (options) => uploadHttpRequest(options, row)
+                    : undefined
+                "
                 :before-upload="(file) => beforeUploadFn(file, row)"
                 :on-progress="(event) => onProgressFn(event, row)"
                 :on-success="