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

UI: Improve time series charts ticks generator function.

Browse Source
This commit is contained in:
Igor Kulikov 2024-04-18 10:05:13 +03:00
parent fd7c7e9b51
commit 0f9aeaa697
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -974,18 +974,19 @@ export const createTimeSeriesYAxis = (units: string,
ticksFormatter = parseFunction(settings.ticksFormatter, ['value']); ticksFormatter = parseFunction(settings.ticksFormatter, ['value']);
} }
} }
let configuredTicksGenerator: TimeSeriesChartTicksGenerator;
let ticksGenerator: TimeSeriesChartTicksGenerator; let ticksGenerator: TimeSeriesChartTicksGenerator;
let minInterval: number; let minInterval: number;
let interval: number; let interval: number;
let splitNumber: number; let splitNumber: number;
if (settings.ticksGenerator) { if (settings.ticksGenerator) {
if (isFunction(settings.ticksGenerator)) { if (isFunction(settings.ticksGenerator)) {
ticksGenerator = settings.ticksGenerator as TimeSeriesChartTicksGenerator; configuredTicksGenerator = settings.ticksGenerator as TimeSeriesChartTicksGenerator;
} else if (settings.ticksGenerator.length) { } else if (settings.ticksGenerator.length) {
ticksGenerator = parseFunction(settings.ticksGenerator, ['extent', 'interval', 'niceTickExtent', 'intervalPrecision']); configuredTicksGenerator = parseFunction(settings.ticksGenerator, ['extent', 'interval', 'niceTickExtent', 'intervalPrecision']);
} }
} }
if (!ticksGenerator) { if (!configuredTicksGenerator) {
interval = settings.interval; interval = settings.interval;
if (isUndefinedOrNull(interval)) { if (isUndefinedOrNull(interval)) {
if (isDefinedAndNotNull(settings.splitNumber)) { if (isDefinedAndNotNull(settings.splitNumber)) {
@ -994,6 +995,11 @@ export const createTimeSeriesYAxis = (units: string,
minInterval = (1 / Math.pow(10, decimals)); minInterval = (1 / Math.pow(10, decimals));
} }
} }
} else {
ticksGenerator = (extent, ticksInterval, niceTickExtent, intervalPrecision) => {
const ticks = configuredTicksGenerator(extent, ticksInterval, niceTickExtent, intervalPrecision);
return ticks?.filter(tick => tick.value >= extent[0] && tick.value <= extent[1]);
};
} }
return { return {
id: settings.id, id: settings.id,