From d89bd2e451ebda9dcf26f8629a3914ba595fee6f Mon Sep 17 00:00:00 2001 From: lyun Date: Sun, 1 Nov 2026 13:38:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=97=B6=E4=BF=9D=E6=8C=81=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=B9=B6=E5=B9=B3=E6=BB=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/QueryPage.tsx | 66 +++++++++++-------- web/src/query-motion.css | 5 ++ web/src/styles.css | 2 +- .../defect_smooth_refresh.test.mjs | 47 +++++++++++++ 4 files changed, 91 insertions(+), 29 deletions(-) create mode 100644 web/verification/defect_smooth_refresh.test.mjs diff --git a/web/src/QueryPage.tsx b/web/src/QueryPage.tsx index df6888f..7a47317 100644 --- a/web/src/QueryPage.tsx +++ b/web/src/QueryPage.tsx @@ -346,6 +346,8 @@ export default function QueryPage({ page, onUnauthorized }: { const summaryExport = useRef<{ exportExcel: () => Promise }>(null); const [summaryExporting, setSummaryExporting] = useState(false); const trendSection = useRef(null); + const defectsSection = useRef(null); + const defectsHeight = useRef(0); const refreshSeen = useRef(refreshKey); useEffect(() => { if (active && refreshSeen.current !== refreshKey) { refreshSeen.current = refreshKey; setQueryRevision(value => value + 1); } @@ -412,7 +414,8 @@ export default function QueryPage({ page, onUnauthorized }: { const queryBusy = loading || queryPending; const metricKeyRef = useRef(metricKey); useLayoutEffect(() => { - if (currentMetricsData && tableContent.current) tableHeight.current = tableContent.current.getBoundingClientRect().height; + // CSS min-height uses layout pixels; DOM rectangles include workspace zoom. + if (currentMetricsData && tableContent.current) tableHeight.current = tableContent.current.offsetHeight; }, [currentMetricsData, fullFields, drilledProduct]); metricKeyRef.current = metricKey; const useSummaryTrend = period === 'year' && !trendObject && trendGranularity === 'month'; @@ -567,6 +570,9 @@ export default function QueryPage({ page, onUnauthorized }: { const captureTrendAnchor = useCallback(() => { trendAnchorTop.current = trendSection.current?.getBoundingClientRect().top ?? null; + // Keep enough document height while the downstream charts are replaced by + // loading content, otherwise the browser clamps scrollY before anchoring. + defectsHeight.current = defectsSection.current?.offsetHeight ?? 0; }, []); const selectTrendPeriod = useCallback((value: number | string) => { const raw = String(value); @@ -639,6 +645,13 @@ export default function QueryPage({ page, onUnauthorized }: { const activeDefectData = trendObject ? defectQueryKey === queryKey ? currentMetricsData : trendObjectMetrics?.key === defectQueryKey ? trendObjectMetrics.data : null : currentMetricsData; + const previousDefectSnapshot = useRef<{ data: MetricsResponse; query: QueryParams } | null>(null); + useLayoutEffect(() => { + if (activeDefectData) previousDefectSnapshot.current = { data: activeDefectData, query: defectQueryParams }; + }, [activeDefectData, defectQueryKey]); + const displayedDefectData = activeDefectData || previousDefectSnapshot.current?.data; + const displayedDefectQuery = activeDefectData ? defectQueryParams : previousDefectSnapshot.current?.query || defectQueryParams; + const defectsRefreshing = !activeDefectData && (queryBusy || trendObjectMetricsLoading); // 产品月度下钻复用当前对象的服务端指标,汇总表仍保留父层结果供返回。 const summaryMetricsData = drilledProduct ? activeDefectData : currentMetricsData; const openRecords = useCallback((row: MetricRow | null, stage: Stage, selectedMonth?: number, sourceQuery?: QueryParams, sourceData?: MetricsResponse | null) => { @@ -655,8 +668,8 @@ export default function QueryPage({ page, onUnauthorized }: { const compositeFormula = formulaDescriptions[rateBasis === 'original' ? 'compositeRate' : 'compositeRateWithoutHeadquartersScrap']; const brightFormula = formulaDescriptions[rateBasis === 'original' ? 'brightRate' : 'brightRateWithoutHeadquartersScrap']; const formulaText = readableMetricFormula; - const blackDefectItems = activeDefectData?.defects?.black || []; - const brightDefectItems = activeDefectData?.defects?.bright || []; + const blackDefectItems = displayedDefectData?.defects?.black || []; + const brightDefectItems = displayedDefectData?.defects?.bright || []; const organizationPaths = options?.organizationPaths || []; const organizationPathOptions = useMemo(() => { const departments = new Set(department); @@ -847,26 +860,24 @@ export default function QueryPage({ page, onUnauthorized }: {
点击期间筛选,再次点击可取消
-
+
+ {defectsRefreshing && 正在更新}
- {trendObjectMetricsLoading &&
正在更新当前趋势对象的不良数据
} {trendObjectMetricsError && } -
+
{(['black', 'bright'] as const).map(stage => { const items = stage === 'black' ? blackDefectItems : brightDefectItems; return

{stage === 'black' ? '黑片' : '亮片'}

- {trendObjectMetricsLoading || trendObjectMetricsError - ? null - : items.length - ? item.weight ?? 0))} onDetail={() => openRecords(null, stage, undefined, defectQueryParams, activeDefectData)} /> - : } + {items.length + ? item.weight ?? 0))} onDetail={() => openRecords(null, stage, undefined, defectQueryParams, activeDefectData)} /> + : !defectsRefreshing && }
; })}
- {currentMetricsData ? item.name === '外废')?.weight} onUnauthorized={onUnauthorized} /> :
{queryBusy ? '正在更新不良数据…' : '不良数据暂不可用'}
} + {displayedDefectData ? item.name === '外废')?.weight} onUnauthorized={onUnauthorized} /> : !defectsRefreshing &&
不良数据暂不可用
}
@@ -928,12 +939,12 @@ export function DefectBreakdown({ items, stage, totalWeight, maximum, onDetail } } -export function DefectParetoPanel({ releaseId, query, externalScrapWeight, onUnauthorized, onlyStage }: { - releaseId?: string; query: QueryParams; externalScrapWeight?: number | null; onUnauthorized: (error: unknown) => boolean; onlyStage?: Stage; +export function DefectParetoPanel({ releaseId, query, externalScrapWeight, onUnauthorized, onlyStage, refreshKey = 0, pending = false }: { + releaseId?: string; query: QueryParams; externalScrapWeight?: number | null; onUnauthorized: (error: unknown) => boolean; onlyStage?: Stage; refreshKey?: number; pending?: boolean; }) { const container = useRef(null); const chart = useRef | null>(null); - const [responses, setResponses] = useState<{ black: FineDefectTopResponse; bright: FineDefectTopResponse } | null>(null); + const [responses, setResponses] = useState<{ black: FineDefectTopResponse; bright: FineDefectTopResponse; externalScrapWeight?: number | null } | null>(null); const [loading, setLoading] = useState(false); const [error, setError] = useState(''); const [themeRevision, setThemeRevision] = useState(0); @@ -956,13 +967,12 @@ export function DefectParetoPanel({ releaseId, query, externalScrapWeight, onUna if (!releaseId) { setResponses(null); setLoading(false); setError(''); return; } const controller = new AbortController(); const base = { releaseId, ...fineQuery, mode: 'top', dimension: 'defect', limit: 100 }; - setResponses(null); setLoading(true); setError(''); Promise.all([ onlyStage === 'bright' ? Promise.resolve({kind:'fine_defect_top' as const,releaseId,sourceRows:0,rows:[]}) : api.fineDefectTop({ ...base, stage: 'black' }, controller.signal), onlyStage === 'black' ? Promise.resolve({kind:'fine_defect_top' as const,releaseId,sourceRows:0,rows:[]}) : api.fineDefectTop({ ...base, stage: 'bright' }, controller.signal), - ]).then(([black, bright]) => { if (!controller.signal.aborted) setResponses({ black, bright }); }) + ]).then(([black, bright]) => { if (!controller.signal.aborted) setResponses({ black, bright, externalScrapWeight }); }) .catch(value => { if (controller.signal.aborted) return; if (onUnauthorized(value)) return; @@ -970,7 +980,7 @@ export function DefectParetoPanel({ releaseId, query, externalScrapWeight, onUna }) .finally(() => { if (!controller.signal.aborted) setLoading(false); }); return () => controller.abort(); - }, [releaseId, fineQueryKey, onUnauthorized, onlyStage]); + }, [releaseId, fineQueryKey, onUnauthorized, onlyStage, refreshKey, externalScrapWeight]); useEffect(() => { const refresh = () => setThemeRevision(value => value + 1); @@ -1000,12 +1010,12 @@ export function DefectParetoPanel({ releaseId, query, externalScrapWeight, onUna weight: row.weight, kind: 'source' as const, }))); - if (onlyStage !== 'bright' && typeof externalScrapWeight === 'number' && Number.isFinite(externalScrapWeight) && externalScrapWeight > 0) { - raw.push({ key: 'black:externalScrap', label: '黑片·外废', category: '外废', weight: externalScrapWeight, kind: 'category' }); + if (onlyStage !== 'bright' && typeof responses.externalScrapWeight === 'number' && Number.isFinite(responses.externalScrapWeight) && responses.externalScrapWeight > 0) { + raw.push({ key: 'black:externalScrap', label: '黑片·外废', category: '外废', weight: responses.externalScrapWeight, kind: 'category' }); } return raw.filter(item => typeof item.weight === 'number' && Number.isFinite(item.weight) && item.weight > 0) .sort((left, right) => right.weight! - left.weight! || left.label.localeCompare(right.label, 'zh-CN')); - }, [responses, externalScrapWeight, onlyStage]); + }, [responses, onlyStage]); const totalWeight = items.reduce((total, item) => total + (item.weight || 0), 0); useEffect(() => { @@ -1027,6 +1037,7 @@ export function DefectParetoPanel({ releaseId, query, externalScrapWeight, onUna }); const option: echarts.EChartsCoreOption = { textStyle: { color: ink, fontFamily, fontSize }, + animation: !window.matchMedia('(prefers-reduced-motion: reduce)').matches, animationDuration: 420, animationDurationUpdate: 520, grid: { left: 32, right: 24, top: 48, bottom: 12, containLabel: true }, @@ -1058,20 +1069,19 @@ export function DefectParetoPanel({ releaseId, query, externalScrapWeight, onUna { type: 'value', name: '累计占比', min: 0, max: 100, nameTextStyle: { color: ink, fontSize }, axisLabel: { color: ink, fontFamily: numericFamily, fontSize, formatter: '{value}%' }, splitLine: { show: false } }, ], series: [ - { name: '报废重量', type: 'bar', z: 1, barMaxWidth: 36, data: items.map(item => ({ value: item.weight, itemStyle: { color: item.kind === 'category' ? '#9aa4b2' : item.key.startsWith('black:') ? blue : teal } })) }, - { name: '累计占比', type: 'line', z: 10, yAxisIndex: 1, symbol: 'circle', symbolSize: 5, lineStyle: { width: 2, color: '#d58c35' }, itemStyle: { color: '#d58c35', borderColor: surface, borderWidth: 1 }, data: cumulative }, + { id: 'pareto-weight', name: '报废重量', type: 'bar', z: 1, barMaxWidth: 36, data: items.map(item => ({ id: item.key, name: item.label, value: item.weight, itemStyle: { color: item.kind === 'category' ? '#9aa4b2' : item.key.startsWith('black:') ? blue : teal } })) }, + { id: 'pareto-cumulative', name: '累计占比', type: 'line', z: 10, yAxisIndex: 1, symbol: 'circle', symbolSize: 5, lineStyle: { width: 2, color: '#d58c35' }, itemStyle: { color: '#d58c35', borderColor: surface, borderWidth: 1 }, data: cumulative.map((value, index) => ({ id: items[index].key, name: items[index].label, value })) }, ], }; - instance.setOption(option, { notMerge: true, lazyUpdate: false }); + instance.setOption(option, { replaceMerge: ['series'], lazyUpdate: false }); }, [items, totalWeight, themeRevision]); - return
-
{onlyStage ? `${onlyStage === 'black' ? '黑片' : '亮片'}报废重量柏拉图` : '黑片与亮片综合报废重量柏拉图'}
- {loading &&
正在汇总细分报废重量
} + return
+
{onlyStage ? `${onlyStage === 'black' ? '黑片' : '亮片'}报废重量柏拉图` : '黑片与亮片综合报废重量柏拉图'}{loading && 正在更新}
{error && } {!loading && !releaseId && } {!loading && !error && responses && !items.length && } -
+
; } diff --git a/web/src/query-motion.css b/web/src/query-motion.css index 8377f6b..fb6bc7e 100644 --- a/web/src/query-motion.css +++ b/web/src/query-motion.css @@ -4,6 +4,11 @@ .query-awaiting-data .metric-value { opacity: .5; } .query-table-content { min-width: 0; } .query-table-content[aria-busy="true"] { pointer-events: none; } +.defect-refresh-indicator { display: inline-flex; align-items: center; gap: 6px; margin-left: auto; color: var(--ink); font-size: var(--font-note); } +.defect-pareto-heading { align-items: center; } +.defect-track > i { transition: width 520ms cubic-bezier(.22,.61,.36,1); } +.defect-pareto-chart[inert] { pointer-events: none; } +@media (prefers-reduced-motion: reduce) { .defect-track > i { transition: none; } } .source-records-drawer .ant-drawer-content, .source-records-drawer .ant-drawer-header, .source-records-drawer .ant-drawer-body { background: var(--surface, #fff); } diff --git a/web/src/styles.css b/web/src/styles.css index 56400e6..7adcefc 100644 --- a/web/src/styles.css +++ b/web/src/styles.css @@ -77,7 +77,7 @@ button { color: inherit; } .mobile-brand { display: none; } .page-content { width: 100%; min-width: 0; margin: 0; padding: 15px 20px 20px; } .panel { background: var(--surface); border: 1px solid var(--line); border-radius: var(--panel-radius, 5px) !important; } -.query-page { display: flex; min-width: 0; flex-direction: column; gap: 11px; } +.query-page { display: flex; min-width: 0; flex-direction: column; gap: 11px; overflow-anchor: none; } .query-toolbar { position: sticky; top: 53px; z-index: 35; display: flex; min-height: 48px; flex-wrap: wrap; align-items: center; gap: 10px 13px; padding: 7px 11px; } .query-toolbar::before { content: ''; position: absolute; right: -20px; bottom: 100%; left: -20px; height: 18px; background: var(--background); pointer-events: none; } .query-field { display: inline-flex; min-width: 0; align-items: center; gap: 7px; } diff --git a/web/verification/defect_smooth_refresh.test.mjs b/web/verification/defect_smooth_refresh.test.mjs new file mode 100644 index 0000000..9a2f15c --- /dev/null +++ b/web/verification/defect_smooth_refresh.test.mjs @@ -0,0 +1,47 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import fs from 'node:fs'; +import ts from 'typescript'; +import React from 'react'; +const deferred=()=>{let resolve,reject;const promise=new Promise((r,j)=>{resolve=r;reject=j;});return {promise,resolve,reject};}; +const tick=()=>new Promise(r=>setImmediate(r)); +function find(tree,predicate){if(!tree||typeof tree!=='object')return; if(predicate(tree))return tree;for(const child of React.Children.toArray(tree.props?.children)){const result=find(child,predicate);if(result)return result;}} +function fixture(){ + const source=fs.readFileSync(process.env.QUERY_PARETO_SOURCE || new URL('../src/QueryPage.tsx',import.meta.url),'utf8'); + const component=source.slice(source.indexOf('export function DefectParetoPanel('),source.indexOf('export function SectionHeading(')).replace('export function','function'); + const requests=[],options=[],effects=new Map(),states=new Map(),refs=new Map();let cursor=0,dirty=false,queued=[],tree,creates=0,clears=0; + const node={clientWidth:900,clientHeight:470}; + const hooks={useState(initial){const i=cursor++;if(!states.has(i))states.set(i,initial);return [states.get(i),v=>{states.set(i,typeof v==='function'?v(states.get(i)):v);dirty=true;}];},useRef(initial){const i=cursor++;if(!refs.has(i))refs.set(i,{current:initial});return refs.get(i);},useMemo(fn){cursor++;return fn();},useEffect(fn,deps){const i=cursor++,old=effects.get(i);if(!old||deps.some((x,j)=>!Object.is(x,old.deps[j])))queued.push(()=>{old?.cleanup?.();effects.set(i,{deps,cleanup:fn()});});}}; + const api={fineDefectTop(params,signal){const d=deferred();requests.push({...d,params,signal});return d.promise;}}; + const chart={setOption:(value,config)=>options.push({value,config}),clear(){clears++;},resize(){},dispose(){}}; + const echarts={init(){creates++;return chart;}}; + const prelude=`const {useState,useRef,useMemo,useEffect}=hooks; + const Spin='Spin',Alert='Alert',Empty=Object.assign('Empty',{PRESENTED_IMAGE_SIMPLE:'simple'}); + const MutationObserver=class{observe(){}disconnect(){}},ResizeObserver=class{observe(){}disconnect(){}}; + const document={documentElement:{}},window={matchMedia:()=>({matches:false,addEventListener(){},removeEventListener(){}})}; + const queryChartTypography=()=>({fontFamily:'sans',numericFamily:'sans',fontSize:12,tooltipFontSize:12}); + const getComputedStyle=()=>({getPropertyValue:()=>''}),escapeTooltipText=v=>v,numberText=v=>String(v),chooseError=e=>e.message; + class ApiError extends Error{}; + `; + const js=ts.transpileModule(prelude+component+'\nreturn DefectParetoPanel;',{fileName:'fixture.tsx',compilerOptions:{target:ts.ScriptTarget.ES2022,jsx:ts.JsxEmit.React}}).outputText; + const renderComponent=new Function('React','hooks','api','echarts',js)(React,hooks,api,echarts); + const props={releaseId:'release-A',query:{year:2026,month:1},onUnauthorized:()=>false}; + const render=()=>{let attempts=0;do{cursor=0;dirty=false;queued=[];tree=renderComponent(props);find(tree,e=>{if(e.props?.ref)e.props.ref.current=node;return false;});queued.forEach(fn=>fn());assert.ok(++attempts<10);}while(dirty);return tree;}; + const result=weight=>({kind:'fine_defect_top',releaseId:'release-A',sourceRows:1,rows:[{key:'chip',label:'缺角',category:'责废',weight}]}); + const resolvePair=(index,weight)=>{requests[index].resolve(result(weight));requests[index+1].resolve(result(weight/2));}; + return {props,requests,options,render,resolvePair,get creates(){return creates;},get clears(){return clears;},get tree(){return tree;},unmount(){effects.forEach(x=>x.cleanup?.());}}; +} +test('actual Pareto keeps the old chart while fetching and updates the same instance with stable series/data ids',async()=>{ + const ui=fixture();ui.render();ui.resolvePair(0,100);await tick();ui.render();const clears=ui.clears; + assert.equal(ui.options.at(-1).value.series[0].data[0].value,100); + ui.props.query={year:2026,month:2};ui.render();assert.equal(ui.tree.props['aria-busy'],true);assert.equal(ui.clears,clears);assert.equal(ui.creates,1);assert.equal(ui.options.at(-1).value.series[0].data[0].value,100); + ui.resolvePair(2,50);await tick();ui.render();const update=ui.options.at(-1); + assert.equal(update.value.series[0].data[0].value,50);assert.equal(update.config.notMerge,undefined);assert.deepEqual(update.config.replaceMerge,['series']);assert.equal(update.value.series[0].id,'pareto-weight');assert.equal(update.value.series[0].data[0].id,'black:chip');assert.equal(ui.creates,1);ui.unmount(); +}); +test('late responses cannot overwrite a newer selection or mix its external scrap into older data',async()=>{ + const ui=fixture();ui.props.externalScrapWeight=3;ui.render();ui.resolvePair(0,100);await tick();ui.render();ui.props.query={year:2026,month:2};ui.props.externalScrapWeight=7;ui.render();ui.props.query={year:2026,month:3};ui.props.externalScrapWeight=11;ui.render();assert.equal(ui.requests[2].signal.aborted,true); + ui.resolvePair(4,70);await tick();ui.render();ui.resolvePair(2,999);await tick();ui.render();const data=ui.options.at(-1).value.series[0].data;assert.equal(data[0].value,70);assert.equal(data.find(x=>x.id==='black:externalScrap').value,11);ui.unmount(); +}); +test('a failed refresh retains the last chart with an error and disables its old tooltips',async()=>{ + const ui=fixture();ui.render();ui.resolvePair(0,100);await tick();ui.render();const clears=ui.clears;ui.props.query={year:2026,month:2};ui.render();ui.requests[2].reject(Error('offline'));await tick();ui.render();assert.equal(ui.clears,clears);assert.equal(ui.options.at(-1).value.series[0].data[0].value,100);assert.equal(find(ui.tree,n=>n.type==='Alert').props.description,'offline');assert.equal(find(ui.tree,n=>n.props?.className==='defect-pareto-chart').props.inert,true);ui.unmount(); +});