From 5a5aedcbb7d3b6a8dc70ade980e06289ce773c13 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Fri, 26 Jun 2026 12:32:41 +0800 Subject: [PATCH] =?UTF-8?q?fix(report):=20=E5=A5=97=E6=89=93=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=8C=89=E9=80=89=E4=B8=AD=E8=A1=8C=E4=B8=BB=E9=94=AE?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=B8=B2=E6=9F=93=EF=BC=8C=E4=BF=AE=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=89=93=E5=8D=B0=E7=A9=BA=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit navigation+reportnosearch 打印按钮原嵌报表查看器,报表唯一的主键选择字段被 F3-1 剔除,选中行主键到不了 /api/report/render → SQL 用设计期默认 ID(库内不存在) → 空白。改为读目标报表 真实参数名,弹窗直接 iframe 渲染并注入选中行同名列(${selectedItems[0].P})。覆盖 195 个打印页(参数 PK/ID/PROJECTID 各异)。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../converter/TemplateToAmisConverter.java | 93 ++++++++++++++++++- .../TemplateToAmisConverterTest.java | 78 ++++++++++++++++ 2 files changed, 166 insertions(+), 5 deletions(-) diff --git a/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java b/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java index 413adcc..0e05367 100644 --- a/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java +++ b/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java @@ -806,15 +806,27 @@ public class TemplateToAmisConverter { String navTitle = UiTypeMapper.firstNonBlank(b.attributeValue("funcname"), btnName); String pkCol = table + "_ID"; boolean needSelected = !"false".equals(b.attributeValue("isneedselected")); + boolean reportNoSearch = "true".equals(b.attributeValue("reportnosearch")); btn.put("actionType", "dialog"); if (needSelected) { btn.put("disabledOn", DISABLED_ON_NO_SELECTION); } - Map dlg = buildNavigationDialog(navTitle, funcId, pkCol, needSelected, result); - btn.put("dialog", dlg); - result.note("button[navigation] " + btnName + " → dialog service schemaApi=/api/page/schema/" - + funcId + "(funcname=" + navTitle + ",注入默认查询 " + pkCol + "=选中行主键" - + (needSelected ? ",需选中" : "") + ")"); + // 单据套打打印(reportnosearch + funcid→type=200 报表):老系统语义=对选中行直接出图、无查询表单。 + // → 直接 iframe 渲染 /api/report/render,按目标报表 参数名注入选中行同名列。 + // (原通用导航嵌报表查看器会把报表唯一的主键选择字段被 F3-1 剔除,选中行主键到不了 render → 空白单据。) + List reportParams = reportNoSearch ? loadReportSearchParams(funcId) : List.of(); + if (!reportParams.isEmpty()) { + btn.put("dialog", buildReportPrintDialog(navTitle, funcId, reportParams)); + result.note("button[navigation] " + btnName + " → 套打直接渲染 /api/report/render/" + + funcId + "(reportnosearch,参数 " + String.join(",", reportParams) + + "=选中行同名列;funcname=" + navTitle + ")"); + } else { + Map dlg = buildNavigationDialog(navTitle, funcId, pkCol, needSelected, result); + btn.put("dialog", dlg); + result.note("button[navigation] " + btnName + " → dialog service schemaApi=/api/page/schema/" + + funcId + "(funcname=" + navTitle + ",注入默认查询 " + pkCol + "=选中行主键" + + (needSelected ? ",需选中" : "") + ")"); + } } default -> result.note("button[" + btnType + "] " + btnName + " → 普通按钮占位"); } @@ -921,6 +933,77 @@ public class TemplateToAmisConverter { return dlg; } + /** + * 单据套打打印:navigation {@code reportnosearch=true} 按钮的目标 funcid 若指向 type=200 报表, + * 返回该报表 {@code } 的参数名列表(调用方按选中行同名列回填 {@code ${selectedItems[0].P}})。 + * 非报表 / 无 search 参 / 无库 / 查询异常 → 空表(调用方回退普通导航弹窗),保持零回归。 + */ + private List loadReportSearchParams(String funcId) { + if (funcId == null || funcId.isBlank() || jdbcTemplate == null) { + return List.of(); + } + try { + List xmls = jdbcTemplate.query( + "SELECT xml::text FROM view_template WHERE trim(view_template_id) = ? AND type = 200", + (rs, n) -> rs.getString(1), funcId.trim()); + if (xmls.isEmpty() || xmls.get(0) == null || xmls.get(0).isBlank()) { + return List.of(); + } + Element search = DocumentHelper.parseText(xmls.get(0)).getRootElement().element("search"); + if (search == null) { + return List.of(); + } + List params = new ArrayList<>(); + for (Element f : search.elements("field")) { + String n = f.attributeValue("name", ""); + if (n != null && !n.isBlank() && !params.contains(n.trim())) { + params.add(n.trim()); + } + } + return params; + } catch (Exception e) { + return List.of(); + } + } + + /** + * 单据套打打印弹窗(navigation reportnosearch + funcid→type=200 报表):直接 iframe 渲染目标报表, + * 把选中行同名列按报表 {@code } 参数名注入 dialog data({@code ${selectedItems[0].P}},按钮作用域求值), + * iframe / 导出 URL 内引用 {@code ${P}};无查询表单(reportnosearch 语义)。+ 导出 PDF/Excel + 关闭。 + * + *

参数名为元数据字段名(IDENT,无 URL 特殊字符),裸拼安全;{@code ${P}} 须保持字面量供 amis 运行时插值。 + * 服务端 {@code ReportParamGuard} 仅放行报表 {@code } 引用的参数并做白名单校验,越权/注入再过一道。 + */ + private Map buildReportPrintDialog(String title, String funcId, List params) { + String tid = funcId.trim(); + Map dlg = new LinkedHashMap<>(); + dlg.put("type", "dialog"); + dlg.put("title", title); + dlg.put("size", "lg"); + + Map data = new LinkedHashMap<>(); + StringBuilder qp = new StringBuilder(); + for (String p : params) { + data.put(p, selectedSingleIdExpr(p)); // ${selectedItems[0].P} + qp.append('&').append(p).append("=${").append(p).append('}'); + } + dlg.put("data", data); + + String renderBase = "/api/report/render/" + tid + "?format="; + Map html = new LinkedHashMap<>(); + html.put("type", "html"); + html.put("html", ""); + dlg.put("body", html); + + List> actions = new ArrayList<>(); + actions.add(reportExportButton("导出PDF", renderBase + "pdf" + qp)); + actions.add(reportExportButton("导出Excel", renderBase + "xls" + qp)); + actions.add(new LinkedHashMap<>(Map.of("type", "button", "actionType", "close", "label", "关闭"))); + dlg.put("actions", actions); + return dlg; + } + /** * F2-17 / 服务流分派:构造 dialog body 为 service 加载 /api/page/schema/{templateId} 的 dialog。 * 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 bebddb4..97715fb 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 @@ -23,6 +23,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowCallbackHandler; +import org.springframework.jdbc.core.RowMapper; /** * 各段转换规则单测(P4 转换器扩展)。JdbcTemplate 用 Mockito 桩,离线运行—— @@ -1676,6 +1677,83 @@ class TemplateToAmisConverterTest { assertEquals("tpl", tpl.get("type")); } + /** + * 套打打印根因修复:navigation 按钮 {@code reportnosearch='true'} 且 funcid→type=200 报表 + * → 「套打直接渲染」弹窗:iframe 指向 {@code /api/report/render} 并按目标报表 {@code } + * 参数名注入选中行同名列({@code ${selectedItems[0].P}}),无查询表单。 + * + *

修「打印内容空白」:原路径把报表查看器嵌入弹窗,报表唯一的主键选择字段被 F3-1 剔除, + * 选中行主键到不了 render → SQL 用设计期默认 ID(库内不存在)→ 空白单据。 + */ + @Test + @SuppressWarnings("unchecked") + void crud_navigation打印reportnosearch_直接渲染套打带选中行参数() { + JdbcTemplate jdbc = mock(JdbcTemplate.class); + // 源 crud 实体表(resolveTableName)故意设为 PM_DEMO,证明参数取自报表 而非源 pkCol + lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class))) + .thenReturn("PM_DEMO"); + // 目标报表(type=200) XML:search 单字段=主键 OA_OFFICE_PURCHASEAPPLY_ID + String reportXml = "" + + "" + + "x"; + lenient().when(jdbc.query(any(String.class), any(RowMapper.class), any(Object[].class))) + .thenReturn(List.of(reportXml)); + TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc); + + String xml = "" + + "