优化:查询按范围分步加载并精简表格聚合
This commit is contained in:
+32
-18
@@ -1,3 +1,5 @@
|
||||
import { usePriorityMetrics } from './usePriorityMetrics';
|
||||
import { overviewTrend, sameTrendScope } from './priorityMetrics';
|
||||
import { QuerySnapshotButton } from './QuerySnapshotButton';
|
||||
import { loadedQueryScope, queryForLocation, readQueryLocation } from './queryLoadingScope';
|
||||
import { AnimatedMetricText, SmoothTableFrame, useAnimatedMetricText, useRetainedResult } from './QueryResultMotion';
|
||||
@@ -413,7 +415,10 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
setDrilledProduct('');
|
||||
}, [drilldownContextKey]);
|
||||
const metricParams = useMemo<QueryParams>(() => ({ ...queryParams, trendGranularity: 'month' }), [queryParams]);
|
||||
const metricKey = useMemo(() => JSON.stringify(metricParams), [metricParams]);
|
||||
const metricKey = useMemo(() => JSON.stringify([metricParams, queryRevision]), [metricParams, queryRevision]);
|
||||
const metricsReady = !!(initialQuery.releaseId || currentReleaseId !== undefined) && (!metricParams.productSearch || !!options);
|
||||
const overview = usePriorityMetrics(metricParams, active && metricsReady, queryRevision, onUnauthorized);
|
||||
const currentOverview = overview.value;
|
||||
const currentMetricsError = errorKey === metricKey ? error : '';
|
||||
const currentMetricsData = dataKey === metricKey && !currentMetricsError ? data : null;
|
||||
const queryPending = !currentMetricsData && !currentMetricsError;
|
||||
@@ -429,7 +434,10 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
}, [queryKey, trendObject, trendGranularity, view]);
|
||||
const defectQueryParams = useMemo<QueryParams>(() => applyTrendObject(queryParams, trendObject, view), [queryKey, trendObject, view]);
|
||||
const defectQueryKey = JSON.stringify(defectQueryParams);
|
||||
const trendKey = JSON.stringify(trendParams);
|
||||
const trendKey = JSON.stringify([trendParams, queryRevision]);
|
||||
const reuseOverviewTrend = sameTrendScope(metricParams, trendParams);
|
||||
const trendGate = !overview.split && !reuseOverviewTrend || overview.settled;
|
||||
const sharedTrend = reuseOverviewTrend ? currentOverview : null;
|
||||
const trendKeyRef = useRef(trendKey);
|
||||
trendKeyRef.current = trendKey;
|
||||
|
||||
@@ -447,12 +455,15 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
}, [queryKey, active]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!active || optionsLoading || optionsError) return;
|
||||
if (!active || !metricsReady || !overview.settled) return;
|
||||
if (currentOverview && !overview.split) {
|
||||
setData(currentOverview); setDataKey(metricKey); setLoading(false); setError(''); setErrorKey(''); return;
|
||||
}
|
||||
const controller = new AbortController();
|
||||
setLoading(true);
|
||||
setError('');
|
||||
setErrorKey('');
|
||||
api.metrics(metricParams, controller.signal).then(result => {
|
||||
(metricParams.view === 'overall' ? api.metrics : api.metricsTable)(metricParams, controller.signal).then(result => {
|
||||
if (controller.signal.aborted || metricKeyRef.current !== metricKey) return;
|
||||
setData(result);
|
||||
setDataKey(metricKey);
|
||||
@@ -465,7 +476,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
setErrorKey(metricKey);
|
||||
}).finally(() => { if (!controller.signal.aborted) setLoading(false); });
|
||||
return () => controller.abort();
|
||||
}, [active, metricKey, queryRevision, onUnauthorized, optionsLoading, optionsError]);
|
||||
}, [active, metricKey, queryRevision, onUnauthorized, metricsReady, overview.settled, overview.split, currentOverview]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!active) return;
|
||||
@@ -479,7 +490,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
setTrendObjectMetrics(null);
|
||||
setTrendObjectMetricsLoading(true);
|
||||
setTrendObjectMetricsError('');
|
||||
api.metrics({ ...defectQueryParams, trendGranularity: 'month' }, controller.signal)
|
||||
api.metrics({ ...defectQueryParams, view: 'overall', trendGranularity: 'month' }, controller.signal)
|
||||
.then(result => { if (!controller.signal.aborted) setTrendObjectMetrics({ key: defectQueryKey, data: result }); })
|
||||
.catch(errorValue => {
|
||||
if (controller.signal.aborted) return;
|
||||
@@ -490,8 +501,11 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
}, [active, trendObject, defectQueryKey, queryKey, queryRevision, onUnauthorized]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!active || optionsLoading || optionsError) return;
|
||||
if (!active || !metricsReady || !trendGate) return;
|
||||
setTrendFailure(null);
|
||||
if (sharedTrend) {
|
||||
setTrendData(overviewTrend(sharedTrend).trend); setTrendDataKey(trendKey); setTrendLoading(false); return;
|
||||
}
|
||||
const controller = new AbortController();
|
||||
setTrendLoading(true);
|
||||
api.trend(trendParams, controller.signal).then(result => {
|
||||
@@ -503,10 +517,10 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
if (!controller.signal.aborted && !onUnauthorized(errorValue)) setTrendFailure({ key: trendKey, message: chooseError(errorValue) });
|
||||
}).finally(() => { if (!controller.signal.aborted) setTrendLoading(false); });
|
||||
return () => controller.abort();
|
||||
}, [active, trendKey, queryRevision, trendRevision, onUnauthorized, optionsLoading, optionsError]);
|
||||
}, [active, trendKey, queryRevision, trendRevision, onUnauthorized, metricsReady, trendGate, sharedTrend]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!active || optionsLoading || optionsError) return;
|
||||
if (!active || !metricsReady || !overview.settled) return;
|
||||
let alive = true;
|
||||
setTrendTarget(null);
|
||||
setTrendTargetKey('');
|
||||
@@ -525,7 +539,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
}
|
||||
});
|
||||
return () => { alive = false; };
|
||||
}, [active, trendKey, queryRevision, trendRevision, onUnauthorized, optionsLoading, optionsError]);
|
||||
}, [active, trendKey, queryRevision, trendRevision, onUnauthorized, metricsReady, overview.settled]);
|
||||
|
||||
const currentTrendTarget = trendTargetKey === trendKey ? trendTarget : null;
|
||||
const visibleTrendData = useMemo(() => fullYearTrend(trendDataKey === trendKey ? trendData : [], year, trendGranularity), [trendData, trendDataKey, trendKey, year, trendGranularity]);
|
||||
@@ -646,8 +660,8 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
);
|
||||
|
||||
const activeDefectData = trendObject
|
||||
? defectQueryKey === queryKey ? currentMetricsData : trendObjectMetrics?.key === defectQueryKey ? trendObjectMetrics.data : null
|
||||
: currentMetricsData;
|
||||
? defectQueryKey === queryKey ? currentOverview || currentMetricsData : trendObjectMetrics?.key === defectQueryKey ? trendObjectMetrics.data : null
|
||||
: currentOverview || currentMetricsData;
|
||||
const previousDefectSnapshot = useRef<{ data: MetricsResponse; query: QueryParams } | null>(null);
|
||||
useLayoutEffect(() => {
|
||||
if (activeDefectData) previousDefectSnapshot.current = { data: activeDefectData, query: defectQueryParams };
|
||||
@@ -656,7 +670,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
const displayedDefectQuery = activeDefectData ? defectQueryParams : previousDefectSnapshot.current?.query || defectQueryParams;
|
||||
const defectsRefreshing = !activeDefectData && (queryBusy || trendObjectMetricsLoading);
|
||||
// 产品月度下钻复用当前对象的服务端指标,汇总表仍保留父层结果供返回。
|
||||
const summaryMetricsData = drilledProduct ? activeDefectData : currentMetricsData;
|
||||
const summaryMetricsData = drilledProduct ? activeDefectData : currentOverview || currentMetricsData;
|
||||
const openRecords = useCallback((row: MetricRow | null, stage: Stage, selectedMonth?: number, sourceQuery?: QueryParams, sourceData?: MetricsResponse | null) => {
|
||||
const source = sourceData === undefined ? summaryMetricsData : sourceData;
|
||||
if (!source?.release?.id) { message.info('指标数据尚未就绪,请重新查询后打开来源明细。'); return; }
|
||||
@@ -665,7 +679,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
setSelectedRecord(row); setRecordStage(stage); setRecordMonth(selectedMonth); setRecordsOpen(true);
|
||||
}, [summaryMetricsData, drilledProduct, defectQueryParams, queryParams, view, message]);
|
||||
const summaryMetricsError = drilledProduct ? trendObjectMetricsError : currentMetricsError;
|
||||
const summaryBusy = drilledProduct ? trendObjectMetricsLoading || !summaryMetricsData && !summaryMetricsError : queryBusy;
|
||||
const summaryBusy = drilledProduct ? trendObjectMetricsLoading || !summaryMetricsData && !summaryMetricsError : !summaryMetricsData && queryBusy;
|
||||
const displayedSummaryData = useRetainedResult(summaryMetricsData);
|
||||
const rowForSummary = displayedSummaryData?.summary;
|
||||
const rawFormulaDescriptions = summaryMetricsData?.context.metricFormulaDescriptions;
|
||||
@@ -758,7 +772,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
</div>}
|
||||
</section>
|
||||
|
||||
{currentMetricsError && <Alert showIcon type="error" message={data ? "更新失败,当前显示上次结果" : "质量指标查询失败"} description={currentMetricsError} action={<Button size="small" icon={<ReloadOutlined />} onClick={() => setQueryRevision(value => value + 1)}>重试</Button>} />}
|
||||
{currentMetricsError && <Alert showIcon type="error" message={currentOverview ? "表格读取失败,指标已更新" : data ? "更新失败,当前显示上次结果" : "质量指标查询失败"} description={currentMetricsError} action={<Button size="small" icon={<ReloadOutlined />} onClick={() => setQueryRevision(value => value + 1)}>重试</Button>} />}
|
||||
{drilledProduct && summaryMetricsError && <Alert showIcon type="error" message="当前产品指标查询失败" description={summaryMetricsError} action={<Button size="small" onClick={() => setQueryRevision(value => value + 1)}>重试</Button>} />}
|
||||
<section className={`metric-strip ${!displayedSummaryData ? 'query-awaiting-data' : ''}`} data-snapshot-module="metrics" aria-label="质量指标" aria-busy={summaryBusy} inert={!summaryMetricsData}>
|
||||
<div className="rate-basis-control"><Segmented size="small" value={rateBasis} options={[{ label: '原口径', value: 'original' }, { label: '去本部报废', value: 'withoutHeadquartersScrap' }]} onChange={value => setRateBasis(value as typeof rateBasis)} aria-label="合格率口径" /></div>
|
||||
@@ -858,7 +872,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
</section>;
|
||||
})}
|
||||
</div>
|
||||
{displayedDefectData ? <DefectParetoPanel releaseId={displayedDefectData.release?.id} query={displayedDefectQuery} refreshKey={queryRevision} pending={defectsRefreshing} externalScrapWeight={blackDefectItems.find(item => item.name === '外废')?.weight} onUnauthorized={onUnauthorized} /> : !defectsRefreshing && <div className="defect-pareto-status">不良数据暂不可用</div>}
|
||||
{displayedDefectData ? <DefectParetoPanel releaseId={displayedDefectData.release?.id} query={displayedDefectQuery} refreshKey={queryRevision} pending={defectsRefreshing||queryBusy} externalScrapWeight={blackDefectItems.find(item => item.name === '外废')?.weight} onUnauthorized={onUnauthorized} /> : !defectsRefreshing && <div className="defect-pareto-status">不良数据暂不可用</div>}
|
||||
</section>
|
||||
</div>
|
||||
</>
|
||||
@@ -947,7 +961,7 @@ export function DefectParetoPanel({ releaseId, query, externalScrapWeight, onUna
|
||||
const showLoading = useDelayedIndicator(loading);
|
||||
|
||||
useEffect(() => {
|
||||
if (!active || !visible) return;
|
||||
if (!active || !visible || pending) return;
|
||||
if (!releaseId) { setResponses(null); setLoading(false); setError(''); return; }
|
||||
const controller = new AbortController();
|
||||
const base = { releaseId, ...fineQuery, mode: 'top', dimension: 'defect', limit: 100 };
|
||||
@@ -964,7 +978,7 @@ export function DefectParetoPanel({ releaseId, query, externalScrapWeight, onUna
|
||||
})
|
||||
.finally(() => { if (!controller.signal.aborted) setLoading(false); });
|
||||
return () => controller.abort();
|
||||
}, [active, visible, releaseId, fineQueryKey, onUnauthorized, onlyStage, refreshKey, externalScrapWeight]);
|
||||
}, [active, visible, pending, releaseId, fineQueryKey, onUnauthorized, onlyStage, refreshKey, externalScrapWeight]);
|
||||
|
||||
useEffect(() => {
|
||||
const refresh = () => setThemeRevision(value => value + 1);
|
||||
|
||||
Reference in New Issue
Block a user