SelectDialog 弹窗化:select 下拉 → amis picker 多列对照弹窗(§7-1b)
老系统 SelectDialog/MultiSelectDialog = 弹窗多列表格选择;P4 批量转换器降级为 select+source
搜索下拉,丢「多列对照」(§4.2:150 dialogId/911 页)。降级注释「6.13 schema 未把 picker
纳入表单项 oneOf,闸一会拒」经核实失实——amis-schema-6.13.0.json 的 SchemaObject allOf 含
{if type==picker then PickerControlSchema},picker 表单项过得了闸一(新增
SchemaGateAndCliTest.schemaGate_picker表单项过闸一 固化)。
converter(UiTypeMapper):
- SelectDialog→picker(弹窗 table+搜索+分页)、MultiSelectDialog→picker(multiple)。
labelField=_label/valueField=_id;source=/api/picker/{dialogid}/list(CRUD 自动透传
q/page/perPage);pickerSchema={mode:table,headerToolbar:[search-box],footerToolbar:[pagination]}。
- 列由运行时 /api/picker 随响应 data.columns 提供——转换器不解析跨模板 dialog XML
(§6:不加深转换器对 XML 的耦合,列知识落运行时)。
- dialogid 缺失 → 保持 F2-9 的 select 搜索下拉降级(无数据源,picker 会空载)。
metadata(PickerController):
- 每行补统一显示值 _label(picker labelField 用,选中 chip 显示人可读名而非 id)。
- 响应新增 data.columns:名称列(绑 _label,标签取实体显示列 displayname,回落「名称」)
+ 标识列(工号/编码,isidentifier,最多+3)+ 不足 2 列补首个非系统 String 列;
友好标签查 SYS_ENTITYATTRIBUTE.displayname,系统/审计列(CREATETIME/VERSION 等)过滤。
- amis picker 内嵌 CRUD 按 data.columns 渲染多列(crud.ts: self.columns=columns.concat()),
与 amis 6.13 picker 官方 pickerSchema(mode=table) 用法一致。
验证:converter 56 测 + SchemaGate 7 测(含 picker 过闸)+ PickerController 13 测全过;
运行时浏览器(加班登记 USERID,overlay 注入)实证:弹窗多列(显示名称+帐号)、搜索框、
分页(186 页)、单选回填——选中「丁健[100001]」后表单值写回 _id(36 位 UUID,非标签),
chip 显示 _label。MultiSelect 同源(multiple)。
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -122,30 +122,33 @@ final class UiTypeMapper {
|
|||||||
+ (hasTime ? "input-datetime-range" : "input-date-range") + "(区间)");
|
+ (hasTime ? "input-datetime-range" : "input-date-range") + "(区间)");
|
||||||
}
|
}
|
||||||
case "SelectDialog" -> {
|
case "SelectDialog" -> {
|
||||||
// 旧引擎弹窗选择器 → amis select + 远程 source(弹窗数据由 dialogid 指向的模板提供,跨模板引用本批未联动)。
|
// 旧引擎弹窗选择器 → amis picker(弹窗多列表格 + 搜索 + 分页),恢复老系统「弹窗对照选择」语义。
|
||||||
// 注:不用 amis picker——picker 需内嵌 pickerSchema(CRUD),且 6.13 schema 未把 picker 纳入
|
// 历史降级注释「6.13 schema 未纳入 picker」已核实失实:amis-schema-6.13.0.json 的 SchemaObject
|
||||||
// 表单项 oneOf,闸一会拒(手册 §8.2 schema 严格性);select+source 双闸皆过,是更保真的降级。
|
// allOf 含 {if type==picker then PickerControlSchema},picker 表单项过得了闸一(见
|
||||||
// F2-9:searchable=true + source 带 q=${term} 透传搜索关键字到后端 /api/picker/{id}/list?q=
|
// SchemaGateTest.picker表单项过闸一)。列由 /api/picker 运行时随响应 data.columns 提供——
|
||||||
item.put("type", "select");
|
// 转换器不解析跨模板 dialog XML(§6:不加深转换器对 XML 的耦合),列知识落在运行时 PickerController。
|
||||||
item.put("clearable", true);
|
String dialogId = f.attributeValue("dialogid", "");
|
||||||
item.put("searchable", true);
|
if (dialogId.isBlank()) {
|
||||||
item.put("source",
|
applySelectDialogFallback(item, "", false);
|
||||||
"/api/picker/" + f.attributeValue("dialogid", "")
|
result.degrade(origin + "@field " + name
|
||||||
+ "/list?q=${term}&page=${page}&perPage=${perPage}");
|
+ " uitype=SelectDialog(dialogid=空) → select+source(无 dialogid,数据源缺失,保持搜索下拉)");
|
||||||
result.degrade(origin + "@field " + name + " uitype=SelectDialog(dialogid="
|
} else {
|
||||||
+ f.attributeValue("dialogid", "") + ") → select+source(searchable) /api/picker(F2-9)");
|
applyPicker(item, dialogId, false);
|
||||||
|
result.note(origin + "@field " + name + " uitype=SelectDialog(dialogid="
|
||||||
|
+ dialogId + ") → picker(弹窗 table,列由 /api/picker 运行时提供)");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
case "MultiSelectDialog" -> {
|
case "MultiSelectDialog" -> {
|
||||||
// F2-9:多选 + searchable
|
String dialogId = f.attributeValue("dialogid", "");
|
||||||
item.put("type", "select");
|
if (dialogId.isBlank()) {
|
||||||
item.put("multiple", true);
|
applySelectDialogFallback(item, "", true);
|
||||||
item.put("clearable", true);
|
result.degrade(origin + "@field " + name
|
||||||
item.put("searchable", true);
|
+ " uitype=MultiSelectDialog(dialogid=空) → select(multiple)+source(无 dialogid,保持搜索下拉)");
|
||||||
item.put("source",
|
} else {
|
||||||
"/api/picker/" + f.attributeValue("dialogid", "")
|
applyPicker(item, dialogId, true);
|
||||||
+ "/list?q=${term}&page=${page}&perPage=${perPage}");
|
result.note(origin + "@field " + name + " uitype=MultiSelectDialog(dialogid="
|
||||||
result.degrade(origin + "@field " + name + " uitype=MultiSelectDialog(dialogid="
|
+ dialogId + ") → picker(弹窗 table,multiple,列由 /api/picker 运行时提供)");
|
||||||
+ f.attributeValue("dialogid", "") + ") → select(multiple,searchable)+source /api/picker(F2-9)");
|
}
|
||||||
}
|
}
|
||||||
case "MultiFileUploadField", "FileUploadField" -> {
|
case "MultiFileUploadField", "FileUploadField" -> {
|
||||||
// F2-8 附件控件:旧引擎 MultiFileUploadField/FileUploadField → amis input-file。
|
// F2-8 附件控件:旧引擎 MultiFileUploadField/FileUploadField → amis input-file。
|
||||||
@@ -173,6 +176,56 @@ final class UiTypeMapper {
|
|||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* SelectDialog/MultiSelectDialog → amis {@code picker}(弹窗对照选择)。
|
||||||
|
*
|
||||||
|
* <p>picker 的 {@code source} 即内嵌 CRUD 的 {@code api}(见 amis Picker.tsx buildSchema:
|
||||||
|
* {@code api: props.source});{@code pickerSchema} 留空 {@code columns} → CRUD 按响应
|
||||||
|
* {@code data.columns} 渲染(见 amis crud.ts:{@code self.columns = columns.concat()}),故
|
||||||
|
* 列由运行时 {@link PickerController} 随每个 dialog 的实体提供,转换器零跨模板耦合。
|
||||||
|
* {@code labelField="_label"}(PickerController 为每行补的统一显示值,选中 chip 显示人可读名而非 id)、
|
||||||
|
* {@code valueField="_id"}(与旧 select 写回值同口径,保证表单提交值不变)。
|
||||||
|
* {@code source} 不带 {@code ?q=&page=} 模板——CRUD 自动把搜索框值 {@code q} 与 {@code page/perPage}
|
||||||
|
* 作 query 透传(见官方 picker 文档示例)。
|
||||||
|
*/
|
||||||
|
private static void applyPicker(Map<String, Object> item, String dialogId, boolean multiple) {
|
||||||
|
item.put("type", "picker");
|
||||||
|
item.put("clearable", true);
|
||||||
|
if (multiple) {
|
||||||
|
item.put("multiple", true);
|
||||||
|
}
|
||||||
|
item.put("source", "/api/picker/" + dialogId + "/list");
|
||||||
|
item.put("labelField", "_label");
|
||||||
|
item.put("valueField", "_id");
|
||||||
|
item.put("modalMode", "dialog");
|
||||||
|
item.put("modalSize", "lg");
|
||||||
|
|
||||||
|
Map<String, Object> searchBox = new LinkedHashMap<>();
|
||||||
|
searchBox.put("type", "search-box");
|
||||||
|
searchBox.put("name", "q"); // CRUD 把它作 query 透传 → PickerController 读 q
|
||||||
|
searchBox.put("placeholder", "输入关键字搜索");
|
||||||
|
|
||||||
|
Map<String, Object> pickerSchema = new LinkedHashMap<>();
|
||||||
|
pickerSchema.put("mode", "table"); // 多列表格(默认 list 为单列),列由 API 提供
|
||||||
|
pickerSchema.put("headerToolbar", List.of(searchBox));
|
||||||
|
pickerSchema.put("footerToolbar", List.of("pagination"));
|
||||||
|
item.put("pickerSchema", pickerSchema);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* dialogid 缺失时的降级:保持 F2-9 的 {@code select + 远程 source}(搜索下拉)。
|
||||||
|
* 无 dialogid 即无可解析数据源,弹窗 picker 会空载,故不退化为弹窗,沿用既有搜索下拉降级形态。
|
||||||
|
*/
|
||||||
|
private static void applySelectDialogFallback(Map<String, Object> item, String dialogId, boolean multiple) {
|
||||||
|
item.put("type", "select");
|
||||||
|
if (multiple) {
|
||||||
|
item.put("multiple", true);
|
||||||
|
}
|
||||||
|
item.put("clearable", true);
|
||||||
|
item.put("searchable", true);
|
||||||
|
item.put("source", "/api/picker/" + dialogId + "/list?q=${term}&page=${page}&perPage=${perPage}");
|
||||||
|
}
|
||||||
|
|
||||||
/** 解析 EditGrid 的 {@code <editgridtemplate>} CDATA,把内嵌 editgrid 字段转成 input-table 列。 */
|
/** 解析 EditGrid 的 {@code <editgridtemplate>} CDATA,把内嵌 editgrid 字段转成 input-table 列。 */
|
||||||
private static List<Map<String, Object>> buildEditGridColumns(Element f, ConversionResult result, String name) {
|
private static List<Map<String, Object>> buildEditGridColumns(Element f, ConversionResult result, String name) {
|
||||||
List<Map<String, Object>> columns = new ArrayList<>();
|
List<Map<String, Object>> columns = new ArrayList<>();
|
||||||
|
|||||||
@@ -36,6 +36,27 @@ class SchemaGateAndCliTest {
|
|||||||
assertTrue(errors.isEmpty(), () -> "闸一应通过,但有错误: " + errors);
|
assertTrue(errors.isEmpty(), () -> "闸一应通过,但有错误: " + errors);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void schemaGate_picker表单项过闸一() {
|
||||||
|
// 核实历史降级注释「6.13 schema 未把 picker 纳入表单项 oneOf,闸一会拒」失实:
|
||||||
|
// amis-schema-6.13.0.json 的 SchemaObject allOf 含 {if type==picker then PickerControlSchema},
|
||||||
|
// SelectDialog→picker 的转换产物应过闸一。此测固化该结论,防回归。
|
||||||
|
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||||
|
lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class)))
|
||||||
|
.thenReturn("PM_DEMO");
|
||||||
|
TemplateToAmisConverter converter = new TemplateToAmisConverter(jdbc);
|
||||||
|
String xml = "<crud title='选择窗' entityid='e1'><display selectservice='SVC'>"
|
||||||
|
+ "<field name='NAME' text='名称' width='100'/></display>"
|
||||||
|
+ "<search><field name='PROJ' label='工程' uitype='SelectDialog' dialogid='d1'/></search></crud>";
|
||||||
|
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), id -> null);
|
||||||
|
String json = new com.fasterxml.jackson.databind.ObjectMapper().valueToTree(r.getSchema()).toString();
|
||||||
|
assertTrue(json.contains("\"picker\""), "SelectDialog 应生成 picker 表单项");
|
||||||
|
|
||||||
|
SchemaGate gate = new SchemaGate();
|
||||||
|
List<String> errors = gate.validate(r.getSchema());
|
||||||
|
assertTrue(errors.isEmpty(), () -> "picker 表单项应过闸一,但有错误: " + errors);
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void schemaGate_明显非法schema被拒() {
|
void schemaGate_明显非法schema被拒() {
|
||||||
SchemaGate gate = new SchemaGate();
|
SchemaGate gate = new SchemaGate();
|
||||||
|
|||||||
@@ -109,18 +109,54 @@ class TemplateToAmisConverterTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void crud_selectDialog降级为select() {
|
@SuppressWarnings("unchecked")
|
||||||
|
void crud_selectDialog转picker弹窗() {
|
||||||
|
// SelectDialog → amis picker(弹窗多列表格 + 搜索 + 分页),恢复老系统弹窗对照选择。
|
||||||
|
// 列由 /api/picker 运行时随 data.columns 提供(转换器不解析跨模板 dialog XML)。
|
||||||
String xml = "<crud entityid='e1'><display/>"
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
+ "<search><field name='PROJ' label='工程' uitype='SelectDialog' dialogid='d1'/></search></crud>";
|
+ "<search><field name='PROJ' label='工程' uitype='SelectDialog' dialogid='d1'/></search></crud>";
|
||||||
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
assertEquals(ConversionGrade.PARTIAL, r.getGrade()); // 数据源未联动 → 降级
|
|
||||||
Map<String, Object> crud = body(r.getSchema());
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
Map<String, Object> filter = (Map<String, Object>) crud.get("filter");
|
Map<String, Object> filter = (Map<String, Object>) crud.get("filter");
|
||||||
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
|
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
|
||||||
// SelectDialog → select+source(picker 会被闸一拒,见 §8.2;F2-9 加了 q/page 参数)
|
Map<String, Object> picker = items.get(0);
|
||||||
|
assertEquals("picker", picker.get("type"));
|
||||||
|
assertEquals("/api/picker/d1/list", picker.get("source"));
|
||||||
|
assertEquals("_label", picker.get("labelField"));
|
||||||
|
assertEquals("_id", picker.get("valueField"));
|
||||||
|
assertEquals("dialog", picker.get("modalMode"));
|
||||||
|
Map<String, Object> ps = (Map<String, Object>) picker.get("pickerSchema");
|
||||||
|
assertEquals("table", ps.get("mode"));
|
||||||
|
// 现为升级 note 而非降级;degrades 不再含该 SelectDialog
|
||||||
|
assertTrue(r.getMappingNotes().stream().anyMatch(n -> n.contains("PROJ") && n.contains("picker")));
|
||||||
|
assertFalse(r.getDegrades().stream().anyMatch(d -> d.contains("SelectDialog(dialogid=d1")));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
void crud_multiSelectDialog转picker多选弹窗() {
|
||||||
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
|
+ "<search><field name='USERS' label='参与人' uitype='MultiSelectDialog' dialogid='d9'/></search></crud>";
|
||||||
|
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
|
Map<String, Object> filter = (Map<String, Object>) body(r.getSchema()).get("filter");
|
||||||
|
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
|
||||||
|
Map<String, Object> picker = items.get(0);
|
||||||
|
assertEquals("picker", picker.get("type"));
|
||||||
|
assertEquals(Boolean.TRUE, picker.get("multiple"));
|
||||||
|
assertEquals("/api/picker/d9/list", picker.get("source"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
void crud_selectDialog无dialogid保持select降级() {
|
||||||
|
// 无 dialogid → 无可解析数据源,picker 会空载,故保持 F2-9 的 select 搜索下拉降级
|
||||||
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
|
+ "<search><field name='X' label='X' uitype='SelectDialog' dialogid=''/></search></crud>";
|
||||||
|
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
|
Map<String, Object> filter = (Map<String, Object>) body(r.getSchema()).get("filter");
|
||||||
|
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
|
||||||
assertEquals("select", items.get(0).get("type"));
|
assertEquals("select", items.get(0).get("type"));
|
||||||
assertTrue(((String) items.get(0).get("source")).startsWith("/api/picker/d1/list"));
|
assertTrue(r.getDegrades().stream().anyMatch(d -> d.contains("dialogid=空")));
|
||||||
assertTrue(r.getDegrades().stream().anyMatch(d -> d.contains("SelectDialog")));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -156,10 +156,15 @@ public class PickerController {
|
|||||||
List<Map<String, Object>> rows = toRows(result.get(POJOCRUDService.LIST_RESULT));
|
List<Map<String, Object>> rows = toRows(result.get(POJOCRUDService.LIST_RESULT));
|
||||||
List<Map<String, Object>> options = new ArrayList<>();
|
List<Map<String, Object>> options = new ArrayList<>();
|
||||||
for (Map<String, Object> row : rows) {
|
for (Map<String, Object> row : rows) {
|
||||||
Map<String, Object> opt = new LinkedHashMap<>();
|
|
||||||
Object value = row.get("_id");
|
Object value = row.get("_id");
|
||||||
Object label = labelColumn != null ? row.get(labelColumn) : null;
|
Object label = labelColumn != null ? row.get(labelColumn) : null;
|
||||||
opt.put("label", label != null && !String.valueOf(label).isBlank() ? label : value);
|
String labelStr = label != null ? String.valueOf(label).trim() : "";
|
||||||
|
String display = !labelStr.isBlank() ? labelStr : String.valueOf(value).trim();
|
||||||
|
// _label:统一显示值字段。picker 用 labelField="_label" 显示选中项人可读名(与 select 的
|
||||||
|
// option.label 同口径),避免依赖各 dialog 实体显示列名(转换器无从得知)。
|
||||||
|
row.put("_label", display);
|
||||||
|
Map<String, Object> opt = new LinkedHashMap<>();
|
||||||
|
opt.put("label", display);
|
||||||
opt.put("value", value);
|
opt.put("value", value);
|
||||||
options.add(opt);
|
options.add(opt);
|
||||||
}
|
}
|
||||||
@@ -167,6 +172,7 @@ public class PickerController {
|
|||||||
Map<String, Object> data = new HashMap<>();
|
Map<String, Object> data = new HashMap<>();
|
||||||
data.put("items", rows); // amis crud/picker 内嵌 CRUD 直接消费
|
data.put("items", rows); // amis crud/picker 内嵌 CRUD 直接消费
|
||||||
data.put("options", options); // amis select 的 source 直接消费
|
data.put("options", options); // amis select 的 source 直接消费
|
||||||
|
data.put("columns", gridColumns(table, info, keyColumn, labelColumn)); // amis picker 内嵌 CRUD 按响应 columns 渲染多列
|
||||||
data.put("total", result.get(POJOCRUDService.PAGE_COUNT));
|
data.put("total", result.get(POJOCRUDService.PAGE_COUNT));
|
||||||
|
|
||||||
Map<String, Object> resp = new HashMap<>();
|
Map<String, Object> resp = new HashMap<>();
|
||||||
@@ -347,6 +353,102 @@ public class PickerController {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 选择窗多列网格列定义(amis picker 内嵌 CRUD 按响应 {@code data.columns} 渲染多列,见 amis crud.ts
|
||||||
|
* {@code self.columns = columns.concat()})。faithfully 恢复老系统弹窗的「多列对照」:
|
||||||
|
* <ol>
|
||||||
|
* <li>名称列:绑 {@code _label}(统一显示值),标签取显示列的 {@code displayname},回落「名称」;</li>
|
||||||
|
* <li>标识列(工号/编码等,{@code isidentifier=1})作对照列,最多再加 3 列;</li>
|
||||||
|
* <li>仍不足 2 列 → 补首个非系统、非主键的 String 列。</li>
|
||||||
|
* </ol>
|
||||||
|
* 对照列均绑 {@code info} 列名 → 与 items 行键一致;{@code displayname} 友好标签查
|
||||||
|
* {@code SYS_ENTITYATTRIBUTE},失败回落列名。列知识落在运行时(非转换器),转换器对 dialog XML 零耦合(§6)。
|
||||||
|
*/
|
||||||
|
private List<Map<String, Object>> gridColumns(String table, POJOInfo info, String keyColumn, String labelColumn) {
|
||||||
|
Map<String, String> friendly = columnDisplayNames(table);
|
||||||
|
String keyUp = keyColumn == null ? "" : keyColumn.toUpperCase();
|
||||||
|
String labelUp = labelColumn == null ? "" : labelColumn.toUpperCase();
|
||||||
|
java.util.Set<String> used = new java.util.LinkedHashSet<>();
|
||||||
|
List<Map<String, Object>> cols = new ArrayList<>();
|
||||||
|
|
||||||
|
// 1) 名称列:绑 _label(已 trim 的显示值),标签取显示列 displayname,回落「名称」
|
||||||
|
String nameLabel = !labelUp.isBlank() ? friendly.getOrDefault(labelUp, "名称") : "名称";
|
||||||
|
cols.add(col("_label", nameLabel));
|
||||||
|
|
||||||
|
// 2) 标识列(工号/编码等)作对照列,最多再加 3 列(共 ≤4)
|
||||||
|
for (int i = 0; i < info.getColumnCount() && cols.size() < 4; i++) {
|
||||||
|
if (!info.isIdentifier(i)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
String c = info.getColumnName(i);
|
||||||
|
if (c == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
String cu = c.toUpperCase();
|
||||||
|
if (cu.equals(keyUp) || cu.equals(labelUp) || used.contains(cu) || isSystemColumn(cu)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
cols.add(col(cu, friendly.getOrDefault(cu, cu)));
|
||||||
|
used.add(cu);
|
||||||
|
}
|
||||||
|
// 3) 不足 2 列 → 补首个非系统、非主键 String 列增加对照
|
||||||
|
for (int i = 0; i < info.getColumnCount() && cols.size() < 2; i++) {
|
||||||
|
String c = info.getColumnName(i);
|
||||||
|
if (c == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
String cu = c.toUpperCase();
|
||||||
|
if (cu.equals(keyUp) || cu.equals(labelUp) || used.contains(cu) || isSystemColumn(cu)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (info.getColumnClass(i) == String.class) {
|
||||||
|
cols.add(col(cu, friendly.getOrDefault(cu, cu)));
|
||||||
|
used.add(cu);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return cols;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Map<String, Object> col(String name, String label) {
|
||||||
|
Map<String, Object> c = new LinkedHashMap<>();
|
||||||
|
c.put("name", name);
|
||||||
|
c.put("label", label);
|
||||||
|
c.put("type", "text");
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 实体各列的 {@code displayname} 友好标签(UPPER(列名)→中文名)。查询失败 → 空 map(列标签回落列名)。 */
|
||||||
|
private Map<String, String> columnDisplayNames(String table) {
|
||||||
|
Map<String, String> map = new HashMap<>();
|
||||||
|
try {
|
||||||
|
jdbcTemplate.query(
|
||||||
|
"SELECT UPPER(ea.columnname) AS col, ea.displayname AS nm "
|
||||||
|
+ "FROM sys_entityattribute ea "
|
||||||
|
+ "JOIN sys_entity e ON UPPER(e.sys_entity_id) = UPPER(ea.entityid) "
|
||||||
|
+ "WHERE UPPER(e.tablename) = ?",
|
||||||
|
rs -> {
|
||||||
|
String c = rs.getString("col");
|
||||||
|
String nm = rs.getString("nm");
|
||||||
|
if (c != null && nm != null && !nm.isBlank()) {
|
||||||
|
map.put(c, nm.trim());
|
||||||
|
}
|
||||||
|
},
|
||||||
|
table.toUpperCase());
|
||||||
|
} catch (DataAccessException ex) {
|
||||||
|
// 元数据查询异常 → 列标签回落列名,不影响数据返回
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 系统/审计列:不作选择窗对照列(噪声)。 */
|
||||||
|
private static boolean isSystemColumn(String colUpper) {
|
||||||
|
return switch (colUpper) {
|
||||||
|
case "CREATETIME", "CREATEBY", "UPDATETIME", "UPDATEBY", "VERSION",
|
||||||
|
"ISACTIVE", "ISDEL", "SEQ", "SYS_ORG_ID", "ORGID", "PARENTID" -> true;
|
||||||
|
default -> false;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 转义进引擎 LIKE 裸拼点的搜索值(引擎 {@code GeneralPO} 对 String 条件做 {@code col like '%值%'}
|
* 转义进引擎 LIKE 裸拼点的搜索值(引擎 {@code GeneralPO} 对 String 条件做 {@code col like '%值%'}
|
||||||
* 字符串拼接,见 GeneralPO.java:1940):单引号双写防 SQL 注入,{@code %}/{@code _} 转义防通配符逃逸。
|
* 字符串拼接,见 GeneralPO.java:1940):单引号双写防 SQL 注入,{@code %}/{@code _} 转义防通配符逃逸。
|
||||||
|
|||||||
Reference in New Issue
Block a user