From 15a88a90a31c7f03efe56d60ac1d43e4350818b8 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 13 Mar 2024 20:32:24 +0200 Subject: [PATCH] UI: time series chart - fix axis intervals calculation. --- .../widget/lib/chart/time-series-chart.ts | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts index 8e5fc4f305..521a3ce06e 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts @@ -55,7 +55,7 @@ import { measureYAxisNameWidth, toNamedData } from '@home/components/widget/lib/chart/echarts-widget.models'; -import { autoDateFormat, DateFormatProcessor } from '@shared/models/widget-settings.models'; +import { DateFormatProcessor } from '@shared/models/widget-settings.models'; import { isDefinedAndNotNull, isEqual, mergeDeep } from '@core/utils'; import { DataKey, Datasource, DatasourceType, widgetType } from '@shared/models/widget.models'; import * as echarts from 'echarts/core'; @@ -73,7 +73,7 @@ import { BarRenderSharedContext } from '@home/components/widget/lib/chart/time-s export class TbTimeSeriesChart { public static dataKeySettings(type = TimeSeriesChartType.default): DataKeySettingsFunction { - return (key, isLatestDataKey) => { + return (_key, isLatestDataKey) => { if (!isLatestDataKey) { const settings = mergeDeep({} as TimeSeriesChartKeySettings, timeSeriesChartKeyDefaultSettings); @@ -629,18 +629,6 @@ export class TbTimeSeriesChart { } } - private updateYAxisScale(axisList: TimeSeriesChartYAxis[]): boolean { - let changed = false; - for (const yAxis of axisList) { - const scaleYAxis = this.scaleYAxis(yAxis); - if (yAxis.option.scale !== scaleYAxis) { - yAxis.option.scale = scaleYAxis; - changed = true; - } - } - return changed; - } - private updateYAxisOffset(axisList: TimeSeriesChartYAxis[]): {offset: number; changed: boolean} { const result = {offset: 0, changed: false}; let width = 0; @@ -684,6 +672,21 @@ export class TbTimeSeriesChart { return result; } + private updateYAxisScale(axisList: TimeSeriesChartYAxis[]): boolean { + let changed = false; + for (const yAxis of axisList) { + const scaleYAxis = this.scaleYAxis(yAxis); + if (yAxis.option.scale !== scaleYAxis) { + yAxis.option.scale = scaleYAxis; + changed = true; + } + if (updateYAxisIntervals(this.timeSeriesChart, yAxis, this.yAxisEmpty(yAxis))) { + changed = true; + } + } + return changed; + } + private scaleYAxis(yAxis: TimeSeriesChartYAxis): boolean { const axisBarDataItems = this.dataItems.filter(d => d.yAxisId === yAxis.id && d.enabled && d.data.length && d.dataKey.settings.type === TimeSeriesChartSeriesType.bar);