Compare commits
3
Commits
bfb91efc2b
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ebb722df36 | ||
|
|
8f1b790b1d | ||
|
|
d948e1e2a4 |
@@ -64,9 +64,9 @@ DSH CLI 固定为 `0.2.2-rc.1`,依赖与官方 Python SDK 校验记录在 `run
|
||||
|
||||
启动时在单线程后台补建当前完整正式版本的索引,导入及归类在事务提交后进入同一去重队列。完整构建标记提交后才启用;未完成、失败或未补建的历史构建沿用原始查询,不阻止启动和正式数据发布。索引增加持久存储及后台构建成本,规模取决于非空字段数和不同值数量;高基数宽表应先测容量。保留清理随无引用构建回收索引;升级后原维护兼容保护继续生效。
|
||||
|
||||
年度全产品查询先显示正式指标和同范围趋势,再读取产品表格;月/季、单产品及总体/产业部等范围复用完整结果,避免额外往返。不同范围的趋势独立加载,底部柏拉图接近视口且主查询就绪后读取。刷新和筛选变化会使旧结果失去当前资格;表格失败时,已就绪的指标与趋势仍可使用。
|
||||
年度全产品查询先显示正式指标和同范围趋势,再读取产品表格;月/季及产品搜索并行读取摘要和产品页,单产品及总体/产业部等范围复用完整结果。不同范围的趋势独立加载,底部柏拉图接近视口且主查询就绪后读取。刷新和筛选变化会使旧结果失去当前资格;表格失败时,已就绪的指标与趋势仍可使用。
|
||||
|
||||
普通查询在数据版本已解析后开始,来源字段条件仍等待对应版本的字段目录;产品文本搜索等待必要产品选项,不因无关元数据失败而禁用。表格仍保留全量产品及全量 Excel 导出。
|
||||
普通查询在数据版本已解析后开始,来源字段条件仍等待对应版本的字段目录;产品文本搜索等待必要产品选项,不因无关元数据失败而禁用。产品汇总、黑片和亮片的宽产品表由数据库分页,默认每页15行,可选择10/15/20/50/100行;换年、筛选和修改每页数量时回到第一页。指标与趋势继续统计完整范围,细分废率随当前页读取。Excel 重新读取完整授权范围并全量导出,产品钻取后的期间表保持原有展示。
|
||||
|
||||
## 旧版本时间迁移
|
||||
|
||||
|
||||
@@ -158,6 +158,12 @@ public class AnalysisFineDefectsService {
|
||||
/** One authorized scan (or rollup query) for every period/object and all visible children. */
|
||||
@Transactional(readOnly = true, isolation = Isolation.REPEATABLE_READ)
|
||||
public Map<String, Object> grouped(Map<String, Object> input, AppUserPrincipal actor, String dimension, String granularity) {
|
||||
return grouped(input,actor,dimension,granularity,null);
|
||||
}
|
||||
|
||||
public Map<String,Object> grouped(Map<String,Object> input,AppUserPrincipal actor,String dimension,String granularity,List<String> productKeys) {
|
||||
productKeys=cn.yunsheng.quality.metrics.ProductBuckets.parse(productKeys);
|
||||
if(productKeys!=null&&!dimension.equals("product"))throw bad("产品桶只能用于产品细分表");
|
||||
Set<String> allowed = governance.allowedFields(actor);
|
||||
Request request = parse(input, allowed, true);
|
||||
String bucket = switch (dimension) {
|
||||
@@ -184,6 +190,7 @@ public class AnalysisFineDefectsService {
|
||||
if (request.productSearch() != null) {
|
||||
predicate.append(" AND LOCATE(LOWER(?),LOWER(COALESCE(f.product,'')))>0"); args.add(request.productSearch());
|
||||
}
|
||||
cn.yunsheng.quality.metrics.ProductBuckets.append(predicate,args,productKeys);
|
||||
List<DefectField> fields = applicableFields(request,allowed);
|
||||
List<Category> categories = categories(request.stage());
|
||||
Set<String> components = new LinkedHashSet<>();
|
||||
|
||||
@@ -32,13 +32,17 @@ public class DefectDrilldownController {
|
||||
String granularity=String.valueOf(input.getOrDefault("trendGranularity","month"));
|
||||
if(!Set.of("period","overall","department","group","product","projectGroup").contains(dimension))throw bad("细分维度无效");
|
||||
if(!Set.of("month","quarter","year").contains(granularity))throw bad("趋势粒度无效");
|
||||
Map<String,Object> scope=new LinkedHashMap<>(input);scope.remove("trendGranularity");scope.remove("view");scope.put("dimension","defect");scope.put("mode","top");scope.put("limit",100);
|
||||
List<String> productKeys=cn.yunsheng.quality.metrics.ProductBuckets.parse(input.get("productKeys"));
|
||||
if(productKeys!=null&&!dimension.equals("product"))throw bad("产品桶只能用于产品细分表");
|
||||
Map<String,Object> scope=new LinkedHashMap<>(input);scope.remove("productKeys");scope.remove("trendGranularity");scope.remove("view");scope.put("dimension","defect");scope.put("mode","top");scope.put("limit",100);
|
||||
// Reuse the source parser to reject unknown filters and validate the selected category/stage.
|
||||
AnalysisFineDefectsService.Request request=AnalysisFineDefectsService.parse(scope,governance.allowedFields(actor),true);
|
||||
if(request.category()==null)throw bad("必须指定不良分类");
|
||||
var query=new MetricsService.MetricsQuery(number(scope,"year"),number(scope,"month"),number(scope,"quarter"),request.department(),request.group(),request.product(),request.projectGroup(),dimension.equals("period")?"overall":dimension,request.includeUnassigned(),request.releaseId(),granularity,AnalysisExplorationTools.exclusions(scope.get("exclusions")))
|
||||
.withProductSearch(request.productSearch()).withExtraFilters(scope.get("extraFilters")).withColumnFilters(scope.get("columnFilters")).withMonthRange(number(scope,"monthStart"),number(scope,"monthEnd")).withStage(request.stage());
|
||||
var paired=metrics.calculatePairedSnapshot(query,actor,dimension.equals("period"),() -> fine.grouped(scope,actor,dimension,granularity));
|
||||
var paired=productKeys==null
|
||||
? metrics.calculatePairedSnapshot(query,actor,dimension.equals("period"),() -> fine.grouped(scope,actor,dimension,granularity))
|
||||
: metrics.calculatePairedProductSnapshot(query,actor,productKeys,() -> fine.grouped(scope,actor,dimension,granularity,productKeys));
|
||||
// Refresh the visible fields after the snapshot; a concurrent policy revocation cannot release old fields.
|
||||
governance.requireDetail(actor);governance.requireBoundAction("QUERY","query.detail");
|
||||
Set<String> currentAllowed=governance.allowedFields(actor);
|
||||
|
||||
@@ -109,6 +109,40 @@ public class MetricsController {
|
||||
return responseAccess.visibleTrend(metrics.calculateTrend(query, actor), actor);
|
||||
}
|
||||
|
||||
/** 产品分页接口:范围、授权和正式规则与主查询一致。 */
|
||||
@GetMapping("/products")
|
||||
@PreAuthorize("hasAnyRole('SYSTEM_ADMIN', 'DATA_ADMIN', 'USER')")
|
||||
public MetricsService.ProductPage productsHttp(@RequestParam(required = false) Integer year,
|
||||
@RequestParam(required = false) Integer month,
|
||||
@RequestParam(required = false) Integer monthStart,
|
||||
@RequestParam(required = false) Integer monthEnd,
|
||||
@RequestParam(required = false) String quarter,
|
||||
@RequestParam(required = false) String department,
|
||||
@RequestParam(required = false) String group,
|
||||
@RequestParam(required = false) String product,
|
||||
@RequestParam(required = false) String productSearch,
|
||||
@RequestParam(required = false) String projectGroup,
|
||||
@RequestParam(defaultValue = "product") String view,
|
||||
@RequestParam(defaultValue = "true") boolean includeUnassigned,
|
||||
@RequestParam(required = false) String releaseId,
|
||||
@RequestParam(defaultValue = "month") String trendGranularity,
|
||||
@RequestParam(required = false) String extraFilters,
|
||||
@RequestParam(required = false) String exclusions,
|
||||
@RequestParam(required = false) String columnFilters,
|
||||
@RequestParam(required = false) String stage,
|
||||
@RequestParam(defaultValue="1") int page,
|
||||
@RequestParam(defaultValue="15") int pageSize,
|
||||
@RequestParam(defaultValue="brightQualifiedDesc") String order,
|
||||
@AuthenticationPrincipal AppUserPrincipal actor) {
|
||||
Integer quarterNumber = parseQuarter(quarter);
|
||||
MetricsService.MetricsQuery query = new MetricsService.MetricsQuery(year, month, quarterNumber, department,
|
||||
group, product, projectGroup, view, includeUnassigned, releaseId, trendGranularity,
|
||||
parseExclusions(exclusions));
|
||||
query = query.withMonthRange(monthStart, monthEnd).withExtraFilters(extraFilters)
|
||||
.withProductSearch(productSearch).withColumnFilters(columnFilters).withStage(stage);
|
||||
return responseAccess.visibleProductPage(metrics.calculateProductPage(query,actor,page,pageSize,order),actor);
|
||||
}
|
||||
|
||||
/** Existing direct callers retain the pre-range controller signature. */
|
||||
public MetricsService.MetricSnapshot calculate(Integer year, Integer month, String quarter,
|
||||
String department, String group, String product, String productSearch,
|
||||
@@ -142,15 +176,16 @@ public class MetricsController {
|
||||
product, projectGroup, view, includeUnassigned, releaseId, trendGranularity, parseExclusions(exclusions))
|
||||
.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 无效");
|
||||
if (rowLimit == null && rowOrder == null) return visible;
|
||||
if (rowLimit != null && (rowLimit < 1 || rowLimit > 500 || rowOffset < 0)) throw new IllegalArgumentException("rowLimit 必须在 1 到 500 之间,rowOffset 不能为负数");
|
||||
ProductTableOrder productOrder=rowOrder==null||rowOrder.equals("scrapDesc")?null:ProductTableOrder.parse(rowOrder);
|
||||
List<MetricsService.MetricRow> ordered = new ArrayList<>(visible.rows());
|
||||
if ("scrapDesc".equals(rowOrder)) ordered.sort(Comparator
|
||||
.comparing(this::totalScrap).reversed()
|
||||
.thenComparing(row -> row.key() == null ? "" : row.key()));
|
||||
int start = Math.min(rowOffset, ordered.size());
|
||||
int end = (int) Math.min((long) start + rowLimit, ordered.size());
|
||||
if(productOrder!=null)ordered.sort(productOrder.comparator());
|
||||
int start = rowLimit==null?0:Math.min(rowOffset, ordered.size());
|
||||
int end = rowLimit==null?ordered.size():(int) Math.min((long) start + rowLimit, ordered.size());
|
||||
Map<String, Object> context = new LinkedHashMap<>(visible.context());
|
||||
context.put("rowCount", ordered.size());
|
||||
return new MetricsService.MetricSnapshot(visible.release(), context, visible.summary(), ordered.subList(start, end),
|
||||
|
||||
@@ -31,6 +31,17 @@ public class MetricsResponseAccess {
|
||||
return new MetricSnapshot(filtered.release(), filtered.context(), hideDefects(filtered.summary()), List.of(), List.of(), defects, filtered.coverage());
|
||||
}
|
||||
|
||||
/** 分页结果返回前重新核验当前用户、字段和明细服务绑定。 */
|
||||
public MetricsService.ProductPage visibleProductPage(MetricsService.ProductPage page,AppUserPrincipal actor) {
|
||||
governance.requireUserActivePolicy(actor);
|
||||
if(!Boolean.TRUE.equals(governance.policy(actor.getId().toString()).get("detailAllowed")))
|
||||
return new MetricsService.ProductPage(page.release(),page.context(),List.of(),0,page.page(),page.pageSize(),page.order());
|
||||
governance.requireBoundAction("QUERY","query.detail");
|
||||
Set<String> allowed=governance.allowedFields(actor);
|
||||
var rows=allowed.contains("*")?page.rows():page.rows().stream().map(row->restrictDefects(row,allowed)).toList();
|
||||
return new MetricsService.ProductPage(page.release(),page.context(),rows,page.total(),page.page(),page.pageSize(),page.order());
|
||||
}
|
||||
|
||||
/** 趋势查询沿用明细授权和指标字段可见性边界。 */
|
||||
public MetricTrendSnapshot visibleTrend(MetricTrendSnapshot snapshot, AppUserPrincipal actor) {
|
||||
governance.requireUserActivePolicy(actor);
|
||||
|
||||
@@ -87,6 +87,54 @@ public class MetricsService {
|
||||
return withConsistentSnapshot(() -> calculateForReleaseSnapshot(query, actor, release, tableOnly));
|
||||
}
|
||||
|
||||
public record ProductPage(Map<String,Object> release,Map<String,Object> context,List<MetricRow> rows,long total,int page,int pageSize,String order) {}
|
||||
|
||||
/** 数据库选出当前页的产品桶,再按正式规则计算这些桶的完整分量。 */
|
||||
public ProductPage calculateProductPage(MetricsQuery query,AppUserPrincipal actor,int page,int pageSize,String orderName) {
|
||||
if(actor==null)throw new ResponseStatusException(HttpStatus.FORBIDDEN,"指标查询必须绑定当前有效用户");
|
||||
governance.requireUserActivePolicy(actor);governance.requireBoundAction("QUERY","query.aggregate");validate(query);
|
||||
if(!"product".equals(query.view()))throw new IllegalArgumentException("产品分页只支持product视图");
|
||||
if(page<1||page>1_000_000||pageSize<1||pageSize>100)throw new IllegalArgumentException("页码或每页数量无效");
|
||||
ProductTableOrder requestedOrder=ProductTableOrder.parse(orderName);
|
||||
ProductTableOrder order=requestedOrder.visibleTo(governance.allowedFields(actor));
|
||||
String releaseId=query.releaseId()==null||query.releaseId().isBlank()?currentReleaseId():query.releaseId();
|
||||
if(releaseId==null){var empty=emptySnapshot(query);return new ProductPage(empty.release(),empty.context(),List.of(),0,page,pageSize,requestedOrder.wire());}
|
||||
ReleaseInfo release=release(releaseId,actor);
|
||||
return withConsistentSnapshot(()->{
|
||||
boolean unrolled=hasUnrolledBuilds(releaseId),sales=salesOrderRollupReady(releaseId,query,actor);
|
||||
boolean source=!query.extraFilters().isEmpty()||!query.columnFilters().isEmpty();
|
||||
var branches=new ArrayList<String>();var args=new ArrayList<Object>();
|
||||
for(String stage:List.of("black","bright")) {
|
||||
if(query.stage()!=null&&!query.stage().equals(stage))continue;
|
||||
if(!source||sales)addProductRankBranch(branches,args,stageScope(stage,releaseId,query,actor,false,sales));
|
||||
if(!sales&&(source||unrolled))addProductRankBranch(branches,args,stageScope(stage,releaseId,query,actor,true,false));
|
||||
}
|
||||
String candidates="WITH candidates AS ("+String.join(" UNION ALL ",branches)+") ";
|
||||
String ranked="SELECT ANY_VALUE(bucket_key) AS bucket_key,"+order.rankExpression()+" AS sort_weight FROM candidates GROUP BY CAST(bucket_key AS BINARY)";
|
||||
String sql=candidates+", ranked AS ("+ranked+") SELECT bucket_key,COUNT(*) OVER() AS row_count FROM ranked ORDER BY "+order.sqlOrder()+" LIMIT ? OFFSET ?";
|
||||
var pageArgs=new ArrayList<Object>(args);pageArgs.add(pageSize);pageArgs.add((long)(page-1)*pageSize);
|
||||
var keys=new ArrayList<String>();long[] count={0};
|
||||
jdbc.query(sql,(RowCallbackHandler)rs->{keys.add(rs.getString("bucket_key"));count[0]=rs.getLong("row_count");},pageArgs.toArray());
|
||||
if(keys.isEmpty()) {
|
||||
Long total=jdbc.queryForObject(candidates+"SELECT COUNT(*) FROM (SELECT CAST(bucket_key AS BINARY) FROM candidates GROUP BY CAST(bucket_key AS BINARY)) all_products",Long.class,args.toArray());
|
||||
count[0]=total==null?0:total;
|
||||
}
|
||||
var snapshot=calculateForReleaseSnapshot(query,actor,release,true,keys);
|
||||
var byKey=new LinkedHashMap<String,MetricRow>();snapshot.rows().forEach(row->byKey.put(row.key(),row));
|
||||
var rows=keys.stream().map(byKey::get).filter(Objects::nonNull).toList();
|
||||
return new ProductPage(snapshot.release(),snapshot.context(),rows,count[0],page,pageSize,requestedOrder.wire());
|
||||
});
|
||||
}
|
||||
|
||||
private void addProductRankBranch(List<String> branches,List<Object> args,StageScope scope) {
|
||||
boolean black=scope.stage().equals("black");
|
||||
String nil="CAST(NULL AS DECIMAL(38,8))";
|
||||
branches.add("SELECT "+ProductBuckets.EXPRESSION+" AS bucket_key,"+(black?"SUM(f.total_weight)":nil)+" AS black_total,"+
|
||||
(black?nil:"SUM(f.qualified_weight)")+" AS bright_good,"+(black?nil:"SUM(f.scrap_weight)")+" AS bright_scrap "+
|
||||
"FROM release_member rm JOIN "+scope.table()+" f"+scope.hint()+" ON f.build_id=rm.transform_build_id"+scope.where()+" GROUP BY bucket_key");
|
||||
args.addAll(scope.args());
|
||||
}
|
||||
|
||||
/** 只按时间桶生成趋势,不构造总体摘要或产品/分组维度行。 */
|
||||
public MetricTrendSnapshot calculateTrend(MetricsQuery query, AppUserPrincipal actor) {
|
||||
if (actor == null) throw new ResponseStatusException(HttpStatus.FORBIDDEN, "指标查询必须绑定当前有效用户");
|
||||
@@ -105,6 +153,15 @@ public class MetricsService {
|
||||
/** Authorize before opening the read snapshot, so service-binding locks do not span source scans. */
|
||||
public <T> PairedSnapshot<T> calculatePairedSnapshot(MetricsQuery query, AppUserPrincipal actor,
|
||||
boolean trendOnly, Supplier<T> source) {
|
||||
return calculatePairedSnapshot(query,actor,trendOnly,source,null);
|
||||
}
|
||||
|
||||
public <T> PairedSnapshot<T> calculatePairedProductSnapshot(MetricsQuery query,AppUserPrincipal actor,List<String> productKeys,Supplier<T> source) {
|
||||
if(!"product".equals(query.view()))throw new IllegalArgumentException("产品桶范围无效");
|
||||
return calculatePairedSnapshot(query,actor,false,source,ProductBuckets.parse(productKeys));
|
||||
}
|
||||
|
||||
private <T> PairedSnapshot<T> calculatePairedSnapshot(MetricsQuery query,AppUserPrincipal actor,boolean trendOnly,Supplier<T> source,List<String> productKeys) {
|
||||
if (actor == null) throw new ResponseStatusException(HttpStatus.FORBIDDEN,"指标查询必须绑定当前有效用户");
|
||||
governance.requireUserActivePolicy(actor);
|
||||
governance.requireBoundAction("QUERY","query.aggregate");
|
||||
@@ -114,7 +171,7 @@ public class MetricsService {
|
||||
ReleaseInfo release=release(releaseId,actor);
|
||||
return withConsistentSnapshot(() -> trendOnly
|
||||
? new PairedSnapshot<T>(null,calculateTrendForReleaseSnapshot(query,actor,release),source.get())
|
||||
: new PairedSnapshot<T>(calculateForReleaseSnapshot(query,actor,release),null,source.get()));
|
||||
: new PairedSnapshot<T>(calculateForReleaseSnapshot(query,actor,release,productKeys!=null,productKeys),null,source.get()));
|
||||
}
|
||||
|
||||
private MetricTrendSnapshot calculateTrendForReleaseSnapshot(MetricsQuery query, AppUserPrincipal actor,
|
||||
@@ -257,9 +314,13 @@ public class MetricsService {
|
||||
}
|
||||
|
||||
private MetricSnapshot calculateForReleaseSnapshot(MetricsQuery query, AppUserPrincipal actor, ReleaseInfo release, boolean tableOnly) {
|
||||
return calculateForReleaseSnapshot(query,actor,release,tableOnly,null);
|
||||
}
|
||||
|
||||
private MetricSnapshot calculateForReleaseSnapshot(MetricsQuery query, AppUserPrincipal actor, ReleaseInfo release, boolean tableOnly,List<String> productKeys) {
|
||||
String releaseId = release.id();
|
||||
boolean hasUnrolledBuilds = hasUnrolledBuilds(releaseId);
|
||||
AggregateSet aggregates = queryAggregates(releaseId, query, actor, hasUnrolledBuilds, null, !tableOnly);
|
||||
AggregateSet aggregates = queryAggregates(releaseId, query, actor, hasUnrolledBuilds, null, !tableOnly,productKeys);
|
||||
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));
|
||||
@@ -268,7 +329,7 @@ public class MetricsService {
|
||||
MetricRow adjusted=rules.applyMetrics(new MetricRow(row.key(),row.label(),row.department(),row.group(),row.product(),row.projectGroup(),row.compositeRate(),row.black(),row.bright(),row.coverage(),row.compositeRateWithoutHeadquartersScrap()));
|
||||
return new TrendMetricRow(row.month(),adjusted.key(),adjusted.label(),adjusted.department(),adjusted.group(),adjusted.product(),adjusted.projectGroup(),adjusted.compositeRate(),adjusted.black(),adjusted.bright(),adjusted.coverage(),adjusted.compositeRateWithoutHeadquartersScrap(),row.period(),row.periodLabel(),row.granularity());
|
||||
}).toList();
|
||||
Map<String, Object> coverage = queryCoverage(releaseId, query, actor, hasUnrolledBuilds);
|
||||
Map<String, Object> coverage = productKeys==null?queryCoverage(releaseId, query, actor, hasUnrolledBuilds):Map.of();
|
||||
Map<String, Object> context = context(query, query.includeUnassigned());
|
||||
context.put("ruleVersionId",ruleVersion==null?BusinessRowMapper.RULE_VERSION:ruleVersion);
|
||||
context.put("calculationRules",rules.calculationRules());context.put("metricFormulaDescriptions",rules.formulaDescriptions());
|
||||
@@ -376,24 +437,29 @@ public class MetricsService {
|
||||
|
||||
private AggregateSet queryAggregates(String releaseId, MetricsQuery query, AppUserPrincipal actor,
|
||||
boolean hasUnrolledBuilds, Map<String, String> canonicalGroupDepartments, boolean includePeriods) {
|
||||
return queryAggregates(releaseId,query,actor,hasUnrolledBuilds,canonicalGroupDepartments,includePeriods,null);
|
||||
}
|
||||
|
||||
private AggregateSet queryAggregates(String releaseId, MetricsQuery query, AppUserPrincipal actor,
|
||||
boolean hasUnrolledBuilds, Map<String, String> canonicalGroupDepartments, boolean includePeriods,List<String> productKeys) {
|
||||
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, includePeriods);
|
||||
aggregateStage(result, "bright", query.view(), releaseId, query, actor, false, salesRollup, canonicalGroupDepartments, includePeriods);
|
||||
aggregateStage(result, "black", query.view(), releaseId, query, actor, false, salesRollup, canonicalGroupDepartments, includePeriods,productKeys);
|
||||
aggregateStage(result, "bright", query.view(), releaseId, query, actor, false, salesRollup, canonicalGroupDepartments, includePeriods,productKeys);
|
||||
}
|
||||
if (!salesRollup && (hasUnrolledBuilds || hasSourceFilters)) {
|
||||
aggregateStage(result, "black", query.view(), releaseId, query, actor, true, false, canonicalGroupDepartments, includePeriods);
|
||||
aggregateStage(result, "bright", query.view(), releaseId, query, actor, true, false, canonicalGroupDepartments, includePeriods);
|
||||
aggregateStage(result, "black", query.view(), releaseId, query, actor, true, false, canonicalGroupDepartments, includePeriods,productKeys);
|
||||
aggregateStage(result, "bright", query.view(), releaseId, query, actor, true, false, canonicalGroupDepartments, includePeriods,productKeys);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private void aggregateStage(AggregateSet result, String stage, String view, String releaseId,
|
||||
MetricsQuery query, AppUserPrincipal actor, boolean factFallback, boolean salesRollup,
|
||||
Map<String, String> canonicalGroupDepartments, boolean includePeriods) {
|
||||
if(query.stage()!=null&&!query.stage().equals(stage))return;
|
||||
Map<String, String> canonicalGroupDepartments, boolean includePeriods,List<String> productKeys) {
|
||||
if(query.stage()!=null&&!query.stage().equals(stage)||productKeys!=null&&productKeys.isEmpty())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) {
|
||||
case "department" -> "f.department";
|
||||
@@ -407,22 +473,11 @@ public class MetricsService {
|
||||
boolean canonicalGroupRows = "group".equals(view) && canonicalGroupDepartments != null;
|
||||
String ownerDepartment = canonicalGroupRows ? ", f.department COLLATE utf8mb4_0900_as_cs AS owner_department" : "";
|
||||
String aggregateKeys = canonicalGroupRows ? "trend_period, bucket_key, owner_department" : "trend_period, bucket_key";
|
||||
StringBuilder where = new StringBuilder(" WHERE rm.release_id=?");
|
||||
List<Object> args = new ArrayList<>();
|
||||
args.add(releaseId);
|
||||
if (factFallback && (query.extraFilters().isEmpty() && query.columnFilters().isEmpty())) where.append(" AND NOT EXISTS (SELECT 1 FROM metric_rollup_build rb WHERE rb.build_id=f.build_id)");
|
||||
else if (!factFallback) { where.append(" AND f.stage=?"); args.add(stage); }
|
||||
if (salesRollup) new SalesOrderMetricRollups(jdbc).append(where, args, query.extraFilters());
|
||||
appendTime(where, args, query);
|
||||
appendDimensions(where, args, query);
|
||||
appendExclusions(where, args, query);
|
||||
if(factFallback) {
|
||||
new QueryFilterFields(jdbc,governance).append(where,args,stage,query.extraFilters(),actor,releaseId);
|
||||
if(!query.columnFilters().isEmpty())sourceColumns.append(where,args,stage,query.columnFilters(),releaseId,actor);
|
||||
}
|
||||
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<>'')");
|
||||
StageScope scope=stageScope(stage,releaseId,query,actor,factFallback,salesRollup);
|
||||
List<Object> args=new ArrayList<>(scope.args());
|
||||
StringBuilder limitedWhere=new StringBuilder(scope.where());
|
||||
ProductBuckets.append(limitedWhere,args,productKeys);
|
||||
String where=limitedWhere.toString();
|
||||
String trendBucket = includePeriods ? trendBucketExpression(query.trendGranularity()) : "'all'";
|
||||
String sql = """
|
||||
SELECT %s AS trend_period, %s AS bucket_key%s,
|
||||
@@ -463,6 +518,29 @@ public class MetricsService {
|
||||
}, args.toArray());
|
||||
}
|
||||
|
||||
private record StageScope(String stage,String table,String hint,String where,List<Object> args) {}
|
||||
|
||||
private StageScope stageScope(String stage,String releaseId,MetricsQuery query,AppUserPrincipal actor,boolean factFallback,boolean salesRollup) {
|
||||
String table=factFallback?(stage.equals("black")?"fact_black":"fact_bright"):(salesRollup?"sales_order_metric_rollup":"metric_rollup");
|
||||
StringBuilder where = new StringBuilder(" WHERE rm.release_id=?");
|
||||
List<Object> args = new ArrayList<>();
|
||||
args.add(releaseId);
|
||||
if (factFallback && (query.extraFilters().isEmpty() && query.columnFilters().isEmpty())) where.append(" AND NOT EXISTS (SELECT 1 FROM metric_rollup_build rb WHERE rb.build_id=f.build_id)");
|
||||
else if (!factFallback) { where.append(" AND f.stage=?"); args.add(stage); }
|
||||
if (salesRollup) new SalesOrderMetricRollups(jdbc).append(where, args, query.extraFilters());
|
||||
appendTime(where, args, query);
|
||||
appendDimensions(where, args, query);
|
||||
appendExclusions(where, args, query);
|
||||
if(factFallback) {
|
||||
new QueryFilterFields(jdbc,governance).append(where,args,stage,query.extraFilters(),actor,releaseId);
|
||||
if(!query.columnFilters().isEmpty())sourceColumns.append(where,args,stage,query.columnFilters(),releaseId,actor);
|
||||
}
|
||||
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<>'')");
|
||||
return new StageScope(stage,table,factFilterHint(stage,factFallback,query),where.toString(),List.copyOf(args));
|
||||
}
|
||||
|
||||
private String componentSum(String key) {
|
||||
String path = "$." + key;
|
||||
String extracted = "JSON_EXTRACT(f.components, '" + path + "')";
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
package cn.yunsheng.quality.metrics;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
/** 已授权范围内的产品桶限制;空字符串与NULL桶保留各自语义。 */
|
||||
public final class ProductBuckets {
|
||||
public static final String EXPRESSION="COALESCE(f.product COLLATE utf8mb4_0900_as_cs, '__UNASSIGNED__') COLLATE utf8mb4_0900_as_cs";
|
||||
private ProductBuckets() {}
|
||||
public static List<String> parse(Object input) {
|
||||
if(input==null)return null;
|
||||
if(!(input instanceof List<?> values)||values.size()>100)throw new IllegalArgumentException("产品桶必须为不超过100项的列表");
|
||||
var result=new LinkedHashSet<String>();
|
||||
for(Object value:values) {
|
||||
if(!(value instanceof String key)||key.length()>512)throw new IllegalArgumentException("产品桶名称无效");
|
||||
result.add(key);
|
||||
}
|
||||
return List.copyOf(result);
|
||||
}
|
||||
public static void append(StringBuilder where,List<Object> args,List<String> keys) {
|
||||
if(keys==null)return;
|
||||
if(keys.isEmpty()){where.append(" AND 1=0");return;}
|
||||
// STRCMP avoids hash-join comparisons dropping canonically equivalent Unicode text.
|
||||
where.append(" AND (").append(String.join(" OR ",Collections.nCopies(keys.size(),
|
||||
"STRCMP("+EXPRESSION+",CONVERT(? USING utf8mb4) COLLATE utf8mb4_0900_as_cs)=0"))).append(')');
|
||||
args.addAll(keys);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package cn.yunsheng.quality.metrics;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Comparator;
|
||||
|
||||
/** SQL分页与全量导出共用的重量排序约定;比率仍由正式规则计算。 */
|
||||
public enum ProductTableOrder {
|
||||
BRIGHT_QUALIFIED("brightQualifiedDesc", "SUM(bright_good)"),
|
||||
BLACK_TOTAL("blackTotalDesc", "SUM(black_total)"),
|
||||
BRIGHT_TOTAL("brightTotalDesc", "CASE WHEN SUM(bright_good) IS NULL AND SUM(bright_scrap) IS NULL THEN NULL ELSE COALESCE(SUM(bright_good),0)+COALESCE(SUM(bright_scrap),0) END"),
|
||||
PRODUCT("productAsc", null);
|
||||
|
||||
private final String wire;
|
||||
private final String expression;
|
||||
ProductTableOrder(String wire, String expression) { this.wire=wire; this.expression=expression; }
|
||||
public String wire() { return wire; }
|
||||
public static ProductTableOrder parse(String value) {
|
||||
for (var order:values()) if (order.wire.equals(value)) return order;
|
||||
throw new IllegalArgumentException("产品排序无效");
|
||||
}
|
||||
public String rankExpression() { return expression==null?"NULL":expression; }
|
||||
public String sqlOrder() {
|
||||
// UTF-16字节序与既有Java对象键次序一致,同重量时固定顺序。
|
||||
return (expression==null?"":"sort_weight DESC, ")+"CAST(CONVERT(bucket_key USING utf16) AS BINARY) ASC";
|
||||
}
|
||||
public ProductTableOrder visibleTo(java.util.Set<String> fields) {
|
||||
String field=switch(this) {
|
||||
case BRIGHT_QUALIFIED -> "bright_qualified_weight";
|
||||
case BLACK_TOTAL -> "black_total_weight";
|
||||
case BRIGHT_TOTAL -> "bright_total_weight";
|
||||
case PRODUCT -> "*";
|
||||
};
|
||||
return fields.contains("*")||fields.contains(field)?this:PRODUCT;
|
||||
}
|
||||
private BigDecimal weight(MetricsService.MetricRow row) {
|
||||
return switch(this) {
|
||||
case BRIGHT_QUALIFIED -> row.bright().qualifiedWeight();
|
||||
case BLACK_TOTAL -> row.black().totalWeight();
|
||||
case BRIGHT_TOTAL -> row.bright().totalWeight();
|
||||
case PRODUCT -> null;
|
||||
};
|
||||
}
|
||||
public Comparator<MetricsService.MetricRow> comparator() {
|
||||
Comparator<MetricsService.MetricRow> keys=Comparator.comparing(row->row.key()==null?"":row.key());
|
||||
return this==PRODUCT?keys:Comparator.comparing(this::weight,Comparator.nullsLast(Comparator.reverseOrder())).thenComparing(keys);
|
||||
}
|
||||
}
|
||||
@@ -84,4 +84,19 @@ class MetricsResponseAccessTest {
|
||||
assertTrue(aggregateOnly.trend().isEmpty());
|
||||
verify(governance, never()).requireBoundAction("QUERY", "query.detail");
|
||||
}
|
||||
@Test void productPageRechecksCurrentDetailAndFieldPolicyAndHidesCountsWithoutDetailAccess() {
|
||||
var page=new ProductPage(Map.of("id","r"),Map.of(),List.of(row),120,2,15,"productAsc");
|
||||
var access=new MetricsResponseAccess(governance);
|
||||
when(governance.policy(actor.getId().toString())).thenReturn(Map.of("detailAllowed",true));
|
||||
when(governance.allowedFields(actor)).thenReturn(Set.of("black_total_weight"));
|
||||
var visible=access.visibleProductPage(page,actor);
|
||||
assertEquals(120,visible.total());assertEquals(2,visible.page());
|
||||
assertEquals(stage.totalWeight(),visible.rows().getFirst().black().totalWeight());
|
||||
assertNull(visible.rows().getFirst().bright().totalWeight());
|
||||
verify(governance).requireUserActivePolicy(actor);
|
||||
when(governance.policy(actor.getId().toString())).thenReturn(Map.of("detailAllowed",false));
|
||||
var revoked=access.visibleProductPage(page,actor);
|
||||
assertTrue(revoked.rows().isEmpty());assertEquals(0,revoked.total());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+55
@@ -93,4 +93,59 @@ class SalesOrderMetricRollupsMySqlTest {
|
||||
rollups.refreshCurrentBuild(build);assertFalse(rollups.ready(release,query.extraFilters(),true,Set.of("*")));
|
||||
assertEquals(0,jdbc.queryForObject("SELECT COUNT(*) FROM sales_order_metric_rollup_build WHERE version_id=?",Integer.class,version));
|
||||
}
|
||||
@Test void databaseProductPagesMatchFormalRowsAcrossRawRollupsFiltersAndStableNullTies() {
|
||||
// Include blanks, a missing stage, equal weights and UTF-16 ordering edges.
|
||||
int n=0;
|
||||
for(String product:List.of("", " ", "edge-😀", "edge-\uE000", "edge-é", "edge-e\u0301", "edge-A", "edge-a")) {
|
||||
jdbc.update("INSERT INTO fact_bright(build_id,month_key,department,group_name,product,qualified_weight,scrap_weight,total_weight,raw_values,components) VALUES(?,'2026-01','A','g',?,100,1,999,JSON_OBJECT('销售订单号','order-0'),JSON_OBJECT('bright_processing_scrap',1))",build,product);
|
||||
n++;
|
||||
}
|
||||
jdbc.update("INSERT INTO fact_black(build_id,month_key,department,group_name,product,qualified_weight,scrap_weight,total_weight,raw_values,components) VALUES(?,'2026-01','A','g',NULL,NULL,0,0,JSON_OBJECT(),JSON_OBJECT())",build);
|
||||
// Stage-specific representatives remain distinct exactly as in the existing formal table.
|
||||
jdbc.update("INSERT INTO fact_black(build_id,month_key,department,group_name,product,qualified_weight,scrap_weight,total_weight,raw_values,components) VALUES(?,'2026-01','A','g',?,50,1,51,JSON_OBJECT(),JSON_OBJECT())",build,"edge-e\u0301");
|
||||
var base=query("product",true,Map.of());
|
||||
var scopes=List.of(base,base.withStage("bright"),base.withStage("black"),base.withMonthRange(1,1),base.withProductSearch("edge"),
|
||||
query("product",false,Map.of(SalesOrderTypes.KEY,List.of("标准销售订单"))),
|
||||
query("product",true,Map.of(SalesOrderTypes.EXCLUDE_KEY,List.of("样品销售订单"))));
|
||||
// No rollups -> facts; regular rollups; then sales-order rollups.
|
||||
for(int path=0;path<3;path++) {
|
||||
if(path==1) for(String stage:List.of("black","bright")) {
|
||||
jdbc.update("INSERT INTO metric_rollup(build_id,stage,month_key,department,group_name,project_group,product,qualified_weight,scrap_weight,total_weight,components,source_row_count,excluded_blank_rows,unmapped_rows,project_unconfigured_rows) SELECT build_id,?,month_key,department,group_name,project_group,product,qualified_weight,scrap_weight,total_weight,components,1,0,0,0 FROM fact_"+stage,stage);
|
||||
}
|
||||
if(path==1)jdbc.update("INSERT INTO metric_rollup_build(build_id,source_row_count) VALUES(?,?)",build,22+n+2);
|
||||
if(path==2)rollups.prepareBuild(version,build);
|
||||
for(var scope:scopes) for(var order:ProductTableOrder.values()) {
|
||||
var expected=metrics.calculateTable(scope,actor).rows().stream().sorted(order.comparator()).toList();
|
||||
var actual=new ArrayList<MetricsService.MetricRow>();
|
||||
int pages=(expected.size()+2)/3;
|
||||
for(int page=1;page<=pages+1;page++) {
|
||||
var result=metrics.calculateProductPage(scope,actor,page,3,order.wire());
|
||||
assertEquals(expected.size(),result.total(),"total path "+path);
|
||||
assertTrue(result.rows().size()<=3);
|
||||
actual.addAll(result.rows());
|
||||
}
|
||||
assertEquals(normalized(expected),normalized(actual),"path="+path+" order="+order+" scope="+scope);
|
||||
}
|
||||
}
|
||||
when(actor.getDepartments()).thenReturn(List.of("A"));
|
||||
var authorized=metrics.calculateTable(base,actor).rows().stream().sorted(ProductTableOrder.PRODUCT.comparator()).toList();
|
||||
assertEquals(normalized(authorized),normalized(metrics.calculateProductPage(base,actor,1,100,"productAsc").rows()));
|
||||
}
|
||||
|
||||
@Test void pageSelectionDoesNotMultiplyUnicodeEquivalentBucketsAndValidatesLimits() {
|
||||
var base=query("product",true,Map.of());
|
||||
var expected=metrics.calculateTable(base,actor).rows().getFirst();
|
||||
when(governance.allowedFields(actor)).thenReturn(Set.of("black_rate"));
|
||||
assertEquals(normalized(metrics.calculateTable(base,actor).rows().stream().sorted(ProductTableOrder.PRODUCT.comparator()).toList()),
|
||||
normalized(metrics.calculateProductPage(base,actor,1,100,"brightQualifiedDesc").rows()),"Hidden weights must not leak through ordering");
|
||||
when(governance.allowedFields(actor)).thenReturn(Set.of("*"));
|
||||
var limited=metrics.calculatePairedProductSnapshot(base,actor,List.of(expected.key(),expected.key()),()->"source");
|
||||
assertEquals(normalized(List.of(expected)),normalized(limited.metrics().rows()));
|
||||
assertTrue(metrics.calculatePairedProductSnapshot(base,actor,List.of(),()->"source").metrics().rows().isEmpty());
|
||||
for(int page:new int[]{0,-1,1_000_001})assertThrows(IllegalArgumentException.class,()->metrics.calculateProductPage(base,actor,page,15,"productAsc"));
|
||||
for(int size:new int[]{0,101})assertThrows(IllegalArgumentException.class,()->metrics.calculateProductPage(base,actor,1,size,"productAsc"));
|
||||
assertThrows(IllegalArgumentException.class,()->metrics.calculateProductPage(base,actor,1,15,"product; DROP TABLE"));
|
||||
assertThrows(IllegalArgumentException.class,()->metrics.calculateProductPage(query("overall",true,Map.of()),actor,1,15,"productAsc"));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+25
-1
@@ -1,5 +1,29 @@
|
||||
# 当前进度
|
||||
|
||||
## 2026-11-14:数据库分页与测试修复已发布(2026.11.14.2)
|
||||
|
||||
用户授权测试通过后发布并同步Gitea。本轮沿用分页独立工作目录,功能提交`8f1b790`,已推送Gitea main,未合入主目录旧分支的无关修改。6项既有失败已复现并修复:报告测试缺少真实辅助函数/钩子绑定4项、SVG趋势测试按固定纵轴校验2项;恢复失败提示按项目静默省略约定校正。未改报告生产逻辑、模型原文或正式指标算法。
|
||||
|
||||
前端全套616项全部通过,类型及生产构建通过;常规后端995项(823执行通过、172按条件跳过),另启用隔离MySQL专项10项通过。分页优化、当前页细分和全量导出一并发布;此前本地专项覆盖Unicode、缺失阶段、权限与导出,本次未调用模型或执行私有原表全量回归。
|
||||
|
||||
公开版本2026.11.14.2,入口HTML及24个发布文件与本地构建逐个摘要一致。新旧JAR迁移SQL资源完全一致,无新增迁移、表或索引。线上只读基线核对:年度综合7651、黑片6419、亮片6715产品;月度2960、搜索8、来源筛选3产品的正式汇总/全量行/覆盖完全一致,各表首页、第二页和末页核对一致,细分废率及48条来源结果保持。浏览器实际第二页显示16–30行、共6715行,15条数据、无错误;来源抽屉读取48条、121字段,原筛选恢复且99.10%保持。
|
||||
|
||||
MySQL原进程、正式版本指针和数据库结构保持;DSH应用/模型/状态路径保持,维护暂停标记恢复原状,原维护兼容保护未解除。完整发布与测试证据位于主目录`output/20261114-pagination-release/`。下方“未发布/6项失败”为之前时点,已由本节结果替代。
|
||||
|
||||
## 2026-11-14:分页发布准备与6项测试修复
|
||||
|
||||
用户已授权测试通过后发布,并同步Gitea。继续使用分页独立分支,核实远端main仍为`d948e1e`。6项失败已复现:报告组件测试缺少当前真实辅助函数/钩子绑定4项,SVG测试仍假定固定纵轴2项;已补齐依赖并按真实百分比坐标范围校验正式值和像素位置。图表恢复失败的旧告警断言按项目“静默省略、保留原文”约定校正。未改模型原始正文、报告生产逻辑或正式指标算法。
|
||||
|
||||
前端全套616项通过;常规后端995项(823执行通过、172按条件跳过)及另启用的隔离MySQL10项通过。本节为发布准备时点,最终发布和同步状态另记后续验收。
|
||||
|
||||
## 2026-11-14:数据库分页本地实现(未发布、未同步)
|
||||
|
||||
按用户“优化并本地测试”,基于 main `d948e1e` 在独立分支 `codex/database-pagination-local-20261114` 实现,源码位于 `/Users/lyun/.codex/worktrees/quality-database-pagination-20261114`。产品汇总、黑片/亮片宽产品表按数据库页读取,保留正式汇总、趋势、授权与全量导出;当前页细分废率只查相应产品。年度摘要优先,月/季/搜索并行读小页,避免额外串行等待。同重量固定次序、隐藏重量不通过排序泄露;换范围重置与请求取消已覆盖。没有新增表、索引、迁移或持久化副本。
|
||||
|
||||
144,016 条合成事实、6,002 产品:年度综合产品表接口三轮中位数 2627→1593ms,数据体积 5,286,041→15,364 字节;同一浏览器旧/新前端表格可用时间中位数 5725→4566ms(约20%),顶部指标/趋势基本不变。分页/细分对齐正式全量接口,9组额外期间、排除及来源筛选一致;浏览器三页查询、换年、来源、第二页全量Excel已验收。常规后端995项(823通过、172跳过),专项隔离MySQL10项和前端相关77项通过,前端构建通过。前端全套616项仍有6个主线既有智能分析报告测试失败,已在未改动基线复现;未修改这些模块。特殊Unicode分组漏计的本轮边界已修正并复验。
|
||||
|
||||
仅本地,未提交/推送或发布;未执行私有原表全量回归。自有测试库/账号/进程已清理,正式指针和原进程保持,原浏览器链接恢复。完整报告与截图:主目录 `output/20261114-database-pagination/测试结果.md`。后续如需交付,先核对当前主线和本轮独立差异;不要把主目录旧分支历史改动一并提交。
|
||||
|
||||
## 2026-11-14:分步加载已发布(2026.11.14.1)
|
||||
|
||||
在用户明确要求发布并同步后,复核 Gitea main 仍为 `3819011`,仅提交本轮查询加载、表格投影、相关测试和使用说明,功能提交 `374f08c`。没有整批提交主工作目录旧分支上的历史改动。
|
||||
@@ -10,7 +34,7 @@
|
||||
|
||||
前端2026.11.14.1已切换,公开版本、入口HTML和资源与本地生产构建一致。复用现有浏览器,原筛选显示查询完成、合格率99.10%、总重7190.86kg;来源抽屉实际载入48条、121字段,产品钻取的5月来源返回1条,返回上一级正常。恢复页面时纠正了上次手工重写筛选名称的偏差,改用保存的原始链接,没有改业务数据。部署验收脚本的进程检查曾缺少初始化,已修正并重新核对新后端、MySQL身份、健康和数据指针;未回滚业务数据。
|
||||
|
||||
仅更新前后端,无新增表、索引或数据库迁移;表格仍返回全量产品,数据库分页尚未实施。现有维护升级兼容保护未解除。私有基线、登录配置、运行包和验收产物不进入Git,完整证据保存在主目录 `output/20261114-progressive-query/`。本节记录发布验收;仓库同步状态以随后的远端分支核验为准,下方本地试验的“未发布、未同步”为当时时点。
|
||||
仅更新前后端,无新增表、索引或数据库迁移;表格仍返回全量产品,数据库分页尚未实施。现有维护升级兼容保护未解除。私有基线、登录配置、运行包和验收产物不进入Git,完整证据保存在主目录 `output/20261114-progressive-query/`。本轮功能与发布验收记录已同步 Gitea `main`,功能提交 `374f08c`,发布记录 `bfb91ef`;远端分支已读回核验。下方本地试验的“未发布、未同步”为当时时点。
|
||||
|
||||
|
||||
## 2026-11-14:分步加载本地试验(未发布、未同步)
|
||||
|
||||
+37
-17
@@ -1,3 +1,5 @@
|
||||
import { useProductPage } from './useProductPage';
|
||||
import { shouldPageProducts, canReadProductPage } from './productPagination';
|
||||
import { usePriorityMetrics } from './usePriorityMetrics';
|
||||
import { overviewTrend, sameTrendScope } from './priorityMetrics';
|
||||
import { QuerySnapshotButton } from './QuerySnapshotButton';
|
||||
@@ -415,14 +417,17 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
setDrilledProduct('');
|
||||
}, [drilldownContextKey]);
|
||||
const metricParams = useMemo<QueryParams>(() => ({ ...queryParams, trendGranularity: 'month' }), [queryParams]);
|
||||
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 productPagingScope=shouldPageProducts(metricParams);
|
||||
const overview = usePriorityMetrics(metricParams, active && metricsReady, queryRevision, onUnauthorized,productPagingScope);
|
||||
const currentOverview = overview.value;
|
||||
const paging=productPagingScope&&!drilledProduct&&!overview.failed;
|
||||
const productPage=useProductPage(metricParams,active&&metricsReady&&paging&&canReadProductPage(metricParams,overview.settled),queryRevision,'brightQualifiedDesc',onUnauthorized);
|
||||
const metricKey = useMemo(() => JSON.stringify([metricParams, queryRevision,productPagingScope?productPage.key:null]), [metricParams, queryRevision,productPagingScope,productPage.key]);
|
||||
const currentMetricsError = errorKey === metricKey ? error : '';
|
||||
const currentMetricsData = dataKey === metricKey && !currentMetricsError ? data : null;
|
||||
const queryPending = !currentMetricsData && !currentMetricsError;
|
||||
const queryBusy = loading || queryPending;
|
||||
const queryPending = !drilledProduct && !currentMetricsData && !currentMetricsError;
|
||||
const queryBusy = !drilledProduct && (loading || queryPending);
|
||||
const metricKeyRef = useRef(metricKey);
|
||||
metricKeyRef.current = metricKey;
|
||||
const trendParams = useMemo<QueryParams>(() => {
|
||||
@@ -455,7 +460,12 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
}, [queryKey, active]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!active || !metricsReady || !overview.settled) return;
|
||||
if (!active || !metricsReady || !overview.settled || drilledProduct) return;
|
||||
if(paging) {
|
||||
if(productPage.error){setError(productPage.error);setErrorKey(metricKey);setLoading(false);return;}
|
||||
if(!productPage.value||!currentOverview){setLoading(true);return;}
|
||||
setData({...currentOverview,rows:productPage.value.rows});setDataKey(metricKey);setLoading(false);setError('');setErrorKey('');return;
|
||||
}
|
||||
if (currentOverview && !overview.split) {
|
||||
setData(currentOverview); setDataKey(metricKey); setLoading(false); setError(''); setErrorKey(''); return;
|
||||
}
|
||||
@@ -476,7 +486,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
setErrorKey(metricKey);
|
||||
}).finally(() => { if (!controller.signal.aborted) setLoading(false); });
|
||||
return () => controller.abort();
|
||||
}, [active, metricKey, queryRevision, onUnauthorized, metricsReady, overview.settled, overview.split, currentOverview]);
|
||||
}, [active, metricKey, queryRevision, onUnauthorized, metricsReady, overview.settled, overview.split, currentOverview,drilledProduct,paging,productPage.value,productPage.error]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!active) return;
|
||||
@@ -568,6 +578,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
: page === 'overall' && currentMetricsData
|
||||
? currentMetricsData.rows.length ? currentMetricsData.rows : [currentMetricsData.summary]
|
||||
: currentMetricsData?.rows || [];
|
||||
if(paging)return rawRows;
|
||||
const scopedRows = view === 'department'
|
||||
? rawRows.filter(row => !RETIRED_DEPARTMENTS.has(row.department || row.label))
|
||||
: view === 'group' && department.length
|
||||
@@ -585,7 +596,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
if (!appliedSearch.trim()) return orderedRows;
|
||||
const term = appliedSearch.trim().toLocaleLowerCase();
|
||||
return orderedRows.filter(row => [row.label, row.department, row.group, row.product, row.projectGroup].filter(Boolean).join(' ').toLocaleLowerCase().includes(term));
|
||||
}, [page, period, currentMetricsData, appliedSearch, year, view, department, allowedGroupSet]);
|
||||
}, [page, period, currentMetricsData, appliedSearch, year, view, department, allowedGroupSet,paging]);
|
||||
|
||||
const tableReady = drilledProduct ? trendDataKey === trendKey && !trendLoading : !!currentMetricsData;
|
||||
const retainedTable = useRetainedResult(tableReady ? {
|
||||
@@ -607,7 +618,7 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
query:{...defectQueryParams,releaseId:summaryMetricsDataRelease()},trendQuery:trendParams,
|
||||
tableQuery:drilledProduct?trendParams:queryParams,
|
||||
tableDimension:tableView==='overall'&&tablePeriod==='year'?'period':tableView,
|
||||
tableGranularity:drilledProduct?trendGranularity:'month',refreshKey:JSON.stringify([refreshKey,queryRevision]),onUnauthorized,display:defectDisplay,onDisplay:setDefectDisplay});
|
||||
tableGranularity:drilledProduct?trendGranularity:'month',productKeys:paging?productPage.value?.rows.map(row=>row.key):undefined,tableEnabled:!paging||!!productPage.value,refreshKey:JSON.stringify([refreshKey,queryRevision]),onUnauthorized,display:defectDisplay,onDisplay:setDefectDisplay});
|
||||
function summaryMetricsDataRelease() { return (drilledProduct?trendObjectMetrics?.data:currentMetricsData)?.release?.id || currentMetricsData?.release?.id || queryParams.releaseId; }
|
||||
|
||||
const captureTrendAnchor = useCallback(() => {
|
||||
@@ -825,6 +836,9 @@ export default function QueryPage({ page, onUnauthorized }: {
|
||||
paginationScope={retainedTable?.paginationScope}
|
||||
exportFilename={`${drilledProduct || scopeName}质量汇总-${year}${drilledProduct || period === 'year' ? '' : period === 'month' ? `-${String(month).padStart(2, '0')}` : `-Q${quarter}`}-${fullFields ? '完整字段' : '关键指标'}`}
|
||||
rows={tableRows}
|
||||
columnRows={paging&¤tOverview?[currentOverview.summary]:undefined}
|
||||
remotePage={paging?productPage.pagination:undefined}
|
||||
loadExportData={paging?async()=>{const [rows,defectDrilldown]=await Promise.all([productPage.loadAll(),defectDrill.exportTable()]);return {rows,defectDrilldown};}:undefined}
|
||||
view={tableView}
|
||||
layoutView={retainedTable?.layoutView || view}
|
||||
pageSizeOverride={tableProduct ? 12 : undefined}
|
||||
@@ -1109,9 +1123,11 @@ const totalWeightTitle = (label: string) => <span className="query-total-weight-
|
||||
const rateBasisTitle = (label: string, basis: QueryRateBasis, kind: 'bright' | 'composite', onBasis?: () => void) => <span className="query-total-weight-title query-rate-rule-title"><span className="query-rate-label">{onBasis ? <button className="header-link" onClick={onBasis}>{label}</button> : label}{basis !== 'original' && <small className="query-rate-subtitle">(去本部报废)</small>}</span>{basis !== 'original' && <Tooltip trigger={['hover', 'focus']} title={<div>{kind === 'composite' && <>综合合格率=黑片合格率×亮片合格率。<br /></>}原口径:亮片合格重量÷亮片总重量。<br />去本部报废:(亮片合格重量+本部报废)÷亮片总重量,同时从亮片报废重量中扣除本部报废,总重量不变。<br />当前:去本部报废。计算结果以已发布数据版本及生效规则为准。</div>}><InfoCircleOutlined tabIndex={0} role="img" aria-label={`${kind === 'composite' ? '综合合格率' : '亮片合格率'}计算说明`} /></Tooltip>}</span>;
|
||||
|
||||
export function MetricTable({
|
||||
ref, exportFilename, rows, view, defectDrilldown, layoutView = view, pageSizeOverride, paginationScope, period, month, quarter, fullFields, rateBasis, onDetail, onBasis, onDrilldown, onlyStage, defectDisplay = 'weight', emptyText = '当前条件下暂无数据',
|
||||
ref, exportFilename, rows, view, defectDrilldown, columnRows, remotePage, loadExportData, layoutView = view, pageSizeOverride, paginationScope, period, month, quarter, fullFields, rateBasis, onDetail, onBasis, onDrilldown, onlyStage, defectDisplay = 'weight', emptyText = '当前条件下暂无数据',
|
||||
}: {
|
||||
ref?: React.Ref<{ exportExcel: () => Promise<void> }>; exportFilename: string; defectDrilldown?: DefectDrilldownResponse;
|
||||
columnRows?:MetricRow[];remotePage?:{current:number;pageSize:number;total:number;onChange:(page:number,size:number)=>void};
|
||||
loadExportData?:()=>Promise<{rows:MetricRow[];defectDrilldown?:DefectDrilldownResponse}>;
|
||||
rows: MetricRow[]; view: ViewKind; layoutView?: ViewKind; pageSizeOverride?: number; paginationScope?: string; period: PeriodKind; month: number; quarter: number; fullFields: boolean;
|
||||
rateBasis: 'original' | 'withoutHeadquartersScrap';
|
||||
onDetail: (row: MetricRow | null, stage: Stage, month?: number) => void; onBasis: () => void; onDrilldown: (row: MetricRow) => void;
|
||||
@@ -1154,7 +1170,7 @@ export function MetricTable({
|
||||
headquartersScrapWeight: '本部报废', rate: '合格率',
|
||||
};
|
||||
const stageColumns = (stage: Stage): ColumnsType<MetricRow> => {
|
||||
const base: ColumnsType<MetricRow> = metricStageColumnPlan(rows, stage, defectDrilldown ? false : fullFields, rateBasis).map(column => {
|
||||
const base: ColumnsType<MetricRow> = metricStageColumnPlan(columnRows||rows, stage, defectDrilldown ? false : 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'
|
||||
@@ -1179,11 +1195,14 @@ export function MetricTable({
|
||||
];
|
||||
const columns = onlyStage ? allColumns.filter(column => !['compositeRate', `stage-${onlyStage === 'black' ? 'bright' : 'black'}`].includes(String(column.key))) : allColumns;
|
||||
useImperativeHandle(ref, () => ({
|
||||
exportExcel: () => downloadMetricWorkbook(exportFilename, columns, rows, (key, row) => {
|
||||
exportExcel: async () => {
|
||||
const exported=loadExportData?await loadExportData():{rows,defectDrilldown};
|
||||
const exportedFine=exported.defectDrilldown;
|
||||
return downloadMetricWorkbook(exportFilename, columns, exported.rows, (key, row) => {
|
||||
if (key === 'object') return [title(row), view === 'group' ? row.department : null].filter(Boolean).join(' / ');
|
||||
if (key === 'compositeRate') return visibleCompositeRate(row, rateBasis);
|
||||
const stage: Stage = key.startsWith('black-') ? 'black' : 'bright';
|
||||
if (defectDrilldown && key.startsWith(`${stage}-fine-`)) return defectCell(defectDrilldown,row,key.slice(`${stage}-fine-`.length),defectDisplay);
|
||||
if (exportedFine && key.startsWith(`${stage}-fine-`)) return defectCell(exportedFine,row,key.slice(`${stage}-fine-`.length),defectDisplay);
|
||||
if (key.startsWith(`${stage}-defect-`)) {
|
||||
const weight=defectList(row, stage).find(item => item.name === key.slice(`${stage}-defect-`.length))?.weight ?? null;
|
||||
return defectDisplay === 'rate' ? defectWeightRate(weight,stageValue(row,stage,'totalWeight')) : weight;
|
||||
@@ -1191,13 +1210,14 @@ export function MetricTable({
|
||||
const field = key.slice(stage.length + 1) as 'qualifiedWeight' | 'scrapWeight' | 'totalWeight' | 'headquartersScrapWeight' | 'rate';
|
||||
if (defectDisplay === 'rate' && (field === 'scrapWeight' || field === 'headquartersScrapWeight')) return defectWeightRate(stageValue(row,stage,field,rateBasis),stageValue(row,stage,'totalWeight'));
|
||||
return field === 'rate' ? visibleStageRate(row, stage, stage === 'bright' ? rateBasis : 'original') : stageValue(row, stage, field, rateBasis);
|
||||
}),
|
||||
});
|
||||
},
|
||||
}));
|
||||
const dataSource = rows.map((row, index) => ({ ...row, sourceMetricKey: row.key, key: row.key || `${title(row)}-${index}` }));
|
||||
const [currentPage, setCurrentPage] = useState(1);
|
||||
const [pageSize, setPageSize] = useState(SUMMARY_PAGE_SIZE);
|
||||
const effectivePage = pageSizeOverride == null ? Math.min(currentPage, Math.max(1, Math.ceil(rows.length / pageSize))) : 1;
|
||||
const effectivePageSize = pageSizeOverride ?? pageSize;
|
||||
const effectivePage = remotePage?remotePage.current:pageSizeOverride == null ? Math.min(currentPage, Math.max(1, Math.ceil(rows.length / pageSize))) : 1;
|
||||
const effectivePageSize = remotePage?.pageSize ?? pageSizeOverride ?? pageSize;
|
||||
useEffect(() => setCurrentPage(1), [paginationScope ?? rows]);
|
||||
const columnWidth = (column: ColumnsType<MetricRow>[number]): number => {
|
||||
if ('children' in column && column.children?.length) {
|
||||
@@ -1208,9 +1228,9 @@ export function MetricTable({
|
||||
const scrollWidth = Math.ceil(columns.reduce((total, column) => total + columnWidth(column), 0));
|
||||
const scroll = { x: scrollWidth };
|
||||
const displayColumns = compact ? columns.flatMap(column => 'children' in column && column.children ? column.children : [column]) : columns;
|
||||
const pageRows = dataSource.slice((effectivePage - 1) * effectivePageSize, effectivePage * effectivePageSize);
|
||||
const pageRows = remotePage?dataSource:dataSource.slice((effectivePage - 1) * effectivePageSize, effectivePage * effectivePageSize);
|
||||
return <div className="metric-table-scroll"><Table<MetricRow> size="small" bordered tableLayout="fixed" columns={displayColumns} dataSource={pageRows} pagination={false} scroll={scroll} rowKey="key" locale={{ emptyText }} />
|
||||
{pageSizeOverride == null && <MetricTablePagination current={effectivePage} total={dataSource.length} pageSize={pageSize} onChange={(nextPage, nextPageSize) => { setPageSize(nextPageSize); setCurrentPage(nextPageSize === pageSize ? nextPage : 1); }} />}
|
||||
{pageSizeOverride == null && <MetricTablePagination current={effectivePage} total={remotePage?.total??dataSource.length} pageSize={effectivePageSize} onChange={remotePage?.onChange||((nextPage, nextPageSize) => { setPageSize(nextPageSize); setCurrentPage(nextPageSize === pageSize ? nextPage : 1); })} />}
|
||||
</div>;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { useProductPage } from './useProductPage';
|
||||
import { shouldPageProducts, canReadProductPage } from './productPagination';
|
||||
import { usePriorityMetrics } from './usePriorityMetrics';
|
||||
import { overviewTrend, sameTrendScope } from './priorityMetrics';
|
||||
import { QuerySnapshotButton } from './QuerySnapshotButton';
|
||||
@@ -74,14 +76,17 @@ 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,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 productPagingScope=!!applied&&shouldPageProducts(applied)&&!drilledProduct;
|
||||
const overview=usePriorityMetrics(applied,active&&appliedReady,JSON.stringify([revision,refreshKey]),onUnauthorized,productPagingScope);
|
||||
const paging=productPagingScope&&!overview.failed;
|
||||
const productPage=useProductPage(applied||draft,active&&appliedReady&&paging&&canReadProductPage(applied||draft,overview.settled),JSON.stringify([revision,refreshKey]),stage==='black'?'blackTotalDesc':'brightTotalDesc',onUnauthorized);
|
||||
const queryKey=JSON.stringify({query:applied,revision,refreshKey,page:productPagingScope?productPage.key:null});const current=response?.key===queryKey?response.value:null;const error=failure?.key===queryKey?failure.message:'';
|
||||
const currentSummary=overview.value||current;
|
||||
useEffect(()=>{
|
||||
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);
|
||||
if(!active||!applied||!appliedReady||!overview.settled)return;if(paging){if(productPage.error){setFailure({key:queryKey,message:productPage.error});setLoading(false);return;}if(!productPage.value||!overview.value){setLoading(true);return;}setResponse({key:queryKey,value:{...overview.value,rows:productPage.value.rows}});setLoading(false);setFailure(null);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,overview.settled,overview.split,overview.value]);
|
||||
},[active,queryKey,onUnauthorized,appliedReady,overview.settled,overview.split,overview.value,paging,productPage.value,productPage.error]);
|
||||
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,refreshKey});
|
||||
@@ -115,13 +120,13 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU
|
||||
const salesSelection=salesOrderTypeSelection(extraFilters);
|
||||
const moreFilterSummary=[salesSelection.values.length?`销售订单类型${salesSelection.exclude?'(排除)':''}:`+salesSelection.values.map(value=>value==='__EMPTY__'?'未匹配':value).join('、'):'',projectGroup.length?`项目组:${projectGroup.map(v=>v==='__UNASSIGNED__'?'未分类':v).join('、')}`:'',...sourceFilters.map(rule=>fields.find(field=>field.key===rule.field)?.label||rule.field)].filter(Boolean).join(';');
|
||||
const displayed = useRetainedResult(current && applied ? { data: current, query: applied } : null);
|
||||
const sortedRows=useMemo(()=>sortStageRowsByTotalWeight(displayed?.data.rows||[],stage),[displayed?.data,stage]);
|
||||
const sortedRows=useMemo(()=>paging?displayed?.data.rows||[]:sortStageRowsByTotalWeight(displayed?.data.rows||[],stage),[displayed?.data,stage,paging]);
|
||||
const trendRefreshing=!trendError&&(trendLoading||trendResponse?.key!==trendKey);
|
||||
const showTrendLoading=useDelayedIndicator(trendRefreshing);
|
||||
const tableReady=!!current&&(!drilledProduct||(trendResponse?.key===trendKey&&!trendLoading&&!trendError));
|
||||
const table=useRetainedResult(tableReady&&applied?{rows:drilledProduct?visibleTrend:sortedRows,query:applied,drilledProduct,granularity:trendGranularity,period:drilledProduct?'year' as const:applied.month?'month' as const:applied.quarter?'quarter' as const:'year' as const}:null);
|
||||
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,
|
||||
productKeys:paging?productPage.value?.rows.map(row=>row.key):undefined,tableEnabled:!paging||!!productPage.value,tableQuery:drilledProduct?(trendQuery||draft):(applied||draft),tableDimension:drilledProduct?'period':'product',tableGranularity:trendGranularity,
|
||||
refreshKey:JSON.stringify([refreshKey,revision]),onUnauthorized,display:defectDisplay,onDisplay:setDefectDisplay});
|
||||
const displayedSummary=useRetainedResult(currentSummary);
|
||||
const summary=displayedSummary?.summary[stage];const stageRate=stage==='bright'&&rateBasis==='withoutHeadquartersScrap'?summary?.rateWithoutHeadquartersScrap:summary?.rate;
|
||||
@@ -178,7 +183,9 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU
|
||||
<SmoothTableFrame busy={queryBusy||!tableReady||defectDrill.tablePending} blocked={queryBusy||!tableReady||defectDrill.tablePending}>
|
||||
<MetricTable defectDrilldown={tableReady&&!queryBusy?defectDrill.table:undefined} ref={exporter} exportFilename={`${table?.drilledProduct||label}产品汇总-${table?.query.year||year}-${fullFields?'完整字段':'关键指标'}`}
|
||||
paginationScope={JSON.stringify({query:table?.query,drilledProduct:table?.drilledProduct})}
|
||||
rows={table?.rows||[]} view={table?.drilledProduct?'overall':'product'} layoutView="product" pageSizeOverride={table?.drilledProduct?12:undefined}
|
||||
rows={table?.rows||[]} columnRows={paging&¤tSummary?[currentSummary.summary]:undefined} remotePage={paging?productPage.pagination:undefined}
|
||||
loadExportData={paging?async()=>{const [rows,defectDrilldown]=await Promise.all([productPage.loadAll(),defectDrill.exportTable()]);return {rows,defectDrilldown};}:undefined}
|
||||
view={table?.drilledProduct?'overall':'product'} layoutView="product" pageSizeOverride={table?.drilledProduct?12:undefined}
|
||||
period={table?.period||period} month={table?.query.month||month} quarter={table?.query.quarter||quarter}
|
||||
fullFields={fullFields} defectDisplay={defectDisplay} rateBasis={rateBasis} onlyStage={stage} onDetail={openDetail} onBasis={()=>setBasisOpen(true)}
|
||||
emptyText={queryBusy?'正在更新数据…':error?'查询失败,暂无可展示结果':'当前条件下暂无数据'}
|
||||
|
||||
+9
-1
@@ -1,3 +1,5 @@
|
||||
import type { ProductOrder } from './productPagination';
|
||||
import type { ProductPageResponse } from './types';
|
||||
import { WORKSPACE_INVALIDATED } from './pageCache';
|
||||
import { consumeEventStream, type StreamEvent } from './eventStream';
|
||||
import { publicErrorMessage } from './publicDataDisplay';
|
||||
@@ -110,7 +112,7 @@ export async function request<T>(path: string, init: RequestInit = {}, timeoutMs
|
||||
method,
|
||||
signal: init.signal ?? undefined,
|
||||
timeoutMs: timeoutMs ?? requestTimeoutFor(path),
|
||||
cache: method === 'GET' && isImmutableRead(path),
|
||||
cache: method === 'GET' && init.cache !== 'reload' && isImmutableRead(path),
|
||||
tags: requestResourceTags(path),
|
||||
category: requestCategory(path),
|
||||
priority: requestPriority(path),
|
||||
@@ -271,6 +273,12 @@ export const api = {
|
||||
metrics(params: QueryParams, signal?: AbortSignal) {
|
||||
return request<MetricsResponse>(`/api/metrics?${toQuery(params)}`, { signal });
|
||||
},
|
||||
productPage(params:QueryParams,page:number,pageSize:number,order:ProductOrder,signal?:AbortSignal) {
|
||||
return request<ProductPageResponse>(`/api/metrics/products?${toQuery({...params,page,pageSize,order})}`,{signal});
|
||||
},
|
||||
exportProductRows(params:QueryParams,rowOrder:ProductOrder,signal?:AbortSignal) {
|
||||
return request<MetricsResponse>(`/api/metrics?${toQuery({...params,part:'table',rowOrder})}`,{signal,cache:'reload'});
|
||||
},
|
||||
metricsTable(params: QueryParams, signal?: AbortSignal) {
|
||||
return request<MetricsResponse>(`/api/metrics?${toQuery({ ...params, part: 'table' })}`, { signal });
|
||||
},
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
import { splitMetricsLoad } from './priorityMetrics.ts';
|
||||
import type { QueryParams } from './types';
|
||||
|
||||
export type ProductOrder = 'brightQualifiedDesc' | 'blackTotalDesc' | 'brightTotalDesc' | 'productAsc';
|
||||
export const PRODUCT_PAGE_SIZE = 15;
|
||||
|
||||
/** 已限定产品的少量结果保留原路径;宽产品表按数据库页读取。 */
|
||||
export function shouldPageProducts(query: QueryParams): boolean {
|
||||
return query.view === 'product' && !!query.releaseId && !query.product;
|
||||
}
|
||||
|
||||
export function pageSelection(scope: string, selected: { scope: string; page: number; size: number }) {
|
||||
return { page: selected.scope === scope ? selected.page : 1, size: selected.size };
|
||||
}
|
||||
|
||||
/** 宽年度先显示摘要;月/季/搜索并行读取小页,避免窄筛选多一次串行等待。 */
|
||||
export function canReadProductPage(query: QueryParams, overviewSettled: boolean): boolean {
|
||||
return overviewSettled || !splitMetricsLoad(query);
|
||||
}
|
||||
@@ -25,6 +25,11 @@ export interface QueryParams {
|
||||
trendGranularity?: 'month' | 'quarter' | 'year';
|
||||
}
|
||||
|
||||
export interface ProductPageResponse {
|
||||
release: {id:string}; context:Record<string,unknown>; rows:MetricRow[];
|
||||
total:number; page:number; pageSize:number; order:string;
|
||||
}
|
||||
|
||||
export interface RecordsParams extends QueryParams {
|
||||
stage: Stage;
|
||||
page: number;
|
||||
|
||||
@@ -4,8 +4,8 @@ import { api } from './api';
|
||||
import { defectScope } from './defectDrilldown';
|
||||
import type { DefectDrilldownResponse, FineDefectCatalogResponse, QueryParams, Stage } from './types';
|
||||
|
||||
export function useDefectDrilldown({active,mode,stage,query,trendQuery,tableQuery,tableDimension,tableGranularity,onUnauthorized,display,onDisplay,refreshKey=0}:{
|
||||
refreshKey?:string|number;active:boolean;mode:string;stage:Stage;query:QueryParams;trendQuery:QueryParams;tableQuery:QueryParams;
|
||||
export function useDefectDrilldown({active,mode,stage,query,trendQuery,tableQuery,tableDimension,tableGranularity,onUnauthorized,display,onDisplay,refreshKey=0,productKeys,tableEnabled=true}:{
|
||||
productKeys?:string[];tableEnabled?:boolean;refreshKey?:string|number;active:boolean;mode:string;stage:Stage;query:QueryParams;trendQuery:QueryParams;tableQuery:QueryParams;
|
||||
tableDimension:string;tableGranularity:string;onUnauthorized:(error:unknown)=>boolean;display:'weight'|'rate';onDisplay:(display:'weight'|'rate')=>void;
|
||||
}) {
|
||||
const [selection,setSelection]=useState<{stage:Stage;category:string}|null>(null);
|
||||
@@ -18,7 +18,8 @@ export function useDefectDrilldown({active,mode,stage,query,trendQuery,tableQuer
|
||||
const catalogKey=JSON.stringify([enabled,stage,defectScope(query),revision,refreshKey]);
|
||||
const common={stage,category,releaseId:query.releaseId};
|
||||
const trend=useDefectPart(enabled&&!!category&&!!query.releaseId,{...defectScope(trendQuery),...common,dimension:'period',trendGranularity:trendQuery.trendGranularity||'month'},[revision,refreshKey],onUnauthorized);
|
||||
const table=useDefectPart(enabled&&!!category&&!!query.releaseId,{...defectScope(tableQuery),...common,dimension:tableDimension,trendGranularity:tableGranularity},[revision,refreshKey],onUnauthorized);
|
||||
const exportParams={...defectScope(tableQuery),...common,dimension:tableDimension,trendGranularity:tableGranularity};
|
||||
const table=useDefectPart(enabled&&!!category&&!!query.releaseId&&tableEnabled,{...exportParams,...(productKeys?{productKeys}:{})},[revision,refreshKey],onUnauthorized);
|
||||
useEffect(()=>{
|
||||
if(!enabled||!query.releaseId)return;
|
||||
const controller=new AbortController();setCatalog(null);setCatalogFailure('');
|
||||
@@ -39,7 +40,7 @@ export function useDefectDrilldown({active,mode,stage,query,trendQuery,tableQuer
|
||||
const retry=<Button size="small" onClick={()=>setRevision(v=>v+1)}>重试</Button>;
|
||||
const controls=category?<div className="defect-drilldown-controls"><Button type="link" onClick={clear}>全部分类</Button><span>› {category}</span>{trend.pending&&<span><Spin size="small"/> 正在读取细分</span>}{trend.error&&<Alert type="error" showIcon message={trend.error} action={retry}/>} {incomplete&&<span className="defect-drilldown-notice">细分来源未完全覆盖分类总量</span>}</div>:catalogFailure&&enabled?<Alert type="error" showIcon message="细分目录读取失败" description={catalogFailure} action={<Button size="small" onClick={()=>setRevision(v=>v+1)}>重试</Button>}/>:null;
|
||||
const tableControls=table.error?<Alert type="error" showIcon message={table.error} action={retry}/>:null;
|
||||
return {category,categories,choose,clear,controls,tableControls,pending,error,trend:trend.data,table:table.data,trendPending:trend.pending,tablePending:table.pending,trendError:trend.error,tableError:table.error};
|
||||
return {category,categories,choose,clear,controls,tableControls,pending,error,exportTable:()=>category?api.defectDrilldown(exportParams):Promise.resolve(undefined),trend:trend.data,table:table.data,trendPending:trend.pending,tablePending:table.pending,trendError:trend.error,tableError:table.error};
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -5,9 +5,9 @@ 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);
|
||||
onUnauthorized: (error: unknown) => boolean, forceOverview = false) {
|
||||
const key = JSON.stringify([query, refresh, forceOverview]);
|
||||
const split = !!query && (forceOverview || splitMetricsLoad(query));
|
||||
const [result, setResult] = useState<{ key: string; value?: MetricsResponse; failed?: boolean } | null>(null);
|
||||
useEffect(() => {
|
||||
if (!enabled || !query) return;
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { api } from './api';
|
||||
import { pageSelection, PRODUCT_PAGE_SIZE, type ProductOrder } from './productPagination';
|
||||
import type { ProductPageResponse, QueryParams } from './types';
|
||||
|
||||
/** 查询范围变化立即使用第一页,避免先发出旧页码请求。 */
|
||||
export function useProductPage(query: QueryParams, enabled: boolean, refresh: string | number,
|
||||
order: ProductOrder, onUnauthorized: (error: unknown) => boolean) {
|
||||
const scope = JSON.stringify([query, refresh, order]);
|
||||
const [selected, setSelected] = useState({ scope, page: 1, size: PRODUCT_PAGE_SIZE });
|
||||
const selection = pageSelection(scope, selected);
|
||||
const key = JSON.stringify([scope, selection.page, selection.size]);
|
||||
const [result, setResult] = useState<{ key: string; scope: string; value?: ProductPageResponse; error?: string } | null>(null);
|
||||
useEffect(() => {
|
||||
if (!enabled) return;
|
||||
const controller = new AbortController();
|
||||
api.productPage(query, selection.page, selection.size, order, controller.signal).then(value => {
|
||||
if (controller.signal.aborted) return;
|
||||
if (value.release.id !== query.releaseId || value.page !== selection.page || value.pageSize !== selection.size || value.order !== order)
|
||||
throw Error('分页查询范围已变化,请重试。');
|
||||
const last = Math.max(1, Math.ceil(value.total / selection.size));
|
||||
if (selection.page > last) { setSelected({ scope, page: last, size: selection.size }); return; }
|
||||
setResult({ key, scope, value });
|
||||
}).catch(error => {
|
||||
if (!controller.signal.aborted && !onUnauthorized(error)) setResult({ key, scope, error: error instanceof Error ? error.message : '表格读取失败' });
|
||||
});
|
||||
return () => controller.abort();
|
||||
}, [enabled, key, onUnauthorized]);
|
||||
const current = enabled && result?.key === key ? result : null;
|
||||
return {
|
||||
key, value: current?.value || null, error: current?.error || '',
|
||||
pagination: { current: selection.page, pageSize: selection.size, total: result?.scope === scope ? result.value?.total || 0 : 0,
|
||||
onChange: (page: number, size: number) => setSelected({ scope, page: size === selection.size ? page : 1, size }) },
|
||||
loadAll: async () => {
|
||||
const value = await api.exportProductRows(query, order);
|
||||
if (value.release?.id !== query.releaseId) throw Error('导出数据版本已变化,请重试。');
|
||||
return value.rows;
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -4,7 +4,7 @@ import fs from 'node:fs';
|
||||
import ts from 'typescript';
|
||||
import React from 'react';
|
||||
import { renderToStaticMarkup } from 'react-dom/server';
|
||||
import { buildAgentReportLayout, agentReportPrimary, agentReportSupplementary } from '../src/agent/agentReportLayout.ts';
|
||||
import { buildAgentReportLayout, agentReportPrimary, agentReportSupplementary, partitionAgentReportVisuals } from '../src/agent/agentReportLayout.ts';
|
||||
import { stripDuplicateFirstMarkdownH1 } from '../src/analysisReportTitle.ts';
|
||||
import { tableTextAlignment } from '../src/tableTextAlignment.ts';
|
||||
import { sanitizeAnalysisDisplayText } from '../src/analysisDisplayText.ts';
|
||||
@@ -26,7 +26,7 @@ const Document=load('../src/agent/AgentDeliverable.tsx','AgentDeliverable',{
|
||||
ReportVisualFigure:({visual,image})=>image?.svg?React.createElement('figure',{'data-chart':visual.id},visual.title):React.createElement('table',{'data-fallback':visual.id},React.createElement('tbody',null,React.createElement('tr',null,React.createElement('td',null,visual.title)))),
|
||||
reportVisualImageSource:image=>image?.svg||'',reportVisuals:()=>figures,
|
||||
useReportVisualImages:()=>({authorized:true,loading:false,images}),analysisSnapshotResult:turn=>turn.result,
|
||||
reportSnapshotIdentity:()=>'',analysisScopeText:()=>'',stripDuplicateFirstMarkdownH1,buildAgentReportLayout,agentReportPrimary,agentReportSupplementary,
|
||||
reportSnapshotIdentity:()=>'',analysisScopeText:()=>'',stripDuplicateFirstMarkdownH1,buildAgentReportLayout,agentReportPrimary,agentReportSupplementary,partitionAgentReportVisuals,
|
||||
captureReportLongImage:()=>{},downloadAuthorizedReport:()=>{},documentCss:'',
|
||||
});
|
||||
const answer='# 原始报告\n\n原始导读。\n\n## 月度趋势\n\n原始分析。\n\n| 月份 | 值 |\n|---|---|\n| 10月 | 95.46% |\n\n## 报废大类\n\n原始说明。';
|
||||
|
||||
@@ -5,6 +5,8 @@ import ts from 'typescript';
|
||||
import React from 'react';
|
||||
import { renderToStaticMarkup } from 'react-dom/server';
|
||||
import { emptyAnalysisNotice } from '../src/analysisConversationState.ts';
|
||||
import { analysisChartReferences } from '../src/analysisChartReferences.ts';
|
||||
import { parseAnalysisVisuals } from '../src/analysisVisualsModel.ts';
|
||||
import { sanitizeAnalysisDisplayText } from '../src/analysisDisplayText.ts';
|
||||
import {
|
||||
analysisMemberListFullyRead,
|
||||
@@ -116,7 +118,7 @@ test('member-list display is opt-in and historical plain answers do not acquire
|
||||
const start = source.indexOf('export const AgentConversationTurn');
|
||||
const code = source.slice(start).replace('export const AgentConversationTurn', 'const AgentConversationTurn');
|
||||
const view = {
|
||||
React, memo: value => value, useMemo: callback => callback(), useState: value => [value, () => {}], useEffect: () => {},
|
||||
React, memo: value => value, useCallback: callback => callback, analysisChartReferences, parseAnalysisVisuals, useMemo: callback => callback(), useState: value => [value, () => {}], useEffect: () => {},
|
||||
useAnalysisVisualRecovery: turn => ({ turn, available: false, recovering: false, error: turn.recoveryError || '' }),
|
||||
analysisSnapshotResult: turn => turn.result || turn, partialAnswerIsOnlyProgress: () => false, analysisIsRunning: () => false,
|
||||
executionEvents: () => [], RunStatus: () => null, authoredReport: () => null, analysisScopeText: () => '', emptyAnalysisNotice,
|
||||
@@ -140,6 +142,7 @@ return AgentConversationTurn;`, {
|
||||
assert.match(empty, /<button>重新分析<\/button>/);
|
||||
assert.match(render({id:'failed-turn',status:'FAILED',answer:'',completion:{reason:'任务理解未完成,请重试'}}), /任务理解未完成,请重试/);
|
||||
const recovery = render({ id: 'old-turn', status: 'PARTIAL', answer: '原答案', recoveryError: '图表恢复暂不可用' });
|
||||
assert.match(recovery, /role="alert">图表恢复暂不可用/);
|
||||
// 图表恢复失败按正式约定静默省略,保留原回答。
|
||||
assert.doesNotMatch(recovery, /role="alert"|图表恢复暂不可用/);
|
||||
assert.match(recovery, /原答案/);
|
||||
});
|
||||
|
||||
@@ -90,3 +90,12 @@ test('changing only the trend object does not recalculate the unchanged product
|
||||
assert.equal(f.requests.length,3);assert.equal(f.requests[2].params.dimension,'period');assert.equal(ui.table?.dimension,'product');
|
||||
assert.equal(ui.trend,undefined);assert.equal(ui.trendPending,true);f.unmount();
|
||||
});
|
||||
|
||||
|
||||
test('product page changes reload only fine table rows and export remains the complete scope',async()=>{
|
||||
const f=fixture();f.props.productKeys=['P1'];f.render();f.catalog[0].resolve(catalogData);await tick();f.render().choose('加工废');f.render();
|
||||
assert.deepEqual(f.requests[1].params.productKeys,['P1']);assert.equal(f.requests[0].params.productKeys,undefined);
|
||||
f.requests[0].resolve({...response,dimension:'period'});f.requests[1].resolve({...response,dimension:'product'});await tick();f.render();
|
||||
f.props.productKeys=['P2'];f.render();assert.equal(f.requests.length,3);assert.deepEqual(f.requests[2].params.productKeys,['P2']);assert.equal(f.render().trend?.dimension,'period');
|
||||
const promise=f.render().exportTable();assert.equal(f.requests[3].params.productKeys,undefined);assert.equal(f.requests[3].params.dimension,'product');f.requests[3].resolve(response);await promise;f.unmount();
|
||||
});
|
||||
|
||||
@@ -158,7 +158,7 @@ test('single-stage detail callback freezes the clicked quarterly/yearly row inst
|
||||
for(const stage of ['black','bright']) {
|
||||
const ui=new Function('freezeSourceRecordsQuery','stage',transpile(`
|
||||
const applied={year:2026,month:10,product:'产品A',stage,columnFilters:[{field:'customer',stages:[stage],operator:'in',values:['001']}]};
|
||||
const current={release:{id:'release-A'}},drilledProduct='产品A';let records;
|
||||
const currentSummary={release:{id:'release-A'}},drilledProduct='产品A';let records;
|
||||
const setRecordVisible=()=>{},setRecords=value=>records=value;
|
||||
${callback}
|
||||
return {openDetail,get:()=>records};
|
||||
|
||||
@@ -248,3 +248,13 @@ test('fine defect expansion and Excel share authorized parent/child values, pres
|
||||
assert.equal(fields.some(f=>f.key.startsWith('black-defect-')||f.key.startsWith('black-fine-')),false);
|
||||
assert.equal(data.groups[0].children[0].rate,0);
|
||||
});
|
||||
|
||||
|
||||
test('remote page two is not sliced again and full export includes every row',async()=>{
|
||||
const all=Array.from({length:35},(_,i)=>({...row,key:String(i),label:'产品'+i}));let changed;
|
||||
const ui=fixture({rows:all.slice(15,30),view:'product',remotePage:{current:2,pageSize:15,total:35,onChange:(...args)=>changed=args},loadExportData:async()=>({rows:all})});
|
||||
assert.equal(find(ui.tree,n=>n.type==='Table').props.dataSource.length,15);
|
||||
const pagination=find(ui.tree,n=>n.type==='Pagination');assert.equal(pagination.props.total,35);assert.equal(pagination.props.current,2);
|
||||
pagination.props.onChange(3,15);assert.deepEqual(changed,[3,15]);
|
||||
await ui.ref.exportExcel();assert.equal(ui.exported.workbook.getWorksheet('质量汇总').rowCount,37);assert.equal(ui.exported.rows[0].key,'0');assert.equal(ui.exported.rows.at(-1).key,'34');
|
||||
});
|
||||
|
||||
@@ -28,7 +28,7 @@ function fixture() {
|
||||
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);
|
||||
dirty = false; index = 0; pending = []; result = hook(props.query, props.enabled, props.refresh, onUnauthorized, props.forceOverview);
|
||||
pending.forEach(run => run()); assert.ok(++count < 10);
|
||||
} while (dirty); return result; }, unmount() { effects.forEach(e => e?.cleanup?.()); } };
|
||||
}
|
||||
@@ -93,12 +93,21 @@ test('inactive pages neither start requests nor accept late results', async () =
|
||||
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}`);
|
||||
const metricExpression=general.match(/const metricKey = useMemo\(\(\) => ([^;]+), \[metricParams, queryRevision[^\]]*\]\);/)[1];
|
||||
const key=new Function('metricParams','queryRevision',`const productPagingScope=true,productPage={key:'page2'};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}`);
|
||||
const stageKey=new Function('applied','revision','refreshKey',`const productPagingScope=true,productPage={key:'page2'};return ${expression}`);
|
||||
assert.notEqual(stageKey(query,0,0),stageKey(query,0,1));
|
||||
assert.notEqual(stageKey(query,0,0),stageKey(query,1,0));
|
||||
});
|
||||
|
||||
|
||||
test('paged month and search tables keep their first response small',async()=>{
|
||||
for(const change of [{month:2},{quarter:1},{productSearch:'P'}]) {
|
||||
const f=fixture();f.props.query={...query,...change};f.props.forceOverview=true;
|
||||
assert.equal(f.render().split,true);assert.equal(f.requests[0].params.view,'overall');
|
||||
for(const key of Object.keys(change))assert.equal(f.requests[0].params[key],change[key]);f.unmount();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import fs from 'node:fs';
|
||||
import ts from 'typescript';
|
||||
import {shouldPageProducts,pageSelection,PRODUCT_PAGE_SIZE,canReadProductPage} from '../src/productPagination.ts';
|
||||
const query={releaseId:'r1',year:2026,view:'product'};
|
||||
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 = { productPage(params,page,pageSize,order,signal) { let resolve, reject;
|
||||
const promise = new Promise((r, j) => { resolve = r; reject = j; });
|
||||
requests.push({ params, page, pageSize, order, signal, resolve, reject }); return promise;
|
||||
} };
|
||||
const source = fs.readFileSync(new URL('../src/useProductPage.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', 'pageSelection', 'PRODUCT_PAGE_SIZE', `const {useState,useEffect}=hooks;${code};return useProductPage;`)(hooks, api, pageSelection, PRODUCT_PAGE_SIZE);
|
||||
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, 'brightQualifiedDesc', onUnauthorized);
|
||||
pending.forEach(run => run()); assert.ok(++count < 10);
|
||||
} while (dirty); return result; }, unmount() { effects.forEach(e => e?.cleanup?.()); } };
|
||||
}
|
||||
|
||||
|
||||
const response=(request,total=80)=>({release:{id:request.params.releaseId},rows:[{key:'P'}],total,page:request.page,pageSize:request.pageSize,order:request.order});
|
||||
test('only unpinned product tables use server pagination',()=>{
|
||||
assert.equal(shouldPageProducts(query),true);
|
||||
for(const extra of [{view:'overall'},{product:'P'},{releaseId:undefined}])assert.equal(shouldPageProducts({...query,...extra}),false);
|
||||
assert.equal(shouldPageProducts({...query,month:2,productSearch:'x'}),true);
|
||||
});
|
||||
test('page changes fetch only the selected page; year and size changes reset immediately',async()=>{
|
||||
const f=fixture();let value=f.render();assert.equal(f.requests[0].page,1);
|
||||
f.requests[0].resolve(response(f.requests[0]));await tick();value=f.render();assert.equal(value.pagination.total,80);
|
||||
value.pagination.onChange(3,15);f.render();assert.equal(f.requests[1].page,3);assert.equal(f.render().value,null);
|
||||
f.requests[1].resolve(response(f.requests[1]));await tick();value=f.render();
|
||||
value.pagination.onChange(3,50);f.render();assert.equal(f.requests[2].page,1);assert.equal(f.requests[2].pageSize,50);
|
||||
f.props.query={...query,year:2025};f.render();assert.equal(f.requests[3].page,1);assert.equal(f.requests[3].pageSize,50);
|
||||
assert.equal(f.requests[2].signal.aborted,true);f.requests[2].resolve(response(f.requests[2]));await tick();assert.equal(f.render().value,null);f.unmount();
|
||||
});
|
||||
test('empty out-of-range pages recover to the valid last page',async()=>{
|
||||
const f=fixture();f.render().pagination.onChange(9,15);f.render();f.requests[1].resolve(response(f.requests[1],20));await tick();f.render();
|
||||
assert.equal(f.requests[2].page,2);f.requests[2].resolve(response(f.requests[2],20));await tick();assert.equal(f.render().pagination.current,2);f.unmount();
|
||||
});
|
||||
test('refresh, inactive pages, errors and authorization cannot qualify stale rows',async()=>{
|
||||
const f=fixture();f.render();f.requests[0].resolve(response(f.requests[0]));await tick();assert.ok(f.render().value);
|
||||
f.props.refresh++;assert.equal(f.render().value,null);f.requests[1].reject(Error('retry'));await tick();assert.equal(f.render().error,'retry');
|
||||
f.props.refresh++;f.render();f.requests[2].reject({status:403});await tick();assert.equal(f.unauthorized.filter(e=>e.status===403).length,1);assert.equal(f.render().value,null);
|
||||
f.props.enabled=false;f.render();assert.equal(f.requests[2].signal.aborted,true);f.unmount();
|
||||
});
|
||||
test('wrong release replies are rejected instead of displayed',async()=>{
|
||||
const f=fixture();f.render();f.requests[0].resolve({...response(f.requests[0]),release:{id:'old'}});await tick();assert.match(f.render().error,/范围已变化/);f.unmount();
|
||||
});
|
||||
|
||||
test('annual aggregate keeps priority while narrow pages avoid a serial round trip',()=>{
|
||||
assert.equal(canReadProductPage(query,false),false);assert.equal(canReadProductPage(query,true),true);
|
||||
for(const narrow of [{month:2},{quarter:1},{productSearch:'P'},{monthStart:1,monthEnd:5}])assert.equal(canReadProductPage({...query,...narrow},false),true);
|
||||
});
|
||||
@@ -27,7 +27,16 @@ for(const type of ['line','area'])test(`900px report ${type} keeps a positive pl
|
||||
assert.equal(points.length,18);
|
||||
const ys=points.filter((_,i)=>i%2===1);
|
||||
assert.ok(Math.max(...ys)-Math.min(...ys)>8,'different rates must not become a flat line');
|
||||
ys.forEach((y,i)=>assert.ok(Math.abs(y-(rect.y+rect.height*(1-v.series[0].values[i])))<.001));
|
||||
const series=chart.getModel().getSeriesByIndex(0).getData();
|
||||
const [low,high]=chart.getModel().getComponent('yAxis').axis.scale.getExtent();
|
||||
assert.ok(low>0 && high-low<20,'rate trends retain their focused percentage axis');
|
||||
ys.forEach((y,i)=>{
|
||||
const expected=v.series[0].values[i]*100;
|
||||
assert.ok(Math.abs(series.get('y',i)-expected)<1e-10,'the plotted value preserves the formal rate');
|
||||
assert.ok(expected>=low&&expected<=high,'the value must fit inside the actual axis');
|
||||
const pixel=rect.y+rect.height*(high-expected)/(high-low);
|
||||
assert.ok(Math.abs(y-pixel)<.001,'SVG coordinates match the formal rate on the actual axis');
|
||||
});
|
||||
assert.match(chart.renderToSVGString(),/<svg/);
|
||||
} finally {chart.dispose();}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user