feat(converter): 报表查看器加导出 PDF/Excel 按钮
convertReportViewer 产导出按钮(actionType:url,blank,指向 /api/report/render 端点 + format=pdf|xls)。
有查询条件 → 落 crud.filter.actions(与 查询[submit]/重置[reset] 同排,读 filter 实时值,
URL 带各字段 ${name} 占位,amis 点击时插值为当前选择);无查询条件 → 落 headerToolbar(无参,导全量)。
field name 为校验过的元数据标识符(UiTypeMapper IDENT),裸拼安全;${name} 须保字面量供 amis 插值。
- buildReportExportParams(filter):filter 各字段 → &NAME=${NAME}。
- reportExportButton(label,url):url 动作按钮。
- 2 单测:filter.actions 含 查询/重置/导出PDF/导出Excel + URL 带 ${字段};无 filter → headerToolbar 无参。
真验(浏览器):选工程→查询(重载 iframe,不触发下载);导出PDF→下载「在建项目收付款信息表.pdf」(有效 PDF/中文正确);
导出Excel→下载 .xls。339 报表页已重转重导 eip3.sys_page_schema(329 更新)。
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -3867,12 +3867,35 @@ public class TemplateToAmisConverter {
|
||||
crud.put("type", "crud");
|
||||
crud.put("api", "/api/report/frame/" + tid);
|
||||
crud.put("syncLocation", false);
|
||||
crud.put("headerToolbar", new ArrayList<>()); // 报表查看器无新增/批量按钮
|
||||
List<Object> headerToolbar = new ArrayList<>(); // 报表查看器无新增/批量按钮(导出按钮见下)
|
||||
crud.put("headerToolbar", headerToolbar);
|
||||
crud.put("footerToolbar", new ArrayList<>()); // 单行信封,无分页条
|
||||
crud.put("affixHeader", false);
|
||||
|
||||
// 导出 PDF/Excel:URL 指向 /api/report/render(端点对 pdf/xls 回 attachment 触发下载),带查询参 ${字段}。
|
||||
// 有查询条件 → 落 crud.filter.actions(与提交/重置同排,读 filter 实时值,已实测可用);
|
||||
// 无查询条件 → 落 headerToolbar(无参,导出全量报表)。
|
||||
String exportParams = buildReportExportParams(filter);
|
||||
List<Map<String, Object>> exportBtns = List.of(
|
||||
reportExportButton("导出PDF", "/api/report/render/" + tid + "?format=pdf" + exportParams),
|
||||
reportExportButton("导出Excel", "/api/report/render/" + tid + "?format=xls" + exportParams));
|
||||
if (filter != null) {
|
||||
crud.put("filter", filter);
|
||||
crud.put("initFetch", false); // 有查询条件 → 等用户「查询」再加载
|
||||
List<Map<String, Object>> actions = new ArrayList<>();
|
||||
Map<String, Object> submit = new LinkedHashMap<>();
|
||||
submit.put("type", "submit");
|
||||
submit.put("label", "查询");
|
||||
submit.put("level", "primary");
|
||||
Map<String, Object> reset = new LinkedHashMap<>();
|
||||
reset.put("type", "reset");
|
||||
reset.put("label", "重置");
|
||||
actions.add(submit);
|
||||
actions.add(reset);
|
||||
actions.addAll(exportBtns);
|
||||
filter.put("actions", actions);
|
||||
} else {
|
||||
headerToolbar.addAll(exportBtns);
|
||||
}
|
||||
// 唯一的 html 列:把回显的 __url 渲成 iframe(JOR HTML 文档独立加载,CSS 隔离保真)
|
||||
Map<String, Object> col = new LinkedHashMap<>();
|
||||
@@ -3885,11 +3908,43 @@ public class TemplateToAmisConverter {
|
||||
crud.put("columns", cols);
|
||||
|
||||
result.note("report 含 JOR 套打版式(" + jorLen + " 字符) → 报表查看器:crud.filter 查询条件 + html 列 iframe 加载 "
|
||||
+ "/api/report/render/" + tid + "(jatools 引擎渲染保真版式;图表 ischart 亦由引擎 jfreechart 出图)");
|
||||
+ "/api/report/render/" + tid + "(jatools 引擎渲染保真版式;图表 ischart 亦由引擎 jfreechart 出图)"
|
||||
+ ";导出 PDF/Excel 按钮指向 render 端点(attachment 下载)");
|
||||
noteScripts(report, result);
|
||||
return page(title, crud);
|
||||
}
|
||||
|
||||
/**
|
||||
* 报表导出 URL 的查询参串:filter 各字段 → {@code &NAME=${NAME}}(amis 运行时插值为当前 filter 值,
|
||||
* 与查看器 iframe 同一份查询条件)。无 filter / 无字段 → 空串(导全量报表)。
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
private static String buildReportExportParams(Map<String, Object> filter) {
|
||||
if (filter == null || !(filter.get("body") instanceof List<?> items)) {
|
||||
return "";
|
||||
}
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for (Object it : items) {
|
||||
// name 为元数据字段名(UiTypeMapper IDENT,形如 [A-Za-z_]\w*,无 URL 特殊字符),裸拼安全;
|
||||
// ${name} 须保持字面量(amis 点击时插值为当前 filter 值,值由 amis 自行编码),故此处不可 URL 编码。
|
||||
if (it instanceof Map<?, ?> m && m.get("name") instanceof String n && !n.isBlank()) {
|
||||
sb.append('&').append(n).append("=${").append(n).append('}');
|
||||
}
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
/** 报表导出按钮:{@code url} 动作 + {@code blank}(新标签打开;render 端点对 pdf/xls 回 attachment 触发下载)。 */
|
||||
private static Map<String, Object> reportExportButton(String label, String url) {
|
||||
Map<String, Object> btn = new LinkedHashMap<>();
|
||||
btn.put("type", "button");
|
||||
btn.put("label", label);
|
||||
btn.put("actionType", "url");
|
||||
btn.put("url", url);
|
||||
btn.put("blank", true);
|
||||
return btn;
|
||||
}
|
||||
|
||||
// ──────────────────────────────────────────────────────────────────────
|
||||
// group(分组容器)—— 子模板跨引用
|
||||
// ──────────────────────────────────────────────────────────────────────
|
||||
|
||||
@@ -2771,6 +2771,57 @@ class TemplateToAmisConverterTest {
|
||||
assertTrue(((String) crud.get("api")).startsWith("/api/flow/PM_X_SEARCH"), "api=" + crud.get("api"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void report_viewer_导出按钮落filter_actions带查询参数() {
|
||||
// 导出 PDF/Excel 落 crud.filter.actions(与查询/重置同排,读 filter 实时值);URL 指向 render 端点 + format + ${字段}
|
||||
String xml = "<report title='收付款' entityid='e1'>"
|
||||
+ "<display><field name='A' text='A'/></display>"
|
||||
+ "<search selectservice='S'>"
|
||||
+ "<field name='PROJECTID' label='工程名称' uitype='SelectDialog' dialogid='d1' required='true'/>"
|
||||
+ "</search>"
|
||||
+ "<reportfile><![CDATA[<jatools>版式占位非空版式占位</jatools>]]></reportfile></report>";
|
||||
ConversionResult r = converter.convertGraded(xml, "TID-1", "收付款", new ArrayList<>(), noPage);
|
||||
Map<String, Object> crud = body(r.getSchema());
|
||||
Map<String, Object> filter = (Map<String, Object>) crud.get("filter");
|
||||
List<Map<String, Object>> actions = (List<Map<String, Object>>) filter.get("actions");
|
||||
List<String> labels = actions.stream().map(a -> (String) a.get("label")).toList();
|
||||
assertTrue(labels.contains("查询") && labels.contains("导出PDF") && labels.contains("导出Excel"),
|
||||
"actions 应含 查询/导出PDF/导出Excel: " + labels);
|
||||
// 查询 = submit(触发 crud 重载报表)
|
||||
assertTrue(actions.stream().anyMatch(a -> "submit".equals(a.get("type")) && "查询".equals(a.get("label"))));
|
||||
// 导出 PDF:url 动作,指向 render 端点 + format=pdf + 带 filter 字段占位
|
||||
Map<String, Object> pdf = actions.stream()
|
||||
.filter(a -> "导出PDF".equals(a.get("label"))).findFirst().orElseThrow();
|
||||
assertEquals("url", pdf.get("actionType"));
|
||||
assertEquals(Boolean.TRUE, pdf.get("blank"));
|
||||
String url = (String) pdf.get("url");
|
||||
assertTrue(url.startsWith("/api/report/render/TID-1?format=pdf"), url);
|
||||
assertTrue(url.contains("PROJECTID=${PROJECTID}"), url);
|
||||
// 导出 Excel:format=xls
|
||||
Map<String, Object> xls = actions.stream()
|
||||
.filter(a -> "导出Excel".equals(a.get("label"))).findFirst().orElseThrow();
|
||||
assertTrue(((String) xls.get("url")).contains("format=xls"), (String) xls.get("url"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void report_viewer_无查询条件导出按钮落headerToolbar无参() {
|
||||
// 无 <search> → filter=null → 导出按钮落 headerToolbar,URL 无查询参(导全量报表)
|
||||
String xml = "<report title='全量报表' entityid='e1'>"
|
||||
+ "<display><field name='A' text='A'/></display>"
|
||||
+ "<reportfile><![CDATA[<jatools>版式占位非空版式占位</jatools>]]></reportfile></report>";
|
||||
ConversionResult r = converter.convertGraded(xml, "TID-2", "全量报表", new ArrayList<>(), noPage);
|
||||
Map<String, Object> crud = body(r.getSchema());
|
||||
assertNull(crud.get("filter"), "无查询条件 filter 应为 null");
|
||||
List<Map<String, Object>> tb = (List<Map<String, Object>>) crud.get("headerToolbar");
|
||||
List<String> labels = tb.stream().map(a -> (String) a.get("label")).toList();
|
||||
assertTrue(labels.contains("导出PDF") && labels.contains("导出Excel"), "headerToolbar 应含导出按钮: " + labels);
|
||||
Map<String, Object> pdf = tb.stream()
|
||||
.filter(a -> "导出PDF".equals(a.get("label"))).findFirst().orElseThrow();
|
||||
assertEquals("/api/report/render/TID-2?format=pdf", pdf.get("url"), "无查询条件 URL 应无查询参");
|
||||
}
|
||||
|
||||
@Test
|
||||
void report_图表降级() {
|
||||
String xml = "<report title='图表' entityid='e1'>"
|
||||
|
||||
Reference in New Issue
Block a user