优化:查询按范围分步加载并精简表格聚合

This commit is contained in:
2026-11-14 12:34:50 +08:00
parent 381901184c
commit 374f08c526
11 changed files with 301 additions and 42 deletions
+32 -18
View File
@@ -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);
+19 -11
View File
@@ -1,3 +1,5 @@
import { usePriorityMetrics } from './usePriorityMetrics';
import { overviewTrend, sameTrendScope } from './priorityMetrics';
import { QuerySnapshotButton } from './QuerySnapshotButton';
import { loadedQueryScope, queryForLocation } from './queryLoadingScope';
import { SmoothTableFrame, useRetainedResult } from './QueryResultMotion';
@@ -72,17 +74,22 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU
const appliedReady=!!applied&&queryReady(applied);
// Apply organizational/source filters directly, like the other query pages. Product text search keeps its explicit submit.
useEffect(()=>{if(active&&draftReady)setApplied(previous=>JSON.stringify(previous)===JSON.stringify(draft)?previous:draft);},[active,draft,draftReady]);
const queryKey=JSON.stringify({query:applied,revision});const current=response?.key===queryKey?response.value:null;const error=failure?.key===queryKey?failure.message:'';
const queryKey=JSON.stringify({query:applied,revision,refreshKey});const current=response?.key===queryKey?response.value:null;const error=failure?.key===queryKey?failure.message:'';
const overview=usePriorityMetrics(applied,active&&appliedReady,JSON.stringify([revision,refreshKey]),onUnauthorized);
const currentSummary=overview.value||current;
useEffect(()=>{
if(!active||!applied||!appliedReady)return;const controller=new AbortController();setLoading(true);setFailure(null);
void api.metrics(applied,controller.signal).then(value=>{if(!controller.signal.aborted)setResponse({key:queryKey,value});}).catch(e=>{if(!controller.signal.aborted&&!onUnauthorized(e))setFailure({key:queryKey,message:e instanceof Error?e.message:'查询失败'});}).finally(()=>{if(!controller.signal.aborted)setLoading(false);});
if(!active||!applied||!appliedReady||!overview.settled)return;if(overview.value&&!overview.split){setResponse({key:queryKey,value:overview.value});setLoading(false);setFailure(null);return;}const controller=new AbortController();setLoading(true);setFailure(null);
void api.metricsTable(applied,controller.signal).then(value=>{if(!controller.signal.aborted)setResponse({key:queryKey,value});}).catch(e=>{if(!controller.signal.aborted&&!onUnauthorized(e))setFailure({key:queryKey,message:e instanceof Error?e.message:'查询失败'});}).finally(()=>{if(!controller.signal.aborted)setLoading(false);});
return()=>controller.abort();
},[active,queryKey,onUnauthorized,appliedReady]);
},[active,queryKey,onUnauthorized,appliedReady,overview.settled,overview.split,overview.value]);
useEffect(()=>{if(!active||!applied)return;const bytes=new TextEncoder().encode(JSON.stringify({query:queryForLocation(applied,initial.releaseId)}));const encoded=btoa(Array.from(bytes,b=>String.fromCharCode(b)).join('')).replace(/=/g,'').replace(/\+/g,'-').replace(/\//g,'_');const url=`?page=${stage==='black'?'blackProduct':'brightProduct'}&context=${encoded}`;window.history.replaceState({},'',`${location.pathname}${url}`);onLocationChange(url);},[active,applied,stage]);
const trendQuery=useMemo(()=>applied?{...applied,month:undefined,quarter:undefined,...(trendGranularity==='year'?{year:undefined}:{}),trendGranularity}:null,[applied,trendGranularity]);
const trendKey=JSON.stringify({query:trendQuery,revision});
const trendKey=JSON.stringify({query:trendQuery,revision,refreshKey});
const trendReady=!!trendQuery&&queryReady(trendQuery);
useEffect(()=>{if(!active||!trendQuery||!trendReady)return;const controller=new AbortController();setTrendLoading(true);setTrendError('');void api.trend(trendQuery,controller.signal).then(value=>{if(!controller.signal.aborted)setTrendResponse({key:trendKey,value,query:trendQuery});}).catch(error=>{if(!controller.signal.aborted&&!onUnauthorized(error))setTrendError(error instanceof Error?error.message:'趋势读取失败');}).finally(()=>{if(!controller.signal.aborted)setTrendLoading(false);});return()=>controller.abort();},[active,trendKey,trendRevision,onUnauthorized,trendReady]);
const reuseOverviewTrend=!!applied&&!!trendQuery&&sameTrendScope(applied,trendQuery);
const trendGate=!overview.split&&!reuseOverviewTrend||overview.settled;
const sharedTrend=reuseOverviewTrend?overview.value:null;
useEffect(()=>{if(!active||!trendQuery||!trendReady||!trendGate)return;if(sharedTrend){setTrendResponse({key:trendKey,value:overviewTrend(sharedTrend),query:trendQuery});setTrendLoading(false);setTrendError('');return;}const controller=new AbortController();setTrendLoading(true);setTrendError('');void api.trend(trendQuery,controller.signal).then(value=>{if(!controller.signal.aborted)setTrendResponse({key:trendKey,value,query:trendQuery});}).catch(error=>{if(!controller.signal.aborted&&!onUnauthorized(error))setTrendError(error instanceof Error?error.message:'趋势读取失败');}).finally(()=>{if(!controller.signal.aborted)setTrendLoading(false);});return()=>controller.abort();},[active,trendKey,trendRevision,onUnauthorized,trendReady,trendGate,sharedTrend]);
const visibleTrend=useMemo(()=>fullYearTrend(trendResponse?.key===trendKey?trendResponse.value.trend:[],applied?.year||year,trendGranularity),[trendResponse,trendKey,applied?.year,year,trendGranularity]);
const displayedTrend=useRetainedResult(trendResponse?.key===trendKey?visibleTrend:null)||visibleTrend;
const selectedTrendPeriod=trendGranularity==='month'&&applied?.month
@@ -116,8 +123,9 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU
const defectDrill=useDefectDrilldown({active,mode:trendMode,stage,query:{...(applied||draft),releaseId:current?.release?.id||applied?.releaseId},trendQuery:trendQuery||draft,
tableQuery:drilledProduct?(trendQuery||draft):(applied||draft),tableDimension:drilledProduct?'period':'product',tableGranularity:trendGranularity,
refreshKey:JSON.stringify([refreshKey,revision]),onUnauthorized,display:defectDisplay,onDisplay:setDefectDisplay});
const summary=displayed?.data.summary[stage];const stageRate=stage==='bright'&&rateBasis==='withoutHeadquartersScrap'?summary?.rateWithoutHeadquartersScrap:summary?.rate;
const openDetail=(row:MetricRow|null,_stage:Stage,selectedMonth?:number)=>{if(!applied||!current?.release)return;setRecordVisible(true);setRecords({row,query:freezeSourceRecordsQuery(applied,current.release.id,drilledProduct?'overall':'product',row,selectedMonth)});};
const displayedSummary=useRetainedResult(currentSummary);
const summary=displayedSummary?.summary[stage];const stageRate=stage==='bright'&&rateBasis==='withoutHeadquartersScrap'?summary?.rateWithoutHeadquartersScrap:summary?.rate;
const openDetail=(row:MetricRow|null,_stage:Stage,selectedMonth?:number)=>{if(!applied||!currentSummary?.release)return;setRecordVisible(true);setRecords({row,query:freezeSourceRecordsQuery(applied,currentSummary.release.id,drilledProduct?'overall':'product',row,selectedMonth)});};
const runExport=async()=>{setExporting(true);try{await exporter.current?.exportExcel();}catch(e){message.error(e instanceof Error?e.message:'导出失败');}finally{setExporting(false);}};
const formulaKey=stage==='black'?'blackRate':rateBasis==='original'?'brightRate':'brightRateWithoutHeadquartersScrap';
return <div className="query-page stage-product-page">
@@ -141,8 +149,8 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU
{catalogMatchesDraft&&<StageSourceFilters stage={stage} fields={fields} query={draft} value={sourceFilters} onChange={setSourceFilters} onUnauthorized={onUnauthorized}/>}
</div>}
</section>
{error&&<Alert showIcon type="error" message={response?"更新失败,当前显示上次结果":"查询失败"} description={error} action={<Button onClick={()=>setRevision(v=>v+1)}>重试</Button>}/>}
<section className="metric-strip stage-metric-strip" data-snapshot-module="metrics" aria-label="质量指标" aria-busy={loading} inert={!current}>
{error&&<Alert showIcon type="error" message={overview.value?"表格读取失败,指标已更新":response?"更新失败,当前显示上次结果":"查询失败"} description={error} action={<Button onClick={()=>setRevision(v=>v+1)}>重试</Button>}/>}
<section className="metric-strip stage-metric-strip" data-snapshot-module="metrics" aria-label="质量指标" aria-busy={!currentSummary&&!error} inert={!currentSummary}>
{stage==='bright'&&<div className="rate-basis-control"><Segmented size="small" aria-label="合格率口径" value={rateBasis} options={[{label:'原口径',value:'original'},{label:'去本部报废',value:'withoutHeadquartersScrap'}]} onChange={v=>setRateBasis(v as typeof rateBasis)}/></div>}
<MetricCard primary stage={stage} label={`${label}合格率`} value={rate(stageRate)} onClick={()=>setBasisOpen(true)}/>
<MetricCard label="合格重量" value={`${weight(summary?.qualifiedWeight)} kg`} onClick={()=>openDetail(null,stage)}/>
@@ -187,7 +195,7 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU
{displayed&&<DefectParetoPanel releaseId={displayed.data.release?.id} query={displayed.query} pending={!current||loading} refreshKey={revision} onlyStage={stage} externalScrapWeight={stage==='black'?displayed.data.defects.black.find(item=>item.name==='外废')?.weight:undefined} onUnauthorized={onUnauthorized}/>}
</div>
</section></div>
<Modal open={basisOpen} title={`${label}计算口径`} onCancel={()=>setBasisOpen(false)} footer={<Button onClick={()=>setBasisOpen(false)}>关闭</Button>}><p>{readableMetricFormula((current?.context.metricFormulaDescriptions as Record<string,unknown>|undefined)?.[formulaKey])}</p></Modal>
<Modal open={basisOpen} title={`${label}计算口径`} onCancel={()=>setBasisOpen(false)} footer={<Button onClick={()=>setBasisOpen(false)}>关闭</Button>}><p>{readableMetricFormula((currentSummary?.context.metricFormulaDescriptions as Record<string,unknown>|undefined)?.[formulaKey])}</p></Modal>
{records&&<RecordsDrawer key={JSON.stringify(records)} open={recordVisible} row={records.row} query={records.query} stage={stage} lockedStage onStage={()=>{}} onClose={()=>setRecordVisible(false)} onUnauthorized={onUnauthorized}/>}
</div>;
}
+3
View File
@@ -271,6 +271,9 @@ export const api = {
metrics(params: QueryParams, signal?: AbortSignal) {
return request<MetricsResponse>(`/api/metrics?${toQuery(params)}`, { signal });
},
metricsTable(params: QueryParams, signal?: AbortSignal) {
return request<MetricsResponse>(`/api/metrics?${toQuery({ ...params, part: 'table' })}`, { signal });
},
trend(params: QueryParams, signal?: AbortSignal) {
return request<TrendResponse>(`/api/metrics/trend?${toQuery(params)}`, { signal });
},
+29
View File
@@ -0,0 +1,29 @@
import type { MetricsResponse, QueryParams, TrendResponse } from './types';
/** 仅调整分组视图,保留全部来源、期间和权限筛选。 */
export function overviewQuery(query: QueryParams): QueryParams {
return { ...query, view: 'overall' };
}
/** 宽范围产品表先取小型汇总;窄范围复用完整结果,避免额外往返。 */
export function splitMetricsLoad(query: QueryParams): boolean {
return query.view === 'product' && !query.month && !query.quarter && !query.product
&& !query.productSearch && !query.monthStart && !query.monthEnd;
}
function canonical(value: unknown): unknown {
if (Array.isArray(value)) return value.map(canonical);
if (value && typeof value === 'object') return Object.fromEntries(Object.entries(value)
.filter(([, item]) => item !== undefined).sort(([a], [b]) => a.localeCompare(b))
.map(([key, item]) => [key, canonical(item)]));
return value;
}
/** 筛选范围和粒度全部一致时,才复用服务端已计算的期间结果。 */
export function sameTrendScope(a: QueryParams, b: QueryParams): boolean {
return JSON.stringify(canonical(overviewQuery(a))) === JSON.stringify(canonical(overviewQuery(b)));
}
export function overviewTrend(value: MetricsResponse): TrendResponse {
return { release: value.release, context: value.context, trend: value.trend, coverage: value.coverage };
}
+24
View File
@@ -0,0 +1,24 @@
import { useEffect, useState } from 'react';
import { api } from './api';
import { overviewQuery, splitMetricsLoad } from './priorityMetrics';
import type { MetricsResponse, QueryParams } from './types';
/** 优先读取正式小型汇总;失败时允许后续正式查询独立回退。 */
export function usePriorityMetrics(query: QueryParams | null, enabled: boolean, refresh: string | number,
onUnauthorized: (error: unknown) => boolean) {
const key = JSON.stringify([query, refresh]);
const split = !!query && splitMetricsLoad(query);
const [result, setResult] = useState<{ key: string; value?: MetricsResponse; failed?: boolean } | null>(null);
useEffect(() => {
if (!enabled || !query) return;
const controller = new AbortController();
api.metrics(split ? overviewQuery(query) : query, controller.signal)
.then(value => { if (!controller.signal.aborted) setResult({ key, value }); })
.catch(error => {
if (!controller.signal.aborted && !onUnauthorized(error)) setResult({ key, failed: true });
});
return () => controller.abort();
}, [enabled, key, onUnauthorized]);
const current = enabled && result?.key === key ? result : null;
return { value: current?.value || null, settled: !!current, failed: !!current?.failed, split };
}
+104
View File
@@ -0,0 +1,104 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import fs from 'node:fs';
import ts from 'typescript';
import { overviewQuery, sameTrendScope, overviewTrend, splitMetricsLoad } from '../src/priorityMetrics.ts';
const query = { releaseId: 'r1', year: 2026, view: 'product', trendGranularity: 'month', stage: 'bright',
columnFilters: [{ field: 'customer', operator: 'contains', values: ['Acme'], stages: ['bright'] }] };
const tick = () => new Promise(resolve => setImmediate(resolve));
function fixture() {
const slots = [], effects = [], requests = []; let index = 0, dirty = false, pending = [];
const props = { query, enabled: true, refresh: 0 }; const unauthorized = [];
const hooks = {
useState(initial) { const n = index++; if (!(n in slots)) slots[n] = initial;
return [slots[n], value => { slots[n] = value; dirty = true; }]; },
useEffect(fn, deps) { const n = index++, old = effects[n];
if (!old || deps.some((d, i) => !Object.is(d, old.deps[i]))) pending.push(() => {
old?.cleanup?.(); effects[n] = { deps, cleanup: fn() };
}); },
};
const api = { metrics(params, signal) { let resolve, reject;
const promise = new Promise((r, j) => { resolve = r; reject = j; });
requests.push({ params, signal, resolve, reject }); return promise;
} };
const source = fs.readFileSync(new URL('../src/usePriorityMetrics.ts', import.meta.url), 'utf8');
const code = ts.transpileModule(source.slice(source.indexOf('export function')).replace('export function', 'function'),
{ compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText;
const hook = new Function('hooks', 'api', 'overviewQuery', 'splitMetricsLoad', `const {useState,useEffect}=hooks;${code};return usePriorityMetrics;`)(hooks, api, overviewQuery, splitMetricsLoad);
const onUnauthorized = error => { unauthorized.push(error); return error.status === 403; };
return { props, requests, unauthorized, render() { let result, count = 0; do {
dirty = false; index = 0; pending = []; result = hook(props.query, props.enabled, props.refresh, onUnauthorized);
pending.forEach(run => run()); assert.ok(++count < 10);
} while (dirty); return result; }, unmount() { effects.forEach(e => e?.cleanup?.()); } };
}
test('overview retains every source predicate and does not mutate the table query', () => {
const small = overviewQuery(query);
assert.deepEqual(small, { ...query, view: 'overall' }); assert.equal(query.view, 'product');
assert.equal(small.columnFilters, query.columnFilters);
});
test('trend reuse requires the same release, time range, grain, stage and all filters', () => {
assert.equal(sameTrendScope(query, { ...query, view: 'overall', month: undefined }), true);
for (const changed of [{ month: 1 }, { quarter: 2 }, { monthStart: 2, monthEnd: 5 }, { year: undefined },
{ releaseId: 'r2' }, { trendGranularity: 'quarter' }, { stage: 'black' }, { includeUnassigned: false },
{ product: 'P1' }, { extraFilters: { order: ['X'] } }, { columnFilters: [] }]) {
assert.equal(sameTrendScope(query, { ...query, ...changed }), false, JSON.stringify(changed));
}
assert.equal(sameTrendScope(query, Object.fromEntries(Object.entries(query).reverse())), true);
});
test('trend adapter uses the exact formal values and performs no rate arithmetic', () => {
const value = { release: { id: 'r1' }, context: {}, trend: [{ compositeRate: .123456789 }], coverage: {} };
assert.equal(overviewTrend(value).trend, value.trend);
});
test('priority gate opens immediately after the small server aggregate and stays closed while loading', async () => {
const f = fixture(); assert.equal(f.render().settled, false);
assert.equal(f.requests.length, 1); assert.equal(f.requests[0].params.view, 'overall');
const value = { release: { id: 'r1' }, summary: { compositeRate: .9 }, trend: [] };
f.requests[0].resolve(value); await tick(); const result = f.render();
assert.equal(result.settled, true); assert.equal(result.value, value);
f.render(); assert.equal(f.requests.length, 1); f.unmount();
});
test('year switches and refresh invalidate the gate and late old replies cannot replace the new result', async () => {
const f = fixture(); f.render(); f.props.query = { ...query, year: 2025 };
assert.equal(f.render().settled, false); assert.equal(f.requests[0].signal.aborted, true);
f.requests[0].resolve({ summary: 'old' }); await tick(); assert.equal(f.render().value, null);
f.requests[1].resolve({ summary: 'new' }); await tick(); assert.equal(f.render().value.summary, 'new');
f.props.refresh++; assert.equal(f.render().settled, false); assert.equal(f.requests.length, 3); f.unmount();
});
test('overview errors allow the regular query to retry independently', async () => {
const f = fixture(); f.render(); f.requests[0].reject(Error('temporary failure')); await tick();
assert.deepEqual(f.render(), { value: null, settled: true, failed: true, split: true }); f.unmount();
});
test('authorization failures do not unlock further requests', async () => {
const f = fixture(); f.render(); f.requests[0].reject({ status: 403 }); await tick();
assert.equal(f.render().settled, false); assert.equal(f.unauthorized.length, 1); f.unmount();
});
test('inactive pages neither start requests nor accept late results', async () => {
const f = fixture(); f.props.enabled = false; f.render(); assert.equal(f.requests.length, 0);
f.props.enabled = true; f.render(); f.props.enabled = false; f.render();
assert.equal(f.requests[0].signal.aborted, true); f.requests[0].resolve({ summary: 'late' });
await tick(); assert.equal(f.render().value, null); f.unmount();
});
test('narrow queries reuse a complete response rather than adding a summary round trip', async () => {
for (const change of [{month:2},{quarter:1},{product:'P'},{productSearch:'P'},{view:'department'},{view:'overall'}]) {
const f=fixture();f.props.query={...query,...change};const first=f.render();
assert.equal(first.split,false);assert.deepEqual(f.requests[0].params,f.props.query);
f.requests[0].resolve({summary:'full',rows:[1],trend:[2]});await tick();
assert.equal(f.render().value.rows.length,1);assert.equal(f.requests.length,1);f.unmount();
}
});
test('refresh generations cannot qualify retained old table and trend results as current', () => {
const source=name=>fs.readFileSync(new URL(`../src/${name}`,import.meta.url),'utf8');
const general=source('QueryPage.tsx');
const metricExpression=general.match(/const metricKey = useMemo\(\(\) => ([^;]+), \[metricParams, queryRevision\]\);/)[1];
const key=new Function('metricParams','queryRevision',`return ${metricExpression}`);
assert.notEqual(key(query,0),key(query,1));
const stage=source('StageProductPage.tsx');
const expression=stage.match(/const queryKey=([^;]+);/)[1];
const stageKey=new Function('applied','revision','refreshKey',`return ${expression}`);
assert.notEqual(stageKey(query,0,0),stageKey(query,0,1));
assert.notEqual(stageKey(query,0,0),stageKey(query,1,0));
});