优化:查询页面平滑切换与默认月份高亮

This commit is contained in:
2026-11-01 14:49:37 +08:00
parent d89bd2e451
commit 19bd9b0122
14 changed files with 450 additions and 126 deletions
+3 -3
View File
@@ -21,7 +21,7 @@ function fixture(props) {
const MONTHS=Array.from({length:12},(_,i)=>String(i+1).padStart(2,'0')+'月');
const SUMMARY_PAGE_SIZE=15;
const useCompactTable=()=>false, useState=v=>[v,()=>{}], useEffect=()=>{};
const Button='Button', Table='Table', MetricTablePagination='Pagination', Tooltip='Tooltip', InfoCircleOutlined='Info';
const AnimatedMetricText='AnimatedMetricText', Button='Button', Table='Table', MetricTablePagination='Pagination', Tooltip='Tooltip', InfoCircleOutlined='Info';
${helpers}\n${table}\nreturn MetricTable;
`, {compilerOptions:{jsx:ts.JsxEmit.React,target:ts.ScriptTarget.ES2022}}).outputText)(React, (target, create) => Object.assign(target, create()), defectWeightRate, queryScrapWeight, async (filename, columns, rows, value) => {
exported = { filename, columns, rows, workbook: await createMetricWorkbook(columns, rows, value) };
@@ -108,7 +108,7 @@ for (const view of ['overall','department','group','product','projectGroup']) te
assert.match(fields[at('black-totalWeight')-1].header,/总重量 \/ kg$/);
assert.equal(sheet.getRow(2).getCell(at('black-totalWeight')).value,1000);
const rendered=ui.exported.columns.flatMap(column=>column.children||[column]).find(column=>column.key==='black-defect-责废').render(null,data);
assert.equal(rendered.props.children,'12.00%');
assert.equal(rendered.props.children.props.value,'12.00%');
const restored=fixture({rows:[data],view,fullFields:true,defectDisplay:'weight'});await restored.ref.exportExcel();
const originalFields=workbookColumns(restored.exported.columns),index=originalFields.findIndex(field=>field.key==='black-defect-责废')+1;
assert.equal(restored.exported.workbook.getWorksheet('质量汇总').getRow(2).getCell(index).value,120);
@@ -134,7 +134,7 @@ test('本部报废原口径紧随扩散废,调整口径隐藏并在表格及Ex
const fields=workbookColumns(adjusted.exported.columns),at=key=>fields.findIndex(f=>f.key===key)+1;
assert.equal(fields.some(f=>f.key==='bright-headquartersScrapWeight'),false);
const scrapColumn=adjusted.exported.columns.flatMap(c=>c.children||[c]).find(c=>c.key==='bright-scrapWeight');
assert.equal(scrapColumn.render(null,data).props.children,'70.0');
assert.equal(scrapColumn.render(null,data).props.children.props.value,'70.0');
assert.equal(adjusted.exported.workbook.getWorksheet('质量汇总').getRow(2).getCell(at('bright-scrapWeight')).value,70);
assert.equal(adjusted.exported.workbook.getWorksheet('质量汇总').getRow(2).getCell(at('bright-totalWeight')).value,1250);
}
+27
View File
@@ -0,0 +1,27 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import { defaultQueryMonth, previousCompleteMonth, previousCompleteQuarter } from '../src/periodDefaults.ts';
const now=new Date(2026,10,1,13);
test('上月已发布时显示上月,不使用更早的最新值替代',()=>{
assert.deepEqual(defaultQueryMonth({periods:['2026-09','2026-10']},now),{year:2026,month:10});
assert.deepEqual(defaultQueryMonth({periods:['2026-10','2026-11']},now),{year:2026,month:10});
});
test('上月未发布时只回退一个月,不按空筛选或更早资料继续回退',()=>{
assert.deepEqual(defaultQueryMonth({periods:['2026-09']},now),{year:2026,month:9});
assert.deepEqual(defaultQueryMonth({periods:['2026-05']},now),{year:2026,month:9});
assert.deepEqual(defaultQueryMonth({periods:[]},now),{year:2026,month:9});
});
test('跨年和闰年保持正确月份',()=>{
assert.deepEqual(defaultQueryMonth({periods:[]},new Date(2027,0,1)),{year:2026,month:11});
assert.deepEqual(defaultQueryMonth({periods:[]},new Date(2027,1,1)),{year:2026,month:12});
assert.deepEqual(defaultQueryMonth({periods:['2024-02']},new Date(2024,2,1)),{year:2024,month:2});
});
test('旧接口无月份列表时保持日历上月,仅在最新已发布月份证明缺失时回退',()=>{
assert.deepEqual(defaultQueryMonth(undefined,now),{year:2026,month:10});
assert.deepEqual(defaultQueryMonth({latestDataPeriod:{year:2026,month:9}},now),{year:2026,month:9});
assert.deepEqual(defaultQueryMonth({latestDataPeriod:{}},now),{year:2026,month:10});
});
test('原有月度/季度工具不变',()=>{
assert.deepEqual(previousCompleteMonth(now),{year:2026,month:10});
assert.deepEqual(previousCompleteQuarter(now),{year:2026,quarter:3});
});
@@ -0,0 +1,26 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import fs from 'node:fs';
import ts from 'typescript';
import {createRequire} from 'node:module';
const require=createRequire(import.meta.url);
const source=fs.readFileSync(new URL('../src/QueryResultMotion.tsx',import.meta.url),'utf8');
function fixture(reduced=false){
const values=new Map(),effects=new Map(),frames=new Map();let cursor=0,now=0,sequence=0;
const hooks={useRef(value){const i=cursor++;if(!values.has(i))values.set(i,{current:value});return values.get(i);},useState(value){const i=cursor++;if(!values.has(i))values.set(i,value);return [values.get(i),v=>values.set(i,typeof v==='function'?v(values.get(i)):v)];},useLayoutEffect(fn,deps){const i=cursor++,old=effects.get(i);if(!old||!deps||deps.some((x,j)=>!Object.is(x,old.deps[j]))){old?.cleanup?.();effects.set(i,{deps,cleanup:fn()});}}};
const compiled=ts.transpileModule(source,{fileName:'QueryResultMotion.tsx',compilerOptions:{jsx:ts.JsxEmit.ReactJSX,target:ts.ScriptTarget.ES2022,module:ts.ModuleKind.CommonJS}}).outputText;
const result={};new Function('require','exports','window','performance','requestAnimationFrame','cancelAnimationFrame',compiled)(name=>name==='react'?hooks:require(name),result,{matchMedia:()=>({matches:reduced})},{now:()=>now},fn=>{const id=++sequence;frames.set(id,fn);return id;},id=>frames.delete(id));
return {api:result,render(fn){cursor=0;return fn();},advance(ms){now+=ms;const work=[...frames.values()];frames.clear();work.forEach(fn=>fn(now));},get frames(){return frames.size;}};
}
test('formatted interpolation preserves units, grouping, decimal precision, zero and missing values',()=>{
const {api}=fixture();assert.equal(api.interpolateMetricText('1,000.0 kg','2,000.0 kg',.5),'1,500.0 kg');assert.equal(api.interpolateMetricText('95.10%','96.30%',.5),'95.70%');assert.equal(api.interpolateMetricText('1.0','0.0',1),'0.0');assert.equal(api.interpolateMetricText('1.0','—',.5),'—');assert.equal(api.interpolateMetricText('—','95.00%',.5),'95.00%');
});
test('pending and failed queries retain the exact previous data/context snapshot, successful empty results replace it',()=>{
const f=fixture();const good={rows:[{id:'A'}],period:'year',month:1};assert.equal(f.render(()=>f.api.useRetainedResult(null)),null);assert.equal(f.render(()=>f.api.useRetainedResult(good)),good);assert.equal(f.render(()=>f.api.useRetainedResult(null)),good);const empty={rows:[],period:'month',month:2};assert.equal(f.render(()=>f.api.useRetainedResult(empty)),empty);
});
test('number refresh keeps the old value while waiting and a rapid new value cancels the prior animation',()=>{
const f=fixture();const render=value=>f.render(()=>f.api.useAnimatedMetricText(value));assert.equal(render('100.0'),'100.0');assert.equal(render('300.0'),'100.0');f.advance(260);const mid=render('300.0');assert.ok(Number(mid)>100&&Number(mid)<300);assert.equal(render('200.0'),mid);assert.equal(f.frames,1);f.advance(520);assert.equal(render('200.0'),'200.0');render('—');assert.equal(render('—'),'—');
});
test('reduced motion updates directly without scheduling animation frames',()=>{
const f=fixture(true);f.render(()=>f.api.useAnimatedMetricText('95.00%'));f.render(()=>f.api.useAnimatedMetricText('96.00%'));assert.equal(f.render(()=>f.api.useAnimatedMetricText('96.00%')),'96.00%');assert.equal(f.frames,0);
});
@@ -0,0 +1,34 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import { createWorkspaceTransition, waitForWorkspaceContent } from '../src/workspaceTransition.ts';
const deferred=()=>{let resolve;const promise=new Promise(r=>resolve=r);return {promise,resolve};};
function nativeFixture(){const records=[];const start=update=>{const ready=deferred(),finished=deferred(),record={update,ready,finished,skipped:0};records.push(record);return {ready:ready.promise,finished:finished.promise,skipTransition(){record.skipped++;}};};return {start,records};}
test('rapid selections only commit the latest route even when skipped native callbacks still execute',async()=>{
const native=nativeFixture(),controller=createWorkspaceTransition(native.start),pages=[];
controller.run(()=>pages.push('department'));controller.run(()=>pages.push('overall'));
assert.equal(native.records[0].skipped,1);await native.records[0].update();await native.records[1].update();assert.deepEqual(pages,['overall']);controller.cancel();
});
test('new navigation interrupts preparation of the previous target without queueing behind it',async()=>{
const native=nativeFixture(),controller=createWorkspaceTransition(native.start),pages=[];let previousSignal;
controller.run(signal=>{pages.push('department');previousSignal=signal;return new Promise(resolve=>signal.addEventListener('abort',resolve,{once:true}));});
const preparing=native.records[0].update();controller.run(()=>pages.push('product'));assert.equal(previousSignal.aborted,true);await preparing;await native.records[1].update();assert.deepEqual(pages,['department','product']);controller.cancel();
});
test('reduced motion and unavailable APIs commit immediately',()=>{
for(const reduced of [true,false]){let starts=0,commits=0;const controller=createWorkspaceTransition(reduced?()=>{starts++;throw Error('must not start');}:undefined,()=>reduced);controller.run(()=>commits++);assert.equal(starts,0);assert.equal(commits,1);controller.cancel();}
});
test('native failure falls back exactly once and cancellation rejects stale pending navigation',async()=>{
let commits=0;createWorkspaceTransition(()=>{throw Error('unavailable snapshot');}).run(()=>commits++);assert.equal(commits,1);
const native=nativeFixture(),controller=createWorkspaceTransition(native.start);controller.run(()=>commits++);controller.cancel();await native.records[0].update();assert.equal(commits,1);
});
test('content preparation resolves on readiness, timeout or abort and always releases observers/timers',async()=>{
const previous={window:globalThis.window,document:globalThis.document,MutationObserver:globalThis.MutationObserver};let callback,disconnected=0;const timers=new Map();let timerId=0;
globalThis.window={setTimeout(fn,delay){const id=++timerId;timers.set(id,{fn:()=>{timers.delete(id);fn();},delay});return id;},clearTimeout:id=>timers.delete(id)};globalThis.document={body:{}};globalThis.MutationObserver=class{constructor(fn){callback=fn;}observe(){}disconnect(){disconnected++;}};
try{let busy=true;const node={querySelector:()=>busy?{}:null};const a=new AbortController();let done=false;const first=waitForWorkspaceContent(()=>node,a.signal).then(()=>done=true);await Promise.resolve();assert.equal(done,false);busy=false;callback();[...timers.values()].find(x=>x.delay===32).fn();await first;assert.equal(timers.size,0);
const b=new AbortController();const second=waitForWorkspaceContent(()=>null,b.signal);b.abort();await second;assert.equal(timers.size,0);
const third=waitForWorkspaceContent(()=>null,new AbortController().signal);[...timers.values()][0].fn();await third;assert.equal(timers.size,0);assert.equal(disconnected,3);
}finally{for(const [key,value] of Object.entries(previous)){if(value===undefined)delete globalThis[key];else globalThis[key]=value;}}
});
test('an older completion never unlocks input while the newer transition is still running',async()=>{
const native=nativeFixture(),busy=[],controller=createWorkspaceTransition(native.start,()=>false,value=>busy.push(value));controller.run(()=>{});controller.run(()=>{});native.records[0].finished.resolve();await Promise.resolve();assert.equal(busy.at(-1),true);native.records[1].finished.resolve();await Promise.resolve();assert.equal(busy.at(-1),false);controller.cancel();
});