ngx-wapp-components 1.4.3 → 1.4.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/misc/w-filter-panel/w-filter-panel.component.mjs +8 -11
- package/fesm2015/ngx-wapp-components.mjs +7 -10
- package/fesm2015/ngx-wapp-components.mjs.map +1 -1
- package/fesm2020/ngx-wapp-components.mjs +7 -10
- package/fesm2020/ngx-wapp-components.mjs.map +1 -1
- package/lib/misc/w-filter-panel/w-filter-panel.component.d.ts +1 -2
- package/package.json +1 -1
|
@@ -2632,7 +2632,7 @@ class WFilterPanelComponent {
|
|
|
2632
2632
|
while (route.parent) {
|
|
2633
2633
|
route = route.parent;
|
|
2634
2634
|
if (route.snapshot.routeConfig && route.snapshot.routeConfig.path) {
|
|
2635
|
-
parentRoute = route.snapshot.routeConfig.path + '/' + parentRoute;
|
|
2635
|
+
parentRoute = route.snapshot.routeConfig.path + (parentRoute ? '/' : '') + parentRoute;
|
|
2636
2636
|
}
|
|
2637
2637
|
}
|
|
2638
2638
|
return parentRoute;
|
|
@@ -2645,16 +2645,13 @@ class WFilterPanelComponent {
|
|
|
2645
2645
|
}
|
|
2646
2646
|
if (this.hasPreviousFilters && this.storedQuery) {
|
|
2647
2647
|
let lastQuery = {
|
|
2648
|
-
|
|
2649
|
-
|
|
2650
|
-
|
|
2651
|
-
|
|
2652
|
-
advanced: this.storedQuery?.advancedQueryValue ? Object.assign({}, this.storedQuery?.advancedQueryValue) : null,
|
|
2653
|
-
grouped: this.isAdvancedSearch && this.filterPanelObject.allowGrouped && this.groupedQueryCtrl ? Object.assign({}, this.groupedQueryCtrl?.value) : null
|
|
2654
|
-
}
|
|
2648
|
+
type: this.getQueryType(),
|
|
2649
|
+
basic: this.storedQuery?.basicQueryValue ? Object.assign({}, this.storedQuery?.basicQueryValue) : null,
|
|
2650
|
+
advanced: this.storedQuery?.advancedQueryValue ? Object.assign({}, this.storedQuery?.advancedQueryValue) : null,
|
|
2651
|
+
grouped: this.isAdvancedSearch && this.filterPanelObject.allowGrouped && this.groupedQueryCtrl ? Object.assign({}, this.groupedQueryCtrl?.value) : null
|
|
2655
2652
|
};
|
|
2656
|
-
lastQuery
|
|
2657
|
-
lastQuery
|
|
2653
|
+
lastQuery = this.deleteFieldsWithoutValue(lastQuery);
|
|
2654
|
+
lastQuery = this.handleEmptyFieldsQuery(lastQuery);
|
|
2658
2655
|
this.lastQuery.emit(lastQuery);
|
|
2659
2656
|
}
|
|
2660
2657
|
}
|