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:
@@ -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<>();
|
||||
|
||||
Reference in New Issue
Block a user