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

Merge pull request #12033 from maxunbearable/fix/4772-chart-widget-hidden-column

Browse Source 
Fixed сhart widget not apply hidden datakey by default
This commit is contained in:
Andrew Shvayka 2024-11-18 16:53:40 +01:00 committed by GitHub
commit 0c160bf369
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart-widget.component.ts
View File

@ -112,6 +112,9 @@ export class TimeSeriesChartWidgetComponent implements OnInit, OnDestroy, AfterV
legendKey.dataKey.settings = mergeDeep<TimeSeriesChartKeySettings>({} as TimeSeriesChartKeySettings, legendKey.dataKey.settings = mergeDeep<TimeSeriesChartKeySettings>({} as TimeSeriesChartKeySettings,
timeSeriesChartKeyDefaultSettings, legendKey.dataKey.settings); timeSeriesChartKeyDefaultSettings, legendKey.dataKey.settings);
legendKey.dataKey.hidden = legendKey.dataKey.settings.dataHiddenByDefault; legendKey.dataKey.hidden = legendKey.dataKey.settings.dataHiddenByDefault;
if (this.settings.yAxes[legendKey.dataKey.settings.yAxisId]) {
this.settings.yAxes[legendKey.dataKey.settings.yAxisId].show = !legendKey.dataKey.settings.dataHiddenByDefault;
}
}); });
this.legendKeys = this.legendKeys.filter(legendKey => legendKey.dataKey.settings.showInLegend); this.legendKeys = this.legendKeys.filter(legendKey => legendKey.dataKey.settings.showInLegend);
if (!this.legendKeys.length) { if (!this.legendKeys.length) {