From 8e5e2410d11b69dcd30d76d17edc058e8abb8509 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 25 Jun 2026 22:19:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(converter):=20convertReport=20=E5=AF=B9?= =?UTF-8?q?=E5=90=AB=20JOR=20=E5=A5=97=E6=89=93=E7=9A=84=20type=3D200=20?= =?UTF-8?q?=E4=BA=A7=E6=8A=A5=E8=A1=A8=E6=9F=A5=E7=9C=8B=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit EIP3 真报表(jatools JOR 套打)此前被转换器降级成 amis 表格。现 convertReport 分流: 含 (JOR 套打版式,328/339)→ convertReportViewer 产 page→crud: - api=/api/report/frame/{templateId}(currentTemplateId,缺则回落 entityId); - filter=buildSearchFilter(查询条件,F3-1 过滤主键列)——picker 落 crud.filter 工作上下文; - 单 html 列把 ${__url} 渲成 "); + List> cols = new ArrayList<>(); + cols.add(col); + crud.put("columns", cols); + + result.note("report 含 JOR 套打版式(" + jorLen + " 字符) → 报表查看器:crud.filter 查询条件 + html 列 iframe 加载 " + + "/api/report/render/" + tid + "(jatools 引擎渲染保真版式;图表 ischart 亦由引擎 jfreechart 出图)"); + noteScripts(report, result); + return page(title, crud); + } + // ────────────────────────────────────────────────────────────────────── // group(分组容器)—— 子模板跨引用 // ────────────────────────────────────────────────────────────────────── diff --git a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java index 7a1dcf7..95d419c 100644 --- a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java +++ b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java @@ -2705,14 +2705,70 @@ class TemplateToAmisConverterTest { } @Test - void report_jor套打版式降级() { + @SuppressWarnings("unchecked") + void report_含JOR套打版式_改产报表查看器crud() { + // Phase 3:含 JOR 套打版式 → 报表查看器(jatools 引擎渲染保真版式), + // 不再降级成 amis 表格。crud.api 指向 /api/report/frame,单个 html 列把 __url 渲成 iframe。 String xml = "" + "" + "" + "非空版式定义内容占位非空版式]]>"; ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage); - assertEquals(ConversionGrade.PARTIAL, r.getGrade()); - assertTrue(r.getDegrades().stream().anyMatch(d -> d.contains("JOR"))); + Map crud = body(r.getSchema()); + assertEquals("crud", crud.get("type")); + assertTrue(((String) crud.get("api")).startsWith("/api/report/frame/"), "api=" + crud.get("api")); + List> cols = (List>) crud.get("columns"); + assertEquals(1, cols.size(), "报表查看器只有一个 html 列"); + assertEquals("html", cols.get(0).get("type")); + String html = (String) cols.get(0).get("html"); + assertTrue(html.contains(" d.contains("不迁移引擎")), + "JOR 应被引擎渲染而非降级: " + r.getDegrades()); + } + + @Test + @SuppressWarnings("unchecked") + void report_查询条件picker落在crud_filter上下文() { + // 工程(SelectDialog) → picker,且必须落在 crud.filter(实测唯一能让 picker 正常加载选项的上下文)。 + // 有查询条件时 initFetch=false:等用户选条件并「查询」后再加载报表(避免必填空参渲染报错)。 + String xml = "" + + "" + + "" + + "" + + "" + + "版式占位非空版式占位]]>"; + ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage); + Map crud = body(r.getSchema()); + Map filter = (Map) crud.get("filter"); + assertNotNull(filter, "查询条件应落在 crud.filter"); + List> fbody = (List>) filter.get("body"); + Map projectField = fbody.stream() + .filter(f -> "PROJECTID".equals(f.get("name"))).findFirst().orElseThrow(); + assertEquals("picker", projectField.get("type"), "工程 SelectDialog 应转 picker"); + assertEquals(Boolean.FALSE, crud.get("initFetch"), "有查询条件时等用户查询再加载"); + } + + @Test + void report_templateId入查看器api() { + String xml = "" + + "" + + "版式占位非空版式占位]]>"; + ConversionResult r = converter.convertGraded(xml, "TID-123", "套打", new ArrayList<>(), noPage); + Map crud = body(r.getSchema()); + assertEquals("/api/report/frame/TID-123", crud.get("api")); + } + + @Test + void report_无reportfile_保留数据表降级() { + // 9/339 无 JOR 套打版式 → 保留原数据表行为(/api/flow 列实体行),不走查看器 + String xml = "" + + "" + + ""; + ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage); + Map crud = body(r.getSchema()); + assertTrue(((String) crud.get("api")).startsWith("/api/flow/PM_X_SEARCH"), "api=" + crud.get("api")); } @Test