增加上传文件取消提示

src/views/product/group/index.vue

@@ -40,7 +40,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
+    <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size" @size-change="sizeChange"
       @current-change="paginationChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
   </div>
 </template>
@@ -76,6 +76,10 @@ export default {
 
   },
   methods: {
+    sizeChange(e){
+      this.tableData.size = e
+      this.getTableData()
+    },
     saleEndTimeFilter: (a, b) => {
 
       var currentDate = new Date(); // 当前日期对象

src/views/system/version/components/add-version.vue

@@ -4,11 +4,9 @@
     width="500px"
     :visible.sync="dialogVisible"
     @close="diaClose"
-    :close-on-click-modal="false"
+    :close-on-click-modal="true"
   >
-    <div class="progress" v-if="loading">
-      <el-progress type="circle" :percentage="progress"></el-progress>
-    </div>
+   
     <el-form
       :element-loading-text="loadingText"
       element-loading-spinner="el-icon-loading"
@@ -18,6 +16,9 @@
       label-width="120px"
       label-position="left"
     >
+    <div class="progress" v-if="loading">
+      <el-progress type="circle" :percentage="progress"></el-progress>
+    </div>
       <el-form-item label="平台">
         <el-select
           v-model="form.source"
@@ -133,7 +134,8 @@ export default {
     diaClose() {
       this.$refs.uploadFile.clearFiles();
       this.restForm();
-      cancelToken();
+      // cancelToken();
+      this.ossClient.abortUpload()
     },
     uploadSuccess(res) {
       this.form.img = res[0];
@@ -152,7 +154,7 @@ export default {
             let fileRes = "";
             const file = this.$refs.uploadFile.getFileList();
             console.log(file);
-            if (!this.hasUpload && file && file.status != "finished") {
+            if (Object.prototype.toString.call(file)=== '[object File]') {
               this.loadingText = "文件上传中，请耐心等待...";
               this.loading = true;
               // fileRes = await $uploadVersionFile(file, { name: version });
@@ -161,13 +163,13 @@ export default {
                 file,
                 (p) => {
                   this.progress = Math.floor(p * 100);
-                  console.log("Progress: " + p * 100 + "%");
                   // 这里可以根据进度做相应的处理，例如更新UI等
                 }
               );
               console.log(fileRes);
               if (!fileRes) {
                 this.loading = false;
+                 this.progress = 0;
                 this.$notify({
                   title: "失败",
                   message: `上传阿里云失败`,
@@ -175,9 +177,11 @@ export default {
                 });
                 return;
               }
+              if(fileRes.name=='cancel'){
+                return
+              }
             }
 
-            this.progress = 0;
             let res = "";
             if (this.form.id) {
               //编辑
@@ -206,7 +210,7 @@ export default {
               });
             }
             this.loading = false;
-
+            this.progress = 0;
             this.close();
 
             this.$emit("success", res);