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

Merge branch 'test/SUPPORT-8811_new_container_loader_service' into develop

Browse source
This commit is contained in:
Foat Saliakhov 2025-03-26 14:24:15 +03:00
commit 9d5832214c
8 changed files with 319 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
frontend/src/ts/component/field/DropdownTreeViewComponent.ts
View file

@ -59,6 +59,7 @@ export class DropdownTreeViewComponent extends InputControl {
this.i18n.selectedItem = rootItem;
this.value = rootItem ? rootItem.value : rootItem;
this.doCollapseLevel();
this.onValueChange(this.value);
this.cd.markForCheck();
});
}

10
frontend/src/ts/ervu_business_metrics/component/filter/FilterGroupDelegate.ts
View file

@ -55,12 +55,12 @@ export class FilterGroupDelegate extends BaseComponent {
@Visible()
public triggerFilter(): void {
let filters = this.filterComponents
.map(filter => filter.getFilter())
.filter(filterModel => filterModel != null);
.map(filterComponent => filterComponent.getFilter())
.filter(filter => filter != null);
this.filterComponents
.filter(filter => filter.getFilter() == null)
.forEach(filter => this.filterable.removeFilter(filter.getObjectId()));
.filter(filterComponent => filterComponent.getFilter() == null)
.forEach(filterComponent => this.filterable.removeFilter(filterComponent.getObjectId()));
return this.reload(filters);
}
@ -104,4 +104,4 @@ export class FilterGroupDelegate extends BaseComponent {
}
});
}
}
}