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:
@@ -10,6 +10,7 @@ import java.util.function.Function;
|
||||
import org.dom4j.Document;
|
||||
import org.dom4j.DocumentHelper;
|
||||
import org.dom4j.Element;
|
||||
import org.springframework.dao.EmptyResultDataAccessException;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@@ -127,7 +128,7 @@ public class TemplateToAmisConverter {
|
||||
|
||||
Map<String, Object> filter = buildSearchFilter(crud.element("search"), result);
|
||||
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 标记
|
||||
boolean masterSub = crud.element("subtemplate") != null
|
||||
@@ -401,7 +402,7 @@ public class TemplateToAmisConverter {
|
||||
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<Object> toolbar = new ArrayList<>();
|
||||
toolbar.add("bulkActions");
|
||||
@@ -417,7 +418,7 @@ public class TemplateToAmisConverter {
|
||||
switch (btnType) {
|
||||
case "insert" -> {
|
||||
String pageId = b.attributeValue("pageid", "");
|
||||
String editFormTemplateId = resolveEditFormTemplateId(pageId, result);
|
||||
String editFormTemplateId = resolveEditFormTemplateId(pageId, entityId, result);
|
||||
btn.put("level", "primary");
|
||||
btn.put("actionType", "dialog");
|
||||
Map<String, Object> dlg = buildFormDialog(btnName, editFormTemplateId, null, false, result);
|
||||
@@ -442,7 +443,7 @@ public class TemplateToAmisConverter {
|
||||
}
|
||||
case "update" -> {
|
||||
String pageId = b.attributeValue("pageid", "");
|
||||
String editFormTemplateId = resolveEditFormTemplateId(pageId, result);
|
||||
String editFormTemplateId = resolveEditFormTemplateId(pageId, entityId, result);
|
||||
btn.put("actionType", "dialog");
|
||||
btn.put("disabledOn", "${!selectedItems || selectedItems.length === 0}");
|
||||
Map<String, Object> dlg = buildFormDialog(btnName, editFormTemplateId,
|
||||
@@ -453,7 +454,7 @@ public class TemplateToAmisConverter {
|
||||
}
|
||||
case "read" -> {
|
||||
String pageId = b.attributeValue("pageid", "");
|
||||
String editFormTemplateId = resolveEditFormTemplateId(pageId, result);
|
||||
String editFormTemplateId = resolveEditFormTemplateId(pageId, entityId, result);
|
||||
btn.put("actionType", "dialog");
|
||||
btn.put("disabledOn", "${!selectedItems || selectedItems.length === 0}");
|
||||
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 属性的模板,
|
||||
* 同实体有多个时取 view_template_id 字典序首个(稳定可重复)。
|
||||
* <p>查找口径(三级优先级):
|
||||
* <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 pageId 按钮 pageid 属性值(view_page.id),可为空
|
||||
* @param entityId crud 实体 id(用于实体级回退),可为 null/空
|
||||
* @param result 转换结果(用于登记台账)
|
||||
* @return EDITFORM 模板 id,或 "MISSING_{pageId}" 占位
|
||||
*/
|
||||
private String resolveEditFormTemplateId(String pageId, ConversionResult result) {
|
||||
if (pageId == null || pageId.isBlank()) {
|
||||
result.degrade("button pageid 为空 → 无法映射 EDITFORM 模板,诚实降级");
|
||||
return "MISSING_empty";
|
||||
}
|
||||
try {
|
||||
String templateId = jdbcTemplate.queryForObject(
|
||||
"SELECT view_template_id FROM view_template "
|
||||
+ "WHERE type=7 AND xml::text LIKE '%' || ? || '%' "
|
||||
+ "ORDER BY view_template_id LIMIT 1",
|
||||
String.class, pageId);
|
||||
if (templateId != null && !templateId.isBlank()) {
|
||||
result.note("button pageid=" + pageId + " → EDITFORM 模板 " + templateId);
|
||||
return templateId.trim();
|
||||
private String resolveEditFormTemplateId(String pageId, String entityId, ConversionResult result) {
|
||||
// ── 第一级:精确 pageid 属性匹配 ────────────────────────────────────────
|
||||
if (pageId != null && !pageId.isBlank()) {
|
||||
try {
|
||||
String templateId = jdbcTemplate.queryForObject(
|
||||
"SELECT view_template_id FROM view_template "
|
||||
+ "WHERE type=7 AND xml::text LIKE '%pageid=\"' || ? || '\"%' "
|
||||
+ "ORDER BY (CASE WHEN xml::text LIKE '%setReadOnly%' THEN 1 ELSE 0 END), "
|
||||
+ "view_template_id LIMIT 1",
|
||||
String.class, pageId);
|
||||
if (templateId != null && !templateId.isBlank()) {
|
||||
result.note("button pageid=" + pageId + " → EDITFORM 模板 " + templateId
|
||||
+ "(精确匹配 pageid 属性,可写优先)");
|
||||
return templateId.trim();
|
||||
}
|
||||
} catch (EmptyResultDataAccessException e) {
|
||||
result.note("button pageid=" + pageId + " 精确匹配无命中 → 尝试实体级回退");
|
||||
} catch (Exception e) {
|
||||
result.note("button pageid=" + pageId + " EDITFORM 映射查询失败: " + safeMsg(e) + " → 尝试实体级回退");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
result.note("button pageid=" + pageId + " EDITFORM 映射查询失败: " + safeMsg(e) + " → 降级");
|
||||
} else {
|
||||
result.degrade("button pageid 为空 → 跳过精确匹配,尝试实体级回退");
|
||||
}
|
||||
result.degrade("button pageid=" + pageId + " 无对应 EDITFORM(type=7) 模板 → 诚实降级");
|
||||
return "MISSING_" + 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(缺解析器/页面不存在)→ 空表单壳");
|
||||
}
|
||||
|
||||
// method → form actions
|
||||
List<Object> actions = new ArrayList<>();
|
||||
// 通知页缺陷①(issue 5):editform 产物经 crud dialog 的 service.schemaApi 嵌入加载,
|
||||
// dialog 页脚已自带「确认/取消」一套。若 form 再生成自带 submit 按钮(来自 <method>),
|
||||
// 就出现两套确认/取消。这里只登记 <method> 路由台账,不再生成内层 submit 按钮,
|
||||
// 并显式置 form.actions=[]——dialog 页脚「确认」即按 form.api 提交并关闭(amis 地道用法)。
|
||||
for (Element m : form.elements("method")) {
|
||||
String mname = m.attributeValue("name");
|
||||
if (mname == null) {
|
||||
continue;
|
||||
}
|
||||
Map<String, Object> btn = new LinkedHashMap<>();
|
||||
btn.put("type", "button");
|
||||
btn.put("label", mname);
|
||||
btn.put("actionType", "submit");
|
||||
String svc = m.attributeValue("servicename", "");
|
||||
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);
|
||||
|
||||
@@ -640,9 +673,8 @@ public class TemplateToAmisConverter {
|
||||
formSchema.put("title", formTitle);
|
||||
formSchema.put("api", "/api/entity/" + table + "/save");
|
||||
formSchema.put("body", formItems);
|
||||
if (!actions.isEmpty()) {
|
||||
formSchema.put("actions", actions);
|
||||
}
|
||||
// 缺陷①(issue 5):显式空 actions——内层无 submit 按钮,dialog 页脚确认是唯一提交入口
|
||||
formSchema.put("actions", new ArrayList<>());
|
||||
return page(formTitle, formSchema);
|
||||
}
|
||||
|
||||
|
||||
@@ -60,6 +60,13 @@ final class UiTypeMapper {
|
||||
applyLength(item, f);
|
||||
}
|
||||
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" -> {
|
||||
item.put("type", "input-number");
|
||||
String mdec = f.attributeValue("mdec");
|
||||
|
||||
Reference in New Issue
Block a user