Merge branch 'pingcode-1104' into dev0515

src/components/FileUpload/index.vue

@@ -190,8 +190,6 @@ export default {
       if(this.loading) {
         this.isLoading = true;
       }
-      this.$emit('isTrue',true)
-      this.$emit('isFalse',true)
       return true;
     },
     // 文件个数超出
@@ -224,12 +222,15 @@ export default {
         if(delIdx>-1){
           fileList.splice(delIdx,1);
         }
+        this.$emit('isTrue',true)
+        this.$emit('isFalse',true)
       } else {
         this.isLoading = false;
-        //this.fileList = [];
+        if(this.limit == 1){
+          this.fileList = [];
+        }
         this.$message({message:"上传失败",type:'error',offset:100});
       }
-
       this.$emit("success", res);
     },
     // 删除文件