micord/ervu-lkrp-fl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/hotfix/1.9.5' into test_audit

Browse source 
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/controller/ExtractController.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
This commit is contained in:
adel.ka 2025-02-03 14:24:35 +03:00
commit b5591f1198
23 changed files with 387 additions and 408 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/pom.xml
View file

@ -4,7 +4,7 @@
<parent>
<groupId>ru.micord.ervu.lkrp</groupId>
<artifactId>fl</artifactId>
<version>1.9.4-SNAPSHOT</version>
<version>1.9.5-SNAPSHOT</version>
</parent>
<groupId>ru.micord.ervu.lkrp.fl</groupId>

5
frontend/src/ts/ervu/component/container/LoadForm.ts
View file

@ -18,7 +18,7 @@ export class LoadForm extends Container {
private ervuDataService: ErvuDataService;
private subscription: Subscription;
private fields: any[];
private fieldDataList: FieldData[] = [];
private fieldDataList: FieldData[];
constructor(el: ElementRef, cd: ChangeDetectorRef) {
super(el, cd);
@ -30,7 +30,7 @@ export class LoadForm extends Container {
}
protected loadContainer(): Promise<any> {
return Promise.resolve(this.loadData());
return this.fieldDataList ? this.loadData() : Promise.resolve();
}
initialize() {
@ -39,6 +39,7 @@ export class LoadForm extends Container {
this.ervuDataService = this.injector.get(ErvuDataService);
this.subscription = this.ervuDataService.message.subscribe(value => {
if (value) {
this.fieldDataList = [];
this.fields.forEach(field => {
let fieldData: FieldData = new FieldData();
fieldData.componentGuid = field.objectId;