优化:完善查询指标口径、冻结布局与Excel导出
This commit is contained in:
@@ -3,6 +3,7 @@ import assert from 'node:assert/strict';
|
||||
import fs from 'node:fs';
|
||||
import ts from 'typescript';
|
||||
import React from 'react';
|
||||
import { queryScrapWeight } from '../src/queryMetricValues.ts';
|
||||
import { defectWeightRate } from '../src/trendMetrics.ts';
|
||||
import { createMetricWorkbook, workbookColumns } from '../src/metricWorkbook.ts';
|
||||
|
||||
@@ -10,18 +11,19 @@ const source = fs.readFileSync(new URL('../src/QueryPage.tsx', import.meta.url),
|
||||
const slice = (start, end) => source.slice(source.indexOf(start), source.indexOf(end, source.indexOf(start)));
|
||||
const helpers = slice('function numberText(', 'const SYSTEM_SOURCE_VERSION_KEYS')
|
||||
+ slice('function hasStageRows(', 'function fullYearTrend(')
|
||||
+ slice('function objectLabel(', 'interface ChartTooltipParam');
|
||||
+ slice('function objectLabel(', 'interface ChartTooltipParam')
|
||||
+ slice('const totalWeightTitle =', 'export function MetricTable(');
|
||||
const table = slice('export function MetricTable(', 'function MetricTablePagination(').replace('export function', 'function');
|
||||
function fixture(props) {
|
||||
let exported, detail = 0, basis = 0;
|
||||
const ref = {};
|
||||
const render = new Function('React', 'useImperativeHandle', 'defectWeightRate', 'downloadMetricWorkbook', ts.transpileModule(`
|
||||
const render = new Function('React', 'useImperativeHandle', 'defectWeightRate', 'queryScrapWeight', 'downloadMetricWorkbook', ts.transpileModule(`
|
||||
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';
|
||||
const 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, async (filename, columns, rows, value) => {
|
||||
`, {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) };
|
||||
});
|
||||
const tree = render({ref,exportFilename:'验收',period:'month',month:9,quarter:3,rateBasis:'original',fullFields:false,onDetail(){detail++;},onBasis(){basis++;},onDrilldown(){},...props});
|
||||
@@ -45,14 +47,18 @@ for (const view of ['overall','department','group','product','projectGroup']) {
|
||||
const {workbook,columns}=ui.exported;
|
||||
const fields=workbookColumns(columns), sheet=workbook.getWorksheet('质量汇总');
|
||||
if(view==='product')assert.equal(find(columns.find(c=>c.key==='object').render(null,row),n=>n.type==='small'),undefined);
|
||||
assert.equal(sheet.rowCount,19);assert.equal(sheet.columnCount,fullFields?13:8);
|
||||
assert.equal(sheet.rowCount,19);assert.equal(sheet.columnCount,fullFields?13:10);
|
||||
assert.deepEqual(sheet.getRow(1).values.slice(1),fields.map(v=>v.header));
|
||||
assert.equal(sheet.getRow(2).getCell(3).value,1234.567);
|
||||
assert.equal(sheet.getRow(2).getCell(4).value,fullFields?1250:0);
|
||||
const at=key=>fields.findIndex(field=>field.key===key)+1;
|
||||
assert.equal(sheet.getRow(2).getCell(at('black-qualifiedWeight')).value,1234.567);
|
||||
assert.equal(sheet.getRow(2).getCell(at('black-totalWeight')).value,1250);
|
||||
assert.ok(at('black-totalWeight')<at('black-qualifiedWeight'));
|
||||
assert.ok(at('bright-totalWeight')<at('bright-qualifiedWeight'));
|
||||
assert.equal(fields.at(-1).key,'compositeRate');
|
||||
assert.equal(fields.some(f=>f.key.includes('defect-')),fullFields);
|
||||
assert.equal(fields.some(f=>f.key.endsWith('headquartersScrapWeight')),fullFields);
|
||||
assert.equal(fields.some(f=>f.key==='actions'),false);
|
||||
assert.equal(sheet.getColumn(2).numFmt,'0.00%');
|
||||
assert.equal(sheet.getColumn(at('compositeRate')).numFmt,'0.00%');
|
||||
assert.equal(sheet.getColumn(3).numFmt,'#,##0.0');
|
||||
for (const field of columns.flatMap(c=>c.children||[c]).filter(c=>c.key!=='actions'&&c.key!=='object')) {
|
||||
const rendered=field.render(null,row);
|
||||
@@ -70,14 +76,20 @@ for (const view of ['overall','department','group','product','projectGroup']) {
|
||||
test('adjusted rates, missing stage and zero weight retain their meaning', async () => {
|
||||
const ui=fixture({rows:[row,{...row,key:'missing',black:{...stage,qualifiedWeight:null,rate:null},coverage:{blackRows:0,brightRows:1}}],view:'product',rateBasis:'withoutHeadquartersScrap'});
|
||||
await ui.ref.exportExcel();const sheet=ui.exported.workbook.getWorksheet('质量汇总');
|
||||
assert.equal(sheet.getCell('B2').value,0.98);assert.equal(sheet.getCell('H2').value,0.99);
|
||||
assert.equal(sheet.getCell('E3').value,null);assert.equal(sheet.getCell('C3').value,null);assert.equal(sheet.getCell('D2').value,0);
|
||||
const fields=workbookColumns(ui.exported.columns), at=key=>fields.findIndex(field=>field.key===key)+1;
|
||||
assert.equal(sheet.getRow(2).getCell(at('compositeRate')).value,0.98);
|
||||
assert.equal(sheet.getRow(2).getCell(at('bright-rate')).value,0.99);
|
||||
assert.equal(sheet.getRow(3).getCell(at('black-rate')).value,null);
|
||||
assert.equal(sheet.getRow(3).getCell(at('black-qualifiedWeight')).value,null);
|
||||
assert.equal(sheet.getRow(2).getCell(at('black-scrapWeight')).value,0);
|
||||
});
|
||||
|
||||
test('overall yearly export preserves month labels and leaves unavailable values blank', async () => {
|
||||
const ui=fixture({rows:[{...row,month:2},{...row,key:'missing',month:3,noData:true,black:{...stage,qualifiedWeight:null,rate:null},bright:{...stage,qualifiedWeight:null,rate:null},coverage:{blackRows:0,brightRows:0}}],view:'overall',period:'year'});
|
||||
await ui.ref.exportExcel();const sheet=ui.exported.workbook.getWorksheet('质量汇总');
|
||||
assert.equal(sheet.getCell('A2').value,'02月');assert.equal(sheet.getCell('A3').value,'03月');assert.equal(sheet.getCell('B3').value,null);
|
||||
assert.equal(sheet.getCell('A2').value,'02月');assert.equal(sheet.getCell('A3').value,'03月');
|
||||
const composite=workbookColumns(ui.exported.columns).findIndex(field=>field.key==='compositeRate')+1;
|
||||
assert.equal(sheet.getRow(3).getCell(composite).value,null);
|
||||
});
|
||||
|
||||
for (const view of ['overall','department','group','product','projectGroup']) test(`${view}: defect-rate mode uses same-stage total and exports numeric percentages`,async()=>{
|
||||
@@ -111,3 +123,20 @@ test('single-stage rate mode exports only its stage; missing or zero denominator
|
||||
assert.equal(sheet.getRow(3).getCell(at('black-defect-裂纹')).value,null);
|
||||
assert.equal(sheet.getRow(4).getCell(at('black-scrapWeight')).value,0);
|
||||
});
|
||||
|
||||
test('本部报废原口径紧随扩散废,调整口径隐藏并在表格及Excel同步扣减', async () => {
|
||||
const data={...row,bright:{...stage,scrapWeight:100,headquartersScrapWeight:30,defects:[{name:'扩散废',weight:20},{name:'加工废',weight:40}]}};
|
||||
const original=fixture({rows:[data],view:'overall',fullFields:true});await original.ref.exportExcel();
|
||||
const keys=workbookColumns(original.exported.columns).map(f=>f.key);
|
||||
assert.equal(keys.indexOf('bright-headquartersScrapWeight'),keys.indexOf('bright-defect-扩散废')+1);
|
||||
for(const fullFields of [false,true]) {
|
||||
const adjusted=fixture({rows:[data],view:'overall',fullFields,rateBasis:'withoutHeadquartersScrap'});await adjusted.ref.exportExcel();
|
||||
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(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);
|
||||
}
|
||||
assert.equal(data.bright.scrapWeight,100);
|
||||
});
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { queryScrapWeight, queryTotalScrapWeight } from '../src/queryMetricValues.ts';
|
||||
|
||||
const metric = { qualifiedWeight: 900, totalWeight: 1000, scrapWeight: 100, headquartersScrapWeight: 25, rate: .9, rateWithoutHeadquartersScrap: .925, defects: [] };
|
||||
test('调整口径仅扣减亮片报废;原始数据、总重及合格率保持不变', () => {
|
||||
const before = structuredClone(metric);
|
||||
assert.equal(queryScrapWeight(metric, 'bright', 'original'), 100);
|
||||
assert.equal(queryScrapWeight(metric, 'bright', 'withoutHeadquartersScrap'), 75);
|
||||
assert.equal(queryScrapWeight(metric, 'black', 'withoutHeadquartersScrap'), 100);
|
||||
assert.deepEqual(metric, before);
|
||||
});
|
||||
test('报废总重同步采用扣减后的亮片重量', () => {
|
||||
const row = { black: { ...metric, scrapWeight: 50 }, bright: metric, coverage: { blackRows: 1, brightRows: 1 } };
|
||||
assert.equal(queryTotalScrapWeight(row, 'original'), 150);
|
||||
assert.equal(queryTotalScrapWeight(row, 'withoutHeadquartersScrap'), 125);
|
||||
});
|
||||
test('本部报废缺失时不冒充已完成扣减,零值则保留原报废', () => {
|
||||
assert.equal(queryScrapWeight({ ...metric, headquartersScrapWeight: null }, 'bright', 'withoutHeadquartersScrap'), null);
|
||||
assert.equal(queryScrapWeight({ ...metric, headquartersScrapWeight: 0 }, 'bright', 'withoutHeadquartersScrap'), 100);
|
||||
assert.equal(queryScrapWeight({ ...metric, scrapWeight: null }, 'bright', 'withoutHeadquartersScrap'), null);
|
||||
});
|
||||
test('缺少阶段来源不计入合计;有来源但无法扣减时不显示误导合计', () => {
|
||||
const row = { black: metric, bright: { ...metric, headquartersScrapWeight: null }, coverage: { blackRows: 1, brightRows: 0 } };
|
||||
assert.equal(queryTotalScrapWeight(row, 'withoutHeadquartersScrap'), 100);
|
||||
assert.equal(queryTotalScrapWeight({ ...row, coverage: { blackRows: 1, brightRows: 1 } }, 'withoutHeadquartersScrap'), null);
|
||||
});
|
||||
Reference in New Issue
Block a user