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

Timewindow: revert default values for useDashboardTimewindow and displayTimewindow

Browse Source
This commit is contained in:
Ekaterina Chantsova 2025-08-06 18:40:00 +03:00
parent 442c45524e
commit 88ec0f91d0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,8 +372,8 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, OnDe
this.advancedSettings = this.fb.group({}); this.advancedSettings = this.fb.group({});
if (widgetTypeCanHaveTimewindow(this.widgetType)) { if (widgetTypeCanHaveTimewindow(this.widgetType)) {
this.dataSettings.addControl('timewindowConfig', this.fb.control({ this.dataSettings.addControl('timewindowConfig', this.fb.control({
useDashboardTimewindow: this.widgetType !== widgetType.latest, useDashboardTimewindow: true,
displayTimewindow: this.widgetType !== widgetType.latest, displayTimewindow: true,
timewindow: null, timewindow: null,
timewindowStyle: null timewindowStyle: null
})); }));
@ -535,11 +535,11 @@ export class WidgetConfigComponent extends PageComponent implements OnInit, OnDe
); );
if (widgetTypeCanHaveTimewindow(this.widgetType)) { if (widgetTypeCanHaveTimewindow(this.widgetType)) {
const useDashboardTimewindow = isDefined(config.useDashboardTimewindow) ? const useDashboardTimewindow = isDefined(config.useDashboardTimewindow) ?
config.useDashboardTimewindow : this.widgetType !== widgetType.latest; config.useDashboardTimewindow : true;
this.dataSettings.get('timewindowConfig').patchValue({ this.dataSettings.get('timewindowConfig').patchValue({
useDashboardTimewindow, useDashboardTimewindow,
displayTimewindow: isDefined(config.displayTimewindow) ? displayTimewindow: isDefined(config.displayTimewindow) ?
config.displayTimewindow : this.widgetType !== widgetType.latest, config.displayTimewindow : true,
timewindow: isDefinedAndNotNull(config.timewindow) timewindow: isDefinedAndNotNull(config.timewindow)
? config.timewindow ? config.timewindow
: initModelFromDefaultTimewindow(null, this.widgetType === widgetType.latest, this.onlyHistoryTimewindow(), : initModelFromDefaultTimewindow(null, this.widgetType === widgetType.latest, this.onlyHistoryTimewindow(),