From d95dbc5b9d301af5a24b59ff6794f3b3ebef6608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=BE=D0=B2=20=D0=90=D1=80=D1=82?= =?UTF-8?q?=D0=B5=D0=BC?= Date: Sun, 5 Jul 2026 04:13:23 +0300 Subject: [PATCH] =?UTF-8?q?BUR-35=20=D0=9F=D1=80=D0=B8=D0=B2=D0=B5=D0=BB?= =?UTF-8?q?=20=D0=BA=20=D1=81=D0=BE=D0=B3=D0=BB=D0=B0=D1=81=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D0=BE=D0=BC=D1=83=20=D1=86=D0=B2=D0=B5=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=D0=BE=D0=BC=D1=83=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8E=20=D0=B3=D1=80=D0=B0=D1=84?= =?UTF-8?q?=D0=B8=D0=BA,=20=D0=BB=D0=B5=D0=B3=D0=B5=D0=BD=D0=B4=D1=83=20?= =?UTF-8?q?=D0=B8=20=D1=82=D1=83=D0=BB=D1=82=D0=B8=D0=BF.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/features/history-chart/chartTypes.ts | 1 + src/features/history-chart/historyChartFormat.ts | 2 +- src/features/history-chart/historyChartOptions.ts | 3 +++ src/features/history-chart/historyChartSeries.ts | 6 +++++- src/styles/charts.css | 12 +++++++++++- 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/features/history-chart/chartTypes.ts b/src/features/history-chart/chartTypes.ts index dd02491..ec9d243 100644 --- a/src/features/history-chart/chartTypes.ts +++ b/src/features/history-chart/chartTypes.ts @@ -1,6 +1,7 @@ export type AvgPointValue = [time: number, avg: number, min: number, max: number, count: number]; export type TooltipParam = { + color?: string; marker?: string; seriesName?: string; value?: unknown; diff --git a/src/features/history-chart/historyChartFormat.ts b/src/features/history-chart/historyChartFormat.ts index a86bfa0..aeb4a74 100644 --- a/src/features/history-chart/historyChartFormat.ts +++ b/src/features/history-chart/historyChartFormat.ts @@ -89,7 +89,7 @@ export function formatTooltip(params: unknown): string { const value = item.value as AvgPointValue; return [ '
', - `${item.marker ?? ''}${item.seriesName ?? ''}`, + `${item.seriesName ?? ''}`, '', `min ${formatChartValue(value[2])} · avg ${formatChartValue(value[1])} · max ${formatChartValue(value[3])}`, value[4] > 1 ? ` · ${value[4]} точек` : '', diff --git a/src/features/history-chart/historyChartOptions.ts b/src/features/history-chart/historyChartOptions.ts index 0ff826c..8a29bcd 100644 --- a/src/features/history-chart/historyChartOptions.ts +++ b/src/features/history-chart/historyChartOptions.ts @@ -45,6 +45,9 @@ export function createHistoryChartOptions({ legend: { type: 'scroll', top: 0, + icon: 'rect', + itemWidth: 18, + itemHeight: 3, data: legendData, textStyle: { color: '#cbd5e1' }, }, diff --git a/src/features/history-chart/historyChartSeries.ts b/src/features/history-chart/historyChartSeries.ts index 9637aab..325e82c 100644 --- a/src/features/history-chart/historyChartSeries.ts +++ b/src/features/history-chart/historyChartSeries.ts @@ -93,7 +93,11 @@ export function createSeriesOptions(points: HistoryPoint[], index: number, label color, }, emphasis: { - focus: 'series', + disabled: true, + lineStyle: { + width: 1.8, + color, + }, }, z: 3, }, diff --git a/src/styles/charts.css b/src/styles/charts.css index 66bcfc2..46f8a77 100644 --- a/src/styles/charts.css +++ b/src/styles/charts.css @@ -36,7 +36,7 @@ margin-top: 5px; } -.chart-tooltip-row span { +.chart-tooltip-label { min-width: 0; overflow: hidden; color: #cbd5e1; @@ -44,6 +44,16 @@ white-space: nowrap; } +.chart-tooltip-label::before { + content: ''; + display: inline-block; + width: 18px; + height: 3px; + margin-right: 6px; + vertical-align: middle; + background: var(--chart-tooltip-marker-color, currentColor); +} + .chart-tooltip-row strong { color: #f8fafc; font-variant-numeric: tabular-nums;