SUPPORT-9339: Fix

This commit is contained in:
Eduard Tihomirov 2025-09-11 14:11:44 +03:00
parent 2b5df5129d
commit 9df894b78e
2 changed files with 20 additions and 100 deletions

View file

@ -59,11 +59,21 @@ export class ErvuFileUploadWithAdditionalFiles extends ErvuFileUpload {
response: string) => {
this.fileUploadFailedEvent.trigger();
this.uploader.cancelAll();
this.messagesService.error(`Не удалось отправить следующие файлы: ${item.file.name},`
+ ` ${this.uploader.getNotUploadedItems()
.map(notUploadeditem => notUploadeditem.file.name)
.join(', ')}.`);
try {
var error = JSON.parse(response);
error.messages.forEach((errorMessage) => {
this.messagesService.error(errorMessage, error);
})
}
catch (error) {
this.messagesService.error(`Не удалось отправить следующие файлы: ${item.file.name}`
+ ` ${this.uploader.getNotUploadedItems()
.map(notUploadeditem => notUploadeditem.file.name)
.join(', ')}.`);
}
this.uploader.clearQueue();
this.mchdFileUploadRef.uploader.clearQueue();
this.signFileUploadRef.uploader.clearQueue();
this.isDropZoneVisible = true;
this.isFilesListVisible = true;
this.isProgressBarVisible = false;
@ -74,6 +84,8 @@ export class ErvuFileUploadWithAdditionalFiles extends ErvuFileUpload {
this.uploader.onCompleteAll = () => {
if (!this.isUploadErrorOccurred) {
this.uploader.clearQueue();
this.mchdFileUploadRef.uploader.clearQueue();
this.signFileUploadRef.uploader.clearQueue();
this.fileUploadEndEvent.trigger();
this.isProgressBarVisible = false;
this.cd.markForCheck();

View file

@ -3710,54 +3710,8 @@
</complex>
</value>
</item>
<item id="00e1f35f-d85a-4d24-b5ec-00ee276c4d37" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"409c0323-011e-4416-a631-f8f852299e1f","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"clearValue"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</item>
<item id="109a344c-1b70-413b-9873-4a960ef96da0" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"1dc25461-a60e-456b-93cb-cc0f28dc347b","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"clearValue"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</item>
<item id="00e1f35f-d85a-4d24-b5ec-00ee276c4d37" removed="true"/>
<item id="109a344c-1b70-413b-9873-4a960ef96da0" removed="true"/>
<item id="1b47a62e-ae78-496a-883c-f78040b59197" removed="true"/>
<item id="8b3c26fd-5837-4e58-83b2-fe85e5197243" removed="true"/>
<item id="20bbd274-893c-4b79-9162-b4bb9b515e7e" removed="true"/>
@ -3865,54 +3819,8 @@
</complex>
</value>
</item>
<item id="0efa4cd1-f014-4277-94da-d902bd1822e7" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"1dc25461-a60e-456b-93cb-cc0f28dc347b","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"clearValue"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</item>
<item id="51e2ec5d-2c2d-4576-896f-11c46bb6f69a" removed="false">
<value>
<complex>
<entry>
<key>behavior</key>
<value>
<simple>{"objectId":"409c0323-011e-4416-a631-f8f852299e1f","packageName":"ervu.component.fileupload","className":"ErvuFileUpload","type":"TS"}</simple>
</value>
</entry>
<entry>
<key>method</key>
<value>
<simple>"clearValue"</simple>
</value>
</entry>
<entry>
<key>value</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</item>
<item id="0efa4cd1-f014-4277-94da-d902bd1822e7" removed="true"/>
<item id="51e2ec5d-2c2d-4576-896f-11c46bb6f69a" removed="true"/>
<item id="1b47a62e-ae78-496a-883c-f78040b59197" removed="true"/>
<item id="8b3c26fd-5837-4e58-83b2-fe85e5197243" removed="true"/>
<item id="20bbd274-893c-4b79-9162-b4bb9b515e7e" removed="true"/>