F3-1: report族查询区过滤主键列+单测

buildSearchFilter 新增 skipKeyFields 参数;report路径传 true,
过滤 designName=主键 / label=主键 / 字段名_ID结尾且长度≥10 三类主键/外键列,
保留 ORGID/DEPART_ID 等业务缩写。filter全空则返回null不渲染查询区。
修复既有测试 crud_selectDialog降级为select 的 source 断言(F2-9加了查询参数)。
新增5个F3-1单测覆盖过滤/保留/全空/crud不过滤场景;39/39全绿。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
2026-06-12 04:41:56 +08:00
parent e3ffc18251
commit 1f8de4adc6
2 changed files with 149 additions and 4 deletions

View File

@@ -325,13 +325,39 @@ public class TemplateToAmisConverter {
/** search/field → filter 表单(uitype 映射经 UiTypeMapper 统一)。 */
private Map<String, Object> buildSearchFilter(Element search, ConversionResult result) {
return buildSearchFilter(search, result, false);
}
/**
* F3-1:report 族查询区过滤主键列。
*
* <p>判断规则(OR 任一成立即视为主键列,跳过):
* <ol>
* <li>{@code designName="主键"} —— 老引擎设计器明确标注主键;</li>
* <li>{@code label="主键"} —— 部分模板 label 属性也写了"主键";</li>
* <li>字段名以 {@code _ID} 结尾且长度 ≥ 10 —— 典型 UUID 外键列(如
* {@code HR_WELFAREPAY_ID}),长度门槛排除业务缩写(如 {@code ORGID})。</li>
* </ol>
*
* @param skipKeyFields {@code true} 时启用过滤(report 路径),{@code false} 保持原行为(crud/form 路径)
*/
private Map<String, Object> buildSearchFilter(Element search, ConversionResult result,
boolean skipKeyFields) {
if (search == null || search.elements("field").isEmpty()) {
return null;
}
List<Map<String, Object>> items = new ArrayList<>();
for (Element f : search.elements("field")) {
if (skipKeyFields && isSearchKeyField(f)) {
result.note("report.search@field " + f.attributeValue("name", "")
+ " 识别为主键列(designName/label=主键 或 _ID 结尾长名) → 跳过查询区(F3-1)");
continue;
}
items.add(UiTypeMapper.mapField(f, result, "search"));
}
if (items.isEmpty()) {
return null;
}
Map<String, Object> filter = new LinkedHashMap<>();
filter.put("title", "查询");
filter.put("body", items);
@@ -339,6 +365,24 @@ public class TemplateToAmisConverter {
return filter;
}
/**
* F3-1:判断一个 search 段字段是否为主键/外键 UUID 列,应从查询区排除。
*/
private static boolean isSearchKeyField(Element f) {
String designName = f.attributeValue("designName", "");
String label = f.attributeValue("label", "");
String name = f.attributeValue("name", "");
// 规则1:designName 或 label 明确标注"主键"
if ("主键".equals(designName) || "主键".equals(label)) {
return true;
}
// 规则2:字段名以 _ID 结尾且长度 ≥ 10(排除 ORGID 等业务缩写)
if (name.toUpperCase().endsWith("_ID") && name.length() >= 10) {
return true;
}
return false;
}
/** crud 的 button 可挂 crud 下,也可挂 display 下;统一收集。 */
private List<Element> collectButtons(Element crud) {
List<Element> buttons = new ArrayList<>(crud.elements("button"));
@@ -566,9 +610,9 @@ public class TemplateToAmisConverter {
}
}
// search → filter(报表查询参数),selectservice → api
// search → filter(报表查询参数,F3-1:过滤主键列),selectservice → api
Element search = report.element("search");
Map<String, Object> filter = buildSearchFilter(search, result);
Map<String, Object> filter = buildSearchFilter(search, result, true);
String selectservice = attrOf(search, "selectservice");
Map<String, Object> crudSchema = new LinkedHashMap<>();

View File

@@ -102,9 +102,9 @@ class TemplateToAmisConverterTest {
Map<String, Object> crud = body(r.getSchema());
Map<String, Object> filter = (Map<String, Object>) crud.get("filter");
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
// SelectDialog → select+source(picker 会被闸一拒,见 §8.2)
// SelectDialog → select+source(picker 会被闸一拒,见 §8.2;F2-9 加了 q/page 参数)
assertEquals("select", items.get(0).get("type"));
assertEquals("/api/picker/d1/list", items.get(0).get("source"));
assertTrue(((String) items.get(0).get("source")).startsWith("/api/picker/d1/list"));
assertTrue(r.getDegrades().stream().anyMatch(d -> d.contains("SelectDialog")));
}
@@ -293,6 +293,107 @@ class TemplateToAmisConverterTest {
assertTrue(r.getDegrades().stream().anyMatch(d -> d.contains("ischart") || d.contains("图表")));
}
// ── F3-1 report 查询区主键过滤 ──────────────────────────────────────────
@Test
@SuppressWarnings("unchecked")
void f3_1_report查询区过滤designName主键() {
// designName="主键" 的字段应被跳过,不出现在 filter 查询区
String xml = "<report title='安全教育' entityid='e1'>"
+ "<display><field name='VM_AQGLBD_ID' text='主键' hidden='true'/>"
+ "<field name='EMPNAME' text='姓名'/></display>"
+ "<search selectservice='S'>"
+ "<field designName='主键' name='PM_PUB_SAFETYEDUCATION_ID' label='主键'"
+ " uitype='SelectDialog' dialogid='d1' hidden='false'/>"
+ "<field designName='年份' name='YEAR' label='年份' uitype='NumberField' mdec='0'/>"
+ "</search></report>";
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema());
Map<String, Object> filter = (Map<String, Object>) crud.get("filter");
assertNotNull(filter, "非主键字段存在时 filter 不应为 null");
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
// 只保留 YEAR,主键 PM_PUB_SAFETYEDUCATION_ID 被过滤
assertEquals(1, items.size(), "主键字段应被过滤,filter 只剩业务字段");
assertEquals("YEAR", items.get(0).get("name"));
// 台账中有跳过主键的记录
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("F3-1") && n.contains("主键列")));
}
@Test
@SuppressWarnings("unchecked")
void f3_1_report查询区过滤长_ID结尾字段() {
// 字段名以 _ID 结尾且长度 >= 10 的字段视为外键 UUID 列被跳过
String xml = "<report title='劳务合同' entityid='e1'>"
+ "<display><field name='GB_PROJECTINFO_ID' text='项目' hidden='true'/></display>"
+ "<search selectservice='S'>"
+ "<field designName='项目' name='GB_PROJECTINFO_ID' label='项目'"
+ " uitype='SelectDialog' dialogid='d2' hidden='false'/>"
+ "<field designName='合同名称' name='CONTRACTNAME' label='合同名称' uitype='TextField'/>"
+ "</search></report>";
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema());
Map<String, Object> filter = (Map<String, Object>) crud.get("filter");
assertNotNull(filter);
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
// GB_PROJECTINFO_ID(_ID结尾,长度16) 被过滤,只剩 CONTRACTNAME
assertEquals(1, items.size());
assertEquals("CONTRACTNAME", items.get(0).get("name"));
}
@Test
@SuppressWarnings("unchecked")
void f3_1_report查询区保留短ORGID类字段() {
// ORGID 长度5,不满足 >= 10,不应被过滤
String xml = "<report title='成本汇总' entityid='e1'>"
+ "<display><field name='ORGNAME' text='机构'/></display>"
+ "<search selectservice='S'>"
+ "<field designName='机构' name='ORGID' label='机构' uitype='SelectDialog' dialogid='d3'/>"
+ "<field designName='年度' name='ENDYEAR' label='年度' uitype='NumberField' mdec='0'/>"
+ "</search></report>";
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema());
Map<String, Object> filter = (Map<String, Object>) crud.get("filter");
assertNotNull(filter);
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
// ORGID 和 ENDYEAR 都应保留
assertEquals(2, items.size());
assertEquals("ORGID", items.get(0).get("name"));
assertEquals("ENDYEAR", items.get(1).get("name"));
}
@Test
@SuppressWarnings("unchecked")
void f3_1_report查询区全是主键时filter为null() {
// 如果 search 段的所有字段都被过滤掉,filter 应为 null(不渲染空查询区)
String xml = "<report title='全主键' entityid='e1'>"
+ "<display><field name='X_ID' text='主键' hidden='true'/></display>"
+ "<search selectservice='S'>"
+ "<field designName='主键' name='SOME_ENTITY_ID' label='主键'"
+ " uitype='SelectDialog' dialogid='d4' hidden='false'/>"
+ "</search></report>";
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema());
assertNull(crud.get("filter"), "所有字段均为主键时 filter 应为 null");
}
@Test
@SuppressWarnings("unchecked")
void f3_1_crud查询区不过滤主键字段() {
// crud 路径不启用主键过滤(skipKeyFields=false),主键列保留
String xml = "<crud entityid='e1'><display/>"
+ "<search>"
+ "<field designName='主键' name='SOME_ENTITY_ID' label='主键' uitype='TextField'/>"
+ "<field designName='名称' name='NAME' label='名称' uitype='TextField'/>"
+ "</search></crud>";
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema());
Map<String, Object> filter = (Map<String, Object>) crud.get("filter");
assertNotNull(filter);
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
// crud 路径:主键字段不过滤,两个字段都在
assertEquals(2, items.size());
}
// ── group ────────────────────────────────────────────────────────────
@Test