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 271b7ea..24da368 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 @@ -2001,19 +2001,79 @@ public class TemplateToAmisConverter { treeSchema.put("removable", true); treeSchema.put("deleteApi", flowApi(deleteSvc, mapOf(pk, "${value}"))); } - // 新增:弹窗表单(真实实体新增需 名称/排序等多必填列 + 顶级 parentid 留空, - // InputTree 内联 creatable 只能给 label 满足不了 → 报「xx 必填」「父引用被删除」)。 + // 新增:优先复用实体「真实编辑视图」(node@pageid)——像列表 添加 弹窗那样 service+schemaApi 载入 + // 老系统编辑页:字段/必填/初值({CURRENTUSER}等)/版面全忠实,会话上下文列 USER_ID/ORGID/DEPARTID 本就 + // 不在编辑页、由 ADD 服务流自动补(故不会出现「*用户/*组织/*部门」这类不该填的字段);提交走 save 服务流、 + // 成功重载左树。无 pageid 时回退「按实体必填列合成」(旧逻辑,保留兜底)。 + String pageId = node != null ? node.attributeValue("pageid", "") : ""; Map addBtn = null; + boolean fromEditForm = false; if (hasInsert && !addSvc.isBlank()) { - addBtn = buildTreeNodeAddButton(treeTable, addSvc, parentCol, sourceRef, treeCompId, result); + if (pageId != null && !pageId.isBlank()) { + addBtn = buildTreeNodeAddButtonFromPage(addSvc, pageId, treeTable, treeCompId, result); + fromEditForm = true; + } else { + addBtn = buildTreeNodeAddButton(treeTable, addSvc, parentCol, sourceRef, treeCompId, result); + } } - result.note("tree(type=3): 节点 CRUD 新增=弹窗(" + (addBtn != null) - + ") editable=" + (hasUpdate && !addSvc.isBlank()) + " removable=" + (hasDelete && !deleteSvc.isBlank()) - + "(表=" + treeTable + " 名列=" + nameCol + " 父列=" + parentCol - + " add=" + addSvc + " del=" + deleteSvc + ")"); + result.note("tree(type=3): 节点 CRUD 新增=" + (fromEditForm ? "编辑视图弹窗(pageid=" + pageId + ")" + : (addBtn != null ? "合成弹窗" : "无")) + + " editable=" + (hasUpdate && !addSvc.isBlank()) + " removable=" + (hasDelete && !deleteSvc.isBlank()) + + "(表=" + treeTable + " 名列=" + nameCol + " add=" + addSvc + " del=" + deleteSvc + ")"); return addBtn; } + /** + * 左树「新增」按钮(复用实体「真实编辑视图」):dialog.body=service 经 schemaApi 载入 node@pageid 指向的 + * 老系统编辑页(字段/必填/初值/版面忠实;会话上下文列 USER_ID/ORGID/DEPARTID 不在编辑页、由 ADD 服务流补, + * 故不会出现「*用户/*组织/*部门」这类不该填的字段)。新建经 {@code /api/form/{table}/defaults} 预填 + * {@code {CURRENTUSER}} 等。提交 {@code actionType=submit} 下钻内层 form 采集字段 → POST save 服务流, + * 成功 {@code close} 并 {@code reload} 左树。与列表「添加」弹窗同源(见 {@link #buildFormDialog})。 + */ + private Map buildTreeNodeAddButtonFromPage(String addSvc, String pageId, String treeTable, + String treeCompId, ConversionResult result) { + Map service = new LinkedHashMap<>(); + service.put("type", "service"); + service.put("schemaApi", "get:/api/page/schema/" + pageId + "?format=amis"); + if (treeTable != null && !treeTable.isBlank()) { + Map api = new LinkedHashMap<>(); + api.put("method", "get"); + api.put("url", "/api/form/" + treeTable + "/defaults?templateId=" + pageId); + service.put("api", api); // 新建默认值:服务端解析 {CURRENTUSER}/{CURRENTTIME} 等初值宏 + } + Map submitBtn = new LinkedHashMap<>(); + submitBtn.put("type", "button"); + submitBtn.put("label", "保存"); + submitBtn.put("level", "primary"); + submitBtn.put("actionType", "submit"); // 下钻内层 form 采集字段值 + submitBtn.put("api", "POST:/api/flow/" + addSvc); + submitBtn.put("close", true); + if (treeCompId != null && !treeCompId.isBlank()) { + submitBtn.put("reload", treeCompId); // 成功后重载左树 + } + Map cancelBtn = new LinkedHashMap<>(Map.of( + "type", "button", "label", "取消", "actionType", "close")); + + Map dialog = new LinkedHashMap<>(); + dialog.put("type", "dialog"); + dialog.put("title", "新增"); + dialog.put("size", "lg"); + dialog.put("body", service); + dialog.put("actions", List.of(cancelBtn, submitBtn)); + + Map btn = new LinkedHashMap<>(); + btn.put("type", "button"); + btn.put("label", "新增分类"); + btn.put("level", "primary"); + btn.put("icon", "fa fa-plus"); + btn.put("className", "m-b-sm"); + btn.put("actionType", "dialog"); + btn.put("dialog", dialog); + result.note("tree(type=3): 新增按钮复用编辑视图 service(schemaApi=/api/page/schema/" + pageId + + ") + 保存 submit→/api/flow/" + addSvc + " reload=" + treeCompId); + return btn; + } + /** * 左树「新增分类」弹窗按钮:表单含实体可编辑必填列(排序号默认 0)+ 上级选择器(tree-select, * 留空=顶级、省略 parentid 避免空引用校验失败)。提交整表单到 add 服务流,成功后重载左树。