diff --git a/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java b/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java index d1d609d..a46b3d8 100644 --- a/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java +++ b/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java @@ -920,9 +920,11 @@ public class TemplateToAmisConverter { treeSchema.put("name", "tree"); treeSchema.put("showOutline", true); treeSchema.put("initiallyOpen", true); - // heightAuto:amis input-tree 默认在约 200~270px 的定高框内滚动,节点多时只露一半(且页面下方大片留白)。 - // 设 heightAuto 让树随内容自然撑高,对齐老系统满高树;超大树由页面滚动承载。 - treeSchema.put("heightAuto", true); + // 树高度跟随视口:amis 内层 .cxd-Tree--outline 默认 max-height:300px(多级分类树「只露一半」根因)。 + // 内联 style 只落到外层 form-item、压不到内层滚动容器,故改挂 className,由 eip4-web amis-theme.css + // 把该 className 内的 .cxd-Tree max-height 抬到视口相对(calc(100vh-230px))+ 内部滚动。既非定高框 + // 只露一半,也非 heightAuto 随内容无限撑高把页面拉爆(大树数千 px)。 + treeSchema.put("className", "eip4-treegrid-tree"); if (treeTemplate != null && !treeRef.isBlank()) { treeSchema.put("source", "/api/template/" + treeRef + "/tree"); // 选中树节点 → 重载右表(${tree} 进右表 api 过滤);TemplateTreeController 运行时构树 @@ -931,6 +933,8 @@ public class TemplateToAmisConverter { new LinkedHashMap<>(Map.of("actionType", "reload", "componentId", gridCrudId))))))); result.note("tree+grid: treetemplate ref=" + treeRef + " → input-tree source /api/template/" + treeRef + "/tree(运行时构树)+ 选中重载右表"); + // 左树分类节点增删改:treetemplate ref 的 → amis 原生 creatable/editable/removable + applyTreeNodeCrud(treeSchema, treeTemplate, treeRef, result); } Map gridSchema = new LinkedHashMap<>(); gridSchema.put("type", "crud"); @@ -942,23 +946,43 @@ public class TemplateToAmisConverter { String rcol = gridTemplate.attributeValue("rcolumnname", ""); String gridEntityId = gridTemplate.attributeValue("entityid", ""); String gridTable = resolveTableName(gridEntityId, result); - if (gridTable != null && !gridTable.isBlank() && !rcol.isBlank()) { + String gridTableUpper = gridTable != null ? gridTable.toUpperCase() : null; + if (gridTableUpper != null && !gridTableUpper.isBlank() && !rcol.isBlank()) { // 右表走子树聚合端点 /api/template/treegrid:点中节点+全部后代 id 以 IN 过滤合成搜索流。 // 这样点父级也出整棵子树的业务行(业务行常只挂叶子节点,对齐老系统)。treeRef 与左树同源。 // 端点内部委托合成 _SEARCH,_DISPLAY__/数据权限/分页全在。空 node(未选中)→ 全部行。 gridSchema.put("api", "/api/template/treegrid?treeRef=" + treeRef - + "&gridTable=" + gridTable.toUpperCase() + "&rcol=" + rcol + + "&gridTable=" + gridTableUpper + "&rcol=" + rcol + "&node=${tree}&page=${page}&perPage=${perPage}"); - result.note("tree+grid: gridtemplate 实体=" + gridTable + " rcolumn=" + rcol + result.note("tree+grid: gridtemplate 实体=" + gridTableUpper + " rcolumn=" + rcol + " → 右表 /api/template/treegrid(子树聚合 IN 过滤,treeRef=" + treeRef + ")"); } else { result.degrade("tree+grid: gridtemplate 实体/rcolumn 解析失败(entityid=" + gridEntityId + ",rcol=" + rcol + ") → 右表数据源缺"); } - // 右表列取自 gridtemplate 引用模板的 (跨模板读 1 次,仅为列定义) - List> refCols = loadRefDisplayColumns(ref, gridEntityId, result); - if (refCols != null && !refCols.isEmpty()) { - gridCols = refCols; + // 右表列 + 操作按钮均取自 gridtemplate 引用模板(跨模板读 1 次根元素) + Element gridRoot = loadRefRoot(ref, result); + if (gridRoot != null) { + Element display = gridRoot.element("display"); + if (display != null) { + List> refCols = buildColumns(display, gridEntityId, result); + if (refCols != null && !refCols.isEmpty()) { + gridCols = refCols; + } + } + // 右表工具栏:复用普通列表的 collectButtons/buildToolbar(添加/修改/删除/查看 + EDITFORM + // 映射 + 删除走 bulkActions ${ids}),与 convertCrud 同源,treegrid 右表此前完全无按钮。 + if (gridTableUpper != null && !gridTableUpper.isBlank()) { + List> bulkActions = new ArrayList<>(); + List toolbar = buildToolbar(collectButtons(gridRoot), gridTableUpper, + gridEntityId, bulkActions, result); + gridSchema.put("selectable", true); + gridSchema.put("headerToolbar", toolbar); + if (!bulkActions.isEmpty()) { + gridSchema.put("bulkActions", bulkActions); + } + gridSchema.put("primaryField", gridTableUpper + "_ID"); + } } } gridSchema.put("columns", gridCols); @@ -976,10 +1000,70 @@ public class TemplateToAmisConverter { } /** - * 取 gridtemplate 引用模板(另一 view_template)的 {@code } 列定义(TreeGrid 右表列)。 - * 跨模板只读 1 次 XML、仅为列定义(列数据仍走 _SEARCH 运行时),不深化 XML 耦合。失败返 null。 + * 左树分类节点增删改:treetemplate 引用模板 {@code } 的增/改/删 → amis InputTree 原生 + * {@code creatable}/{@code editable}/{@code removable} + {@code addApi}/{@code editApi}/{@code deleteApi}。 + * + *

老系统树分类是内联节点编辑(点+输名称→保存→服务流),正对应 amis 原生节点 CRUD。持久化走 + * {@code OA_*_FOLDER_ADD/DELETE} 服务流:add 送 {名称列:${label}, 父列:${parent.value}}, + * edit 送 {主键:${value}, 名称列:${label}},delete 送 {主键:${value}}。InputTree 配了 source, + * 增删改后 amis 自动重拉 source 刷新树。无 或实体未解析 → 跳过(只读树)。 */ - private List> loadRefDisplayColumns(String ref, String entityId, ConversionResult result) { + private void applyTreeNodeCrud(Map treeSchema, Element treeTemplate, String treeRef, + ConversionResult result) { + Element refRoot = loadRefRoot(treeRef, result); + Element node = refRoot != null ? refRoot.element("node") : null; + Element buttonsEl = node != null ? node.element("buttons") : null; + if (buttonsEl == null) { + return; + } + boolean hasInsert = false, hasUpdate = false, hasDelete = false; + String addSvc = "", deleteSvc = ""; + for (Element b : buttonsEl.elements("button")) { + if ("false".equals(b.attributeValue("isshow"))) { + continue; + } + String svc = b.elements("method").stream() + .map(m -> m.attributeValue("servicename", "")) + .filter(s -> !s.isBlank()).findFirst().orElse(""); + switch (b.attributeValue("type", "")) { + case "insert" -> hasInsert = true; + case "update" -> hasUpdate = true; + case "delete" -> { hasDelete = true; if (!svc.isBlank()) deleteSvc = svc; } + case "save" -> { if (!svc.isBlank()) addSvc = svc; } // 保存按钮携带新增/更新服务名 + default -> { } + } + } + String treeTable = resolveTableName(treeTemplate.attributeValue("entityid", ""), result); + if (treeTable == null || treeTable.isBlank()) { + result.degrade("tree+grid: 左树实体未解析 → 跳过节点增删改(树仍可浏览)"); + return; + } + treeTable = treeTable.toUpperCase(); + String pk = treeTable + "_ID"; + String nameCol = resolveDisplayColumn(treeTable); + String parentCol = resolveTreeParentCol(refRoot); + + if (hasInsert && !addSvc.isBlank()) { + treeSchema.put("creatable", true); + treeSchema.put("rootCreatable", true); + treeSchema.put("addApi", flowApi(addSvc, mapOf(nameCol, "${label}", parentCol, "${parent.value}"))); + } + if (hasUpdate && !addSvc.isBlank()) { + treeSchema.put("editable", true); + treeSchema.put("editApi", flowApi(addSvc, mapOf(pk, "${value}", nameCol, "${label}"))); + } + if (hasDelete && !deleteSvc.isBlank()) { + treeSchema.put("removable", true); + treeSchema.put("deleteApi", flowApi(deleteSvc, mapOf(pk, "${value}"))); + } + result.note("tree+grid: 左树节点 CRUD creatable=" + (hasInsert && !addSvc.isBlank()) + + " editable=" + (hasUpdate && !addSvc.isBlank()) + " removable=" + (hasDelete && !deleteSvc.isBlank()) + + "(表=" + treeTable + " 名列=" + nameCol + " 父列=" + parentCol + + " add=" + addSvc + " del=" + deleteSvc + ")"); + } + + /** 取被引用模板(view_template)的根元素;失败/空返 null。treegrid 列定义、右表按钮、左树节点 CRUD 共用。 */ + private Element loadRefRoot(String ref, ConversionResult result) { if (ref == null || ref.isBlank()) { return null; } @@ -990,18 +1074,69 @@ public class TemplateToAmisConverter { if (xmls.isEmpty() || xmls.get(0) == null || xmls.get(0).isBlank()) { return null; } - Document doc = DocumentHelper.parseText(xmls.get(0).trim()); - Element display = doc.getRootElement().element("display"); - if (display == null) { - return null; - } - return buildColumns(display, entityId, result); + return DocumentHelper.parseText(xmls.get(0).trim()).getRootElement(); } catch (Exception e) { - result.note("tree+grid: 取右表列失败 ref=" + ref + ": " + safeMsg(e)); + result.note("tree+grid: 取引用模板失败 ref=" + ref + ": " + safeMsg(e)); return null; } } + /** 实体显示列(isentitydisplay=1);解析失败回落 NAME。connect 用 currentSchema=eip3,故表/列名不带前缀。 */ + private String resolveDisplayColumn(String table) { + try { + List cols = jdbcTemplate.queryForList( + "SELECT UPPER(ea.columnname) FROM sys_entityattribute ea " + + "JOIN sys_entity e ON UPPER(e.sys_entity_id)=UPPER(ea.entityid) " + + "WHERE UPPER(e.tablename)=? AND ea.isentitydisplay=1", + String.class, table.toUpperCase()); + if (!cols.isEmpty() && cols.get(0) != null && !cols.get(0).isBlank()) { + return cols.get(0).toUpperCase(); + } + } catch (Exception ignore) { + // 回落 NAME + } + return "NAME"; + } + + /** 树自嵌套父列:取 node/nextnodes/levelnode 的 parentid 属性,缺则回落 PARENTID。 */ + private String resolveTreeParentCol(Element refRoot) { + Element node = refRoot != null ? refRoot.element("node") : null; + if (node != null) { + Element nexts = node.element("nextnodes"); + if (nexts != null) { + for (Element ln : nexts.elements("levelnode")) { + String p = ln.attributeValue("parentid", ""); + if (!p.isBlank()) { + return p.toUpperCase(); + } + } + } + String np = node.attributeValue("parentid", ""); + if (!np.isBlank()) { + return np.toUpperCase(); + } + } + return "PARENTID"; + } + + /** 构造服务流写 api:{method:post, url:/api/flow/{svc}, data:{...}}(节点 CRUD 持久化用)。 */ + private static Map flowApi(String svc, Map data) { + Map api = new LinkedHashMap<>(); + api.put("method", "post"); + api.put("url", "/api/flow/" + svc); + api.put("data", data); + return api; + } + + /** 有序键值对 → LinkedHashMap(api data 映射用)。 */ + private static Map mapOf(String... kv) { + Map m = new LinkedHashMap<>(); + for (int i = 0; i + 1 < kv.length; i += 2) { + m.put(kv[i], kv[i + 1]); + } + return m; + } + // ────────────────────────────────────────────────────────────────────── // report(A 类表格式报表)—— 报表迁移方案口径 // ────────────────────────────────────────────────────────────────────── diff --git a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java index 014e4af..8e20fe7 100644 --- a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java +++ b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java @@ -418,7 +418,10 @@ class TemplateToAmisConverterTest { Map gridItem = (Map) cols.get(1).get("body"); assertEquals("input-tree", treeItem.get("type")); assertEquals("/api/template/t1/tree", treeItem.get("source")); - assertEquals(Boolean.TRUE, treeItem.get("heightAuto"), "BUG1:树须 heightAuto 撑高,不可定高滚动只露一半"); + // BUG1:树高度跟随视口——挂 className,由 eip4-web amis-theme.css 把 .cxd-Tree max-height + // 抬到视口相对+内部滚动(amis 默认 .cxd-Tree--outline 限高 300px 致「只露一半」)。 + assertNull(treeItem.get("heightAuto"), "不应再用 heightAuto 无限撑高"); + assertEquals("eip4-treegrid-tree", treeItem.get("className"), "BUG1:树须挂视口高度 className"); assertNotNull(treeItem.get("onEvent"), "选中树节点应触发右表重载"); assertEquals("crud", gridItem.get("type")); String api = (String) gridItem.get("api");