优化:缓存查询与智能分析页面,修复组织下钻和草稿保留
This commit is contained in:
+29
-27
@@ -1,3 +1,4 @@
|
||||
import { usePageCache } from './pageCache';
|
||||
import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
|
||||
import * as echarts from 'echarts/core';
|
||||
import { BarChart, LineChart } from 'echarts/charts';
|
||||
@@ -202,8 +203,8 @@ function escapeTooltipText(value: string): string {
|
||||
return value.replace(/[&<>"']/g, character => ({ '&': '&', '<': '<', '>': '>', '"': '"', "'": ''' })[character]!);
|
||||
}
|
||||
|
||||
function queryFromLocation(): Partial<QueryParams> {
|
||||
const context = new URLSearchParams(window.location.search).get('context');
|
||||
function queryFromLocation(search = window.location.search): Partial<QueryParams> {
|
||||
const context = new URLSearchParams(search).get('context');
|
||||
if (!context) return {};
|
||||
try {
|
||||
const binary = atob(context.replace(/-/g, '+').replace(/_/g, '/') + '='.repeat((4 - context.length % 4) % 4));
|
||||
@@ -266,11 +267,11 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
onNavigate?: (page: PageKey, query: QueryParams, resultRef?: TopResultRef) => void;
|
||||
}) {
|
||||
const { message } = App.useApp();
|
||||
const { active, initialSearch, refreshKey, onLocationChange } = usePageCache();
|
||||
const baseView = SCOPE[page] || 'overall';
|
||||
const initialQuery = queryFromLocation();
|
||||
const [initialQuery] = useState(() => queryFromLocation(initialSearch));
|
||||
const [viewOverrideState, setViewOverrideState] = useState<{ page: PageKey; view: ViewKind } | undefined>(() => initialQuery.view && initialQuery.view !== baseView ? { page, view: initialQuery.view } : undefined);
|
||||
const routeViewOverride = initialQuery.view && initialQuery.view !== baseView ? initialQuery.view : undefined;
|
||||
const viewOverride = routeViewOverride || (viewOverrideState?.page === page ? viewOverrideState.view : undefined);
|
||||
const viewOverride = viewOverrideState?.page === page ? viewOverrideState.view : undefined;
|
||||
const setViewOverride = (next?: ViewKind) => setViewOverrideState(next ? { page, view: next } : undefined);
|
||||
const view = viewOverride || baseView;
|
||||
const scopeName = viewOverride ? ({ overall: '总体', department: '产业部', group: '产业部-业务分组', product: '产品', projectGroup: '项目组' } as Record<ViewKind, string>)[viewOverride] : SCOPE_NAMES[page] || '总体';
|
||||
@@ -290,8 +291,8 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
const [extraFilters, setExtraFilters] = useState<Record<string,string[]>>(initialQuery.extraFilters || {});
|
||||
const [includeUnassigned, setIncludeUnassigned] = useState(initialQuery.includeUnassigned === true);
|
||||
const [trendGranularity, setTrendGranularity] = useState<'month' | 'quarter' | 'year'>(initialQuery.trendGranularity || (initialQuery.quarter ? 'quarter' : 'month'));
|
||||
const [search, setSearch] = useState('');
|
||||
const [appliedSearch, setAppliedSearch] = useState('');
|
||||
const [search, setSearch] = useState(initialQuery.productSearch || '');
|
||||
const [appliedSearch, setAppliedSearch] = useState(initialQuery.productSearch || '');
|
||||
const [fullFields, setFullFields] = useState(false);
|
||||
const [data, setData] = useState<MetricsResponse | null>(null);
|
||||
const [dataKey, setDataKey] = useState('');
|
||||
@@ -319,17 +320,15 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
const [basisOpen, setBasisOpen] = useState(false);
|
||||
const trendAnchorTop = useRef<number | null>(null);
|
||||
const tableContent = useRef<HTMLDivElement>(null);
|
||||
const trendSection = useRef<HTMLElement>(null);
|
||||
const refreshSeen = useRef(refreshKey);
|
||||
useEffect(() => {
|
||||
if (active && refreshSeen.current !== refreshKey) { refreshSeen.current = refreshKey; setQueryRevision(value => value + 1); }
|
||||
if (!active) { setRecordsOpen(false); setBasisOpen(false); }
|
||||
}, [active, refreshKey]);
|
||||
const tableHeight = useRef(525);
|
||||
|
||||
useEffect(() => {
|
||||
setTrendObject('');
|
||||
setDrilledProduct('');
|
||||
setSearch('');
|
||||
setAppliedSearch('');
|
||||
setViewOverrideState(undefined);
|
||||
setRecordsOpen(false);
|
||||
setSelectedRecord(null);
|
||||
}, [page]);
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
let alive = true;
|
||||
@@ -344,7 +343,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
if (alive) setOptionsError(chooseError(errorValue));
|
||||
}).finally(() => { if (alive) setOptionsLoading(false); });
|
||||
return () => { alive = false; };
|
||||
}, [onUnauthorized]);
|
||||
}, [onUnauthorized, queryRevision]);
|
||||
|
||||
const allowedGroups = useMemo(() => {
|
||||
const parents = new Set(department);
|
||||
@@ -406,6 +405,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
trendKeyRef.current = trendKey;
|
||||
|
||||
useEffect(() => {
|
||||
if (!active) return;
|
||||
const url = new URL(window.location.href);
|
||||
if (!['overall', 'department', 'group', 'product'].includes(url.searchParams.get('page') || '')) return;
|
||||
const bytes = new TextEncoder().encode(JSON.stringify({ query: queryParams }));
|
||||
@@ -414,7 +414,8 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
const context = btoa(binary).replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
|
||||
url.searchParams.set('context', context);
|
||||
window.history.replaceState(window.history.state, '', `${url.pathname}${url.search}${url.hash}`);
|
||||
}, [queryKey]);
|
||||
onLocationChange(url.search);
|
||||
}, [queryKey, active]);
|
||||
|
||||
useEffect(() => {
|
||||
const controller = new AbortController();
|
||||
@@ -498,7 +499,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
}
|
||||
});
|
||||
return () => { alive = false; };
|
||||
}, [trendKey, onUnauthorized]);
|
||||
}, [trendKey, queryRevision, onUnauthorized]);
|
||||
|
||||
const currentTrendTarget = trendTargetKey === trendKey ? trendTarget : null;
|
||||
const visibleTrendData = useMemo(() => fullYearTrend(trendDataKey === trendKey ? trendData : [], year, trendGranularity), [trendData, trendDataKey, trendKey, year, trendGranularity]);
|
||||
@@ -546,7 +547,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
setRecordsOpen(true);
|
||||
}, []);
|
||||
const captureTrendAnchor = useCallback(() => {
|
||||
trendAnchorTop.current = document.getElementById('monthly-trend')?.getBoundingClientRect().top ?? null;
|
||||
trendAnchorTop.current = trendSection.current?.getBoundingClientRect().top ?? null;
|
||||
}, []);
|
||||
const selectTrendPeriod = useCallback((value: number | string) => {
|
||||
const raw = String(value);
|
||||
@@ -581,8 +582,8 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
}, [period, year, month, quarter, captureTrendAnchor]);
|
||||
|
||||
useLayoutEffect(() => {
|
||||
if (trendAnchorTop.current == null) return;
|
||||
const nextTop = document.getElementById('monthly-trend')?.getBoundingClientRect().top;
|
||||
if (!active || trendAnchorTop.current == null) return;
|
||||
const nextTop = trendSection.current?.getBoundingClientRect().top;
|
||||
if (nextTop != null) window.scrollBy(0, nextTop - trendAnchorTop.current);
|
||||
// Keep the anchor through the response as the new result may have a
|
||||
// different row count. Clearing it at request start allowed a second jump.
|
||||
@@ -698,7 +699,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
{filterSelect('业务分组', group, allowedGroups, values => { setGroup(values); setProduct([]); }, !department.length)}
|
||||
{filterSelect('产品', product, department.length || group.length ? organizationPathOptions.products : options?.products, setProduct)}
|
||||
|
||||
<ExtraQueryFilters projectGroup={projectGroup} projectGroups={options?.projectGroupStatus === 'READY' ? options.projectGroups : undefined} onProjectGroup={setProjectGroup} value={extraFilters} onChange={setExtraFilters} onUnauthorized={onUnauthorized} />
|
||||
<ExtraQueryFilters key={queryRevision} projectGroup={projectGroup} projectGroups={options?.projectGroupStatus === 'READY' ? options.projectGroups : undefined} onProjectGroup={setProjectGroup} value={extraFilters} onChange={setExtraFilters} onUnauthorized={onUnauthorized} />
|
||||
<Checkbox className="query-unassigned" checked={includeUnassigned} onChange={event => setIncludeUnassigned(event.target.checked)}>包含未分类行</Checkbox>
|
||||
<div className="query-toolbar-tail">
|
||||
<span className={`query-status ${queryBusy ? 'busy' : currentMetricsError ? 'failed' : ''}`}><i />{queryBusy ? '正在查询' : currentMetricsError ? '查询失败' : '查询完成'}</span>
|
||||
@@ -737,6 +738,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
<Button type="primary" disabled={Boolean(drilledProduct)} onClick={() => applySearch()} aria-label="开始搜索">搜索</Button>
|
||||
<Segmented value={fullFields ? 'full' : 'key'} options={[{ label: '关键指标', value: 'key' }, { label: '完整字段', value: 'full' }]} onChange={value => setFullFields(value === 'full')} aria-label="字段显示" />
|
||||
<Tooltip title="点击综合合格率可查看计算依据"><Button type="text" icon={<InfoCircleOutlined />} aria-label="查看计算依据" onClick={() => setBasisOpen(true)} /></Tooltip>
|
||||
{!drilledProduct && (view === 'group' || view === 'product' && (group.length > 0 || department.length > 0)) && <Button onClick={() => { setSearch(''); setAppliedSearch(''); setTrendObject(''); if (view === 'product') { setProduct([]); setGroup([]); setViewOverride('group'); } else { setGroup([]); setDepartment([]); setViewOverride('department'); } }}>{view === 'product' ? '返回业务分组' : '返回产业部'}</Button>}
|
||||
{drilledProduct && <Button onClick={() => { setDrilledProduct(''); setTrendObject(''); setTrendMode('production'); }}>返回产品汇总</Button>}
|
||||
</div>
|
||||
</div>
|
||||
@@ -771,8 +773,8 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
emptyText={queryBusy ? '正在更新数据…' : currentMetricsError ? '查询失败,暂无可展示结果' : '当前条件下暂无数据'}
|
||||
onDrilldown={row => {
|
||||
if (view === 'overall') setViewOverride('department');
|
||||
else if (view === 'department' && row.department) { setDepartment([row.department]); setViewOverride('group'); }
|
||||
else if (view === 'group' && row.group) { setGroup([row.group]); setViewOverride('product'); }
|
||||
else if (view === 'department' && row.department) { setSearch(''); setAppliedSearch(''); setTrendObject(''); setGroup([]); setProduct([]); setDepartment([row.department]); setViewOverride('group'); }
|
||||
else if (view === 'group' && row.group) { setSearch(''); setAppliedSearch(''); setTrendObject(''); setProduct([]); setGroup([row.group]); setViewOverride('product'); }
|
||||
else if (view === 'product') {
|
||||
const selectedProduct = row.product || row.label;
|
||||
if (!selectedProduct) return;
|
||||
@@ -789,7 +791,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
</section>
|
||||
|
||||
<div className="analysis-stack">
|
||||
<section className="panel section-panel trend-panel" id="monthly-trend">
|
||||
<section className="panel section-panel trend-panel" ref={trendSection} id={active ? 'monthly-trend' : undefined}>
|
||||
<div className="section-heading-row trend-heading-row">
|
||||
<SectionHeading title={`${trendGranularity === 'month' ? '月度' : trendGranularity === 'quarter' ? '季度' : '年度'}变化趋势`} subtitle={`${trendGranularity === 'year' ? '全部实际数据年份' : `${year} 年`} · ${trendObject || `当前${scopeName}筛选`}`} />
|
||||
<Segmented value={trendMode} options={[{ label: '合格率与产量', value: 'production' }, { label: '不良率', value: 'defects' }, { label: `${trendGranularity === 'quarter' ? '季度' : trendGranularity === 'year' ? '年度' : '月度'}数据`, value: 'data' }]} onChange={value => setTrendMode(value as typeof trendMode)} aria-label="趋势视图" />
|
||||
@@ -828,7 +830,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
</section>;
|
||||
})}
|
||||
</div>
|
||||
{currentMetricsData ? <DefectParetoPanel key={defectQueryKey} releaseId={currentMetricsData.release?.id} query={defectQueryParams} externalScrapWeight={blackDefectItems.find(item => item.name === '外废')?.weight} onUnauthorized={onUnauthorized} /> : <div className="defect-pareto-status">{queryBusy ? '正在更新不良数据…' : '不良数据暂不可用'}</div>}
|
||||
{currentMetricsData ? <DefectParetoPanel key={`${currentMetricsData.release?.id}:${defectQueryKey}:${queryRevision}`} releaseId={currentMetricsData.release?.id} query={defectQueryParams} externalScrapWeight={blackDefectItems.find(item => item.name === '外废')?.weight} onUnauthorized={onUnauthorized} /> : <div className="defect-pareto-status">{queryBusy ? '正在更新不良数据…' : '不良数据暂不可用'}</div>}
|
||||
</section>
|
||||
</div>
|
||||
</>
|
||||
|
||||
Reference in New Issue
Block a user