|
@@ -85,9 +85,9 @@ export class CompUploadComponent implements OnInit {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
let isEncrypt = await this.isEncrypt(info)
|
|
let isEncrypt = await this.isEncrypt(info)
|
|
- if (isEncrypt) {
|
|
|
|
- return
|
|
|
|
- }
|
|
|
|
|
|
+ // if (isEncrypt) {
|
|
|
|
+ // return
|
|
|
|
+ // }
|
|
this.disabled = true
|
|
this.disabled = true
|
|
if (info.file.status !== 'uploading') {
|
|
if (info.file.status !== 'uploading') {
|
|
// 选择文件后,自动开始上传
|
|
// 选择文件后,自动开始上传
|
|
@@ -179,13 +179,11 @@ export class CompUploadComponent implements OnInit {
|
|
if (isEncrypt) {
|
|
if (isEncrypt) {
|
|
clearTimeout(this.timeOut)
|
|
clearTimeout(this.timeOut)
|
|
this.timeOut = setTimeout(() => {
|
|
this.timeOut = setTimeout(() => {
|
|
- // this.msg.create('error', file.name + '为加密文件,无法上传。',
|
|
|
|
- // {nzDuration: 10000}
|
|
|
|
- // )
|
|
|
|
this.notification.create(
|
|
this.notification.create(
|
|
'error',
|
|
'error',
|
|
'请勿上传加密文件',
|
|
'请勿上传加密文件',
|
|
- `${file.name} 为加密文件,无法上传。`
|
|
|
|
|
|
+ `${file.name} 为加密文件,影响导出,请替换。`,
|
|
|
|
+ { nzDuration: 0 }
|
|
);
|
|
);
|
|
|
|
|
|
}, 1000);
|
|
}, 1000);
|
|
@@ -196,6 +194,5 @@ export class CompUploadComponent implements OnInit {
|
|
}
|
|
}
|
|
} else { resolve(false) }
|
|
} else { resolve(false) }
|
|
})
|
|
})
|
|
-
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|