From b03715cb76e99226839bfa6e3afde7ed744fce57 Mon Sep 17 00:00:00 2001 From: lyun Date: Mon, 2 Nov 2026 13:23:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=9C=88=E5=BA=A6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=85=B3=E9=94=AE=E5=92=8C=E5=AE=8C=E6=95=B4?= =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=88=87=E6=8D=A2=E5=8F=8A=E5=88=86=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E9=BB=98=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DESIGN.md | 2 + web/src/QueryPage.tsx | 87 +++++++++++++------ web/src/QueryPanels.tsx | 4 +- web/src/StageProductPage.tsx | 7 +- web/src/metricColumnPlan.ts | 35 ++++++++ web/verification/metric_workbook.test.mjs | 5 +- web/verification/trend_metric_fields.test.mjs | 53 +++++++++++ 7 files changed, 163 insertions(+), 30 deletions(-) create mode 100644 web/src/metricColumnPlan.ts create mode 100644 web/verification/trend_metric_fields.test.mjs diff --git a/DESIGN.md b/DESIGN.md index 5d6d97e..bdfe808 100644 --- a/DESIGN.md +++ b/DESIGN.md @@ -2,6 +2,8 @@ 更新:2026-11-02 +- 月度趋势数据表提供“关键指标 / 完整指标”切换,完整列与主汇总表共用字段口径与顺序。黑片、亮片页面首次默认完整指标,其余四类查询首次默认关键指标;各缓存页保留用户选择,查询和重置不改写选择,不增加数据请求。 + ## 智能分析正文与运行反馈(2026-11-02) - 历史正文与会话列表分别读取,指定会话链接不等待列表;只有从查询条件创建会话时才加载选项。加载提示放在对应面板内部,首次读取不得显示欢迎空状态,也不得用通用大高度加载块推移会话框和输入区;列表失败不阻止已授权正文读取。 diff --git a/web/src/QueryPage.tsx b/web/src/QueryPage.tsx index dcf34d0..331c111 100644 --- a/web/src/QueryPage.tsx +++ b/web/src/QueryPage.tsx @@ -50,6 +50,7 @@ import { readableSelectPopup } from './readableSelectPopup'; import { isInternalDataField, readableMetricFormula } from './publicDataDisplay'; import { defaultQueryMonth, previousCompleteMonth, previousCompleteQuarter } from './periodDefaults'; import { defectWeightRate } from './trendMetrics'; +import { defaultFullMetricFields, metricStageColumnPlan, type MetricStageField } from './metricColumnPlan'; import DefectComposition from './DefectComposition'; import { QueryTrendPanel, QueryTablePanel } from './QueryPanels'; import { selectTrendPeriod as nextTrendPeriod } from './trendPeriodSelection'; @@ -210,10 +211,6 @@ function defectList(row: MetricRow | undefined, stage: Stage): DefectMetric[] { return row?.[stage]?.defects || []; } -function defectsFor(rows: MetricRow[], stage: Stage): string[] { - return Array.from(new Set(rows.flatMap(row => defectList(row, stage).map(item => item.name)))); -} - interface ChartTooltipParam { name?: string | number; axisValue?: string | number; @@ -314,6 +311,7 @@ export default function QueryPage({ page, onUnauthorized }: { const [search, setSearch] = useState(initialQuery.productSearch || ''); const [appliedSearch, setAppliedSearch] = useState(initialQuery.productSearch || ''); const [fullFields, setFullFields] = useState(false); + const [trendFullFields, setTrendFullFields] = useState(() => defaultFullMetricFields(page)); const [defectDisplay, setDefectDisplay] = useState<'weight' | 'rate'>('weight'); const [data, setData] = useState(null); const [dataKey, setDataKey] = useState(''); @@ -765,13 +763,14 @@ export default function QueryPage({ page, onUnauthorized }: {
setTrendStage(value as Stage)} aria-label="趋势阶段" />}> {currentTrendError && setTrendRevision(value => value + 1)}>重试} />}
{trendMode === 'data' - ? + ? : } {showTrendLoading && {retainedTrend ? `正在更新 · 当前显示上次筛选的${loadedQueryScope(retainedTrend.query, decodeQueryValueList)}` : '正在读取趋势'}}
@@ -1083,8 +1082,6 @@ export function MetricTable({ emptyText?: string; onlyStage?: Stage; defectDisplay?: 'weight'|'rate'; }) { const compact = useCompactTable(); - const blackDefects = fullFields ? defectsFor(rows, 'black') : []; - const brightDefects = fullFields ? defectsFor(rows, 'bright') : []; const isOverall = view === 'overall'; const title = (row: MetricRow) => isOverall && period === 'year' ? (monthNumber((row as TrendMetricRow).month) ? MONTHS[monthNumber((row as TrendMetricRow).month)! - 1] : row.label) @@ -1114,16 +1111,21 @@ export function MetricTable({ return ; }, })); - const brightDetailColumns: ColumnsType = defectColumns('bright', brightDefects); - if (fullFields && rateBasis === 'original') { - const diffusionIndex = brightDetailColumns.findIndex(column => column.key === 'bright-defect-扩散废'); - brightDetailColumns.splice(diffusionIndex < 0 ? brightDetailColumns.length : diffusionIndex + 1, 0, - numeric('本部报废', 'bright', 'headquartersScrapWeight')); - } + const fieldLabels: Record = { + totalWeight: '总重量', qualifiedWeight: '合格重量', scrapWeight: '报废重量', + headquartersScrapWeight: '本部报废', rate: '合格率', + }; + const stageColumns = (stage: Stage): ColumnsType => metricStageColumnPlan(rows, stage, fullFields, rateBasis).map(column => { + if (column.kind === 'defect') return defectColumns(stage, [column.name])[0]; + const metricColumn = numeric(fieldLabels[column.field], stage, column.field); + return stage === 'bright' && column.field === 'rate' + ? { ...metricColumn, render: (_: unknown, row: MetricRow) => } + : metricColumn; + }); const allColumns: ColumnsType = [ { title: isOverall ? period === 'year' ? '月份' : '统计期间' : view === 'group' ? '产业部 / 业务分组' : view === 'product' ? '产品规格' : view === 'projectGroup' ? '项目组' : view === 'department' ? '产业部' : '对象', key: 'object', dataIndex: 'label', fixed: 'left', width: compact ? isOverall ? 100 : 180 : isOverall ? 120 : layoutView === 'product' ? (fullFields ? 240 : 300) : layoutView === 'group' ? (fullFields ? 220 : 260) : (fullFields ? 180 : 220), render: (_: unknown, row) => {view === 'department' || view === 'group' || view === 'product' ? : {title(row)}}{view === 'group' && row.department && {row.department}} }, - { key: 'stage-black', title: 黑片, children: [numeric('总重量', 'black', 'totalWeight'), numeric('合格重量', 'black', 'qualifiedWeight'), numeric('报废重量', 'black', 'scrapWeight'), ...defectColumns('black', blackDefects), numeric('合格率', 'black', 'rate')] }, - { key: 'stage-bright', title: 亮片, children: [numeric('总重量', 'bright', 'totalWeight'), numeric('合格重量', 'bright', 'qualifiedWeight'), numeric('报废重量', 'bright', 'scrapWeight'), ...brightDetailColumns, { ...numeric('合格率', 'bright', 'rate'), render: (_: unknown, row: MetricRow) => }] }, + { key: 'stage-black', title: 黑片, children: stageColumns('black') }, + { key: 'stage-bright', title: 亮片, children: stageColumns('bright') }, { title: rateBasisTitle('综合合格率', rateBasis, 'composite', onBasis), key: 'compositeRate', dataIndex: 'compositeRate', align: 'center', fixed: compact ? undefined : 'right', width: 120, className: 'combined-column', render: (_: number | null, row: MetricRow) => }, { title: '操作', key: 'actions', fixed: compact ? undefined : 'right', width: 96, align: 'center', render: (_: unknown, row) => (row as TrendMetricRow).noData ? — : }, ]; @@ -1391,18 +1393,53 @@ export function TrendChart({ rows, mode, stage, rateBasis, targetRate, selectedP
; } -export function TrendTable({ rows, rateBasis, onMonth, defectDisplay = 'weight', onlyStage }: { rows: TrendMetricRow[]; rateBasis: 'original' | 'withoutHeadquartersScrap'; onMonth: (value: number | string) => void; defectDisplay?: 'weight'|'rate'; onlyStage?: Stage }) { +export function TrendTable({ rows, rateBasis, onMonth, defectDisplay = 'weight', onlyStage, fullFields = false }: { rows: TrendMetricRow[]; rateBasis: 'original' | 'withoutHeadquartersScrap'; onMonth: (value: number | string) => void; defectDisplay?: 'weight'|'rate'; onlyStage?: Stage; fullFields?: boolean }) { const compact = useCompactTable(); + const stageLabel = (stage: Stage) => stage === 'black' ? '黑片' : '亮片'; + const metricLabels: Record = { + totalWeight: '总重量', qualifiedWeight: '合格重量', scrapWeight: '报废重量', + headquartersScrapWeight: '本部报废', rate: '合格率', + }; + const stageColumns = (stage: Stage): ColumnsType => metricStageColumnPlan(rows, stage, fullFields, rateBasis).map(column => { + const prefix = stageLabel(stage); + if (column.kind === 'defect') { + return { + title: `${prefix}${defectDisplay === 'rate' ? defectRateLabel(column.name) : column.name}${defectDisplay === 'rate' ? '' : ' / kg'}`, + key: `${stage}-defect-${column.name}`, align: 'center', width: fullFields ? 130 : 160, + render: (_: unknown, row: TrendMetricRow) => { + const value = row[stage].defects.find(item => item.name === column.name)?.weight ?? null; + return defectDisplay === 'rate' ? rateText(defectWeightRate(value, row[stage].totalWeight)) : numberText(value); + }, + }; + } + const field = column.field; + const baseLabel = `${prefix}${metricLabels[field]}`; + const title = field === 'totalWeight' && stage === 'black' + ? totalWeightTitle(`${baseLabel} / kg`) + : field === 'rate' && stage === 'bright' + ? rateBasisTitle(baseLabel, rateBasis, 'bright') + : `${defectDisplay === 'rate' && (field === 'scrapWeight' || field === 'headquartersScrapWeight') ? defectRateLabel(baseLabel) : baseLabel}${field === 'rate' || defectDisplay === 'rate' && (field === 'scrapWeight' || field === 'headquartersScrapWeight') ? '' : ' / kg'}`; + const width = field === 'rate' ? stage === 'bright' && rateBasis !== 'original' ? 194 : stage === 'black' ? 130 : 180 : fullFields ? 130 : 160; + return { + title, dataIndex: [stage, field], key: `${stage}-${field}`, align: 'center', width, + className: field === 'rate' ? `rate-cell ${stage}` : 'weight-cell', + render: (_: unknown, row: TrendMetricRow) => { + if (field === 'rate') return rateText(visibleStageRate(row, stage, stage === 'bright' ? rateBasis : 'original')); + if (field === 'scrapWeight') { + const value = queryScrapWeight(row[stage], stage, rateBasis); + return defectDisplay === 'rate' ? rateText(defectWeightRate(value, row[stage].totalWeight)) : numberText(value); + } + if (field === 'headquartersScrapWeight') { + const value = row.bright.headquartersScrapWeight ?? null; + return defectDisplay === 'rate' ? rateText(defectWeightRate(value, row.bright.totalWeight)) : numberText(value); + } + return numberText(row[stage][field]); + }, + }; + }); const columns: ColumnsType = [ { title: '统计期间', dataIndex: 'month', key: 'month', align: 'center', fixed: 'left', width: 130, render: (_: unknown, row) => }, - { title: totalWeightTitle('黑片总重量 / kg'), dataIndex: ['black', 'totalWeight'], key: 'blackTotal', align: 'center', width: 160, render: value => numberText(value) }, - { title: '黑片合格重量 / kg', dataIndex: ['black', 'qualifiedWeight'], key: 'blackQualified', align: 'center', width: 160, render: value => numberText(value) }, - { title: defectDisplay === 'rate' ? '黑片报废率' : '黑片报废重量 / kg', dataIndex: ['black', 'scrapWeight'], key: 'blackScrap', align: 'center', width: 160, render: (_: unknown, row: TrendMetricRow) => defectDisplay === 'rate' ? rateText(defectWeightRate(row.black.scrapWeight,row.black.totalWeight)) : numberText(row.black.scrapWeight) }, - { title: '黑片合格率', dataIndex: ['black', 'rate'], key: 'blackRate', align: 'center', width: 130, className: 'rate-cell black', render: (_: number | null, row: TrendMetricRow) => rateText(visibleStageRate(row, 'black')) }, - { title: '亮片总重量 / kg', dataIndex: ['bright', 'totalWeight'], key: 'brightTotal', align: 'center', width: 160, render: value => numberText(value) }, - { title: '亮片合格重量 / kg', dataIndex: ['bright', 'qualifiedWeight'], key: 'brightQualified', align: 'center', width: 160, render: value => numberText(value) }, - { title: defectDisplay === 'rate' ? '亮片报废率' : '亮片报废重量 / kg', dataIndex: ['bright', 'scrapWeight'], key: 'brightScrap', align: 'center', width: 160, render: (_: unknown, row: TrendMetricRow) => defectDisplay === 'rate' ? rateText(defectWeightRate(queryScrapWeight(row.bright,'bright',rateBasis),row.bright.totalWeight)) : numberText(queryScrapWeight(row.bright,'bright',rateBasis)) }, - { title: rateBasisTitle('亮片合格率', rateBasis, 'bright'), dataIndex: ['bright', 'rate'], key: 'brightRate', align: 'center', width: rateBasis === 'original' ? 180 : 194, className: 'rate-cell bright', render: (_: number | null, row: TrendMetricRow) => rateText(visibleStageRate(row, 'bright', rateBasis)) }, + ...stageColumns('black'), ...stageColumns('bright'), { title: rateBasisTitle('综合合格率', rateBasis, 'composite'), dataIndex: 'compositeRate', key: 'compositeRate', align: 'center', width: 120, fixed: compact ? undefined : 'right', className: 'combined-column', render: (_: number | null, row: MetricRow) => rateText(visibleCompositeRate(row, rateBasis)) }, ]; const visibleColumns = onlyStage ? columns.filter(column => column.key === 'month' || String(column.key).startsWith(onlyStage)) : columns; diff --git a/web/src/QueryPanels.tsx b/web/src/QueryPanels.tsx index 549d21f..e684fc0 100644 --- a/web/src/QueryPanels.tsx +++ b/web/src/QueryPanels.tsx @@ -7,10 +7,11 @@ type Granularity = 'month' | 'quarter' | 'year'; type TrendMode = 'production' | 'defects' | 'data'; type DefectDisplay = 'weight' | 'rate'; -export function QueryTrendPanel({ panelRef, id, mode, onMode, granularity, onGranularity, defectDisplay, onDefectDisplay, object, onObject, objects, scopeName, stageSwitch, children }: { +export function QueryTrendPanel({ panelRef, id, mode, onMode, granularity, onGranularity, defectDisplay, onDefectDisplay, fullFields, onFullFields, object, onObject, objects, scopeName, stageSwitch, children }: { panelRef?: Ref; id?: string; mode: TrendMode; onMode: (value: TrendMode) => void; granularity: Granularity; onGranularity: (value: Granularity) => void; defectDisplay: DefectDisplay; onDefectDisplay: (value: DefectDisplay) => void; + fullFields: boolean; onFullFields: (value: boolean) => void; object?: string; onObject: (value?: string) => void; objects: Array<{ label: string; value: string }>; scopeName: string; stageSwitch?: ReactNode; children: ReactNode; }) { @@ -22,6 +23,7 @@ export function QueryTrendPanel({ panelRef, id, mode, onMode, granularity, onGra
{mode === 'data' && } + {mode === 'data' && onFullFields(value === 'full')} aria-label="趋势字段显示" />} {mode !== 'data' && stageSwitch} diff --git a/web/src/StageProductPage.tsx b/web/src/StageProductPage.tsx index bace554..c15d70f 100644 --- a/web/src/StageProductPage.tsx +++ b/web/src/StageProductPage.tsx @@ -13,6 +13,7 @@ import { useDelayedIndicator } from './useDelayedBusy'; import { defaultQueryMonth, previousCompleteMonth, previousCompleteQuarter } from './periodDefaults'; import { readableSelectPopup } from './readableSelectPopup'; import { readableMetricFormula } from './publicDataDisplay'; +import { defaultFullMetricFields } from './metricColumnPlan'; import type { MetricRow, MetricsResponse, OptionsResponse, PeriodKind, QueryParams, SourceColumnField, SourceColumnFilter, Stage, TrendResponse } from './types'; import { QueryTrendPanel, QueryTablePanel } from './QueryPanels'; import { selectTrendPeriod as nextTrendPeriod } from './trendPeriodSelection'; @@ -33,6 +34,7 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU const [applied,setApplied]=useState(null);const [revision,setRevision]=useState(0);const [response,setResponse]=useState<{key:string;value:MetricsResponse}|null>(null);const [loading,setLoading]=useState(false);const [failure,setFailure]=useState<{key:string;message:string}|null>(null); const [defectDisplay,setDefectDisplay]=useState<'weight'|'rate'>('weight'); const [fullFields,setFullFields]=useState(true);const [rateBasis,setRateBasis]=useState<'original'|'withoutHeadquartersScrap'>('original');const [basisOpen,setBasisOpen]=useState(false);const [trendMode,setTrendMode]=useState<'production'|'defects'|'data'>('production'); + const [trendFullFields,setTrendFullFields]=useState(()=>defaultFullMetricFields(stage==='black'?'blackProduct':'brightProduct')); const [drilledProduct,setDrilledProduct]=useState('');const drillParentSearch=useRef(''); const [trendGranularity,setTrendGranularity]=useState<'month'|'quarter'|'year'>('month'); const [trendResponse,setTrendResponse]=useState<{key:string;value:TrendResponse;query:QueryParams}|null>(null);const [trendRevision,setTrendRevision]=useState(0);const [trendError,setTrendError]=useState('');const [trendLoading,setTrendLoading]=useState(false); @@ -125,11 +127,12 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU
+ defectDisplay={defectDisplay} onDefectDisplay={setDefectDisplay} fullFields={trendFullFields} onFullFields={setTrendFullFields} + object={trendObject} onObject={setTrendObject} objects={trendOptions} scopeName="产品"> {trendError&&setTrendRevision(v=>v+1)}>重试}/>}
{trendMode==='data' - ? + ? : } {showTrendLoading&&{trendResponse?`正在更新 · 当前显示上次筛选的${loadedQueryScope(trendResponse.query,decodeQueryValueList)}`:'正在读取趋势'}}
diff --git a/web/src/metricColumnPlan.ts b/web/src/metricColumnPlan.ts new file mode 100644 index 0000000..85d66d6 --- /dev/null +++ b/web/src/metricColumnPlan.ts @@ -0,0 +1,35 @@ +import type { MetricRow, Stage } from './types'; + +export type MetricStageField = 'totalWeight' | 'qualifiedWeight' | 'scrapWeight' | 'headquartersScrapWeight' | 'rate'; +export type MetricStageColumn = { kind: 'metric'; field: MetricStageField } | { kind: 'defect'; name: string }; +export type MetricFieldView = 'key' | 'full'; +export type MetricPageView = 'overall' | 'department' | 'group' | 'product' | 'blackProduct' | 'brightProduct'; + +const KEY_FIELDS: MetricStageField[] = ['totalWeight', 'qualifiedWeight', 'scrapWeight']; + +/** The stage pages start expanded; the four organization/product pages start compact. */ +export function defaultFullMetricFields(page: string): boolean { + return page === 'blackProduct' || page === 'brightProduct'; +} + +/** Keep the full/key field contract shared by the summary and trend tables. */ +export function metricStageColumnPlan( + rows: MetricRow[], + stage: Stage, + fullFields: boolean, + rateBasis: 'original' | 'withoutHeadquartersScrap', +): MetricStageColumn[] { + const columns: MetricStageColumn[] = KEY_FIELDS.map(field => ({ kind: 'metric', field })); + if (fullFields) { + const defectNames = Array.from(new Set(rows.flatMap(row => (row[stage]?.defects || []).map(item => item.name)))); + const defectColumns = defectNames.map(name => ({ kind: 'defect' as const, name })); + columns.push(...defectColumns); + if (stage === 'bright' && rateBasis === 'original') { + const diffusionIndex = defectNames.indexOf('扩散废'); + const insertAt = KEY_FIELDS.length + (diffusionIndex < 0 ? defectNames.length : diffusionIndex + 1); + columns.splice(insertAt, 0, { kind: 'metric', field: 'headquartersScrapWeight' }); + } + } + columns.push({ kind: 'metric', field: 'rate' }); + return columns; +} diff --git a/web/verification/metric_workbook.test.mjs b/web/verification/metric_workbook.test.mjs index 2257ff6..a80082b 100644 --- a/web/verification/metric_workbook.test.mjs +++ b/web/verification/metric_workbook.test.mjs @@ -5,6 +5,7 @@ import ts from 'typescript'; import React from 'react'; import { queryScrapWeight } from '../src/queryMetricValues.ts'; import { defectWeightRate } from '../src/trendMetrics.ts'; +import { metricStageColumnPlan } from '../src/metricColumnPlan.ts'; import { createMetricWorkbook, workbookColumns } from '../src/metricWorkbook.ts'; const source = fs.readFileSync(new URL('../src/QueryPage.tsx', import.meta.url), 'utf8'); @@ -17,13 +18,13 @@ const table = slice('export function MetricTable(', 'function MetricTablePaginat function fixture(props) { let exported, detail = 0, basis = 0; const ref = {}; - const render = new Function('React', 'useImperativeHandle', 'defectWeightRate', 'queryScrapWeight', 'downloadMetricWorkbook', ts.transpileModule(` + const render = new Function('React', 'useImperativeHandle', 'defectWeightRate', 'queryScrapWeight', 'metricStageColumnPlan', '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 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) => { + `, {compilerOptions:{jsx:ts.JsxEmit.React,target:ts.ScriptTarget.ES2022}}).outputText)(React, (target, create) => Object.assign(target, create()), defectWeightRate, queryScrapWeight, metricStageColumnPlan, 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}); diff --git a/web/verification/trend_metric_fields.test.mjs b/web/verification/trend_metric_fields.test.mjs new file mode 100644 index 0000000..826a83e --- /dev/null +++ b/web/verification/trend_metric_fields.test.mjs @@ -0,0 +1,53 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { defaultFullMetricFields, metricStageColumnPlan } from '../src/metricColumnPlan.ts'; + +const columnKeys = columns => columns.map(column => column.kind === 'defect' ? `defect:${column.name}` : column.field); + +test('six query views start with the requested key/full metric selection', () => { + for (const page of ['overall', 'department', 'group', 'product']) assert.equal(defaultFullMetricFields(page), false, page); + for (const page of ['blackProduct', 'brightProduct']) assert.equal(defaultFullMetricFields(page), true, page); +}); + +test('key metrics preserve the current four-column stage table', () => { + const rows = [{ black: { defects: [{ name: '责废', weight: 10 }] }, bright: { defects: [{ name: '镀废', weight: 5 }] } }]; + assert.deepEqual(columnKeys(metricStageColumnPlan(rows, 'black', false, 'original')), + ['totalWeight', 'qualifiedWeight', 'scrapWeight', 'rate']); + assert.deepEqual(columnKeys(metricStageColumnPlan(rows, 'bright', false, 'original')), + ['totalWeight', 'qualifiedWeight', 'scrapWeight', 'rate']); +}); + +test('full trend fields share summary ordering, including bright headquarters scrap', () => { + const rows = [{ + black: { defects: [{ name: '责废', weight: 8 }, { name: '料废', weight: 2 }, { name: '外废', weight: 1 }] }, + bright: { defects: [{ name: '镀废', weight: 4 }, { name: '材料废', weight: 3 }, { name: '加工废', weight: 2 }, { name: '扩散废', weight: 1 }] }, + }]; + assert.deepEqual(columnKeys(metricStageColumnPlan(rows, 'black', true, 'original')), + ['totalWeight', 'qualifiedWeight', 'scrapWeight', 'defect:责废', 'defect:料废', 'defect:外废', 'rate']); + assert.deepEqual(columnKeys(metricStageColumnPlan(rows, 'bright', true, 'original')), + ['totalWeight', 'qualifiedWeight', 'scrapWeight', 'defect:镀废', 'defect:材料废', 'defect:加工废', 'defect:扩散废', 'headquartersScrapWeight', 'rate']); + assert.deepEqual(columnKeys(metricStageColumnPlan(rows, 'bright', true, 'withoutHeadquartersScrap')), + ['totalWeight', 'qualifiedWeight', 'scrapWeight', 'defect:镀废', 'defect:材料废', 'defect:加工废', 'defect:扩散废', 'rate']); +}); + +test('bright headquarters scrap stays immediately after diffusion scrap when defect order varies', () => { + const rows = [{ bright: { defects: [ + { name: '材料废', weight: 3 }, { name: '扩散废', weight: 1 }, + { name: '镀废', weight: 4 }, { name: '加工废', weight: 2 }, + ] } }]; + assert.deepEqual(columnKeys(metricStageColumnPlan(rows, 'bright', true, 'original')), + ['totalWeight', 'qualifiedWeight', 'scrapWeight', 'defect:材料废', 'defect:扩散废', 'headquartersScrapWeight', 'defect:镀废', 'defect:加工废', 'rate']); +}); + +test('full field plan only uses defect values returned in the trend rows and does not mutate them', () => { + const rows = [ + { black: { defects: [{ name: '责废', weight: 8 }] }, bright: { defects: [] } }, + { black: { defects: [{ name: '料废', weight: null }] }, bright: { defects: [{ name: '镀废', weight: 1 }] } }, + ]; + const before = structuredClone(rows); + assert.deepEqual(columnKeys(metricStageColumnPlan(rows, 'black', true, 'original')), + ['totalWeight', 'qualifiedWeight', 'scrapWeight', 'defect:责废', 'defect:料废', 'rate']); + assert.deepEqual(columnKeys(metricStageColumnPlan(rows, 'bright', true, 'original')), + ['totalWeight', 'qualifiedWeight', 'scrapWeight', 'defect:镀废', 'headquartersScrapWeight', 'rate']); + assert.deepEqual(rows, before); +});