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

UI: Fix binding to dashboard timewindow for widgets group within state widget

Browse Source
This commit is contained in:
Ekaterina Chantsova 2022-07-08 14:54:24 +03:00
parent 1c6c0e1f74
commit f9cc85d5a8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-ngx/src/app/modules/home/components/dashboard-page/layout/dashboard-layout.component.ts
View File

@ -27,7 +27,7 @@ import {
IDashboardComponent, IDashboardComponent,
WidgetContextMenuItem WidgetContextMenuItem
} from '@home/models/dashboard-component.models'; } from '@home/models/dashboard-component.models';
import { Subscription } from 'rxjs'; import { merge, Subscription } from 'rxjs';
import { Hotkey } from 'angular2-hotkeys'; import { Hotkey } from 'angular2-hotkeys';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { ItemBufferService } from '@app/core/services/item-buffer.service'; import { ItemBufferService } from '@app/core/services/item-buffer.service';
@ -94,7 +94,11 @@ export class DashboardLayoutComponent extends PageComponent implements ILayoutCo
} }
ngOnInit(): void { ngOnInit(): void {
this.rxSubscriptions.push(this.dashboard.dashboardTimewindowChanged.subscribe( const dashboardTimewindowChanged = [this.dashboard.dashboardTimewindowChanged];
if (this.parentDashboard) {
dashboardTimewindowChanged.push(this.parentDashboard.dashboardTimewindowChanged);
}
this.rxSubscriptions.push(merge(...dashboardTimewindowChanged).subscribe(
(dashboardTimewindow) => { (dashboardTimewindow) => {
this.dashboardCtx.dashboardTimewindow = dashboardTimewindow; this.dashboardCtx.dashboardTimewindow = dashboardTimewindow;
this.dashboardCtx.runChangeDetection(); this.dashboardCtx.runChangeDetection();