Browse Source

Merge branch 'lts-4.2' into lts-4.3

pull/15851/head
Igor Kulikov 1 month ago
parent
commit
3b5b074b02
  1. 7
      ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-browse.component.scss
  2. 2
      ui-ngx/src/app/modules/home/home.component.html
  3. 3
      ui-ngx/src/app/modules/home/home.component.ts

7
ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-browse.component.scss

@ -359,14 +359,17 @@
}
}
// Filter chips row Design: 32px tall, no padding, centered
.tb-iot-hub-sort-row {
height: 32px;
min-height: 32px;
align-items: center;
padding: 0;
margin-top: 16px;
margin-bottom: 12px;
::ng-deep .mat-mdc-chip-set .mdc-evolution-chip-set__chips {
row-gap: 8px;
}
.mat-mdc-chip {
margin-top: 0;
margin-bottom: 0;

2
ui-ngx/src/app/modules/home/home.component.html

@ -78,7 +78,7 @@
<mat-progress-bar color="warn" style="z-index: 10; margin-bottom: -4px; width: 100%;" mode="indeterminate"
*ngIf="!hideLoadingBar && (isLoading$ | async)">
</mat-progress-bar>
<div tb-toast class="tb-main-content flex flex-1 flex-col">
<div #mainContent tb-toast class="tb-main-content flex flex-1 flex-col">
<router-outlet (activate)="activeComponentChanged($event)"></router-outlet>
</div>
</div>

3
ui-ngx/src/app/modules/home/home.component.ts

@ -58,6 +58,8 @@ export class HomeComponent extends PageComponent implements AfterViewInit, OnIni
@ViewChild('sidenav')
sidenav: MatSidenav;
@ViewChild('mainContent', { static: true }) mainContent: ElementRef<HTMLElement>;
@ViewChild('searchInput') searchInputField: ElementRef;
fullscreenEnabled = screenfull.isEnabled;
@ -136,6 +138,7 @@ export class HomeComponent extends PageComponent implements AfterViewInit, OnIni
activeComponentChanged(activeComponent: any) {
this.activeComponentService.setCurrentActiveComponent(activeComponent);
this.mainContent?.nativeElement?.scrollTo({ top: 0, left: 0 });
if (!this.activeComponent) {
setTimeout(() => {
this.updateActiveComponent(activeComponent);

Loading…
Cancel
Save