Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -380,7 +380,7 @@ export default {
|
|||||||
if (!info.file.status && this.uploadGoOn === false) {
|
if (!info.file.status && this.uploadGoOn === false) {
|
||||||
info.fileList.pop()
|
info.fileList.pop()
|
||||||
}
|
}
|
||||||
let fileList = info.fileList.filter(item => item.uploadGoOn)
|
let fileList = info.fileList.filter(item => item.status === 'done' || item.uploadGoOn)
|
||||||
if (info.file.status === 'done') {
|
if (info.file.status === 'done') {
|
||||||
if (this.number > 0) {
|
if (this.number > 0) {
|
||||||
fileList = fileList.slice(-this.number)
|
fileList = fileList.slice(-this.number)
|
||||||
|
|||||||
Reference in New Issue
Block a user