3 Commits

3 changed files with 11 additions and 10 deletions

View File

@@ -41,7 +41,7 @@ function createAvgLineData(points: HistoryPoint[], granulate: string, breakOnGap
}
const previousTime = new Date(finitePoints[index - 1].time).getTime();
const hasAcceptableGap = currentTime - previousTime <= slotMs * 24;
const hasAcceptableGap = currentTime - previousTime <= slotMs * 50;
return hasAcceptableGap ? [currentPoint] : [null, currentPoint];
});

View File

@@ -56,7 +56,12 @@ export function formatAxisDate(value: number, labelFormat: HistoryAxisLabelForma
function formatChartValue(value: number): string {
return new Intl.NumberFormat('ru-RU', {
maximumFractionDigits: Math.abs(value) >= 100 ? 2 : 3,
maximumFractionDigits:
Math.abs(value) >= 1000 ? 0
: Math.abs(value) >= 100 ? 1
: Math.abs(value) >= 10 ? 2
: Math.abs(value) >= 1 ? 3
: 4,
}).format(value);
}
@@ -141,7 +146,8 @@ export function formatTooltip(params: unknown): string {
return '';
}
const header = formatTooltipInterval(firstValue);
const time = firstValue[0];
const header = formatTooltipDateTime(time);
const rows = avgItems.map((item) => {
const value = item.value as AvgPointValue;
@@ -149,8 +155,7 @@ export function formatTooltip(params: unknown): string {
'<div class="chart-tooltip-row">',
`<span class="chart-tooltip-label" style="--chart-tooltip-marker-color:${item.color ?? 'currentColor'};">${item.seriesName ?? ''}</span>`,
'<strong>',
formatTooltipValue(value),
value[4] > 1 ? ` · ${value[4]} точек` : '',
formatChartValue(value[1]),
'</strong>',
'</div>',
].join('');

View File

@@ -76,10 +76,6 @@
border-radius: var(--radius);
}
.chart-tooltip {
min-width: 240px;
}
.chart-tooltip-title {
margin-bottom: 8px;
color: #e5e7eb;
@@ -88,7 +84,7 @@
.chart-tooltip-row {
display: grid;
grid-template-columns: minmax(90px, 1fr) auto;
grid-template-columns: 1fr auto;
align-items: center;
gap: 14px;
margin-top: 5px;