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

UI: Fixed incorrect apply timewindows after cancel edit dashboard

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2024-12-16 17:00:49 +02:00
parent 72ae3078f8
commit a7dbb4cc64
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui-ngx/src/app/modules/home/components/widget/widget-container.component.html
View File

@ -66,6 +66,7 @@
<div class="tb-widget-content" [class.tb-no-interaction]="disableWidgetInteraction"> <div class="tb-widget-content" [class.tb-no-interaction]="disableWidgetInteraction">
<tb-widget #widgetComponent <tb-widget #widgetComponent
[dashboardWidget]="widget" [dashboardWidget]="widget"
[widget]="widget.widget"
[isEdit]="isEdit" [isEdit]="isEdit"
[isPreview]="isPreview" [isPreview]="isPreview"
[isMobile]="isMobile" [isMobile]="isMobile"
@ -96,8 +97,8 @@
noMargin noMargin
noPadding noPadding
[isEdit]="isEdit" [isEdit]="isEdit"
[timewindowStyle]="widgetComponent.widget.config.timewindowStyle" [timewindowStyle]="widget.widget.config.timewindowStyle"
[(ngModel)]="widgetComponent.widget.config.timewindow" [(ngModel)]="widget.widget.config.timewindow"
(ngModelChange)="widgetComponent.onTimewindowChanged($event)"> (ngModelChange)="widgetComponent.onTimewindowChanged($event)">
</tb-timewindow> </tb-timewindow>
</div> </div>

6
ui-ngx/src/app/modules/home/components/widget/widget.component.ts
View File

@ -150,9 +150,11 @@ export class WidgetComponent extends PageComponent implements OnInit, OnChanges,
@Input() @Input()
dashboardWidget: DashboardWidget; dashboardWidget: DashboardWidget;
@Input()
widget: Widget;
@ViewChild('widgetContent', {read: ViewContainerRef, static: true}) widgetContentContainer: ViewContainerRef; @ViewChild('widgetContent', {read: ViewContainerRef, static: true}) widgetContentContainer: ViewContainerRef;
widget: Widget;
widgetInfo: WidgetInfo; widgetInfo: WidgetInfo;
errorMessages: string[]; errorMessages: string[];
widgetContext: WidgetContext; widgetContext: WidgetContext;
@ -223,8 +225,6 @@ export class WidgetComponent extends PageComponent implements OnInit, OnChanges,
this.loadingData = true; this.loadingData = true;
this.widget = this.dashboardWidget.widget;
const actionDescriptorsBySourceId: {[actionSourceId: string]: Array<WidgetActionDescriptor>} = {}; const actionDescriptorsBySourceId: {[actionSourceId: string]: Array<WidgetActionDescriptor>} = {};
if (this.widget.config.actions) { if (this.widget.config.actions) {
for (const actionSourceId of Object.keys(this.widget.config.actions)) { for (const actionSourceId of Object.keys(this.widget.config.actions)) {