BUR-64 Убран loader с графика. Во время зума храним предыдущее состояние до тех пор, пока не пришла новая серия
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
|
||||||
|
import type { EChartsOption } from 'echarts';
|
||||||
import { getHistoryGranularity, type HistoryAxisLabelFormat } from '../../utils/historyGranularity';
|
import { getHistoryGranularity, type HistoryAxisLabelFormat } from '../../utils/historyGranularity';
|
||||||
import type { DataZoomEventBatch, DataZoomState, HistoryZoomRange } from './chartTypes';
|
import type { DataZoomEventBatch, DataZoomState, HistoryZoomRange } from './chartTypes';
|
||||||
import { HistoryChartArea } from './HistoryChartArea';
|
import { HistoryChartArea } from './HistoryChartArea';
|
||||||
@@ -139,6 +140,7 @@ export function HistoryChart({
|
|||||||
const baseRangeRef = useRef(baseRange);
|
const baseRangeRef = useRef(baseRange);
|
||||||
const zoomRangeRef = useRef(zoomRange);
|
const zoomRangeRef = useRef(zoomRange);
|
||||||
const zoomTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
const zoomTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||||
|
const lastReadyOptionRef = useRef<EChartsOption | null>(null);
|
||||||
const lines = useHistoryChartQueries({
|
const lines = useHistoryChartQueries({
|
||||||
edge,
|
edge,
|
||||||
from: zoomRange.from,
|
from: zoomRange.from,
|
||||||
@@ -150,6 +152,7 @@ export function HistoryChart({
|
|||||||
const series = useHistoryChartSeries(lines, zoomRange.granulate);
|
const series = useHistoryChartSeries(lines, zoomRange.granulate);
|
||||||
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);
|
||||||
|
const hasData = series.length > 0;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
baseRangeRef.current = baseRange;
|
baseRangeRef.current = baseRange;
|
||||||
@@ -184,6 +187,18 @@ export function HistoryChart({
|
|||||||
[baseRange, legendData, series, zoomRange],
|
[baseRange, legendData, series, zoomRange],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// Во время lazy-загрузки нового zoom-диапазона оставляем на экране последний готовый график.
|
||||||
|
// Так canvas не заменяется loader-ом и пользователь не теряет визуальный контекст.
|
||||||
|
const fallbackOption = loading && !hasData ? lastReadyOptionRef.current : null;
|
||||||
|
const displayOption = fallbackOption ?? option;
|
||||||
|
const displayHasData = hasData || Boolean(fallbackOption);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (hasData) {
|
||||||
|
lastReadyOptionRef.current = option;
|
||||||
|
}
|
||||||
|
}, [hasData, option]);
|
||||||
|
|
||||||
const handleDataZoom = useCallback((event: DataZoomEventBatch) => {
|
const handleDataZoom = useCallback((event: DataZoomEventBatch) => {
|
||||||
const state = (event.batch ?? [event]).find(isXAxisDataZoom);
|
const state = (event.batch ?? [event]).find(isXAxisDataZoom);
|
||||||
|
|
||||||
@@ -211,10 +226,10 @@ export function HistoryChart({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<HistoryChartArea
|
<HistoryChartArea
|
||||||
hasData={series.length > 0}
|
hasData={displayHasData}
|
||||||
hasSelection={tags.length > 0}
|
hasSelection={tags.length > 0}
|
||||||
loading={loading}
|
loading={loading}
|
||||||
option={option}
|
option={displayOption}
|
||||||
onDataZoom={handleDataZoom}
|
onDataZoom={handleDataZoom}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ export function HistoryChartArea({
|
|||||||
return <div className="chart-placeholder">Разверните список показателей и выберите серию для графика</div>;
|
return <div className="chart-placeholder">Разверните список показателей и выберите серию для графика</div>;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (loading) {
|
if (!hasData && loading) {
|
||||||
return <div className="chart-placeholder">Загрузка графика...</div>;
|
return <div className="chart-placeholder">Загрузка графика...</div>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useMemo } from 'react';
|
import { useMemo } from 'react';
|
||||||
import { useQueries } from '@tanstack/react-query';
|
import { keepPreviousData, useQueries } from '@tanstack/react-query';
|
||||||
import { getHistory } from '../../entities/history/api';
|
import { getHistory } from '../../entities/history/api';
|
||||||
import type { HistoryPoint } from '../../entities/history/types';
|
import type { HistoryPoint } from '../../entities/history/types';
|
||||||
|
|
||||||
@@ -35,6 +35,7 @@ export function useHistoryChartQueries({
|
|||||||
queryKey: ['history', edge, tag, from, to, granulate],
|
queryKey: ['history', edge, tag, from, to, granulate],
|
||||||
queryFn: ({ signal }: { signal: AbortSignal }) => getHistory({ edge, tag, from, to, granulate }, signal),
|
queryFn: ({ signal }: { signal: AbortSignal }) => getHistory({ edge, tag, from, to, granulate }, signal),
|
||||||
enabled,
|
enabled,
|
||||||
|
placeholderData: keepPreviousData,
|
||||||
})),
|
})),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user