fix framework treegrid search and formeditgrid editors

This commit is contained in:
2026-06-18 16:35:51 +08:00
parent b6e6964913
commit d218c2ba6f
6 changed files with 493 additions and 28 deletions

View File

@@ -9,7 +9,7 @@
| 口径 | 数量 | 说明 |
|---|---:|---|
| framework 定制视图总数 | 46 | README 总览口径;backlog 表格当前可解析出 45 行,需后续校正缺的 1 行。 |
| 已逐功能验收 / 可算 Done | 约 13 | 用户管理、功能模板下载、实体分类-枚举组、已办任务、消息查看/已读、短消息、查看审批、我的发起任务、流程监控、通用脚本/XML 编辑器第一批、treeGrid 主键列隐藏、服务页实体显名、服务/实体配置下拉与子表加载。功能模板下载/已办/消息查看各覆盖 2 个 templateId,但按 engineclass 各计 1 组。 |
| 已逐功能验收 / 可算 Done | 约 14 | 用户管理、功能模板下载、实体分类-枚举组、已办任务、消息查看/已读、短消息、查看审批、我的发起任务、流程监控、通用脚本/XML 编辑器第一批、treeGrid 主键列隐藏、treeGrid 查询字段提交、服务页实体显名、服务/实体配置下拉与子表加载。功能模板下载/已办/消息查看各覆盖 2 个 templateId,但按 engineclass 各计 1 组。 |
| 代码已提交但待最终副作用验收 | 约 10 | 待办任务:列表、查看详细、处理抽屉已验;未点同意/拒绝。用户选择框全家已切标准 amis picker,并已覆盖单选查询、单选表单、多选弹窗层级与多选展示烟测;流程选择框已接线/页面烟测;审批表单删除已补查看/删除端点和按钮注入;设置定时任务提醒人、数据导入下载/执行入口、功能/视图设计器入口、报表宿主、工作日历已接线。上述项未覆盖所有真实业务保存、权限差异或页面副作用验收。 |
| 仍需修或逐功能验收 | 约 34 | 含上面的待验组;大多是通用页已产出,但 engineclass Java delta 未迁移或仍需真实业务副作用验收。 |
| 剩余工程单元 | 约 28+ | 多视图可复用同一套组件/端点,如脚本编辑器、消息详情、工作流按钮。 |
@@ -36,7 +36,8 @@
| 2026-06-18 | 通用脚本/XML 编辑器(P2 第一批):定时任务脚本、数据导入转换/保存脚本、功能/视图 XML 高级配置统一走 `/api/field-editor/load|save` | Done | 本次提交 | `FieldEditorControllerTest`; `TemplateToAmisConverterTest`; live 可逆保存:`RUNSCRIPT`、`CONVERTSCRIPT`、`SAVESCRIPT`、`VIEW_TEMPLATE.XML`、`VIEW_PAGE.XML` 均完成保存-回读-恢复;非法 XML 返回业务失败不再 500;内置浏览器验收:`d99b5760` 打开「编辑任务脚本」并加载脚本,`8b89fd29` 打开「高级配置」并加载 XML,`7821ef3b` 打开「编辑转换脚本」并加载脚本,弹窗层级 `z-index=1400` |
| 2026-06-18 | 引用式 treeGrid 右表主键列隐藏:`hidden=true` 或 `iskeycolumn=true` 的 display 列统一默认隐藏,修复功能/视图/定时任务等 treeGrid 列表露出 UUID 主键 | Done | 本次提交 | `TemplateToAmisConverterTest#tree_treeGrid右表引用模板主键列默认隐藏`; `mvn -q -pl platform-converter -Dtest=TemplateToAmisConverterTest test`; 全量重转 2757 项、导入扫描 2685 项/更新 800 项;HTTP schema 确认 `8b89fd29 VIEW_TEMPLATE_ID`、`d7e12a83 VIEW_PAGE_ID`、`d99b5760 SYS_SCHEDULEJOB_ID` 均为 `toggled=false`;内置浏览器刷新 `8b89fd29` 后表头只剩「功能名称/模板类型/可作为菜单/模板解析类」,行内不再显示 UUID |
| 2026-06-18 | 服务页 `76ff564a` 实体列显名:转换器按 `SYS_REFERENCE → SYS_ENTITY` 识别旧式引用标识,把 `SYS_SERVICEFLOW.ENTITYID` 列改绑 `ENTITYID_DISPLAY__` | Done | 本次提交 | `TemplateToAmisConverterTest#引用列绑定到displayField字段`; 全量重转 2757 项、导入扫描 2685 项/更新 613 项;HTTP schema 确认服务页「实体」列 name=`ENTITYID_DISPLAY__`;接口 `/api/template/treegrid?...gridTable=SYS_SERVICEFLOW&rcol=ENTITYID` 返回 `ENTITYID_DISPLAY__=项目报销申请表`;内置浏览器刷新服务页后行显示「项目报销申请表」而非 UUID |
| 2026-06-18 | 服务/实体配置下拉与子表加载:枚举 ComboBox 在查询和编辑表单内联 `options`,避免远程字典下拉加载时序问题;`FormEditGrid` 支持旧 XML 的 `formeditgridtemplate/display/field` 列解析,修复实体配置编辑/查看弹窗子表列为空;服务页左树按排序字段/fallback 排序 | Done | 本次提交 | `mvn -q -pl platform-converter -Dtest=TemplateToAmisConverterTest#form_formEditGrid从display解析子表列,TemplateToAmisConverterTest#crud_search枚举下拉优先内联options,TemplateToAmisConverterTest#form_editform枚举下拉优先内联options test`; `mvn -q -pl platform-converter -Dtest=TemplateToAmisConverterTest test`; 全量重转 2757 项、导入扫描 2727 项/更新 815 项;HTTP schema 确认实体编辑 `8de37a6d` 的 `ATTRIBUTES` 子表 13 列、查看 `12491103` 子表 14 列,实体/服务配置查询下拉均为 inline options;接口确认项目报销申请表 `ATTRIBUTES=29`;内置浏览器验收:服务配置查询/弹窗下拉可展开,服务新增内容为 XML editor,实体配置查询下拉可展开,实体编辑弹窗「实体属性」子表表头正常显示 |
| 2026-06-18 | 服务/实体配置下拉与子表加载:枚举 ComboBox 在查询和编辑表单内联 `options`,避免远程字典下拉加载时序问题;`FormEditGrid` 支持旧 XML 的 `formeditgridtemplate/display/field` 列解析,并按 `pageid` 子页面字段定义恢复子表单元格组件(ComboBox/SelectDialog/NumberField 等),修复实体配置编辑/查看弹窗子表列为空或全部退化为文本框;服务页左树按排序字段/fallback 排序 | Done | 本次提交 | `mvn -q -pl platform-converter -Dtest=TemplateToAmisConverterTest#form_formEditGrid从display解析子表列,TemplateToAmisConverterTest#form_formEditGrid按pageid子页面字段定义生成quickEdit控件,TemplateToAmisConverterTest#crud_search枚举下拉优先内联options,TemplateToAmisConverterTest#form_editform枚举下拉优先内联options test`; `mvn -q -pl platform-converter -Dtest=TemplateToAmisConverterTest test`; 全量重转 2757 项、导入扫描 2727 项/更新 815 项;本轮补充重转导入扫描 2685 项/更新 155 项;HTTP schema 确认实体编辑 `8de37a6d` 的 `ATTRIBUTES` 子表 13 列,`ISMANDATORY/ISREADONLY` 为 `select false/true`、`REFERENCEID` 为 `picker`、`FIELDLENGTH` 为 `input-number`;接口确认项目报销申请表 `ATTRIBUTES=29`;内置浏览器验收:服务配置查询/弹窗下拉可展开,服务新增内容为 XML editor,实体配置查询下拉可展开,实体编辑弹窗「实体属性」子表表头正常显示,子表 DOM 出现 `cxd-Select`、`cxd-Picker`、`cxd-NumberControl` |
| 2026-06-18 | TreeGrid 右表查询通用修复:转换器把 gridtemplate `<search>` 字段显式拼入 `/api/template/treegrid` CRUD api,修复 treegrid 页面点击搜索不提交查询字段;BOOLEAN 查询值按列元数据 coerce,编辑兜底表单 BOOLEAN 下拉 options 与 load 返回值统一为 `false/true` | Done | 本次提交 | `TemplateToAmisConverterTest#tree_treeGrid右表查询字段拼入api`; `TemplateToAmisConverterTest#crud_search布尔枚举下拉内联为booleanOptions`; `FlowInputCoercerTest#coerceSearchValuesByTableBoolean`; 全量重转 2757 项、导入扫描 2685 项/更新 638 项;HTTP schema 确认服务页 `76ff564a` 的 treegrid api 含 `SYS_SERVICEFLOW_ID/DISPLAYNAME/ISCONTROL/ISUPDATEABLE`;接口确认 `DISPLAYNAME=项目` 返回 642 条、`ISCONTROL=false/true` 分别返回 1946/3052 条;内置浏览器验收:服务页「服务流名称=签到」从 500 页缩为 10 行且项目报销行消失,「是否受权限控制=否」后剩余行该列全为“否” |
## In Progress / Needs Verification

View File

@@ -55,6 +55,7 @@ public class TemplateToAmisConverter {
*/
private String currentEngineclass;
private static final String ENTITY_FORM_PREFIX = "ENTITY_FORM:";
private static final Pattern IDENT = Pattern.compile("[A-Za-z_][A-Za-z0-9_]*");
private static final Set<String> SYSTEM_FORM_COLUMNS = Set.of(
"CREATETIME", "CREATEBY", "UPDATETIME", "UPDATEBY", "VERSION", "ISACTIVE");
@@ -506,7 +507,7 @@ public class TemplateToAmisConverter {
}
Map<String, Object> searchItem = UiTypeMapper.mapField(f, result, "search", colMeta);
enrichFieldRefs(searchItem, f, result);
inlineEnumerateOptions(searchItem, "search", result);
inlineEnumerateOptions(searchItem, "search", result, colMeta);
items.add(searchItem);
}
if (items.isEmpty()) {
@@ -519,7 +520,58 @@ public class TemplateToAmisConverter {
return filter;
}
private void inlineEnumerateOptions(Map<String, Object> item, String origin, ConversionResult result) {
private static String appendFilterParamsToApi(String api, Map<String, Object> filter) {
if (api == null || api.isBlank() || filter == null) {
return api;
}
LinkedHashSet<String> names = new LinkedHashSet<>();
collectFilterNames(filter.get("body"), names);
String out = api;
for (String name : names) {
if (name == null || !IDENT.matcher(name).matches() || apiHasQueryParam(out, name)) {
continue;
}
out += (out.contains("?") ? "&" : "?") + name + "=${" + name + "}";
}
return out;
}
@SuppressWarnings("unchecked")
private static void collectFilterNames(Object node, Set<String> out) {
if (node instanceof List<?> list) {
for (Object item : list) {
collectFilterNames(item, out);
}
return;
}
if (!(node instanceof Map<?, ?> raw)) {
return;
}
Map<String, Object> map = (Map<String, Object>) raw;
Object name = map.get("name");
if (name instanceof String s && !s.isBlank()) {
out.add(s.trim());
}
collectFilterNames(map.get("body"), out);
}
private static boolean apiHasQueryParam(String api, String name) {
int idx = api.indexOf('?');
if (idx < 0 || idx == api.length() - 1) {
return false;
}
for (String part : api.substring(idx + 1).split("&")) {
int eq = part.indexOf('=');
String key = eq >= 0 ? part.substring(0, eq) : part;
if (name.equals(key)) {
return true;
}
}
return false;
}
private void inlineEnumerateOptions(Map<String, Object> item, String origin, ConversionResult result,
Map<String, String[]> colMeta) {
if (!"select".equals(item.get("type")) || !(item.get("source") instanceof String source)) {
return;
}
@@ -535,12 +587,69 @@ public class TemplateToAmisConverter {
if (options.isEmpty()) {
return;
}
String name = String.valueOf(item.getOrDefault("name", "")).toUpperCase();
String[] meta = colMeta == null ? null : colMeta.get(name);
if (meta != null && meta.length > 0 && "BOOLEAN".equalsIgnoreCase(String.valueOf(meta[0]))) {
options = booleanOptions(options);
if (item.containsKey("value")) {
Boolean bool = toBooleanOptionValue(item.get("value"));
if (bool != null) {
item.put("value", bool);
}
}
}
item.remove("source");
item.put("options", options);
result.note(origin + "@field " + item.getOrDefault("name", "")
+ " 枚举字典 " + dict + " → 内联 options(" + options.size() + "项),避免远程下拉空载");
}
private static List<Map<String, Object>> booleanOptions(List<Map<String, Object>> options) {
List<Map<String, Object>> out = new ArrayList<>();
for (Map<String, Object> option : options) {
Object raw = option.get("value");
Boolean bool = toBooleanOptionValue(raw);
if (bool == null) {
out.add(option);
continue;
}
Map<String, Object> next = new LinkedHashMap<>(option);
next.put("value", bool);
out.add(next);
}
return out;
}
private static List<Map<String, Object>> defaultBooleanOptions() {
List<Map<String, Object>> options = new ArrayList<>();
Map<String, Object> no = new LinkedHashMap<>();
no.put("label", "否");
no.put("value", Boolean.FALSE);
options.add(no);
Map<String, Object> yes = new LinkedHashMap<>();
yes.put("label", "是");
yes.put("value", Boolean.TRUE);
options.add(yes);
return options;
}
private static Boolean toBooleanOptionValue(Object raw) {
if (raw instanceof Boolean b) {
return b;
}
if (raw == null) {
return null;
}
String v = String.valueOf(raw).trim();
if ("1".equals(v) || "true".equalsIgnoreCase(v) || "Y".equalsIgnoreCase(v)) {
return Boolean.TRUE;
}
if ("0".equals(v) || "false".equalsIgnoreCase(v) || "N".equalsIgnoreCase(v)) {
return Boolean.FALSE;
}
return null;
}
/**
* F3-1:判断一个 search 段字段是否为主键/外键 UUID 列,应从查询区排除。
*/
@@ -1202,7 +1311,14 @@ public class TemplateToAmisConverter {
item.put("disabled", true);
}
if (attr.defaultValue() != null && !attr.defaultValue().isBlank()) {
item.put("value", scalarValue(attr.defaultValue().trim()));
Object defaultValue = scalarValue(attr.defaultValue().trim());
if ("BOOLEAN".equalsIgnoreCase(ref)) {
Boolean bool = toBooleanOptionValue(defaultValue);
if (bool != null) {
defaultValue = bool;
}
}
item.put("value", defaultValue);
}
String codeLanguage = fallbackCodeLanguage(name, attr.label(), ref, attr.fieldLength());
@@ -1219,6 +1335,9 @@ public class TemplateToAmisConverter {
item.put("clearable", true);
String dict = enumType.isBlank() ? "YESNO" : enumType;
List<Map<String, Object>> options = enumerateOptions(dict, result);
if ("BOOLEAN".equalsIgnoreCase(ref)) {
options = options.isEmpty() ? defaultBooleanOptions() : booleanOptions(options);
}
if (options.isEmpty()) {
item.put("source", "/api/poc/dict/" + dict);
} else {
@@ -1894,10 +2013,11 @@ public class TemplateToAmisConverter {
// 本页脚本(key→脚本体):供 filterscript 级联(组织→部门→岗位)解析,与 convertViewPage 同口径
Map<String, String> pageScripts = pageScriptsByKey(pageRoot);
for (Element f : fields.elements("field")) {
Map<String, Object> formItem = UiTypeMapper.mapField(f, result, "editform", colMeta);
Map<String, Object> formItem = UiTypeMapper.mapField(f, result, "editform", colMeta, pageScripts);
enrichFieldRefs(formItem, f, result);
applyFilterscriptCascade(formItem, f, pageScripts, result);
inlineEnumerateOptions(formItem, "editform", result);
inlineEnumerateOptions(formItem, "editform", result, colMeta);
enrichEditGridColumnsFromChildPage(formItem, f, result);
formItems.add(formItem);
}
result.note("form@pageid=" + pageId + " → 解析 view_page 取得 " + formItems.size() + " 字段");
@@ -2011,6 +2131,148 @@ public class TemplateToAmisConverter {
return map;
}
/**
* FormEditGrid 常见结构是:外层 {@code <display>} 只列出显示列,真正控件定义在
* {@code <formeditgrid pageid="...">} 指向的子 view_page。先由 UiTypeMapper 按 display 建列,
* 再在这里用子页面字段定义覆盖 quickEdit,避免全部退化成 input-text。
*/
@SuppressWarnings("unchecked")
private void enrichEditGridColumnsFromChildPage(Map<String, Object> formItem, Element sourceField,
ConversionResult result) {
if (formItem == null || sourceField == null || !"input-table".equals(formItem.get("type"))) {
return;
}
Object colsObj = formItem.get("columns");
if (!(colsObj instanceof List<?> rawColumns) || rawColumns.isEmpty()) {
return;
}
String pageId = editGridChildPageId(sourceField);
if (pageId == null || pageId.isBlank()) {
return;
}
String pageXml = loadPageXml(pageId);
if (pageXml == null || pageXml.isBlank()) {
result.note("editgrid " + sourceField.attributeValue("name", "")
+ " pageid=" + pageId + " 无法解析子 view_page → 保留 display 默认列控件");
return;
}
try {
Element childPage = DocumentHelper.parseText(pageXml).getRootElement();
Element childFields = childPage.element("fields");
if (childFields == null) {
return;
}
Map<String, Element> byName = new LinkedHashMap<>();
for (Element f : childFields.elements("field")) {
String name = f.attributeValue("name", "").trim();
if (!name.isBlank()) {
byName.put(name.toUpperCase(), f);
}
}
if (byName.isEmpty()) {
return;
}
String childEntityId = childPage.attributeValue("entityid", "");
Map<String, String[]> childColMeta = loadColumnMeta(childEntityId, result);
Map<String, String> childScripts = pageScriptsByKey(childPage);
String gridName = sourceField.attributeValue("name", String.valueOf(formItem.getOrDefault("name", "")));
int enriched = 0;
for (Object rawCol : rawColumns) {
if (!(rawCol instanceof Map<?, ?> m)) {
continue;
}
Map<String, Object> col = (Map<String, Object>) m;
String colName = String.valueOf(col.getOrDefault("name", "")).trim();
if (colName.isBlank()) {
continue;
}
Element childField = byName.get(colName.toUpperCase());
if (childField == null) {
continue;
}
Map<String, Object> control = UiTypeMapper.mapField(
childField, result, "editgrid:" + gridName, childColMeta, childScripts);
enrichFieldRefs(control, childField, result);
applyFilterscriptCascade(control, childField, childScripts, result);
inlineEnumerateOptions(control, "editgrid:" + gridName, result, childColMeta);
applyEditGridChildControl(col, control, childField, gridName, result);
if (String.valueOf(col.getOrDefault("label", "")).isBlank()) {
col.put("label", control.get("label"));
}
enriched++;
}
if (enriched > 0) {
result.note("editgrid " + gridName + " pageid=" + pageId
+ " → 按子 view_page 字段定义增强 " + enriched + " 列 quickEdit 控件");
}
} catch (Exception e) {
result.note("editgrid " + sourceField.attributeValue("name", "")
+ " pageid=" + pageId + " 子 view_page 解析失败: " + e.getClass().getSimpleName()
+ " → 保留 display 默认列控件");
}
}
private void applyEditGridChildControl(Map<String, Object> col, Map<String, Object> control,
Element childField, String gridName, ConversionResult result) {
String childName = childField.attributeValue("name", "");
String childUitype = childField.attributeValue("uitype", "");
boolean isRef = "SelectDialog".equals(childUitype) || "MultiSelectDialog".equals(childUitype);
if (isRef && "static".equals(control.get("type"))) {
col.put("type", "tpl");
col.put("tpl", control.get("tpl"));
col.put("quickEdit", false);
result.note("editgrid " + gridName + " 子列 " + childName
+ " 只读引用 → 显示列(tpl 显名 + quickEdit:false 只读,非 picker)");
return;
}
Map<String, Object> quickEdit = new LinkedHashMap<>(control);
quickEdit.remove("label");
String script = childField.attributeValue("script", "").trim();
if (!script.isBlank()) {
quickEdit.put("onEvent", UiTypeMapper.editGridChangeOnEvent(gridName, script, childName));
result.note("editgrid " + gridName + " 子列 " + childName
+ " script=" + script + " → onEvent.change 行内联动端点");
}
col.remove("type");
col.remove("tpl");
col.put("quickEdit", quickEdit);
}
private static String editGridChildPageId(Element f) {
Element tpl = f.element("editgridtemplate");
if (tpl == null) {
tpl = f.element("formeditgridtemplate");
}
String tplXml = tpl != null ? tpl.getText() : null;
if (tplXml == null || tplXml.isBlank()) {
return null;
}
try {
Element grid = embeddedEditGridElement(DocumentHelper.parseText(tplXml.trim()).getRootElement());
return grid != null ? grid.attributeValue("pageid") : null;
} catch (Exception ignore) {
return null;
}
}
private static Element embeddedEditGridElement(Element root) {
if (root == null) {
return null;
}
String name = root.getName();
if ("editgrid".equals(name) || "formeditgrid".equals(name)) {
return root;
}
for (Element child : root.elements()) {
Element found = embeddedEditGridElement(child);
if (found != null) {
return found;
}
}
return null;
}
private Map<String, Object> convertViewPage(Element pageRoot, ConversionResult result, String templateName) {
String entityId = pageRoot.attributeValue("entityid", "");
Map<String, String[]> colMeta = (entityId != null && !entityId.isBlank())
@@ -2023,7 +2285,8 @@ public class TemplateToAmisConverter {
Map<String, Object> formItem = UiTypeMapper.mapField(f, result, "editform", colMeta, pageScripts);
enrichFieldRefs(formItem, f, result);
applyFilterscriptCascade(formItem, f, pageScripts, result);
inlineEnumerateOptions(formItem, "editform", result);
inlineEnumerateOptions(formItem, "editform", result, colMeta);
enrichEditGridColumnsFromChildPage(formItem, f, result);
formItems.add(formItem);
}
}
@@ -2881,7 +3144,10 @@ public class TemplateToAmisConverter {
Map<String, Object> filter = buildSearchFilter(gridSearch, result, false, gridEntityId);
if (filter != null) {
gridSchema.put("filter", filter);
result.note("tree+grid: gridtemplate <search> → 右表查询过滤表单");
if (gridSchema.get("api") instanceof String api) {
gridSchema.put("api", appendFilterParamsToApi(api, filter));
}
result.note("tree+grid: gridtemplate <search> → 右表查询过滤表单,api 显式携带查询字段");
}
}
}

View File

@@ -680,7 +680,7 @@ final class UiTypeMapper {
* ③ 自定义动作 {@code applyEditGridParent} 把 {@code parentSetValues} 写主表(如申请总金额)。
* templateId 此处填占位符,convertViewPage 后置注入。
*/
private static Map<String, Object> editGridChangeOnEvent(String editgridField, String scriptKey, String changedField) {
static Map<String, Object> editGridChangeOnEvent(String editgridField, String scriptKey, String changedField) {
Map<String, Object> data = new LinkedHashMap<>();
data.put("templateId", EDITGRID_TPL_PLACEHOLDER);
data.put("editgridField", editgridField);

View File

@@ -744,6 +744,26 @@ class TemplateToAmisConverterTest {
assertEquals(1, options.get(1).get("value"));
}
@Test
@SuppressWarnings("unchecked")
void crud_search布尔枚举下拉内联为booleanOptions() throws Exception {
TemplateToAmisConverter c = converterWithMeta(new String[][]{
{"ISCONTROL", "BOOLEAN", "YESNO", null}
}, new String[][]{
{"0", "否"}, {"1", "是"}
});
String xml = "<crud entityid='e1'><display/>"
+ "<search><field name='ISCONTROL' label='是否受权限控制' uitype='ComboBox' comboboxid='YESNO'/></search>"
+ "</crud>";
ConversionResult r = c.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");
List<Map<String, Object>> options = (List<Map<String, Object>>) items.get(0).get("options");
assertEquals(Boolean.FALSE, options.get(0).get("value"));
assertEquals(Boolean.TRUE, options.get(1).get("value"));
}
@Test
@SuppressWarnings("unchecked")
void form_editform枚举下拉优先内联options() throws Exception {
@@ -764,6 +784,25 @@ class TemplateToAmisConverterTest {
assertEquals(1, options.get(0).get("value"));
}
@Test
@SuppressWarnings("unchecked")
void form_editform布尔枚举下拉内联为booleanOptions() throws Exception {
TemplateToAmisConverter c = converterWithMeta(new String[][]{
{"ISUPDATEABLE", "BOOLEAN", "YESNO", null}
}, new String[][]{
{"0", "否"}, {"1", "是"}
});
String pageXml = "<page entityid='e9'><fields>"
+ "<field name='ISUPDATEABLE' label='是否允许修改' uitype='ComboBox' comboboxid='YESNO'/>"
+ "</fields></page>";
ConversionResult r = c.convertGraded("<form entityid='e1' pageid='p1'/>", new ArrayList<>(), id -> pageXml);
Map<String, Object> select = flattenFormBody(body(r.getSchema())).get(0);
List<Map<String, Object>> options = (List<Map<String, Object>>) select.get("options");
assertEquals(Boolean.FALSE, options.get(0).get("value"));
assertEquals(Boolean.TRUE, options.get(1).get("value"));
}
@Test
@SuppressWarnings("unchecked")
void comboBox年月列内建生成选项() {
@@ -1688,6 +1727,88 @@ class TemplateToAmisConverterTest {
assertEquals("DISPLAYNAME", cols.get(1).get("name"));
}
@Test
@SuppressWarnings("unchecked")
void form_formEditGrid按pageid子页面字段定义生成quickEdit控件() throws Exception {
JdbcTemplate jdbc = mock(JdbcTemplate.class);
String childPageXml = "<page entityid='child-e'><fields>"
+ "<field name='ISMANDATORY' label='是否必填' uitype='ComboBox' comboboxid='YESNO' defaultvalue='0'/>"
+ "<field name='REFERENCEID' label='属性类型' uitype='SelectDialog' dialogid='type-dialog'/>"
+ "<field name='FIELDLENGTH' label='文本长度' uitype='NumberField' mdec='0'/>"
+ "</fields></page>";
lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class)))
.thenAnswer(inv -> {
String sql = inv.getArgument(0);
if (sql.contains("VIEW_PAGE")) {
return childPageXml;
}
return "PM_DEMO";
});
doAnswer(inv -> {
RowCallbackHandler handler = inv.getArgument(1);
for (String[] row : new String[][]{
{"ISMANDATORY", "BOOLEAN", "YESNO", null},
{"REFERENCEID", "34d6fcab-cd41-4ab5-b362-e1d7076a5ca0", null, "SYS_REFERENCE"},
{"FIELDLENGTH", "INTEGER", null, null}
}) {
ResultSet rs = mock(ResultSet.class);
when(rs.getString(1)).thenReturn(row[0]);
when(rs.getString(2)).thenReturn(row[1]);
when(rs.getString(3)).thenReturn(row[2]);
when(rs.getString(4)).thenReturn(row[3]);
handler.processRow(rs);
}
return null;
}).when(jdbc).query(
org.mockito.ArgumentMatchers.contains("SYS_ENTITYATTRIBUTE"),
any(RowCallbackHandler.class),
any(Object[].class));
doAnswer(inv -> {
RowCallbackHandler handler = inv.getArgument(1);
for (String[] row : new String[][]{{"0", "否"}, {"1", "是"}}) {
ResultSet rs = mock(ResultSet.class);
when(rs.getString(1)).thenReturn(row[0]);
when(rs.getString(2)).thenReturn(row[1]);
handler.processRow(rs);
}
return null;
}).when(jdbc).query(
org.mockito.ArgumentMatchers.contains("SYS_ENUMERATE"),
any(RowCallbackHandler.class),
any(Object[].class));
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
String parentPageXml = "<page entityid='parent-e'><fields>"
+ "<field name='ATTRIBUTES' label='属性子表' uitype='FormEditGrid'>"
+ "<formeditgridtemplate><![CDATA[<component><formeditgrid pageid='child-page'>"
+ "<display>"
+ "<field name='ISMANDATORY' text='必填'/>"
+ "<field name='REFERENCEID' text='属性类型'/>"
+ "<field name='FIELDLENGTH' text='文本长度'/>"
+ "</display>"
+ "</formeditgrid></component>]]></formeditgridtemplate>"
+ "</field></fields></page>";
ConversionResult r = c.convertGraded("<form entityid='parent-e' pageid='parent-page'/>",
new ArrayList<>(), id -> parentPageXml);
Map<String, Object> sub = flattenFormBody(body(r.getSchema())).get(0);
List<Map<String, Object>> cols = (List<Map<String, Object>>) sub.get("columns");
Map<String, Map<String, Object>> quickByName = new java.util.HashMap<>();
for (Map<String, Object> col : cols) {
quickByName.put(String.valueOf(col.get("name")), (Map<String, Object>) col.get("quickEdit"));
}
assertEquals("select", quickByName.get("ISMANDATORY").get("type"));
assertEquals(Boolean.FALSE, quickByName.get("ISMANDATORY").get("value"));
List<Map<String, Object>> yesNo = (List<Map<String, Object>>) quickByName.get("ISMANDATORY").get("options");
assertEquals(Boolean.FALSE, yesNo.get(0).get("value"));
assertEquals(Boolean.TRUE, yesNo.get(1).get("value"));
assertEquals("picker", quickByName.get("REFERENCEID").get("type"));
assertEquals("/api/picker/type-dialog/list", quickByName.get("REFERENCEID").get("source"));
assertEquals("input-number", quickByName.get("FIELDLENGTH").get("type"));
assertEquals(0, quickByName.get("FIELDLENGTH").get("precision"));
}
@Test
@SuppressWarnings("unchecked")
void form_editGrid子表列递归映射控件类型() {
@@ -2401,6 +2522,48 @@ class TemplateToAmisConverterTest {
assertFalse(api.contains("/api/flow/"), "不应再裸用合成流精确匹配(无子树聚合)");
}
@Test
@SuppressWarnings("unchecked")
void tree_treeGrid右表查询字段拼入api() throws Exception {
JdbcTemplate jdbc = mock(JdbcTemplate.class);
lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class)))
.thenReturn("PM_DEMO");
lenient().when(jdbc.queryForList(
org.mockito.ArgumentMatchers.contains("VIEW_TEMPLATE"),
eq(String.class),
any(Object.class)))
.thenAnswer(inv -> {
Object ref = inv.getArgument(2);
if ("g1".equals(String.valueOf(ref))) {
return List.of("<crud entityid='e2'>"
+ "<display><field name='NAME' text='名称'/></display>"
+ "<search>"
+ "<field name='DISPLAYNAME' label='服务流名称'/>"
+ "<field name='ISCONTROL' label='是否受权限控制' uitype='ComboBox'/>"
+ "</search>"
+ "</crud>");
}
return List.of();
});
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
String xml = "<tree>"
+ "<treetemplate ref='t1' entityid='e1'/>"
+ "<gridtemplate ref='g1' entityid='e2' rcolumnname='EVENTID'/></tree>";
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> root = body(r.getSchema());
List<Map<String, Object>> cols = (List<Map<String, Object>>) root.get("columns");
Map<String, Object> gridItem = (Map<String, Object>) cols.get(1).get("body");
String api = (String) gridItem.get("api");
assertTrue(api.contains("DISPLAYNAME=${DISPLAYNAME}"),
"treegrid 右表 CRUD api 必须显式携带文本查询字段,否则点击搜索不发过滤参数: " + api);
assertTrue(api.contains("ISCONTROL=${ISCONTROL}"),
"treegrid 右表 CRUD api 必须显式携带下拉查询字段,否则点击搜索不发过滤参数: " + api);
Map<String, Object> filter = (Map<String, Object>) gridItem.get("filter");
assertNotNull(filter, "右表仍应生成查询过滤表单");
}
@Test
@SuppressWarnings("unchecked")
void tree_treeGrid右表引用模板主键列默认隐藏() throws Exception {
@@ -3874,7 +4037,7 @@ class TemplateToAmisConverterTest {
{"DISPLAYNAME", "服务流名称", "NVARCHAR", null, null, null, 1, 0, 0, 100, null},
{"CONTENTXML", "内容", "NVARCHAR", null, null, null, 1, 0, 0, 50000, null},
{"ENTITYID", "实体", "ref-entity", null, null, "SYS_ENTITY", 1, 0, 0, 0, null},
{"ISCONTROL", "是否受权限控制", "BOOLEAN", null, "YESNO", null, 1, 0, 0, 0, null}
{"ISCONTROL", "是否受权限控制", "BOOLEAN", null, "YESNO", null, 1, 0, 0, 0, "1"}
};
for (Object[] row : rows) {
ResultSet rs = mock(ResultSet.class);
@@ -3927,8 +4090,13 @@ class TemplateToAmisConverterTest {
assertTrue(fields.stream().anyMatch(f -> "editor".equals(f.get("type"))
&& "CONTENTXML".equals(f.get("name")) && "xml".equals(f.get("language"))));
assertTrue(fields.stream().anyMatch(f -> "picker".equals(f.get("type")) && "ENTITYID".equals(f.get("name"))));
assertTrue(fields.stream().anyMatch(f -> "ISCONTROL".equals(f.get("name"))
&& f.get("options") instanceof List<?> opts && opts.size() == 2));
Map<String, Object> isControl = fields.stream()
.filter(f -> "ISCONTROL".equals(f.get("name")))
.findFirst().orElseThrow();
assertEquals(Boolean.TRUE, isControl.get("value"));
List<Map<String, Object>> isControlOptions = (List<Map<String, Object>>) isControl.get("options");
assertEquals(Boolean.FALSE, isControlOptions.get(0).get("value"));
assertEquals(Boolean.TRUE, isControlOptions.get(1).get("value"));
List<Object> actions = (List<Object>) dlg.get("actions");
Map<String, Object> submit = (Map<String, Object>) actions.get(0);
assertEquals("submit", submit.get("actionType"));

View File

@@ -106,21 +106,24 @@ public class FlowInputCoercer {
applyCoerce(map, colTypes);
}
/**
* 读流(SEARCH)日期 coerce:<b>仅</b>把 DATE/TIME 列的 String 值转 {@code DateTime}/{@code DateTime[]}。
*
* <p>amis {@code input-date(time)-range} 把时间段提交为 "起,止" 逗号串,但引擎 GeneralPO 的搜索 where
* 构建只对 {@code DateTime[]} 值生成区间条件 {@code (col>=起 AND col<=止)}——收到 String 则识别不了,
* 整条时间段过滤被忽略(操作日志等"时间段查不动"根因)。本方法把日期列值转成引擎期望形态。
*
* <p><b>只碰 DATE/TIME 列</b>,其它过滤参(文本/枚举/picker)一概不动 → 对已工作的搜索零回归。fail-safe:
* 无表名/查元数据失败/parse 失败 → 原值保留。供 {@code FlowController} 命名读流(NAMED_READ)路径调用。
*/
/** 兼容旧调用名;实际已扩展为搜索值类型 coerce(日期 + BOOLEAN/ENUMERATE/数字等)。 */
public void coerceSearchDatesByFlowId(String flowId, Map<String, Object> map) {
coerceSearchValuesByFlowId(flowId, map);
}
/**
* 读流(SEARCH)值 coerce:把查询表单提交的 String 转成引擎按元数据期望的 Java 类型。
*
* <p>覆盖两类已验证问题:DATE/TIME 区间字符串须转 {@code DateTime[]},BOOLEAN 的 "0/1/false/true"
* 须转 {@code Boolean}。否则引擎 {@code GeneralPO} 搜索 where 构建会忽略条件,表现为“选择了也查不动”。
*
* <p>不同于写路径,本方法不做空串转 null,也不扁平化 picker 对象;只处理已有 String 标量,失败保留原值。
*/
public void coerceSearchValuesByFlowId(String flowId, Map<String, Object> map) {
if (flowId == null || flowId.isBlank() || map == null || map.isEmpty()) {
return;
}
coerceDatesOnly(map, flowTableCache.get(flowId, this::resolveTableNameByFlowId));
coerceSearchValues(map, flowTableCache.get(flowId, this::resolveTableNameByFlowId));
}
/**
@@ -128,14 +131,19 @@ public class FlowInputCoercer {
* 表名由 key 剥后缀推得({@code FlowController} SYNTHESIZED 路径用)。
*/
public void coerceSearchDatesByTable(String tableName, Map<String, Object> map) {
coerceSearchValuesByTable(tableName, map);
}
/** 同 {@link #coerceSearchValuesByFlowId},但表名直接给定。 */
public void coerceSearchValuesByTable(String tableName, Map<String, Object> map) {
if (map == null || map.isEmpty()) {
return;
}
coerceDatesOnly(map, tableName);
coerceSearchValues(map, tableName);
}
/** 就地:只对 {@code tableName} 里 DATE/TIME 列的 String 值做日期/区间 coerce,其余键不动。 */
private void coerceDatesOnly(Map<String, Object> map, String tableName) {
/** 就地:按 {@code tableName} 的列元数据对 String 查询值做 fail-safe coerce。 */
private void coerceSearchValues(Map<String, Object> map, String tableName) {
if (tableName == null || tableName.isEmpty()) {
return;
}
@@ -148,7 +156,7 @@ public class FlowInputCoercer {
continue;
}
String refId = colTypes.get(entry.getKey().toUpperCase());
if ("DATE".equals(refId) || "TIME".equals(refId)) {
if (refId != null) {
Object coerced = coerceValue(s, refId, entry.getKey());
if (coerced != entry.getValue()) {
entry.setValue(coerced);

View File

@@ -273,6 +273,28 @@ class FlowInputCoercerTest {
assertEquals(Boolean.TRUE, map.get("ISACTIVE"), "BOOLEAN String→Boolean");
}
@Test
@DisplayName("coerceSearchValuesByTable: 搜索条件按列元数据转换 BOOLEAN,文本保持原值")
void coerceSearchValuesByTableBoolean() {
when(jdbc.queryForList(anyString(), eq("SYS_SERVICEFLOW")))
.thenReturn(List.of(
Map.of("col", "ISCONTROL", "ref", "BOOLEAN"),
Map.of("col", "ISUPDATEABLE", "ref", "BOOLEAN"),
Map.of("col", "DISPLAYNAME", "ref", "NVARCHAR")
));
Map<String, Object> map = new HashMap<>();
map.put("ISCONTROL", "0");
map.put("ISUPDATEABLE", "1");
map.put("DISPLAYNAME", "项目");
coercer.coerceSearchValuesByTable("SYS_SERVICEFLOW", map);
assertEquals(Boolean.FALSE, map.get("ISCONTROL"));
assertEquals(Boolean.TRUE, map.get("ISUPDATEABLE"));
assertEquals("项目", map.get("DISPLAYNAME"));
}
@Test
@DisplayName("coerce: 值已是 Integer(非 String),幂等不重复转换")
void coerceIdempotent() {