From d98e7b55cfd603ed354080f7f6c40ca32c900209 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Tue, 25 Feb 2020 13:40:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A8=E5=B1=80=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SimpleUploader/globalUploader.vue | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/SimpleUploader/globalUploader.vue b/src/components/SimpleUploader/globalUploader.vue
index 5ee4099..c483f99 100755
--- a/src/components/SimpleUploader/globalUploader.vue
+++ b/src/components/SimpleUploader/globalUploader.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="global-uploader" v-wechat-title="process === -10 || process===100 ? $route.meta.title : process+'%'+' | '+$route.meta.title" >
+  <div id="global-uploader" v-wechat-title="process === -10 || process===100 || this.fileListLength === 0 ? $route.meta.title : process+'%'+' | '+$route.meta.title" >
 
     <!-- 上传 -->
     <uploader
@@ -12,6 +12,7 @@
       @file-success="onFileSuccess"
       @file-progress="onFileProgress"
       @file-error="onFileError"
+      @file-removed="onFileRemoved"
     >
       <uploader-unsupport></uploader-unsupport>
 
@@ -24,7 +25,7 @@
           <div class="file-title">
             <h2 class="files-title">文件列表</h2>
             <div class="operate">
-              <el-button type="text" class="button-collapse" @click="shrink">
+              <el-button v-if="fileListLength > 0" type="text" class="button-collapse" @click="shrink">
                 <i class="iconfont el-icon-position"></i>
               </el-button>
               <!--<el-button type="text" class="button-collapse" :title="collapse ? '展开':'折叠' " @click="fileListShow">-->
@@ -132,6 +133,7 @@ export default {
         paused: '暂停中',
         waiting: '等待中'
       },
+      fileListLength: 0,
       panelShow: false, // 选择文件后，展示上传panel
       collapse: false,
       isShrink: true,
@@ -182,6 +184,7 @@ export default {
     //   Bus.$emit('fileAdded')
     // },
     onFilesAdded(files) {
+      this.fileListLength = this.uploader.fileList.length
       const filePaths = this.uploader.filePaths
       const paths = Object.keys(filePaths)
       const pathsLength = paths.length
@@ -233,9 +236,10 @@ export default {
       // fileList.forEach(file => {
       //   file.currentSpeed
       // })
+      console.log('window.uploader',window.uploader)
       this.netSpeed = formatNetSpeed(file.currentSpeed)
       this.process = Math.trunc(window.uploader.progress() * 100)
-      if(this.process > 0 && this.process < 100){
+      if(this.process > 0 && this.process < 100 && window.uploader.fileList.length > 0){
         window.onbeforeunload = function() {
           return "还有文件正在上传, 确定退出吗?";
         }
@@ -297,6 +301,9 @@ export default {
         type: 'error'
       })
     },
+    onFileRemoved() {
+      this.fileListLength = this.uploader.fileList.length
+    },
     /**
      * 计算md5，实现断点续传及秒传
      * @param file
@@ -421,7 +428,7 @@ export default {
       },500)
     },
     close() {
-      if(this.process === -10 || this.process === 100){
+      if(this.process === -10 || this.process === 100 || this.fileListLength === 0){
         this.uploader.cancel()
         this.panelShow = false
       } else {