F2-17根因: 转换器修 editform精确解析+消双按钮+富文本(通知页试点)

resolveEditFormTemplateId 改精确 pageid 匹配 + 可写优先(排只读归档)+
实体级回退(read/查看按钮 pageid 无壳→复用同实体编辑表单 static);
convertForm 置 form.actions:[] 消除"form提交+dialog确认"双按钮;
UiTypeMapper 加 RichTextArea→input-rich-text。50 单测。顺带消 17 个同类死桩。

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-12 10:42:21 +08:00
parent d5c1236a08
commit 37db794566
3 changed files with 222 additions and 43 deletions

View File

@@ -10,6 +10,7 @@ import java.util.function.Function;
import org.dom4j.Document; import org.dom4j.Document;
import org.dom4j.DocumentHelper; import org.dom4j.DocumentHelper;
import org.dom4j.Element; import org.dom4j.Element;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@@ -127,7 +128,7 @@ public class TemplateToAmisConverter {
Map<String, Object> filter = buildSearchFilter(crud.element("search"), result); Map<String, Object> filter = buildSearchFilter(crud.element("search"), result);
List<Map<String, Object>> bulkActions = new ArrayList<>(); List<Map<String, Object>> bulkActions = new ArrayList<>();
List<Object> toolbar = buildToolbar(collectButtons(crud), table, bulkActions, result); List<Object> toolbar = buildToolbar(collectButtons(crud), table, entityId, bulkActions, result);
// 主子表识别:display 段含 <subtemplate>/<detail> 指向子表,或 crud 含 ismaster 标记 // 主子表识别:display 段含 <subtemplate>/<detail> 指向子表,或 crud 含 ismaster 标记
boolean masterSub = crud.element("subtemplate") != null boolean masterSub = crud.element("subtemplate") != null
@@ -401,7 +402,7 @@ public class TemplateToAmisConverter {
return buttons; return buttons;
} }
private List<Object> buildToolbar(List<Element> buttons, String table, private List<Object> buildToolbar(List<Element> buttons, String table, String entityId,
List<Map<String, Object>> bulkActions, ConversionResult result) { List<Map<String, Object>> bulkActions, ConversionResult result) {
List<Object> toolbar = new ArrayList<>(); List<Object> toolbar = new ArrayList<>();
toolbar.add("bulkActions"); toolbar.add("bulkActions");
@@ -417,7 +418,7 @@ public class TemplateToAmisConverter {
switch (btnType) { switch (btnType) {
case "insert" -> { case "insert" -> {
String pageId = b.attributeValue("pageid", ""); String pageId = b.attributeValue("pageid", "");
String editFormTemplateId = resolveEditFormTemplateId(pageId, result); String editFormTemplateId = resolveEditFormTemplateId(pageId, entityId, result);
btn.put("level", "primary"); btn.put("level", "primary");
btn.put("actionType", "dialog"); btn.put("actionType", "dialog");
Map<String, Object> dlg = buildFormDialog(btnName, editFormTemplateId, null, false, result); Map<String, Object> dlg = buildFormDialog(btnName, editFormTemplateId, null, false, result);
@@ -442,7 +443,7 @@ public class TemplateToAmisConverter {
} }
case "update" -> { case "update" -> {
String pageId = b.attributeValue("pageid", ""); String pageId = b.attributeValue("pageid", "");
String editFormTemplateId = resolveEditFormTemplateId(pageId, result); String editFormTemplateId = resolveEditFormTemplateId(pageId, entityId, result);
btn.put("actionType", "dialog"); btn.put("actionType", "dialog");
btn.put("disabledOn", "${!selectedItems || selectedItems.length === 0}"); btn.put("disabledOn", "${!selectedItems || selectedItems.length === 0}");
Map<String, Object> dlg = buildFormDialog(btnName, editFormTemplateId, Map<String, Object> dlg = buildFormDialog(btnName, editFormTemplateId,
@@ -453,7 +454,7 @@ public class TemplateToAmisConverter {
} }
case "read" -> { case "read" -> {
String pageId = b.attributeValue("pageid", ""); String pageId = b.attributeValue("pageid", "");
String editFormTemplateId = resolveEditFormTemplateId(pageId, result); String editFormTemplateId = resolveEditFormTemplateId(pageId, entityId, result);
btn.put("actionType", "dialog"); btn.put("actionType", "dialog");
btn.put("disabledOn", "${!selectedItems || selectedItems.length === 0}"); btn.put("disabledOn", "${!selectedItems || selectedItems.length === 0}");
Map<String, Object> dlg = buildFormDialog(btnName, editFormTemplateId, Map<String, Object> dlg = buildFormDialog(btnName, editFormTemplateId,
@@ -534,37 +535,71 @@ public class TemplateToAmisConverter {
} }
/** /**
* F2-17:通过 pageid 查对应的 EDITFORM 模板 id(view_template 表,pageid 含于 xml 属性中)。 * F2-17 / 通知页缺陷①:通过 pageid 精确查对应的 EDITFORM 模板 id(view_template 表)。
* *
* <p>查找口径:VIEW_TEMPLATE 表中 TYPE=7(EDITFORM)且 XML 含该 pageid 属性的模板, * <p>查找口径(三级优先级):
* 同实体有多个时取 view_template_id 字典序首个(稳定可重复)。 * <ol>
* <li><b>精确 pageid 命中</b>:TYPE=7 且 XML 含 {@code pageid="<pageId>"}。
* 多个时可写表单(无 setReadOnly)排前,只读归档排后;同档按 view_template_id 字典序。</li>
* <li><b>实体级回退</b>:pageid 无命中时,按 entityId 查同实体的可写 type=7 editform
* (XML 含该 entityid,无 setReadOnly 优先)。用于 read/查看 等按钮的 pageid 无壳模板的场景,
* 复用实体编辑表单 + 调用方传入的 readOnly=true 渲染只读。</li>
* <li><b>MISSING 诚实降级</b>:两级均无命中,返回占位(调用方渲染 disabled+tooltip)。</li>
* </ol>
* *
* <p>pageid 为空或查无结果时返回 "MISSING_pageid" 占位(调用方降级处理,不抛异常)。 * @param pageId 按钮 pageid 属性值(view_page.id),可为空
* * @param entityId crud 实体 id(用于实体级回退),可为 null/空
* @param pageId 按钮 pageid 属性值(view_page.id)
* @param result 转换结果(用于登记台账) * @param result 转换结果(用于登记台账)
* @return EDITFORM 模板 id,或 "MISSING_{pageId}" 占位 * @return EDITFORM 模板 id,或 "MISSING_{pageId}" 占位
*/ */
private String resolveEditFormTemplateId(String pageId, ConversionResult result) { private String resolveEditFormTemplateId(String pageId, String entityId, ConversionResult result) {
if (pageId == null || pageId.isBlank()) { // ── 第一级:精确 pageid 属性匹配 ────────────────────────────────────────
result.degrade("button pageid 为空 → 无法映射 EDITFORM 模板,诚实降级"); if (pageId != null && !pageId.isBlank()) {
return "MISSING_empty";
}
try { try {
String templateId = jdbcTemplate.queryForObject( String templateId = jdbcTemplate.queryForObject(
"SELECT view_template_id FROM view_template " "SELECT view_template_id FROM view_template "
+ "WHERE type=7 AND xml::text LIKE '%' || ? || '%' " + "WHERE type=7 AND xml::text LIKE '%pageid=\"' || ? || '\"%' "
+ "ORDER BY view_template_id LIMIT 1", + "ORDER BY (CASE WHEN xml::text LIKE '%setReadOnly%' THEN 1 ELSE 0 END), "
+ "view_template_id LIMIT 1",
String.class, pageId); String.class, pageId);
if (templateId != null && !templateId.isBlank()) { if (templateId != null && !templateId.isBlank()) {
result.note("button pageid=" + pageId + " → EDITFORM 模板 " + templateId); result.note("button pageid=" + pageId + " → EDITFORM 模板 " + templateId
+ "(精确匹配 pageid 属性,可写优先)");
return templateId.trim(); return templateId.trim();
} }
} catch (EmptyResultDataAccessException e) {
result.note("button pageid=" + pageId + " 精确匹配无命中 → 尝试实体级回退");
} catch (Exception e) { } catch (Exception e) {
result.note("button pageid=" + pageId + " EDITFORM 映射查询失败: " + safeMsg(e) + " → 降级"); result.note("button pageid=" + pageId + " EDITFORM 映射查询失败: " + safeMsg(e) + " → 尝试实体级回退");
} }
result.degrade("button pageid=" + pageId + " 无对应 EDITFORM(type=7) 模板 → 诚实降级"); } else {
return "MISSING_" + pageId; result.degrade("button pageid 为空 → 跳过精确匹配,尝试实体级回退");
}
// ── 第二级:实体级回退(同 entityId 的可写 type=7 editform)────────────────
if (entityId != null && !entityId.isBlank()) {
try {
String fallbackId = jdbcTemplate.queryForObject(
"SELECT view_template_id FROM view_template "
+ "WHERE type=7 AND xml::text LIKE '%' || ? || '%' "
+ "ORDER BY (CASE WHEN xml::text LIKE '%setReadOnly%' THEN 1 ELSE 0 END), "
+ "view_template_id LIMIT 1",
String.class, entityId);
if (fallbackId != null && !fallbackId.isBlank()) {
result.note("button pageid=" + pageId + " → 实体级回退 EDITFORM 模板 " + fallbackId
+ "(entityId=" + entityId + ",可写优先,read 按钮复用 + static=true)");
return fallbackId.trim();
}
} catch (EmptyResultDataAccessException e) {
result.note("button entityId=" + entityId + " 实体级回退无命中 → 诚实降级");
} catch (Exception e) {
result.note("button entityId=" + entityId + " 实体级回退查询失败: " + safeMsg(e) + " → 降级");
}
}
// ── 第三级:MISSING 诚实降级 ─────────────────────────────────────────────
result.degrade("button pageid=" + pageId + " 无对应 EDITFORM(type=7) 模板,实体级回退也无命中 → 诚实降级");
return "MISSING_" + (pageId != null ? pageId : "empty");
} }
/** /**
@@ -614,22 +649,20 @@ public class TemplateToAmisConverter {
result.degrade("form@pageid=" + pageId + " 无法解析 view_page(缺解析器/页面不存在)→ 空表单壳"); result.degrade("form@pageid=" + pageId + " 无法解析 view_page(缺解析器/页面不存在)→ 空表单壳");
} }
// method → form actions // 通知页缺陷①(issue 5):editform 产物经 crud dialog 的 service.schemaApi 嵌入加载,
List<Object> actions = new ArrayList<>(); // dialog 页脚已自带「确认/取消」一套。若 form 再生成自带 submit 按钮(来自 <method>),
// 就出现两套确认/取消。这里只登记 <method> 路由台账,不再生成内层 submit 按钮,
// 并显式置 form.actions=[]——dialog 页脚「确认」即按 form.api 提交并关闭(amis 地道用法)。
for (Element m : form.elements("method")) { for (Element m : form.elements("method")) {
String mname = m.attributeValue("name"); String mname = m.attributeValue("name");
if (mname == null) { if (mname == null) {
continue; continue;
} }
Map<String, Object> btn = new LinkedHashMap<>();
btn.put("type", "button");
btn.put("label", mname);
btn.put("actionType", "submit");
String svc = m.attributeValue("servicename", ""); String svc = m.attributeValue("servicename", "");
if (!svc.isBlank()) { if (!svc.isBlank()) {
result.note("form@method " + mname + "(servicename=" + svc + ") → submit → /api/flow/" + svc); result.note("form@method " + mname + "(servicename=" + svc
+ ") → 经 dialog 页脚确认按 form.api 提交(不生成内层 submit,避免双按钮)");
} }
actions.add(btn);
} }
noteFormScripts(form, result); noteFormScripts(form, result);
@@ -640,9 +673,8 @@ public class TemplateToAmisConverter {
formSchema.put("title", formTitle); formSchema.put("title", formTitle);
formSchema.put("api", "/api/entity/" + table + "/save"); formSchema.put("api", "/api/entity/" + table + "/save");
formSchema.put("body", formItems); formSchema.put("body", formItems);
if (!actions.isEmpty()) { // 缺陷①(issue 5):显式空 actions——内层无 submit 按钮,dialog 页脚确认是唯一提交入口
formSchema.put("actions", actions); formSchema.put("actions", new ArrayList<>());
}
return page(formTitle, formSchema); return page(formTitle, formSchema);
} }

View File

@@ -60,6 +60,13 @@ final class UiTypeMapper {
applyLength(item, f); applyLength(item, f);
} }
case "TextArea" -> item.put("type", "textarea"); case "TextArea" -> item.put("type", "textarea");
case "RichTextArea" -> {
// 通知页缺陷②:旧引擎富文本控件 RichTextArea(如 NOTICECONTENT 内容/正文)
// → amis input-rich-text(富文本编辑器),不再退化为单行 input-text。
// 客户库实测富文本 uitype 全集仅 RichTextArea(16 处),无 FCK/Kind/CK/Html 变体。
item.put("type", "input-rich-text");
result.note(origin + "@field " + name + " uitype=RichTextArea → input-rich-text(富文本编辑器)");
}
case "NumberField" -> { case "NumberField" -> {
item.put("type", "input-number"); item.put("type", "input-number");
String mdec = f.attributeValue("mdec"); String mdec = f.attributeValue("mdec");

View File

@@ -162,8 +162,11 @@ class TemplateToAmisConverterTest {
assertEquals(2, items.size()); assertEquals(2, items.size());
assertEquals(true, items.get(0).get("required")); assertEquals(true, items.get(0).get("required"));
assertEquals("select", items.get(1).get("type")); assertEquals("select", items.get(1).get("type"));
// 缺陷①(issue 5):editform 经 dialog 嵌入,内层 actions 必为空(dialog 页脚确认是唯一提交入口),
// <method> 不再生成内层 submit 按钮,避免双确认/取消。
List<Object> actions = (List<Object>) form.get("actions"); List<Object> actions = (List<Object>) form.get("actions");
assertEquals(1, actions.size()); assertNotNull(actions);
assertTrue(actions.isEmpty(), "editform 内层 actions 应为空,提交交给 dialog 页脚确认");
} }
@Test @Test
@@ -815,10 +818,23 @@ class TemplateToAmisConverterTest {
@Test @Test
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
void f2_17_button_insert_无editform映射_诚实降级() { void f2_17_button_insert_无editform映射_诚实降级() {
// pageid 为空 → EDITFORM 找不到 → dialog body=tpl 提示,按钮降级 // pageid 空 + 同实体也无 type=7 form → 两级均无命中 → dialog body=tpl 提示,按钮降级。
// setUp mock 返回 PM_DEMO 会被实体级回退误用,故此测用独立 mock:两级均抛 EmptyResult。
JdbcTemplate jdbc = mock(JdbcTemplate.class);
// resolveTableName(SYS_ENTITY 查询,SQL 含 "SYS_ENTITY")
lenient().when(jdbc.queryForObject(
org.mockito.ArgumentMatchers.contains("SYS_ENTITY"),
eq(String.class), any(Object.class)))
.thenReturn("PM_DEMO");
// type=7 form 查询(精确 pageid 或实体级回退)→ 均无命中
lenient().when(jdbc.queryForObject(
org.mockito.ArgumentMatchers.contains("type=7"),
eq(String.class), any(Object.class)))
.thenThrow(new org.springframework.dao.EmptyResultDataAccessException(1));
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
String xml = "<crud entityid='e1'><display/>" String xml = "<crud entityid='e1'><display/>"
+ "<button type='insert' name='添加' isshow='true'/></crud>"; + "<button type='insert' name='添加' isshow='true'/></crud>";
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage); ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema()); Map<String, Object> crud = body(r.getSchema());
List<Object> toolbar = (List<Object>) crud.get("headerToolbar"); List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
Map<String, Object> btn = (Map<String, Object>) toolbar.get(1); Map<String, Object> btn = (Map<String, Object>) toolbar.get(1);
@@ -849,4 +865,128 @@ class TemplateToAmisConverterTest {
assertNotNull(data); assertNotNull(data);
assertEquals("${ids}", data.get("ids")); assertEquals("${ids}", data.get("ids"));
} }
// ── 通知页缺陷 ①②(editform 精确匹配 / 富文本映射 / 弹窗单按钮)─────────────
@Test
@SuppressWarnings("unchecked")
void 缺陷2_富文本RichTextArea映射为inputRichText() {
// 缺陷②(issue 6):NOTICECONTENT 的 uitype=RichTextArea,应映射为 input-rich-text,
// 不再退化成单行 input-text。
String pageXml = "<page entityid='e9'><fields>"
+ "<field name='NOTICECONTENT' label='内容' uitype='RichTextArea' required='true'/>"
+ "</fields></page>";
Function<String, String> resolver = id -> pageXml;
String xml = "<form entityid='e1' pageid='p1'/>";
ConversionResult r = converter.convertGraded(xml, "通知编辑表单", new ArrayList<>(), resolver);
Map<String, Object> form = body(r.getSchema());
List<Map<String, Object>> items = (List<Map<String, Object>>) form.get("body");
assertEquals("input-rich-text", items.get(0).get("type"));
assertEquals(true, items.get(0).get("required"));
assertTrue(r.getMappingNotes().stream()
.anyMatch(n -> n.contains("RichTextArea") && n.contains("input-rich-text")));
}
@Test
@SuppressWarnings("unchecked")
void 缺陷1_editform含method也不生成内层submit按钮() {
// 缺陷①(issue 5):即便 <form> 带 <method>(保存/保存并提交审批),editform 也不生成内层
// submit 按钮——actions 显式为空,提交交由 crud dialog 页脚「确认」,避免双确认/取消。
String pageXml = "<page entityid='e9'><fields>"
+ "<field name='TITLE' label='主题' uitype='TextField' required='true'/>"
+ "</fields></page>";
Function<String, String> resolver = id -> pageXml;
String xml = "<form entityid='e1' pageid='p1'>"
+ "<method id='m1' name='保存' servicename='X_ADD'/>"
+ "<method id='m2' name='保存并提交审批' servicename='X_ADD_SUBMIT'/></form>";
ConversionResult r = converter.convertGraded(xml, "编辑表单", new ArrayList<>(), resolver);
Map<String, Object> form = body(r.getSchema());
List<Object> actions = (List<Object>) form.get("actions");
assertNotNull(actions);
assertTrue(actions.isEmpty(), "带 method 的 editform 内层 actions 也应为空(单按钮)");
// <method> 仍登记进路由台账(保留语义,便于排查)
assertTrue(r.getMappingNotes().stream()
.anyMatch(n -> n.contains("X_ADD") && n.contains("不生成内层 submit")));
}
@Test
void 缺陷1_resolveEditForm精确匹配pageid属性且可写优先() {
// 缺陷①(issue 3):通过 crud insert 按钮触发 resolveEditFormTemplateId,
// 断言其 SQL 用精确属性串 pageid="<id>" 匹配(非裸子串),且 setReadOnly 表单排后(可写优先)。
JdbcTemplate jdbc = mock(JdbcTemplate.class);
// 实体表名解析(带 Object[] 变参)返回固定表名
lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class)))
.thenReturn("OA_NOTICEMANAGE");
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
String pageId = "7a1bbdaf-2db8-41ec-bc24-40235aa0ac7f";
String xml = "<crud entityid='e1'><display/>"
+ "<button type='insert' name='添加' isshow='true' pageid='" + pageId + "'>"
+ "<method name='保存' servicename='OA_NOTICEMANAGE_ADD'/></button></crud>";
c.convertGraded(xml, new ArrayList<>(), noPage);
org.mockito.ArgumentCaptor<String> sqlCap = org.mockito.ArgumentCaptor.forClass(String.class);
// 至少一次 queryForObject(String, Class<String>, Object...) 调用——捕获其 SQL
org.mockito.Mockito.verify(jdbc, org.mockito.Mockito.atLeastOnce())
.queryForObject(sqlCap.capture(), eq(String.class), any(Object.class));
// 找到 resolveEditFormTemplateId 的那条 SQL(含 type=7 与精确 pageid 属性串)
boolean found = sqlCap.getAllValues().stream().anyMatch(sql ->
sql.contains("type=7")
&& sql.contains("pageid=\"' || ? || '\"") // 精确属性串,非裸子串
&& sql.contains("setReadOnly") // 只读归档排后(可写优先)
&& sql.toUpperCase().contains("ORDER BY"));
assertTrue(found, "resolveEditFormTemplateId 应精确匹配 pageid 属性且 setReadOnly 排后");
}
@Test
@SuppressWarnings("unchecked")
void 缺陷1_read按钮pageid无壳模板时回退同实体editform并static() {
// read 按钮 pageid 无对应 type=7 form(精确匹配 EmptyResult)→ 实体级回退:
// 复用同实体可写 editform,dialog.body.static=true(只读查看态);
// insert/update 按钮 pageid 正常命中,不走回退。
JdbcTemplate jdbc = mock(JdbcTemplate.class);
// SYS_ENTITY 解析(resolveTableName):始终返回表名
// dispatch by (sql, bindArg): resolveTableName → "PM_DEMO";
//精确 pageid=edit-page → "EDIT_FORM_TID"; pageid=read-page → EmptyResult;
// 实体级回退 entityId=entity-1 → "FALLBACK_FORM_TID"
doAnswer(inv -> {
String sql = inv.getArgument(0);
Object arg = inv.getArgument(2); // first vararg bind value
if (sql.contains("pageid=\"' || ? || '\"")) {
if ("edit-page".equals(arg)) return "EDIT_FORM_TID";
if ("read-page".equals(arg)) throw new org.springframework.dao.EmptyResultDataAccessException(1);
}
if ("entity-1".equals(arg)) return "FALLBACK_FORM_TID";
return "PM_DEMO"; // resolveTableName fallback
}).when(jdbc).queryForObject(any(String.class), eq(String.class), any(Object.class));
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
String xml = "<crud entityid='entity-1'><display/>"
+ "<button type='insert' name='添加' isshow='true' pageid='edit-page'/>"
+ "<button type='read' name='查看' isshow='true' pageid='read-page' isneedselected='true'/>"
+ "</crud>";
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
Map<String, Object> crud = body(r.getSchema());
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
// toolbar = [bulkActions, 添加-btn, 查看-btn, pagination]
Map<String, Object> insertBtn = (Map<String, Object>) toolbar.get(1);
Map<String, Object> readBtn = (Map<String, Object>) toolbar.get(2);
// insert 精确命中 EDIT_FORM_TID
Map<String, Object> insertDlg = (Map<String, Object>) insertBtn.get("dialog");
Map<String, Object> insertBody = (Map<String, Object>) insertDlg.get("body");
assertEquals("get:/api/page/schema/EDIT_FORM_TID?format=amis", insertBody.get("schemaApi"));
assertNull(insertBody.get("static"), "insert dialog body 不应有 static");
// read 实体级回退 FALLBACK_FORM_TID,且 dialog.body.static=true(只读查看态)
Map<String, Object> readDlg = (Map<String, Object>) readBtn.get("dialog");
Map<String, Object> readBody = (Map<String, Object>) readDlg.get("body");
assertEquals("get:/api/page/schema/FALLBACK_FORM_TID?format=amis", readBody.get("schemaApi"),
"read 按钮 pageid 无 form 壳时应回退到同实体 editform");
assertEquals(true, readBody.get("static"), "read 按钮 dialog 应 static=true(只读查看态)");
// 台账中有实体级回退的记录
assertTrue(r.getMappingNotes().stream()
.anyMatch(n -> n.contains("实体级回退") && n.contains("FALLBACK_FORM_TID")));
}
} }