APervov/ui
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'BUR-67 скорректировал режим Авто, соед. линия рисуется корректно' (#27) from bur-67 into dev

Browse Source 
Reviewed-on: #27
This commit was merged in pull request #27.
This commit is contained in:
APervov
2026-07-07 21:25:48 +00:00
parent 1632bfb3d8 486221b980
commit 88d628b696
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/features/history-chart/HistoryChart.tsx
View File

@@ -28,8 +28,8 @@ type HistoryChartProps = {
const DAY_MS = 24 * 60 * 60 * 1000; const DAY_MS = 24 * 60 * 60 * 1000;
/** Определяет видимость соединительной avg-линии с учетом ручного режима и текущей грануляции. */ /** Определяет видимость соединительной avg-линии с учетом ручного режима и масштаба X-шкалы. */
function shouldShowAvgLine(mode: AvgLineMode, granulate: string): boolean { function shouldShowAvgLine(mode: AvgLineMode, range: HistoryZoomRange): boolean {
if (mode === 'show') { if (mode === 'show') {
return true; return true;
} }
@@ -38,7 +38,7 @@ function shouldShowAvgLine(mode: AvgLineMode, granulate: string): boolean {
return false; return false;
} }
return parseGranulateMs(granulate) < DAY_MS; return (range.tickIntervalMs ?? parseGranulateMs(range.granulate)) < DAY_MS;
} }
export function HistoryChart({ export function HistoryChart({
@@ -71,7 +71,7 @@ export function HistoryChart({
to: zoomRange.to, to: zoomRange.to,
tagLabels, tagLabels,
}); });
const showAvgLine = shouldShowAvgLine(avgLineMode, zoomRange.granulate); const showAvgLine = shouldShowAvgLine(avgLineMode, zoomRange);
const series = useHistoryChartSeries(lines, zoomRange.granulate, showAvgLine); const series = useHistoryChartSeries(lines, zoomRange.granulate, showAvgLine);
const legendData = useMemo(() => lines.map((line) => line.label), [lines]); const legendData = useMemo(() => lines.map((line) => line.label), [lines]);
const loading = lines.some((line) => line.loading); const loading = lines.some((line) => line.loading);