Merge remote-tracking branch 'origin/master' into master

@@ -10,7 +10,6 @@
                 :on-error="uploadError"
                 :on-error="uploadError"
                 :show-file-list="false"
                 :show-file-list="false"
                 multiple
                 multiple
-                :limit="3"
                 :on-exceed="handleExceed"
                 :on-exceed="handleExceed"
         >
         >
             <el-button size="small" type="primary">上传</el-button>
             <el-button size="small" type="primary">上传</el-button>
@@ -157,7 +156,8 @@
             },
             },
             handleExceed(files, fileList) {
             handleExceed(files, fileList) {
                 console.log(fileList)
                 console.log(fileList)
-                this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+               // this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+                this.$message.warning("上传失败")
             },
             },
             beforeRemove(file, fileList) {
             beforeRemove(file, fileList) {
                 return this.$confirm(`确定移除 ${ file.name }？`);
                 return this.$confirm(`确定移除 ${ file.name }？`);