diff --git a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts index e6a56c7..c946e03 100644 --- a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts +++ b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts @@ -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(); }); } diff --git a/frontend/src/ts/ervu_business_metrics/component/filter/FilterGroupDelegate.ts b/frontend/src/ts/ervu_business_metrics/component/filter/FilterGroupDelegate.ts index f03fdc1..e794948 100644 --- a/frontend/src/ts/ervu_business_metrics/component/filter/FilterGroupDelegate.ts +++ b/frontend/src/ts/ervu_business_metrics/component/filter/FilterGroupDelegate.ts @@ -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 { } }); } -} \ No newline at end of file +}