@indigina/ui-kit 1.1.174 → 1.1.176
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.
|
@@ -6855,7 +6855,7 @@ class KitGridUrlStateService {
|
|
|
6855
6855
|
sort: params?.sort && JSON.parse(params.sort),
|
|
6856
6856
|
filter: params?.filter && JSON.parse(params.filter),
|
|
6857
6857
|
search: params?.search,
|
|
6858
|
-
columns:
|
|
6858
|
+
columns: params?.columns && JSON.parse(params.columns),
|
|
6859
6859
|
};
|
|
6860
6860
|
}
|
|
6861
6861
|
setGridStateToUrl(state) {
|
|
@@ -6865,6 +6865,7 @@ class KitGridUrlStateService {
|
|
|
6865
6865
|
search: state.search,
|
|
6866
6866
|
sort: JSON.stringify(state.sort),
|
|
6867
6867
|
filter: JSON.stringify(state.filter),
|
|
6868
|
+
columns: JSON.stringify(state.columns),
|
|
6868
6869
|
};
|
|
6869
6870
|
this.router.navigate([], {
|
|
6870
6871
|
relativeTo: this.activatedRoute,
|
|
@@ -7606,12 +7607,13 @@ class KitGridViewsComponent {
|
|
|
7606
7607
|
const reset = this.needToResetQueryParams();
|
|
7607
7608
|
const useViewState = reset || urlState.skip === undefined;
|
|
7608
7609
|
const defaults = this.defaultGridState;
|
|
7610
|
+
const defaultColumns = buildGridColumns(defaults.columns, viewState.columns ?? defaults.columns);
|
|
7609
7611
|
const state = {
|
|
7610
7612
|
skip: urlState.skip ?? defaults.skip,
|
|
7611
7613
|
take: urlState.take ?? defaults.take,
|
|
7612
7614
|
sort: useViewState ? viewState.sort ?? defaults.sort : urlState.sort ?? [],
|
|
7613
7615
|
filter: convertFilterStringDate(useViewState ? viewState.filter ?? [] : urlState.filter ?? []),
|
|
7614
|
-
columns:
|
|
7616
|
+
columns: reset ? defaultColumns : (urlState.columns ?? defaultColumns),
|
|
7615
7617
|
search: urlState.search,
|
|
7616
7618
|
};
|
|
7617
7619
|
if (reset) {
|