遗留② 编辑表单迁移:view_page→sys_page_schema(查看/添加/修改 表单本体可渲染)
编辑表单本体是 view_page(全库≈1241,自带 <fields>+<layout>),原 BatchConvertCli 只遍历
view_template→view_page 从未迁入 sys_page_schema→按钮弹窗「该单据未配编辑表单」。打通:
- 转换器 dispatcher 加 case "page"→convertViewPage:root=<page>,entityId 取 <page entityid>
(实测1233/1241自带,缺则降级),复用 loadColumnMeta + buildFormBody(含A2多tab);actions 空
(提交由调用方 dialog 的 _ADD/_SUBMIT 按钮提供,来自 view_template 按钮 <method servicename>)
- BatchConvertCli 第二循环遍历 view_page → 产物 {view_page_id}.json(key=raw view_page_id,
与 view_template_id 实测零冲突;用户拍板);onEvent 不挂(page 级脚本属另一管线)
- resolveEditFormTemplateId 加第三级:无 type=7 包壳但 view_page 存在→返 pageId
(dialog 加载 /api/page/schema/{pageId});顺带消除旧 type=7 LIKE 序首猜测误选只读归档(F2-17 老bug)
- 现有两 resolver 测试(未配降级/精确匹配SQL)mock 未 stub view_page 查询→旧行为完全保留,零回归
新增 convertViewPage + resolver直接命中 两单测;platform-converter 72 测试全绿 + SchemaGate 闸一。
width/colspan 像素版面仍后置(A2 同口径)。
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -210,6 +210,48 @@ public final class BatchConvertCli {
|
||||
}
|
||||
}
|
||||
|
||||
// ── A3(遗留②):第二循环遍历 view_page(独立编辑表单本体,全库≈1241,不在 view_template 内)。
|
||||
// root=<page> 经 convertGraded 路由到 convertViewPage,产物按 view_page_id 命名落盘
|
||||
// (与 view_template_id 实测零冲突);SchemaImportCli 全量入库后,按钮 pageid 即可命中编辑表单。
|
||||
// onEvent 不挂(page 级 <scripts> 属另一脚本管线,本轮不接)。
|
||||
String pageSql = "SELECT view_page_id, name, xml::text AS xmltext "
|
||||
+ "FROM view_page WHERE xml IS NOT NULL ORDER BY view_page_id";
|
||||
int viewPageCount = 0;
|
||||
try (PreparedStatement ps = conn.prepareStatement(pageSql);
|
||||
ResultSet rs = ps.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
String id = rs.getString("view_page_id").trim();
|
||||
String name = rs.getString("name");
|
||||
String xml = rs.getString("xmltext");
|
||||
if (xml == null || xml.isBlank()) {
|
||||
continue;
|
||||
}
|
||||
List<String> notes = new ArrayList<>();
|
||||
ConversionResult result = converter.convertGraded(xml, name, notes, pageResolver);
|
||||
boolean gate1 = false;
|
||||
if (result.getSchema() != null) {
|
||||
List<String> errors = gate.validate(result.getSchema());
|
||||
gate1 = errors.isEmpty();
|
||||
if (!gate1) {
|
||||
result.getDegrades().add("闸一 schema 校验未过: "
|
||||
+ String.join(" | ", errors.subList(0, Math.min(3, errors.size()))));
|
||||
}
|
||||
Files.writeString(schemaDir.resolve(id + ".json"),
|
||||
json.writeValueAsString(result.getSchema()), StandardCharsets.UTF_8);
|
||||
}
|
||||
ConversionGrade effective = effectiveGrade(result.getGrade(), gate1);
|
||||
summary.record(result.getRootElement(), effective, gate1, false);
|
||||
csvRows.add(new String[]{
|
||||
id, name, "viewpage", result.getRootElement(),
|
||||
effective.name(), String.valueOf(gate1),
|
||||
String.valueOf(result.getMappingNotes().size()),
|
||||
"false",
|
||||
classifyReasons(result)});
|
||||
viewPageCount++;
|
||||
}
|
||||
}
|
||||
System.out.println("[A3] view_page 编辑表单迁移:" + viewPageCount + " 个产物已生成");
|
||||
|
||||
writeCsv(outDir.resolve("分级清单.csv"), csvRows);
|
||||
return summary;
|
||||
}
|
||||
|
||||
@@ -105,7 +105,8 @@ public class TemplateToAmisConverter {
|
||||
case "tree" -> result.setSchema(convertTree(rootEl, result, effectiveName));
|
||||
case "report" -> result.setSchema(convertReport(rootEl, result, effectiveName));
|
||||
case "group" -> result.setSchema(convertGroup(rootEl, result, effectiveName));
|
||||
default -> result.fail("不支持的根元素 <" + root + ">(非 crud/form/tree/report/group)");
|
||||
case "page" -> result.setSchema(convertViewPage(rootEl, result, effectiveName));
|
||||
default -> result.fail("不支持的根元素 <" + root + ">(非 crud/form/tree/report/group/page)");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
result.fail("转换异常: " + e.getClass().getSimpleName() + " " + safeMsg(e));
|
||||
@@ -690,11 +691,34 @@ public class TemplateToAmisConverter {
|
||||
}
|
||||
}
|
||||
|
||||
// ── 第三级:MISSING 诚实降级 ─────────────────────────────────────────────
|
||||
result.degrade("button pageid=" + pageId + " 无对应 EDITFORM(type=7) 模板,实体级回退也无命中 → 诚实降级");
|
||||
// ── 第三级:A3 直接命中已迁移 view_page ───────────────────────────────────
|
||||
// 无 type=7 包壳时,按钮 pageid 直指 view_page(全库≈1241,BatchConvertCli 第二循环已迁入
|
||||
// sys_page_schema,key=view_page_id,与 view_template_id 实测零冲突)。命中即返 pageId →
|
||||
// dialog 加载 /api/page/schema/{pageId} 取该编辑表单本体(告别旧 type=7 LIKE 序首猜测/只读归档误选)。
|
||||
if (pageId != null && !pageId.isBlank() && viewPageExists(pageId)) {
|
||||
result.note("button pageid=" + pageId
|
||||
+ " → 直接指向已迁移 view_page(标准层 key=view_page_id),无 type=7 包壳");
|
||||
return pageId.trim();
|
||||
}
|
||||
|
||||
// ── 第四级:MISSING 诚实降级 ─────────────────────────────────────────────
|
||||
result.degrade("button pageid=" + pageId
|
||||
+ " 无 type=7 包壳、无同实体 editform、view_page 也不存在 → 诚实降级");
|
||||
return "MISSING_" + (pageId != null ? pageId : "empty");
|
||||
}
|
||||
|
||||
/** A3:判断 pageId 是否为库内存在(且有 xml)的 view_page;用于按钮直接命中已迁移编辑表单(fail-closed)。 */
|
||||
private boolean viewPageExists(String pageId) {
|
||||
try {
|
||||
Integer cnt = jdbcTemplate.queryForObject(
|
||||
"SELECT count(*) FROM view_page WHERE view_page_id = ? AND xml IS NOT NULL",
|
||||
Integer.class, pageId);
|
||||
return cnt != null && cnt > 0;
|
||||
} catch (Exception e) {
|
||||
return false; // 查询失败 → 视为不存在,回落 MISSING
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* F2-17:crud api 改为裸路径,不带 query 参数模板。
|
||||
*
|
||||
@@ -798,6 +822,49 @@ public class TemplateToAmisConverter {
|
||||
return page(formTitle, formSchema);
|
||||
}
|
||||
|
||||
/**
|
||||
* A3(遗留②):独立 view_page(root={@code <page>})→ amis 表单页,迁移进 sys_page_schema。
|
||||
*
|
||||
* <p>编辑表单本体是 view_page(全库≈1241,自带 {@code <fields>}+{@code <layout>}),不在
|
||||
* view_template 内;按钮 {@code pageid} 直指它。BatchConvertCli 第二循环遍历 view_page 走此方法,
|
||||
* 产物按 {@code view_page_id} 命名落盘(与 view_template_id 实测零冲突),
|
||||
* {@link #resolveEditFormTemplateId} 命中后返 pageId 即取此产物。
|
||||
*
|
||||
* <p>entityId 取 {@code <page entityid>}(实测 1233/1241 自带;缺则 colMeta 空、字段仍渲染但无
|
||||
* 实体字典源)。表单本体无自带提交按钮——提交由调用方 dialog 的 _ADD/_SUBMIT 动作(来自
|
||||
* view_template 按钮的 {@code <method servicename>})提供,故 actions 为空。字段排版复用
|
||||
* {@link #buildFormBody}(含 A2 多 tab)。
|
||||
*/
|
||||
private Map<String, Object> convertViewPage(Element pageRoot, ConversionResult result, String templateName) {
|
||||
String entityId = pageRoot.attributeValue("entityid", "");
|
||||
Map<String, String[]> colMeta = (entityId != null && !entityId.isBlank())
|
||||
? loadColumnMeta(entityId, result) : Map.of();
|
||||
List<Map<String, Object>> formItems = new ArrayList<>();
|
||||
Element fields = pageRoot.element("fields");
|
||||
if (fields != null) {
|
||||
for (Element f : fields.elements("field")) {
|
||||
formItems.add(UiTypeMapper.mapField(f, result, "editform", colMeta));
|
||||
}
|
||||
}
|
||||
if (entityId == null || entityId.isBlank()) {
|
||||
result.degrade("view_page 缺 <page entityid> → 字段渲染但无实体列元数据(字典/枚举源可能缺失)");
|
||||
}
|
||||
result.note("view_page(独立编辑表单迁移)→ 解析取得 " + formItems.size() + " 字段");
|
||||
|
||||
String formTitle = templateName != null ? templateName : "";
|
||||
Map<String, Object> formSchema = new LinkedHashMap<>();
|
||||
formSchema.put("type", "form");
|
||||
formSchema.put("title", "");
|
||||
formSchema.put("mode", "horizontal");
|
||||
Map<String, Object> labelAlign = new LinkedHashMap<>();
|
||||
labelAlign.put("leftFixed", 120);
|
||||
formSchema.put("horizontal", labelAlign);
|
||||
formSchema.put("body", buildFormBody(pageRoot, formItems, result));
|
||||
// 提交动作由调用方 dialog 的 _ADD/_SUBMIT 按钮(view_template 按钮 <method servicename>)提供,表单本体不带
|
||||
formSchema.put("actions", new ArrayList<>());
|
||||
return page(formTitle, formSchema);
|
||||
}
|
||||
|
||||
/**
|
||||
* 显式行布局:窄字段两两包进 {@code {type:group}} 行,宽控件独占整行平铺。
|
||||
*
|
||||
|
||||
@@ -1171,6 +1171,57 @@ class TemplateToAmisConverterTest {
|
||||
assertTrue(r.getDegrades().stream().anyMatch(d -> d.contains("降级")));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void a3_viewPage独立编辑表单root转form() {
|
||||
// A3:root=<page> 的独立编辑表单(view_page)→ amis form;字段映射(含 A0 控件)+ actions 空(提交由 dialog 提供)
|
||||
String pageXml = "<page entityid='e1'><fields>"
|
||||
+ "<field name='NAME' label='名称' uitype='TextField' required='true'/>"
|
||||
+ "<field name='PWD' label='密码' uitype='PasswordField'/>"
|
||||
+ "</fields></page>";
|
||||
ConversionResult r = converter.convertGraded(pageXml, "设备编辑表单", new ArrayList<>(), noPage);
|
||||
assertEquals("page", r.getRootElement());
|
||||
Map<String, Object> form = body(r.getSchema());
|
||||
assertEquals("form", form.get("type"));
|
||||
List<Object> actions = (List<Object>) form.get("actions");
|
||||
assertTrue(actions.isEmpty(), "view_page 表单本体不带提交按钮(由调用方 dialog 提供)");
|
||||
List<Map<String, Object>> items = flattenFormBody(form);
|
||||
assertEquals(2, items.size());
|
||||
assertEquals("input-text", items.get(0).get("type"));
|
||||
assertEquals("input-password", items.get(1).get("type")); // A0 控件在编辑表单迁移路径同生效
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void a3_resolveEditForm无type7包壳但viewPage存在_直接命中pageId() {
|
||||
// A3:按钮 pageid 无 type=7 包壳,但 view_page 已迁移存在 → resolver 返 pageId,
|
||||
// dialog 加载 /api/page/schema/{pageId} 取该编辑表单本体(不再"未配编辑表单")。
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class)))
|
||||
.thenReturn("OA_NOTICEMANAGE");
|
||||
// type=7 精确匹配 / 实体回退均无命中
|
||||
lenient().when(jdbc.queryForObject(
|
||||
org.mockito.ArgumentMatchers.contains("type=7"), eq(String.class), any(Object.class)))
|
||||
.thenThrow(new org.springframework.dao.EmptyResultDataAccessException(1));
|
||||
// view_page 存在性查询 → 命中(1)
|
||||
lenient().when(jdbc.queryForObject(
|
||||
org.mockito.ArgumentMatchers.contains("FROM view_page"), eq(Integer.class), any(Object.class)))
|
||||
.thenReturn(1);
|
||||
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
|
||||
String pageId = "3d94fad0-310b-425a-ae89-8606013575be";
|
||||
String xml = "<crud entityid='e1'><display/>"
|
||||
+ "<button type='insert' name='添加' isshow='true' pageid='" + pageId + "'>"
|
||||
+ "<method name='保存' servicename='OA_NOTICEMANAGE_ADD'/></button></crud>";
|
||||
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
||||
Map<String, Object> crud = body(r.getSchema());
|
||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||
Map<String, Object> btn = (Map<String, Object>) toolbar.get(1);
|
||||
Map<String, Object> dlg = (Map<String, Object>) btn.get("dialog");
|
||||
Map<String, Object> dlgBody = (Map<String, Object>) dlg.get("body");
|
||||
assertFalse("tpl".equals(dlgBody.get("type")), "view_page 命中后不应再是 tpl「未配编辑表单」");
|
||||
assertTrue(dlgBody.toString().contains(pageId), "dialog 应经 service 加载 /api/page/schema/{pageId}");
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void f2_17_button_delete_POST端点含ids数据() {
|
||||
|
||||
Reference in New Issue
Block a user