Merge remote-tracking branch 'origin/branch20241月中旬' into branch20241月中旬

This commit is contained in:
danshihao
2024-01-16 18:26:15 +08:00
@@ -412,7 +412,7 @@ export default {
} }
return true return true
}, },
handleChange(info) { async handleChange(info) {
if (info.file.status !== 'uploading') { if (info.file.status !== 'uploading') {
console.log(info.file, info.fileList) console.log(info.file, info.fileList)
} }
@@ -436,17 +436,8 @@ export default {
} else { } else {
this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`) this.$message.success(info.file.response.message || `${info.file.name} 文件上传成功`)
} }
let newFile = await this.getFileInfoArr(info.file.response.result.id)
this.confirmLoading = true this.fileList.push(newFile[0])
this.getFileInfoArr(info.file.response.result.id).then(arr => {
if (arr) {
this.fileList.push(arr[0])
} else {
this.fileList.push(info.file.response.result)
}
}).finally(() => {
this.confirmLoading = false
})
} else { } else {
this.messageLineFeed('文件导入错误', info.file.response.message) this.messageLineFeed('文件导入错误', info.file.response.message)
} }