feat(converter): type=4 选择框→picker 弹窗收尾(分类树过滤+功能表格)
Some checks failed
ci / build-test-parity (push) Has been cancelled

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-16 22:08:58 +08:00
parent 5e0845e2c2
commit bad7e66b73

View File

@@ -1115,14 +1115,29 @@ public class TemplateToAmisConverter {
String name = f.attributeValue("name", ""); String name = f.attributeValue("name", "");
// 右表列:取自 gridtemplate 引用模板的 <display>(与 convertTreeGrid 右表列同源)。 // 右表列:取自 gridtemplate 引用模板的 <display>(与 convertTreeGrid 右表列同源)。
// 丢主键列(iskeycolumn=true,如 VIEW_TEMPLATE_ID)——它是 picker 的 value(valueField=_id),
// 在选择网格里再显一遍裸 id 是噪声(用户反馈「列表还有 ID 显示」),故剔除。
List<Map<String, Object>> gridCols = new ArrayList<>(); List<Map<String, Object>> gridCols = new ArrayList<>();
Element gridRoot = loadRefRoot(gridRef, result); Element gridRoot = loadRefRoot(gridRef, result);
if (gridRoot != null) { if (gridRoot != null) {
Element display = gridRoot.element("display"); Element display = gridRoot.element("display");
if (display != null) { if (display != null) {
Set<String> keyColNames = new LinkedHashSet<>();
for (Element fld : display.elements("field")) {
if ("true".equalsIgnoreCase(fld.attributeValue("iskeycolumn"))) {
String kn = fld.attributeValue("name", "");
if (!kn.isBlank()) keyColNames.add(kn.toUpperCase());
}
}
List<Map<String, Object>> refCols = buildColumns(display, gridEntityId, result); List<Map<String, Object>> refCols = buildColumns(display, gridEntityId, result);
if (refCols != null && !refCols.isEmpty()) { if (refCols != null) {
gridCols = refCols; for (Map<String, Object> c : refCols) {
Object cn = c.get("name");
if (cn != null && keyColNames.contains(String.valueOf(cn).toUpperCase())) {
continue; // 主键列 = picker 的 value,不在网格里重复显裸 id
}
gridCols.add(c);
}
} }
} }
} }
@@ -1135,7 +1150,11 @@ public class TemplateToAmisConverter {
String source = "/api/template/treegrid?treeRef=" + treeRef + "&gridTable=" + gridTableUpper String source = "/api/template/treegrid?treeRef=" + treeRef + "&gridTable=" + gridTableUpper
+ "&rcol=" + rcolUpper + "&node=${" + rcolUpper + "}&page=${page}&perPage=${perPage}"; + "&rcol=" + rcolUpper + "&node=${" + rcolUpper + "}&page=${page}&perPage=${perPage}";
// 左分类树过滤器:tree-select(name=rcol),source=左树端点;选分类→${rcol}→source.node 过滤右表重载。 // 过滤器:分类树过滤器仅当 rcol 是 gridTable 的真实列时才渲染。否则(如功能管理:右表 VIEW_TEMPLATE
// 无 ENTITYTYPE 列,分类靠「功能→实体→实体分类」join,属老自定义组件 UserFunDesignComponent 逻辑/153)
// 过滤器点了也不缩窄,渲染只会误导用户,故省略死过滤器,降级为「可搜索表格」(始终补名称搜索框)。
List<Object> filterBody = new ArrayList<>();
if (isRealColumn(gridTableUpper, rcolUpper)) {
Map<String, Object> treeFilter = new LinkedHashMap<>(); Map<String, Object> treeFilter = new LinkedHashMap<>();
treeFilter.put("type", "tree-select"); treeFilter.put("type", "tree-select");
treeFilter.put("name", rcolUpper); treeFilter.put("name", rcolUpper);
@@ -1143,9 +1162,24 @@ public class TemplateToAmisConverter {
treeFilter.put("source", "/api/template/" + treeRef + "/tree"); treeFilter.put("source", "/api/template/" + treeRef + "/tree");
treeFilter.put("searchable", true); treeFilter.put("searchable", true);
treeFilter.put("clearable", true); treeFilter.put("clearable", true);
filterBody.add(treeFilter);
} else {
result.degrade("树+grid选择框 dialogid=" + dialogId + " rcol=" + rcolUpper + " 非 "
+ gridTableUpper + " 真实列(分类过滤需实体→分类 join,属自定义组件/153)"
+ " → 省略死分类过滤器,降级为可搜索表格");
}
// 名称搜索框(始终):按首个显示列名搜索(treegrid 端点把非保留参转发给搜索流过滤)。大表可搜,覆盖查找诉求。
String searchCol = !gridCols.isEmpty() ? String.valueOf(gridCols.get(0).get("name")) : "NAME";
Map<String, Object> nameSearch = new LinkedHashMap<>();
nameSearch.put("type", "input-text");
nameSearch.put("name", searchCol);
nameSearch.put("label", "名称");
nameSearch.put("clearable", true);
filterBody.add(nameSearch);
Map<String, Object> filter = new LinkedHashMap<>(); Map<String, Object> filter = new LinkedHashMap<>();
filter.put("title", ""); filter.put("title", "");
filter.put("body", new ArrayList<>(List.of(treeFilter))); filter.put("body", filterBody);
Map<String, Object> pickerSchema = new LinkedHashMap<>(); Map<String, Object> pickerSchema = new LinkedHashMap<>();
pickerSchema.put("mode", "table"); pickerSchema.put("mode", "table");
@@ -1192,6 +1226,26 @@ public class TemplateToAmisConverter {
} }
} }
/**
* {@code table} 是否真实存在 {@code col} 列(information_schema 查)。用于 type=4 树+grid 选择框:
* 仅当 rcolumnname 是右表真实列时才渲染分类树过滤器;否则(如功能管理右表 VIEW_TEMPLATE 无 ENTITYTYPE
* 列,分类靠跨实体 join)过滤器无效,省略以免误导。查询失败 → false(保守省略过滤器)。
*/
private boolean isRealColumn(String table, String col) {
if (table == null || table.isBlank() || col == null || col.isBlank()) {
return false;
}
try {
Integer cnt = jdbcTemplate.queryForObject(
"SELECT count(*) FROM information_schema.columns "
+ "WHERE upper(table_name) = ? AND upper(column_name) = ?",
Integer.class, table.toUpperCase(), col.toUpperCase());
return cnt != null && cnt > 0;
} catch (Exception e) {
return false;
}
}
/** /**
* dialogid(=view_template_id) 指向的模板是否 type=3(树形对话框,绑自引用层级实体)。 * dialogid(=view_template_id) 指向的模板是否 type=3(树形对话框,绑自引用层级实体)。
* 用于把「上级菜单/父分类」等层级引用的 SelectDialog 从扁平 picker 改写为 tree-select。 * 用于把「上级菜单/父分类」等层级引用的 SelectDialog 从扁平 picker 改写为 tree-select。