Browse Source

UI: refactoring

pull/6475/head
fe-dev 4 years ago
parent
commit
863200d6e7
  1. 2
      ui-ngx/src/app/modules/home/components/entity/entities-table.component.html
  2. 6
      ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts

2
ui-ngx/src/app/modules/home/components/entity/entities-table.component.html

@ -262,7 +262,7 @@
class="no-data-found">{{ 'common.loading' | translate }}</span>
</div>
<mat-divider *ngIf="displayPagination"></mat-divider>
<mat-paginator [fxShow]="displayPagination"
<mat-paginator *ngIf="displayPagination"
[length]="dataSource.total() | async"
[pageIndex]="pageLink.page"
[pageSize]="pageLink.pageSize"

6
ui-ngx/src/app/modules/home/components/entity/entities-table.component.ts

@ -295,8 +295,10 @@ export class EntitiesTableComponent extends PageComponent implements IEntitiesTa
if (this.pageMode) {
this.route.queryParams.pipe(skip(1)).subscribe((params: PageQueryParam) => {
this.paginator.pageIndex = Number(params.page) || 0;
this.paginator.pageSize = Number(params.pageSize) || this.defaultPageSize;
if (this.displayPagination) {
this.paginator.pageIndex = Number(params.page) || 0;
this.paginator.pageSize = Number(params.pageSize) || this.defaultPageSize;
}
this.sort.active = params.property || this.entitiesTableConfig.defaultSortOrder.property;
this.sort.direction = (params.direction || this.entitiesTableConfig.defaultSortOrder.direction).toLowerCase() as SortDirection;
if (params.hasOwnProperty('textSearch') && !isEmptyStr(params.textSearch)) {

Loading…
Cancel
Save