dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5908 from vvlladd28/bug/persistent-page-link/page-mode

Browse Source 
[3.3.3] UI: Fixed persistent page link not correct init in pageMode disable
This commit is contained in:
Igor Kulikov 2022-01-17 15:00:48 +02:00 committed by GitHub
commit 275fda0a37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts
View File

@ -217,10 +217,17 @@ export class EntitiesTableComponent extends PageComponent implements IEntitiesTa
const routerQueryParams: PageQueryParam = this.route.snapshot.queryParams; const routerQueryParams: PageQueryParam = this.route.snapshot.queryParams;
let sortOrder: SortOrder = null; let sortOrder: SortOrder = null;
if (this.entitiesTableConfig.defaultSortOrder || routerQueryParams.hasOwnProperty('direction') || routerQueryParams.hasOwnProperty('property')) { if (this.pageMode) {
if (this.entitiesTableConfig.defaultSortOrder || routerQueryParams.hasOwnProperty('direction') || routerQueryParams.hasOwnProperty('property')) {
sortOrder = {
property: routerQueryParams?.property || this.entitiesTableConfig.defaultSortOrder.property,
direction: routerQueryParams?.direction || this.entitiesTableConfig.defaultSortOrder.direction
};
}
} else if (this.entitiesTableConfig.defaultSortOrder){
sortOrder = { sortOrder = {
property: routerQueryParams?.property || this.entitiesTableConfig.defaultSortOrder.property, property: this.entitiesTableConfig.defaultSortOrder.property,
direction: routerQueryParams?.direction || this.entitiesTableConfig.defaultSortOrder.direction direction: this.entitiesTableConfig.defaultSortOrder.direction
}; };
} }
@ -238,15 +245,17 @@ export class EntitiesTableComponent extends PageComponent implements IEntitiesTa
this.pageLink = new PageLink(10, 0, null, sortOrder); this.pageLink = new PageLink(10, 0, null, sortOrder);
} }
this.pageLink.pageSize = this.displayPagination ? this.defaultPageSize : MAX_SAFE_PAGE_SIZE; this.pageLink.pageSize = this.displayPagination ? this.defaultPageSize : MAX_SAFE_PAGE_SIZE;
if (routerQueryParams.hasOwnProperty('page')) { if (this.pageMode) {
this.pageLink.page = Number(routerQueryParams.page); if (routerQueryParams.hasOwnProperty('page')) {
} this.pageLink.page = Number(routerQueryParams.page);
if (routerQueryParams.hasOwnProperty('pageSize')) { }
this.pageLink.pageSize = Number(routerQueryParams.pageSize); if (routerQueryParams.hasOwnProperty('pageSize')) {
} this.pageLink.pageSize = Number(routerQueryParams.pageSize);
if (routerQueryParams.hasOwnProperty('textSearch') && !isEmptyStr(routerQueryParams.textSearch)) { }
this.textSearchMode = true; if (routerQueryParams.hasOwnProperty('textSearch') && !isEmptyStr(routerQueryParams.textSearch)) {
this.pageLink.textSearch = decodeURI(routerQueryParams.textSearch); this.textSearchMode = true;
this.pageLink.textSearch = decodeURI(routerQueryParams.textSearch);
}
} }
this.dataSource = this.entitiesTableConfig.dataSource(this.dataLoaded.bind(this)); this.dataSource = this.entitiesTableConfig.dataSource(this.dataLoaded.bind(this));
if (this.entitiesTableConfig.onLoadAction) { if (this.entitiesTableConfig.onLoadAction) {