diff --git a/web/src/StageProductPage.tsx b/web/src/StageProductPage.tsx index e317783..b78b99d 100644 --- a/web/src/StageProductPage.tsx +++ b/web/src/StageProductPage.tsx @@ -2,7 +2,7 @@ import { SmoothTableFrame, useRetainedResult } from './QueryResultMotion'; import { queryScrapWeight } from './queryMetricValues'; import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { Alert, App, Button, Empty, Input, Modal, Segmented, Select, Spin } from 'antd'; -import { DownOutlined, DownloadOutlined, ReloadOutlined, SearchOutlined, UpOutlined } from '@ant-design/icons'; +import { DownOutlined, DownloadOutlined, UpOutlined } from '@ant-design/icons'; import { api, decodeQueryValueList, encodeQueryValueList } from './api'; import { MetricTable, MetricCard, DefectBreakdown, DefectParetoPanel, SectionHeading, RecordsDrawer, TrendChart, fullYearTrend, queryFromLocation } from './QueryPage'; import { StageSourceFilters } from './StageSourceFilters'; @@ -23,7 +23,7 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU const [period,setPeriod]=useState(initial.quarter?'quarter':initial.month?'month':initial.year?'year':'month'); const [year,setYear]=useState(initial.year||defaults.year);const [month,setMonth]=useState(initial.month||defaults.month);const [quarter,setQuarter]=useState(initial.quarter||previousCompleteQuarter().quarter); const [department,setDepartment]=useState(()=>decodeQueryValueList(initial.department));const [group,setGroup]=useState(()=>decodeQueryValueList(initial.group));const [product,setProduct]=useState(()=>decodeQueryValueList(initial.product));const [projectGroup,setProjectGroup]=useState(()=>decodeQueryValueList(initial.projectGroup)); - const [sourceFilters,setSourceFilters]=useState(initial.columnFilters||[]);const [search,setSearch]=useState(initial.productSearch||'');const includeUnassigned=true; + const [sourceFilters,setSourceFilters]=useState(initial.columnFilters||[]);const [search,setSearch]=useState(initial.productSearch||'');const [appliedSearch,setAppliedSearch]=useState(initial.productSearch||'');const includeUnassigned=true; const [moreFiltersOpen,setMoreFiltersOpen]=useState(false); const [options,setOptions]=useState(null);const [catalog,setCatalog]=useState<{releaseId:string;sourceFields:SourceColumnField[]}|null>(null);const [supportError,setSupportError]=useState('');const [supportLoading,setSupportLoading]=useState(true); 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); @@ -41,9 +41,9 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU },[onUnauthorized]); useEffect(()=>{if(active)void loadSupport();},[active,refreshKey,loadSupport]); const fields=useMemo(()=>catalog?.sourceFields.filter(field=>field.type==='source_value'&&field.stages.includes(stage))||[],[catalog,stage]); - const draft=useMemo(()=>stageProductQuery({year,...(period==='month'?{month}:period==='quarter'?{quarter}:{}),department:encodeQueryValueList(department),group:encodeQueryValueList(group),product:encodeQueryValueList(product),projectGroup:encodeQueryValueList(projectGroup),productSearch:search.trim()||undefined,includeUnassigned,view:'product',trendGranularity:'month',releaseId:catalog?.releaseId},stage,sourceFilters),[year,period,month,quarter,department,group,product,projectGroup,search,includeUnassigned,catalog,stage,sourceFilters]); - // A new release resets the data binding; hidden cached pages never issue queries. - useEffect(()=>{if(catalog)setApplied(draft);},[catalog]); + const draft=useMemo(()=>stageProductQuery({year,...(period==='month'?{month}:period==='quarter'?{quarter}:{}),department:encodeQueryValueList(department),group:encodeQueryValueList(group),product:encodeQueryValueList(product),projectGroup:encodeQueryValueList(projectGroup),productSearch:appliedSearch.trim()||undefined,includeUnassigned,view:'product',trendGranularity:'month',releaseId:catalog?.releaseId},stage,sourceFilters),[year,period,month,quarter,department,group,product,projectGroup,appliedSearch,includeUnassigned,catalog,stage,sourceFilters]); + // Apply organizational/source filters directly, like the other query pages. Product text search keeps its explicit submit. + useEffect(()=>{if(active&&catalog&&!supportLoading&&!supportError)setApplied(previous=>JSON.stringify(previous)===JSON.stringify(draft)?previous:draft);},[active,catalog,draft,supportLoading,supportError]); const queryKey=JSON.stringify({query:applied,revision});const current=response?.key===queryKey?response.value:null;const error=failure?.key===queryKey?failure.message:''; useEffect(()=>{ if(!active||!applied||supportError)return;const controller=new AbortController();setLoading(true);setFailure(null); @@ -60,7 +60,11 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU ? `${applied.year}-${String(applied.month).padStart(2,'0')}` : trendGranularity==='quarter'&&applied?.quarter ? `${applied.year}-Q${applied.quarter}` : undefined; const selectTrendPeriod=(value:number|string)=>{if(!applied)return;automaticPeriod.current=false;const text=String(value);if(trendGranularity==='year'){const selectedYear=Number(text);if(Number.isFinite(selectedYear)){setYear(selectedYear);setPeriod('year');setApplied({...applied,year:selectedYear,month:undefined,quarter:undefined});}}else if(trendGranularity==='quarter'){const selectedQuarter=Number(text.replace(/^.*Q/,''));if(selectedQuarter>=1&&selectedQuarter<=4){setQuarter(selectedQuarter);setPeriod('quarter');setApplied({...applied,quarter:selectedQuarter,month:undefined});}}else{const selectedMonth=Number(text.slice(-2));if(selectedMonth>=1&&selectedMonth<=12){setMonth(selectedMonth);setPeriod('month');setApplied({...applied,month:selectedMonth,quarter:undefined});}}setRevision(v=>v+1);}; - const dirty=!!applied&&JSON.stringify(draft)!==JSON.stringify(applied);const submit=()=>{automaticPeriod.current=false;setApplied(draft);setRevision(v=>v+1);}; + const dirty=!!applied&&JSON.stringify(draft)!==JSON.stringify(applied); + const queryBusy=supportLoading||loading||(!error&&!supportError&&(dirty||!current)); + const queryFailed=!!(error||supportError); + const submit=()=>{automaticPeriod.current=false;const value=search.trim();setAppliedSearch(value);setApplied(stageProductQuery({...draft,productSearch:value||undefined},stage,sourceFilters));setRevision(v=>v+1);}; + const reset=()=>{automaticPeriod.current=false;const previous=defaultQueryMonth(options);setYear(previous.year);setMonth(previous.month);setQuarter(previousCompleteQuarter().quarter);setPeriod('month');setTrendGranularity('month');setDepartment([]);setGroup([]);setProduct([]);setProjectGroup([]);setSourceFilters([]);setSearch('');setAppliedSearch('');setApplied(stageProductQuery({year:previous.year,month:previous.month,includeUnassigned,view:'product',trendGranularity:'month',releaseId:catalog?.releaseId},stage,[]));setRevision(v=>v+1);}; const groups=(options?.groups||[]).filter(name=>!department.length||department.includes(options?.groupDepartments?.[name]||'')); const paths=options?.organizationPaths||[];const products=department.length||group.length?[...new Set(paths.filter(path=>(!department.length||department.includes(path.department||''))&&(!group.length||group.includes(path.group||''))).map(path=>path.product).filter((v):v is string=>!!v))]:options?.products||[]; const select=(name:string,value:string[],choices:string[],change:(v:string[])=>void,extra=false)=>{trendError&&}
{trendMode==='data'?setBasisOpen(true)} onDrilldown={()=>{}}/>:}{trendLoading&&正在更新趋势}
{trendMode!=='data'&&
指标由来源分量汇总,使用当前生效公式。
}
setSearch(e.target.value)} onPressEnter={submit}/>setFullFields(v==='full')}/>setDefectDisplay(v as typeof defectDisplay)}/>
- setBasisOpen(true)} onDrilldown={row=>{setProduct([row.product||'__UNASSIGNED__']);setSearch('');setApplied({...applied!,product:row.product||'__UNASSIGNED__',productSearch:undefined});setRevision(v=>v+1);}}/> + setBasisOpen(true)} onDrilldown={row=>{setProduct([row.product||'__UNASSIGNED__']);setSearch('');setAppliedSearch('');setApplied({...applied!,product:row.product||'__UNASSIGNED__',productSearch:undefined});setRevision(v=>v+1);}}/>