diff --git a/README.md b/README.md index 278d896..e45fb61 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,9 @@ DSH CLI 固定为 `0.2.2-rc.1`,依赖与官方 Python SDK 校验记录在 `run 启动时在单线程后台补建当前完整正式版本的索引,导入及归类在事务提交后进入同一去重队列。完整构建标记提交后才启用;未完成、失败或未补建的历史构建沿用原始查询,不阻止启动和正式数据发布。索引增加持久存储及后台构建成本,规模取决于非空字段数和不同值数量;高基数宽表应先测容量。保留清理随无引用构建回收索引;升级后原维护兼容保护继续生效。 -黑片/亮片页的普通查询在数据版本已解析后独立加载,来源字段条件仍等待对应版本的字段目录;产品搜索不因无关元数据失败而禁用。 +年度全产品查询先显示正式指标和同范围趋势,再读取产品表格;月/季、单产品及总体/产业部等范围复用完整结果,避免额外往返。不同范围的趋势独立加载,底部柏拉图接近视口且主查询就绪后读取。刷新和筛选变化会使旧结果失去当前资格;表格失败时,已就绪的指标与趋势仍可使用。 + +普通查询在数据版本已解析后开始,来源字段条件仍等待对应版本的字段目录;产品文本搜索等待必要产品选项,不因无关元数据失败而禁用。表格仍保留全量产品及全量 Excel 导出。 ## 旧版本时间迁移 diff --git a/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsController.java b/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsController.java index 4cc7155..1d90ebc 100644 --- a/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsController.java +++ b/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsController.java @@ -70,10 +70,12 @@ public class MetricsController { @RequestParam(required=false) String exclusions, @RequestParam(required=false) String columnFilters, @RequestParam(required=false) String stage, + @RequestParam(defaultValue="full") String part, @AuthenticationPrincipal AppUserPrincipal actor) { + if (!List.of("full", "table").contains(part)) throw new IllegalArgumentException("part 必须是 full 或 table"); return calculateRangeStage(year, month, monthStart, monthEnd, quarter, department, group, product, productSearch, projectGroup, view, includeUnassigned, releaseId, trendGranularity, rowLimit, rowOffset, rowOrder, - extraFilters, exclusions, columnFilters, stage, actor); + extraFilters, exclusions, columnFilters, stage, actor, "table".equals(part)); } /** 轻量趋势接口:查询参数与正式指标接口一致,但只返回版本、上下文、趋势和覆盖信息。 */ @@ -131,10 +133,15 @@ public class MetricsController { } private MetricsService.MetricSnapshot calculateRangeStage(Integer year,Integer month,Integer monthStart,Integer monthEnd,String quarter,String department,String group,String product,String productSearch,String projectGroup,String view,boolean includeUnassigned,String releaseId,String trendGranularity,Integer rowLimit,int rowOffset,String rowOrder,String extraFilters,String exclusions,String columnFilters,String stage,AppUserPrincipal actor) { + return calculateRangeStage(year,month,monthStart,monthEnd,quarter,department,group,product,productSearch,projectGroup,view,includeUnassigned,releaseId,trendGranularity,rowLimit,rowOffset,rowOrder,extraFilters,exclusions,columnFilters,stage,actor,false); + } + + private MetricsService.MetricSnapshot calculateRangeStage(Integer year,Integer month,Integer monthStart,Integer monthEnd,String quarter,String department,String group,String product,String productSearch,String projectGroup,String view,boolean includeUnassigned,String releaseId,String trendGranularity,Integer rowLimit,int rowOffset,String rowOrder,String extraFilters,String exclusions,String columnFilters,String stage,AppUserPrincipal actor,boolean tableOnly) { Integer quarterNumber = parseQuarter(quarter); - MetricsService.MetricSnapshot visible = responseAccess.visible(metrics.calculate(new MetricsService.MetricsQuery(year, month, quarterNumber, department, group, + MetricsService.MetricsQuery query = new MetricsService.MetricsQuery(year, month, quarterNumber, department, group, product, projectGroup, view, includeUnassigned, releaseId, trendGranularity, parseExclusions(exclusions)) - .withMonthRange(monthStart, monthEnd).withExtraFilters(extraFilters).withProductSearch(productSearch).withColumnFilters(columnFilters).withStage(stage), actor), actor); + .withMonthRange(monthStart, monthEnd).withExtraFilters(extraFilters).withProductSearch(productSearch).withColumnFilters(columnFilters).withStage(stage); + MetricsService.MetricSnapshot visible = responseAccess.visible(tableOnly ? metrics.calculateTable(query,actor) : metrics.calculate(query,actor), actor); if (rowLimit == null) return visible; if (rowLimit < 1 || rowLimit > 500 || rowOffset < 0) throw new IllegalArgumentException("rowLimit 必须在 1 到 500 之间,rowOffset 不能为负数"); if (rowOrder != null && !rowOrder.equals("scrapDesc")) throw new IllegalArgumentException("rowOrder 无效"); diff --git a/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsService.java b/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsService.java index 647e524..f93f481 100644 --- a/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsService.java +++ b/backend/src/main/java/cn/yunsheng/quality/metrics/MetricsService.java @@ -67,6 +67,15 @@ public class MetricsService { } public MetricSnapshot calculate(MetricsQuery query, AppUserPrincipal actor) { + return calculate(query, actor, false); + } + + /** 仅按对象汇总表格,省去时间与对象交叉分组的中间行。 */ + public MetricSnapshot calculateTable(MetricsQuery query, AppUserPrincipal actor) { + return calculate(query, actor, true); + } + + private MetricSnapshot calculate(MetricsQuery query, AppUserPrincipal actor, boolean tableOnly) { if (actor == null) throw new ResponseStatusException(HttpStatus.FORBIDDEN, "指标查询必须绑定当前有效用户"); governance.requireUserActivePolicy(actor); governance.requireBoundAction("QUERY", "query.aggregate"); @@ -75,7 +84,7 @@ public class MetricsService { ? currentReleaseId() : query.releaseId(); if (releaseId == null) return emptySnapshot(query); ReleaseInfo release = release(releaseId, actor); - return calculateForRelease(query, actor, release); + return withConsistentSnapshot(() -> calculateForReleaseSnapshot(query, actor, release, tableOnly)); } /** 只按时间桶生成趋势,不构造总体摘要或产品/分组维度行。 */ @@ -244,9 +253,13 @@ public class MetricsService { } private MetricSnapshot calculateForReleaseSnapshot(MetricsQuery query, AppUserPrincipal actor, ReleaseInfo release) { + return calculateForReleaseSnapshot(query, actor, release, false); + } + + private MetricSnapshot calculateForReleaseSnapshot(MetricsQuery query, AppUserPrincipal actor, ReleaseInfo release, boolean tableOnly) { String releaseId = release.id(); boolean hasUnrolledBuilds = hasUnrolledBuilds(releaseId); - AggregateSet aggregates = queryAggregates(releaseId, query, actor, hasUnrolledBuilds); + AggregateSet aggregates = queryAggregates(releaseId, query, actor, hasUnrolledBuilds, null, !tableOnly); String ruleVersion=jdbc.queryForObject("SELECT rule_version FROM data_release WHERE id=?",String.class,releaseId); ConfigurableRuleEngine rules=rulesForVersion(ruleVersion); MetricRow summary = rules.applyMetrics(aggregates.summary().toMetricRow("overall", "总体", null, null, null)); @@ -358,23 +371,28 @@ public class MetricsService { private AggregateSet queryAggregates(String releaseId, MetricsQuery query, AppUserPrincipal actor, boolean hasUnrolledBuilds, Map canonicalGroupDepartments) { + return queryAggregates(releaseId, query, actor, hasUnrolledBuilds, canonicalGroupDepartments, true); + } + + private AggregateSet queryAggregates(String releaseId, MetricsQuery query, AppUserPrincipal actor, + boolean hasUnrolledBuilds, Map canonicalGroupDepartments, boolean includePeriods) { AggregateSet result = new AggregateSet(); boolean salesRollup = salesOrderRollupReady(releaseId, query, actor); boolean hasSourceFilters = !query.extraFilters().isEmpty() || !query.columnFilters().isEmpty(); if (!hasSourceFilters || salesRollup) { - aggregateStage(result, "black", query.view(), releaseId, query, actor, false, salesRollup, canonicalGroupDepartments); - aggregateStage(result, "bright", query.view(), releaseId, query, actor, false, salesRollup, canonicalGroupDepartments); + aggregateStage(result, "black", query.view(), releaseId, query, actor, false, salesRollup, canonicalGroupDepartments, includePeriods); + aggregateStage(result, "bright", query.view(), releaseId, query, actor, false, salesRollup, canonicalGroupDepartments, includePeriods); } if (!salesRollup && (hasUnrolledBuilds || hasSourceFilters)) { - aggregateStage(result, "black", query.view(), releaseId, query, actor, true, false, canonicalGroupDepartments); - aggregateStage(result, "bright", query.view(), releaseId, query, actor, true, false, canonicalGroupDepartments); + aggregateStage(result, "black", query.view(), releaseId, query, actor, true, false, canonicalGroupDepartments, includePeriods); + aggregateStage(result, "bright", query.view(), releaseId, query, actor, true, false, canonicalGroupDepartments, includePeriods); } return result; } private void aggregateStage(AggregateSet result, String stage, String view, String releaseId, MetricsQuery query, AppUserPrincipal actor, boolean factFallback, boolean salesRollup, - Map canonicalGroupDepartments) { + Map canonicalGroupDepartments, boolean includePeriods) { if(query.stage()!=null&&!query.stage().equals(stage))return; String table = factFallback ? (stage.equals("black") ? "fact_black" : "fact_bright") : (salesRollup ? "sales_order_metric_rollup" : "metric_rollup"); String dimensionColumn = view.equals("overall") ? null : switch (view) { @@ -405,7 +423,7 @@ public class MetricsService { DataScope.append(where, args, actor, "f.department COLLATE utf8mb4_0900_as_cs", "f.group_name COLLATE utf8mb4_0900_as_cs"); if (!effectiveIncludeUnassigned(query)) where.append(" AND (f.group_name IS NOT NULL AND f.group_name<>'')"); - String trendBucket = trendBucketExpression(query.trendGranularity()); + String trendBucket = includePeriods ? trendBucketExpression(query.trendGranularity()) : "'all'"; String sql = """ SELECT %s AS trend_period, %s AS bucket_key%s, SUM(f.qualified_weight) AS qualified_weight, @@ -437,7 +455,7 @@ public class MetricsService { String key = rs.getString("bucket_key"); AggregateStats stats = new AggregateStats().read(rs, stage); result.summary().merge(stage, stats); - result.periods().computeIfAbsent(period, ignored -> new AggregateStats()).merge(stage, stats); + if (includePeriods) result.periods().computeIfAbsent(period, ignored -> new AggregateStats()).merge(stage, stats); if (dimensionColumn != null) { if (!canonicalGroupRows || canonicalGroupOwnerMatches(canonicalGroupDepartments, key, rs.getString("owner_department"))) result.dimensions().computeIfAbsent(key, ignored -> new AggregateStats()).merge(stage, stats); diff --git a/backend/src/test/java/cn/yunsheng/quality/metrics/MetricsTrendControllerTest.java b/backend/src/test/java/cn/yunsheng/quality/metrics/MetricsTrendControllerTest.java index f4df541..5dd75ad 100644 --- a/backend/src/test/java/cn/yunsheng/quality/metrics/MetricsTrendControllerTest.java +++ b/backend/src/test/java/cn/yunsheng/quality/metrics/MetricsTrendControllerTest.java @@ -51,4 +51,31 @@ class MetricsTrendControllerTest { assertEquals(Map.of("customerCode", List.of("000123")), value.extraFilters()); assertEquals("src_any", value.columnFilters().getFirst().get("field")); } + @Test void tableProjectionKeepsSourceScopeAndUsesTheSameResponseAuthorization() { + MetricsService metrics = mock(MetricsService.class); + MetricsResponseAccess access = mock(MetricsResponseAccess.class); + AppUserPrincipal actor = new AppUserPrincipal(UUID.randomUUID(), "table", "unused", "表格", true, false, + List.of("USER"), List.of("D"), List.of("G"), List.of()); + var response = new MetricsService.MetricSnapshot(Map.of(), Map.of(), null, List.of(), List.of(), Map.of(), Map.of()); + when(metrics.calculateTable(any(), eq(actor))).thenReturn(response); + when(access.visible(response, actor)).thenReturn(response); + var actual = new MetricsController(metrics, access).calculateHttp( + 2026, null, 3, 9, null, "D", "G", "P", "18X15", "PG", "product", false, + "release-a", "quarter", null, 0, null, "{\"customerCode\":[\"000123\"]}", + "{\"product\":[\"P2\"]}", + "[{\"field\":\"src_any\",\"stages\":[\"black\"],\"operator\":\"contains\",\"values\":[\"000123\"]}]", + "black", "table", actor); + assertEquals(response, actual); + var query = ArgumentCaptor.forClass(MetricsService.MetricsQuery.class); + verify(metrics).calculateTable(query.capture(), eq(actor)); + verify(access).visible(response, actor); + var value = query.getValue(); + assertEquals(3, value.monthStart()); assertEquals(9, value.monthEnd()); + assertEquals("black", value.stage()); assertEquals("P", value.product()); + assertEquals("D", value.department()); assertEquals("G", value.group()); + assertEquals("18X15", value.productSearch()); assertEquals("PG", value.projectGroup()); + assertEquals(Map.of("product", List.of("P2")), value.exclusions()); + assertEquals(Map.of("customerCode", List.of("000123")), value.extraFilters()); + assertEquals("contains", value.columnFilters().getFirst().get("operator")); + } } diff --git a/backend/src/test/java/cn/yunsheng/quality/metrics/MetricsTrendServiceTest.java b/backend/src/test/java/cn/yunsheng/quality/metrics/MetricsTrendServiceTest.java index a47e813..35688c3 100644 --- a/backend/src/test/java/cn/yunsheng/quality/metrics/MetricsTrendServiceTest.java +++ b/backend/src/test/java/cn/yunsheng/quality/metrics/MetricsTrendServiceTest.java @@ -49,6 +49,29 @@ class MetricsTrendServiceTest { assertTrue(trendSql.stream().allMatch(sql -> !sql.contains("bucket_key") && !sql.contains("f.product"))); } + @Test void tableProjectionKeepsFormalRowsSummaryAndCoverageWithoutTimeByProductGrouping() { + JdbcTemplate jdbc = jdbc(true, true); + var governance = mock(GovernanceAccessService.class); + MetricsService service = new MetricsService(jdbc, governance); + var query = new MetricsService.MetricsQuery(2026, null, null, null, null, null, null, + "product", true, RELEASE, "month", Map.of()).withMonthRange(2, 5).withStage("bright"); + var full = service.calculate(query, actor); + clearInvocations(jdbc, governance); + var table = service.calculateTable(query, actor); + assertEquals(full.summary(), table.summary()); + assertEquals(full.rows(), table.rows()); + assertEquals(full.defects(), table.defects()); + assertEquals(full.coverage(), table.coverage()); + assertEquals(full.context(), table.context()); + assertTrue(table.trend().isEmpty()); + var sql = capturedSql(jdbc).stream().filter(value -> value.contains("AS bucket_key")).toList(); + assertEquals(1, sql.size()); + assertTrue(sql.getFirst().contains("SELECT 'all' AS trend_period")); + assertTrue(sql.getFirst().contains("f.month_key BETWEEN ? AND ?")); + verify(governance).requireUserActivePolicy(actor); + verify(governance).requireBoundAction("QUERY", "query.aggregate"); + } + @Test void rangeStageAndFiltersReachOnlyTheRequestedTrendAndCoverageQueries() { JdbcTemplate jdbc = jdbc(true, true); MetricsService service = new MetricsService(jdbc, mock(GovernanceAccessService.class)); diff --git a/web/src/QueryPage.tsx b/web/src/QueryPage.tsx index 47a48fb..ae10dbf 100644 --- a/web/src/QueryPage.tsx +++ b/web/src/QueryPage.tsx @@ -1,3 +1,5 @@ +import { usePriorityMetrics } from './usePriorityMetrics'; +import { overviewTrend, sameTrendScope } from './priorityMetrics'; import { QuerySnapshotButton } from './QuerySnapshotButton'; import { loadedQueryScope, queryForLocation, readQueryLocation } from './queryLoadingScope'; import { AnimatedMetricText, SmoothTableFrame, useAnimatedMetricText, useRetainedResult } from './QueryResultMotion'; @@ -413,7 +415,10 @@ export default function QueryPage({ page, onUnauthorized }: { setDrilledProduct(''); }, [drilldownContextKey]); const metricParams = useMemo(() => ({ ...queryParams, trendGranularity: 'month' }), [queryParams]); - const metricKey = useMemo(() => JSON.stringify(metricParams), [metricParams]); + const metricKey = useMemo(() => JSON.stringify([metricParams, queryRevision]), [metricParams, queryRevision]); + const metricsReady = !!(initialQuery.releaseId || currentReleaseId !== undefined) && (!metricParams.productSearch || !!options); + const overview = usePriorityMetrics(metricParams, active && metricsReady, queryRevision, onUnauthorized); + const currentOverview = overview.value; const currentMetricsError = errorKey === metricKey ? error : ''; const currentMetricsData = dataKey === metricKey && !currentMetricsError ? data : null; const queryPending = !currentMetricsData && !currentMetricsError; @@ -429,7 +434,10 @@ export default function QueryPage({ page, onUnauthorized }: { }, [queryKey, trendObject, trendGranularity, view]); const defectQueryParams = useMemo(() => applyTrendObject(queryParams, trendObject, view), [queryKey, trendObject, view]); const defectQueryKey = JSON.stringify(defectQueryParams); - const trendKey = JSON.stringify(trendParams); + const trendKey = JSON.stringify([trendParams, queryRevision]); + const reuseOverviewTrend = sameTrendScope(metricParams, trendParams); + const trendGate = !overview.split && !reuseOverviewTrend || overview.settled; + const sharedTrend = reuseOverviewTrend ? currentOverview : null; const trendKeyRef = useRef(trendKey); trendKeyRef.current = trendKey; @@ -447,12 +455,15 @@ export default function QueryPage({ page, onUnauthorized }: { }, [queryKey, active]); useEffect(() => { - if (!active || optionsLoading || optionsError) return; + if (!active || !metricsReady || !overview.settled) return; + if (currentOverview && !overview.split) { + setData(currentOverview); setDataKey(metricKey); setLoading(false); setError(''); setErrorKey(''); return; + } const controller = new AbortController(); setLoading(true); setError(''); setErrorKey(''); - api.metrics(metricParams, controller.signal).then(result => { + (metricParams.view === 'overall' ? api.metrics : api.metricsTable)(metricParams, controller.signal).then(result => { if (controller.signal.aborted || metricKeyRef.current !== metricKey) return; setData(result); setDataKey(metricKey); @@ -465,7 +476,7 @@ export default function QueryPage({ page, onUnauthorized }: { setErrorKey(metricKey); }).finally(() => { if (!controller.signal.aborted) setLoading(false); }); return () => controller.abort(); - }, [active, metricKey, queryRevision, onUnauthorized, optionsLoading, optionsError]); + }, [active, metricKey, queryRevision, onUnauthorized, metricsReady, overview.settled, overview.split, currentOverview]); useEffect(() => { if (!active) return; @@ -479,7 +490,7 @@ export default function QueryPage({ page, onUnauthorized }: { setTrendObjectMetrics(null); setTrendObjectMetricsLoading(true); setTrendObjectMetricsError(''); - api.metrics({ ...defectQueryParams, trendGranularity: 'month' }, controller.signal) + api.metrics({ ...defectQueryParams, view: 'overall', trendGranularity: 'month' }, controller.signal) .then(result => { if (!controller.signal.aborted) setTrendObjectMetrics({ key: defectQueryKey, data: result }); }) .catch(errorValue => { if (controller.signal.aborted) return; @@ -490,8 +501,11 @@ export default function QueryPage({ page, onUnauthorized }: { }, [active, trendObject, defectQueryKey, queryKey, queryRevision, onUnauthorized]); useEffect(() => { - if (!active || optionsLoading || optionsError) return; + if (!active || !metricsReady || !trendGate) return; setTrendFailure(null); + if (sharedTrend) { + setTrendData(overviewTrend(sharedTrend).trend); setTrendDataKey(trendKey); setTrendLoading(false); return; + } const controller = new AbortController(); setTrendLoading(true); api.trend(trendParams, controller.signal).then(result => { @@ -503,10 +517,10 @@ export default function QueryPage({ page, onUnauthorized }: { if (!controller.signal.aborted && !onUnauthorized(errorValue)) setTrendFailure({ key: trendKey, message: chooseError(errorValue) }); }).finally(() => { if (!controller.signal.aborted) setTrendLoading(false); }); return () => controller.abort(); - }, [active, trendKey, queryRevision, trendRevision, onUnauthorized, optionsLoading, optionsError]); + }, [active, trendKey, queryRevision, trendRevision, onUnauthorized, metricsReady, trendGate, sharedTrend]); useEffect(() => { - if (!active || optionsLoading || optionsError) return; + if (!active || !metricsReady || !overview.settled) return; let alive = true; setTrendTarget(null); setTrendTargetKey(''); @@ -525,7 +539,7 @@ export default function QueryPage({ page, onUnauthorized }: { } }); return () => { alive = false; }; - }, [active, trendKey, queryRevision, trendRevision, onUnauthorized, optionsLoading, optionsError]); + }, [active, trendKey, queryRevision, trendRevision, onUnauthorized, metricsReady, overview.settled]); const currentTrendTarget = trendTargetKey === trendKey ? trendTarget : null; const visibleTrendData = useMemo(() => fullYearTrend(trendDataKey === trendKey ? trendData : [], year, trendGranularity), [trendData, trendDataKey, trendKey, year, trendGranularity]); @@ -646,8 +660,8 @@ export default function QueryPage({ page, onUnauthorized }: { ); const activeDefectData = trendObject - ? defectQueryKey === queryKey ? currentMetricsData : trendObjectMetrics?.key === defectQueryKey ? trendObjectMetrics.data : null - : currentMetricsData; + ? defectQueryKey === queryKey ? currentOverview || currentMetricsData : trendObjectMetrics?.key === defectQueryKey ? trendObjectMetrics.data : null + : currentOverview || currentMetricsData; const previousDefectSnapshot = useRef<{ data: MetricsResponse; query: QueryParams } | null>(null); useLayoutEffect(() => { if (activeDefectData) previousDefectSnapshot.current = { data: activeDefectData, query: defectQueryParams }; @@ -656,7 +670,7 @@ export default function QueryPage({ page, onUnauthorized }: { const displayedDefectQuery = activeDefectData ? defectQueryParams : previousDefectSnapshot.current?.query || defectQueryParams; const defectsRefreshing = !activeDefectData && (queryBusy || trendObjectMetricsLoading); // 产品月度下钻复用当前对象的服务端指标,汇总表仍保留父层结果供返回。 - const summaryMetricsData = drilledProduct ? activeDefectData : currentMetricsData; + const summaryMetricsData = drilledProduct ? activeDefectData : currentOverview || currentMetricsData; const openRecords = useCallback((row: MetricRow | null, stage: Stage, selectedMonth?: number, sourceQuery?: QueryParams, sourceData?: MetricsResponse | null) => { const source = sourceData === undefined ? summaryMetricsData : sourceData; if (!source?.release?.id) { message.info('指标数据尚未就绪,请重新查询后打开来源明细。'); return; } @@ -665,7 +679,7 @@ export default function QueryPage({ page, onUnauthorized }: { setSelectedRecord(row); setRecordStage(stage); setRecordMonth(selectedMonth); setRecordsOpen(true); }, [summaryMetricsData, drilledProduct, defectQueryParams, queryParams, view, message]); const summaryMetricsError = drilledProduct ? trendObjectMetricsError : currentMetricsError; - const summaryBusy = drilledProduct ? trendObjectMetricsLoading || !summaryMetricsData && !summaryMetricsError : queryBusy; + const summaryBusy = drilledProduct ? trendObjectMetricsLoading || !summaryMetricsData && !summaryMetricsError : !summaryMetricsData && queryBusy; const displayedSummaryData = useRetainedResult(summaryMetricsData); const rowForSummary = displayedSummaryData?.summary; const rawFormulaDescriptions = summaryMetricsData?.context.metricFormulaDescriptions; @@ -758,7 +772,7 @@ export default function QueryPage({ page, onUnauthorized }: { } - {currentMetricsError && } onClick={() => setQueryRevision(value => value + 1)}>重试} />} + {currentMetricsError && } onClick={() => setQueryRevision(value => value + 1)}>重试} />} {drilledProduct && summaryMetricsError && setQueryRevision(value => value + 1)}>重试} />}
setRateBasis(value as typeof rateBasis)} aria-label="合格率口径" />
@@ -858,7 +872,7 @@ export default function QueryPage({ page, onUnauthorized }: {
; })} - {displayedDefectData ? item.name === '外废')?.weight} onUnauthorized={onUnauthorized} /> : !defectsRefreshing &&
不良数据暂不可用
} + {displayedDefectData ? item.name === '外废')?.weight} onUnauthorized={onUnauthorized} /> : !defectsRefreshing &&
不良数据暂不可用
} @@ -947,7 +961,7 @@ export function DefectParetoPanel({ releaseId, query, externalScrapWeight, onUna const showLoading = useDelayedIndicator(loading); useEffect(() => { - if (!active || !visible) return; + if (!active || !visible || pending) return; if (!releaseId) { setResponses(null); setLoading(false); setError(''); return; } const controller = new AbortController(); const base = { releaseId, ...fineQuery, mode: 'top', dimension: 'defect', limit: 100 }; @@ -964,7 +978,7 @@ export function DefectParetoPanel({ releaseId, query, externalScrapWeight, onUna }) .finally(() => { if (!controller.signal.aborted) setLoading(false); }); return () => controller.abort(); - }, [active, visible, releaseId, fineQueryKey, onUnauthorized, onlyStage, refreshKey, externalScrapWeight]); + }, [active, visible, pending, releaseId, fineQueryKey, onUnauthorized, onlyStage, refreshKey, externalScrapWeight]); useEffect(() => { const refresh = () => setThemeRevision(value => value + 1); diff --git a/web/src/StageProductPage.tsx b/web/src/StageProductPage.tsx index f645fa4..837aeab 100644 --- a/web/src/StageProductPage.tsx +++ b/web/src/StageProductPage.tsx @@ -1,3 +1,5 @@ +import { usePriorityMetrics } from './usePriorityMetrics'; +import { overviewTrend, sameTrendScope } from './priorityMetrics'; import { QuerySnapshotButton } from './QuerySnapshotButton'; import { loadedQueryScope, queryForLocation } from './queryLoadingScope'; import { SmoothTableFrame, useRetainedResult } from './QueryResultMotion'; @@ -72,17 +74,22 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU const appliedReady=!!applied&&queryReady(applied); // Apply organizational/source filters directly, like the other query pages. Product text search keeps its explicit submit. useEffect(()=>{if(active&&draftReady)setApplied(previous=>JSON.stringify(previous)===JSON.stringify(draft)?previous:draft);},[active,draft,draftReady]); - const queryKey=JSON.stringify({query:applied,revision});const current=response?.key===queryKey?response.value:null;const error=failure?.key===queryKey?failure.message:''; + const queryKey=JSON.stringify({query:applied,revision,refreshKey});const current=response?.key===queryKey?response.value:null;const error=failure?.key===queryKey?failure.message:''; + const overview=usePriorityMetrics(applied,active&&appliedReady,JSON.stringify([revision,refreshKey]),onUnauthorized); + const currentSummary=overview.value||current; useEffect(()=>{ - if(!active||!applied||!appliedReady)return;const controller=new AbortController();setLoading(true);setFailure(null); - void api.metrics(applied,controller.signal).then(value=>{if(!controller.signal.aborted)setResponse({key:queryKey,value});}).catch(e=>{if(!controller.signal.aborted&&!onUnauthorized(e))setFailure({key:queryKey,message:e instanceof Error?e.message:'查询失败'});}).finally(()=>{if(!controller.signal.aborted)setLoading(false);}); + if(!active||!applied||!appliedReady||!overview.settled)return;if(overview.value&&!overview.split){setResponse({key:queryKey,value:overview.value});setLoading(false);setFailure(null);return;}const controller=new AbortController();setLoading(true);setFailure(null); + void api.metricsTable(applied,controller.signal).then(value=>{if(!controller.signal.aborted)setResponse({key:queryKey,value});}).catch(e=>{if(!controller.signal.aborted&&!onUnauthorized(e))setFailure({key:queryKey,message:e instanceof Error?e.message:'查询失败'});}).finally(()=>{if(!controller.signal.aborted)setLoading(false);}); return()=>controller.abort(); - },[active,queryKey,onUnauthorized,appliedReady]); + },[active,queryKey,onUnauthorized,appliedReady,overview.settled,overview.split,overview.value]); useEffect(()=>{if(!active||!applied)return;const bytes=new TextEncoder().encode(JSON.stringify({query:queryForLocation(applied,initial.releaseId)}));const encoded=btoa(Array.from(bytes,b=>String.fromCharCode(b)).join('')).replace(/=/g,'').replace(/\+/g,'-').replace(/\//g,'_');const url=`?page=${stage==='black'?'blackProduct':'brightProduct'}&context=${encoded}`;window.history.replaceState({},'',`${location.pathname}${url}`);onLocationChange(url);},[active,applied,stage]); const trendQuery=useMemo(()=>applied?{...applied,month:undefined,quarter:undefined,...(trendGranularity==='year'?{year:undefined}:{}),trendGranularity}:null,[applied,trendGranularity]); - const trendKey=JSON.stringify({query:trendQuery,revision}); + const trendKey=JSON.stringify({query:trendQuery,revision,refreshKey}); const trendReady=!!trendQuery&&queryReady(trendQuery); - useEffect(()=>{if(!active||!trendQuery||!trendReady)return;const controller=new AbortController();setTrendLoading(true);setTrendError('');void api.trend(trendQuery,controller.signal).then(value=>{if(!controller.signal.aborted)setTrendResponse({key:trendKey,value,query:trendQuery});}).catch(error=>{if(!controller.signal.aborted&&!onUnauthorized(error))setTrendError(error instanceof Error?error.message:'趋势读取失败');}).finally(()=>{if(!controller.signal.aborted)setTrendLoading(false);});return()=>controller.abort();},[active,trendKey,trendRevision,onUnauthorized,trendReady]); + const reuseOverviewTrend=!!applied&&!!trendQuery&&sameTrendScope(applied,trendQuery); + const trendGate=!overview.split&&!reuseOverviewTrend||overview.settled; + const sharedTrend=reuseOverviewTrend?overview.value:null; + useEffect(()=>{if(!active||!trendQuery||!trendReady||!trendGate)return;if(sharedTrend){setTrendResponse({key:trendKey,value:overviewTrend(sharedTrend),query:trendQuery});setTrendLoading(false);setTrendError('');return;}const controller=new AbortController();setTrendLoading(true);setTrendError('');void api.trend(trendQuery,controller.signal).then(value=>{if(!controller.signal.aborted)setTrendResponse({key:trendKey,value,query:trendQuery});}).catch(error=>{if(!controller.signal.aborted&&!onUnauthorized(error))setTrendError(error instanceof Error?error.message:'趋势读取失败');}).finally(()=>{if(!controller.signal.aborted)setTrendLoading(false);});return()=>controller.abort();},[active,trendKey,trendRevision,onUnauthorized,trendReady,trendGate,sharedTrend]); const visibleTrend=useMemo(()=>fullYearTrend(trendResponse?.key===trendKey?trendResponse.value.trend:[],applied?.year||year,trendGranularity),[trendResponse,trendKey,applied?.year,year,trendGranularity]); const displayedTrend=useRetainedResult(trendResponse?.key===trendKey?visibleTrend:null)||visibleTrend; const selectedTrendPeriod=trendGranularity==='month'&&applied?.month @@ -116,8 +123,9 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU const defectDrill=useDefectDrilldown({active,mode:trendMode,stage,query:{...(applied||draft),releaseId:current?.release?.id||applied?.releaseId},trendQuery:trendQuery||draft, tableQuery:drilledProduct?(trendQuery||draft):(applied||draft),tableDimension:drilledProduct?'period':'product',tableGranularity:trendGranularity, refreshKey:JSON.stringify([refreshKey,revision]),onUnauthorized,display:defectDisplay,onDisplay:setDefectDisplay}); - const summary=displayed?.data.summary[stage];const stageRate=stage==='bright'&&rateBasis==='withoutHeadquartersScrap'?summary?.rateWithoutHeadquartersScrap:summary?.rate; - const openDetail=(row:MetricRow|null,_stage:Stage,selectedMonth?:number)=>{if(!applied||!current?.release)return;setRecordVisible(true);setRecords({row,query:freezeSourceRecordsQuery(applied,current.release.id,drilledProduct?'overall':'product',row,selectedMonth)});}; + const displayedSummary=useRetainedResult(currentSummary); + const summary=displayedSummary?.summary[stage];const stageRate=stage==='bright'&&rateBasis==='withoutHeadquartersScrap'?summary?.rateWithoutHeadquartersScrap:summary?.rate; + const openDetail=(row:MetricRow|null,_stage:Stage,selectedMonth?:number)=>{if(!applied||!currentSummary?.release)return;setRecordVisible(true);setRecords({row,query:freezeSourceRecordsQuery(applied,currentSummary.release.id,drilledProduct?'overall':'product',row,selectedMonth)});}; const runExport=async()=>{setExporting(true);try{await exporter.current?.exportExcel();}catch(e){message.error(e instanceof Error?e.message:'导出失败');}finally{setExporting(false);}}; const formulaKey=stage==='black'?'blackRate':rateBasis==='original'?'brightRate':'brightRateWithoutHeadquartersScrap'; return
@@ -141,8 +149,8 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU {catalogMatchesDraft&&}
} - {error&&setRevision(v=>v+1)}>重试}/>} -
+ {error&&setRevision(v=>v+1)}>重试}/>} +
{stage==='bright'&&
setRateBasis(v as typeof rateBasis)}/>
} setBasisOpen(true)}/> openDetail(null,stage)}/> @@ -187,7 +195,7 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU {displayed&&item.name==='外废')?.weight:undefined} onUnauthorized={onUnauthorized}/>}
- setBasisOpen(false)} footer={}>

{readableMetricFormula((current?.context.metricFormulaDescriptions as Record|undefined)?.[formulaKey])}

+ setBasisOpen(false)} footer={}>

{readableMetricFormula((currentSummary?.context.metricFormulaDescriptions as Record|undefined)?.[formulaKey])}

{records&&{}} onClose={()=>setRecordVisible(false)} onUnauthorized={onUnauthorized}/>} ; } diff --git a/web/src/api.ts b/web/src/api.ts index 63db6e0..ba61607 100644 --- a/web/src/api.ts +++ b/web/src/api.ts @@ -271,6 +271,9 @@ export const api = { metrics(params: QueryParams, signal?: AbortSignal) { return request(`/api/metrics?${toQuery(params)}`, { signal }); }, + metricsTable(params: QueryParams, signal?: AbortSignal) { + return request(`/api/metrics?${toQuery({ ...params, part: 'table' })}`, { signal }); + }, trend(params: QueryParams, signal?: AbortSignal) { return request(`/api/metrics/trend?${toQuery(params)}`, { signal }); }, diff --git a/web/src/priorityMetrics.ts b/web/src/priorityMetrics.ts new file mode 100644 index 0000000..cac81bb --- /dev/null +++ b/web/src/priorityMetrics.ts @@ -0,0 +1,29 @@ +import type { MetricsResponse, QueryParams, TrendResponse } from './types'; + +/** 仅调整分组视图,保留全部来源、期间和权限筛选。 */ +export function overviewQuery(query: QueryParams): QueryParams { + return { ...query, view: 'overall' }; +} + +/** 宽范围产品表先取小型汇总;窄范围复用完整结果,避免额外往返。 */ +export function splitMetricsLoad(query: QueryParams): boolean { + return query.view === 'product' && !query.month && !query.quarter && !query.product + && !query.productSearch && !query.monthStart && !query.monthEnd; +} + +function canonical(value: unknown): unknown { + if (Array.isArray(value)) return value.map(canonical); + if (value && typeof value === 'object') return Object.fromEntries(Object.entries(value) + .filter(([, item]) => item !== undefined).sort(([a], [b]) => a.localeCompare(b)) + .map(([key, item]) => [key, canonical(item)])); + return value; +} + +/** 筛选范围和粒度全部一致时,才复用服务端已计算的期间结果。 */ +export function sameTrendScope(a: QueryParams, b: QueryParams): boolean { + return JSON.stringify(canonical(overviewQuery(a))) === JSON.stringify(canonical(overviewQuery(b))); +} + +export function overviewTrend(value: MetricsResponse): TrendResponse { + return { release: value.release, context: value.context, trend: value.trend, coverage: value.coverage }; +} diff --git a/web/src/usePriorityMetrics.ts b/web/src/usePriorityMetrics.ts new file mode 100644 index 0000000..0276da2 --- /dev/null +++ b/web/src/usePriorityMetrics.ts @@ -0,0 +1,24 @@ +import { useEffect, useState } from 'react'; +import { api } from './api'; +import { overviewQuery, splitMetricsLoad } from './priorityMetrics'; +import type { MetricsResponse, QueryParams } from './types'; + +/** 优先读取正式小型汇总;失败时允许后续正式查询独立回退。 */ +export function usePriorityMetrics(query: QueryParams | null, enabled: boolean, refresh: string | number, + onUnauthorized: (error: unknown) => boolean) { + const key = JSON.stringify([query, refresh]); + const split = !!query && splitMetricsLoad(query); + const [result, setResult] = useState<{ key: string; value?: MetricsResponse; failed?: boolean } | null>(null); + useEffect(() => { + if (!enabled || !query) return; + const controller = new AbortController(); + api.metrics(split ? overviewQuery(query) : query, controller.signal) + .then(value => { if (!controller.signal.aborted) setResult({ key, value }); }) + .catch(error => { + if (!controller.signal.aborted && !onUnauthorized(error)) setResult({ key, failed: true }); + }); + return () => controller.abort(); + }, [enabled, key, onUnauthorized]); + const current = enabled && result?.key === key ? result : null; + return { value: current?.value || null, settled: !!current, failed: !!current?.failed, split }; +} diff --git a/web/verification/priority_metrics.test.mjs b/web/verification/priority_metrics.test.mjs new file mode 100644 index 0000000..e6f42c6 --- /dev/null +++ b/web/verification/priority_metrics.test.mjs @@ -0,0 +1,104 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import fs from 'node:fs'; +import ts from 'typescript'; +import { overviewQuery, sameTrendScope, overviewTrend, splitMetricsLoad } from '../src/priorityMetrics.ts'; + +const query = { releaseId: 'r1', year: 2026, view: 'product', trendGranularity: 'month', stage: 'bright', + columnFilters: [{ field: 'customer', operator: 'contains', values: ['Acme'], stages: ['bright'] }] }; +const tick = () => new Promise(resolve => setImmediate(resolve)); +function fixture() { + const slots = [], effects = [], requests = []; let index = 0, dirty = false, pending = []; + const props = { query, enabled: true, refresh: 0 }; const unauthorized = []; + const hooks = { + useState(initial) { const n = index++; if (!(n in slots)) slots[n] = initial; + return [slots[n], value => { slots[n] = value; dirty = true; }]; }, + useEffect(fn, deps) { const n = index++, old = effects[n]; + if (!old || deps.some((d, i) => !Object.is(d, old.deps[i]))) pending.push(() => { + old?.cleanup?.(); effects[n] = { deps, cleanup: fn() }; + }); }, + }; + const api = { metrics(params, signal) { let resolve, reject; + const promise = new Promise((r, j) => { resolve = r; reject = j; }); + requests.push({ params, signal, resolve, reject }); return promise; + } }; + const source = fs.readFileSync(new URL('../src/usePriorityMetrics.ts', import.meta.url), 'utf8'); + const code = ts.transpileModule(source.slice(source.indexOf('export function')).replace('export function', 'function'), + { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText; + const hook = new Function('hooks', 'api', 'overviewQuery', 'splitMetricsLoad', `const {useState,useEffect}=hooks;${code};return usePriorityMetrics;`)(hooks, api, overviewQuery, splitMetricsLoad); + const onUnauthorized = error => { unauthorized.push(error); return error.status === 403; }; + return { props, requests, unauthorized, render() { let result, count = 0; do { + dirty = false; index = 0; pending = []; result = hook(props.query, props.enabled, props.refresh, onUnauthorized); + pending.forEach(run => run()); assert.ok(++count < 10); + } while (dirty); return result; }, unmount() { effects.forEach(e => e?.cleanup?.()); } }; +} + +test('overview retains every source predicate and does not mutate the table query', () => { + const small = overviewQuery(query); + assert.deepEqual(small, { ...query, view: 'overall' }); assert.equal(query.view, 'product'); + assert.equal(small.columnFilters, query.columnFilters); +}); +test('trend reuse requires the same release, time range, grain, stage and all filters', () => { + assert.equal(sameTrendScope(query, { ...query, view: 'overall', month: undefined }), true); + for (const changed of [{ month: 1 }, { quarter: 2 }, { monthStart: 2, monthEnd: 5 }, { year: undefined }, + { releaseId: 'r2' }, { trendGranularity: 'quarter' }, { stage: 'black' }, { includeUnassigned: false }, + { product: 'P1' }, { extraFilters: { order: ['X'] } }, { columnFilters: [] }]) { + assert.equal(sameTrendScope(query, { ...query, ...changed }), false, JSON.stringify(changed)); + } + assert.equal(sameTrendScope(query, Object.fromEntries(Object.entries(query).reverse())), true); +}); +test('trend adapter uses the exact formal values and performs no rate arithmetic', () => { + const value = { release: { id: 'r1' }, context: {}, trend: [{ compositeRate: .123456789 }], coverage: {} }; + assert.equal(overviewTrend(value).trend, value.trend); +}); +test('priority gate opens immediately after the small server aggregate and stays closed while loading', async () => { + const f = fixture(); assert.equal(f.render().settled, false); + assert.equal(f.requests.length, 1); assert.equal(f.requests[0].params.view, 'overall'); + const value = { release: { id: 'r1' }, summary: { compositeRate: .9 }, trend: [] }; + f.requests[0].resolve(value); await tick(); const result = f.render(); + assert.equal(result.settled, true); assert.equal(result.value, value); + f.render(); assert.equal(f.requests.length, 1); f.unmount(); +}); +test('year switches and refresh invalidate the gate and late old replies cannot replace the new result', async () => { + const f = fixture(); f.render(); f.props.query = { ...query, year: 2025 }; + assert.equal(f.render().settled, false); assert.equal(f.requests[0].signal.aborted, true); + f.requests[0].resolve({ summary: 'old' }); await tick(); assert.equal(f.render().value, null); + f.requests[1].resolve({ summary: 'new' }); await tick(); assert.equal(f.render().value.summary, 'new'); + f.props.refresh++; assert.equal(f.render().settled, false); assert.equal(f.requests.length, 3); f.unmount(); +}); +test('overview errors allow the regular query to retry independently', async () => { + const f = fixture(); f.render(); f.requests[0].reject(Error('temporary failure')); await tick(); + assert.deepEqual(f.render(), { value: null, settled: true, failed: true, split: true }); f.unmount(); +}); +test('authorization failures do not unlock further requests', async () => { + const f = fixture(); f.render(); f.requests[0].reject({ status: 403 }); await tick(); + assert.equal(f.render().settled, false); assert.equal(f.unauthorized.length, 1); f.unmount(); +}); +test('inactive pages neither start requests nor accept late results', async () => { + const f = fixture(); f.props.enabled = false; f.render(); assert.equal(f.requests.length, 0); + f.props.enabled = true; f.render(); f.props.enabled = false; f.render(); + assert.equal(f.requests[0].signal.aborted, true); f.requests[0].resolve({ summary: 'late' }); + await tick(); assert.equal(f.render().value, null); f.unmount(); +}); + + test('narrow queries reuse a complete response rather than adding a summary round trip', async () => { + for (const change of [{month:2},{quarter:1},{product:'P'},{productSearch:'P'},{view:'department'},{view:'overall'}]) { + const f=fixture();f.props.query={...query,...change};const first=f.render(); + assert.equal(first.split,false);assert.deepEqual(f.requests[0].params,f.props.query); + f.requests[0].resolve({summary:'full',rows:[1],trend:[2]});await tick(); + assert.equal(f.render().value.rows.length,1);assert.equal(f.requests.length,1);f.unmount(); + } + }); + + test('refresh generations cannot qualify retained old table and trend results as current', () => { + const source=name=>fs.readFileSync(new URL(`../src/${name}`,import.meta.url),'utf8'); + const general=source('QueryPage.tsx'); + const metricExpression=general.match(/const metricKey = useMemo\(\(\) => ([^;]+), \[metricParams, queryRevision\]\);/)[1]; + const key=new Function('metricParams','queryRevision',`return ${metricExpression}`); + assert.notEqual(key(query,0),key(query,1)); + const stage=source('StageProductPage.tsx'); + const expression=stage.match(/const queryKey=([^;]+);/)[1]; + const stageKey=new Function('applied','revision','refreshKey',`return ${expression}`); + assert.notEqual(stageKey(query,0,0),stageKey(query,0,1)); + assert.notEqual(stageKey(query,0,0),stageKey(query,1,0)); + });