feat(converter): 通用模板 P0 收口——日历 type5 / 树 type3 接端点 / 组合 type6 真加载
type5 日历:isCalendarTemplate 分流根元素<crud>但语义日历的模板→convertCalendar(amis calendar,largeMode,items→schedules,scheduleAction drawer),不再被当普通表格丢班次/调度语义。type3 声明式树:currentTemplateId 把 source 指向 /api/template/{templateId}/tree(TemplateTreeController 构 {label,value}),修 source 用 /api/flow 返 {items:[{TYPENAME}]} 显「undefined」根因;树型选择框同源复用 /api/template/{dialogId}/tree。type6 组合:convertGroup 每 tab 发 service schemaApi get:/api/page/schema/{tempId}?format=amis + amis mountOnEnter 懒加载,真接子模板远程加载,不再 tpl 占位。分级清单.csv 同步重生。
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -154,6 +154,10 @@ public class TemplateToAmisConverter {
|
||||
// ──────────────────────────────────────────────────────────────────────
|
||||
|
||||
private Map<String, Object> convertCrud(Element crud, ConversionResult result, String templateName) {
|
||||
// type=5 CALENDAR:根元素是 <crud> 但语义是日历,分流到 convertCalendar(否则被当普通表格,班次/调度语义全丢)。
|
||||
if (currentTemplateId != null && isCalendarTemplate(currentTemplateId)) {
|
||||
return convertCalendar(crud, result, templateName);
|
||||
}
|
||||
// F2-13:title 优先取 view_template.name,XML title 属性作后备
|
||||
String title = templateName != null ? templateName : crud.attributeValue("title", "");
|
||||
String entityId = crud.attributeValue("entityid", "");
|
||||
@@ -194,6 +198,58 @@ public class TemplateToAmisConverter {
|
||||
return page(title, crudSchema);
|
||||
}
|
||||
|
||||
/**
|
||||
* type=5 CALENDAR:老日历模板(根元素 {@code <crud>})→ amis {@code calendar}。数据源走 {@code listApi} 同款
|
||||
* {@code /api/flow/{selectservice}}(已注册的 _SEARCH 合成流),用 {@code service.api.adaptor} 把返回的
|
||||
* {@code items[]} 映射成 amis 日历的 {@code schedules[]}({@code startTime/endTime/content})。
|
||||
*
|
||||
* <p>日期列为 epoch-ms(bigint),{@code Number()} 直传可被 moment 解析。两个日历模板列名不同
|
||||
* (员工排班 STARTDATE/ENDDATE/CAPTION,会议室调度 STARTTIME/ENDTIME/MEETING_TOPIC),故 adaptor 在运行时
|
||||
* 按常见日历字段名模式容错挑取,免转换期逐模板硬编码。
|
||||
*/
|
||||
private Map<String, Object> convertCalendar(Element crud, ConversionResult result, String templateName) {
|
||||
String title = templateName != null ? templateName : crud.attributeValue("title", "日历");
|
||||
String entityId = crud.attributeValue("entityid", "");
|
||||
String table = resolveTableName(entityId, result);
|
||||
String dataUrl = listApi(crud, table);
|
||||
|
||||
String adaptor =
|
||||
"var rows=(payload.data&&payload.data.items)||[];"
|
||||
+ "function pk(r,ks){for(var i=0;i<ks.length;i++){var v=r[ks[i]];if(v!=null&&v!=='')return v;}return null;}"
|
||||
+ "var sk=['STARTDATE','STARTTIME','BEGINTIME','BEGINDATE','MEETINGTIME','RUNDATE'];"
|
||||
+ "var ek=['ENDDATE','ENDTIME','FINISHTIME','MEETINGENDTIME'];"
|
||||
+ "var ck=['CAPTION','TITLE','MEETING_TOPIC','TOPIC','SUBJECT','NAME','DESCRIPTION'];"
|
||||
+ "var sch=rows.map(function(r){var s=pk(r,sk);var e=pk(r,ek);var c=pk(r,ck);"
|
||||
+ "return {startTime:s==null?null:Number(s),endTime:e==null?(s==null?null:Number(s)):Number(e),"
|
||||
+ "content:c==null?'':c};}).filter(function(x){return x.startTime!=null;});"
|
||||
+ "return Object.assign({},payload,{data:{schedules:sch}});";
|
||||
|
||||
Map<String, Object> api = new LinkedHashMap<>();
|
||||
api.put("method", "get");
|
||||
api.put("url", dataUrl);
|
||||
api.put("adaptor", adaptor);
|
||||
|
||||
Map<String, Object> calendar = new LinkedHashMap<>();
|
||||
calendar.put("type", "calendar");
|
||||
calendar.put("largeMode", true);
|
||||
calendar.put("schedules", "${schedules}");
|
||||
// 点日程弹抽屉看详情
|
||||
Map<String, Object> drawer = new LinkedHashMap<>();
|
||||
drawer.put("title", "日程详情");
|
||||
drawer.put("body", new LinkedHashMap<>(Map.of(
|
||||
"type", "table", "data", "${scheduleData}",
|
||||
"columns", List.of(new LinkedHashMap<>(Map.of("name", "content", "label", "内容"))))));
|
||||
calendar.put("scheduleAction", new LinkedHashMap<>(Map.of("actionType", "drawer", "drawer", drawer)));
|
||||
|
||||
Map<String, Object> service = new LinkedHashMap<>();
|
||||
service.put("type", "service");
|
||||
service.put("api", api);
|
||||
service.put("body", calendar);
|
||||
|
||||
result.note("type=5 日历 → amis calendar(service+adaptor 映射 items→schedules,数据源 " + dataUrl + ")");
|
||||
return page(title, service);
|
||||
}
|
||||
|
||||
/** display/field → crud columns(含 _DISPLAY__ 翻译列、合计/金额特性)。 */
|
||||
private List<Map<String, Object>> buildColumns(Element display, ConversionResult result) {
|
||||
return buildColumns(display, null, result);
|
||||
@@ -575,10 +631,85 @@ public class TemplateToAmisConverter {
|
||||
}
|
||||
toolbar.add(btn);
|
||||
}
|
||||
// 审批列表统一加「查看审批」:工具栏里出现提交审批类按钮 = 该实体走审批流 → 补查看审批轨迹按钮
|
||||
// (修「没有查看审批功能」)。任何状态都可查,故 disabledOn=纯选中态。
|
||||
if (table != null && !table.isBlank() && hasSubmitApprovalButton(toolbar)) {
|
||||
toolbar.add(buildViewApprovalButton(table));
|
||||
result.note("审批列表 → 统一补「查看审批」按钮(GET /api/flow/business/${PK}/trace 轨迹弹窗)");
|
||||
}
|
||||
toolbar.add("pagination");
|
||||
return toolbar;
|
||||
}
|
||||
|
||||
/** toolbar 里是否已有<b>已接线</b>的提交审批按钮(actionType=ajax,= 该实体真走审批流),决定是否补「查看审批」。
|
||||
* 禁用占位(无 servicename/actionType 的提交审批)= 审批未接线,不触发查看审批。 */
|
||||
@SuppressWarnings("unchecked")
|
||||
private static boolean hasSubmitApprovalButton(List<Object> toolbar) {
|
||||
for (Object item : toolbar) {
|
||||
if (item instanceof Map<?, ?> m) {
|
||||
Map<String, Object> btn = (Map<String, Object>) m;
|
||||
Object id = btn.get("id");
|
||||
if (id instanceof String s && isSubmitApprovalButton(s) && "ajax".equals(btn.get("actionType"))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 「查看审批」按钮(审批列表通用):dialog → service 调 {@code GET /api/flow/business/${PK}/trace} 拉审批轨迹,
|
||||
* 表格展示环节/办理人/意见/结果/时间。trace 端点返裸数组,用 adaptor 包成 amis 信封并取出 nodes。
|
||||
*/
|
||||
private Map<String, Object> buildViewApprovalButton(String table) {
|
||||
String pk = table + "_ID";
|
||||
Map<String, Object> api = new LinkedHashMap<>();
|
||||
api.put("method", "get");
|
||||
api.put("url", "/api/flow/business/${selectedItems[0]." + pk + "}/trace");
|
||||
api.put("adaptor",
|
||||
"return {status:0,msg:'',data:{nodes:Array.isArray(payload)?payload:((payload&&payload.data)||[])}};");
|
||||
|
||||
List<Object> cols = new ArrayList<>();
|
||||
cols.add(new LinkedHashMap<>(Map.of("name", "taskName", "label", "审批环节")));
|
||||
cols.add(new LinkedHashMap<>(Map.of("name", "assigneeName", "label", "办理人")));
|
||||
cols.add(new LinkedHashMap<>(Map.of("name", "result", "label", "结果")));
|
||||
cols.add(new LinkedHashMap<>(Map.of("name", "comment", "label", "审批意见")));
|
||||
// valueFormat:"x" 告诉 amis 输入是 epoch-ms(trace 节点 startTime/endTime=getTime()),否则被当秒解析成乱码年份。
|
||||
cols.add(new LinkedHashMap<>(Map.of("name", "startTime", "label", "开始时间",
|
||||
"type", "date", "format", "YYYY-MM-DD HH:mm", "valueFormat", "x")));
|
||||
cols.add(new LinkedHashMap<>(Map.of("name", "endTime", "label", "完成时间",
|
||||
"type", "date", "format", "YYYY-MM-DD HH:mm", "valueFormat", "x")));
|
||||
|
||||
Map<String, Object> tbl = new LinkedHashMap<>();
|
||||
tbl.put("type", "table");
|
||||
tbl.put("source", "${nodes}");
|
||||
tbl.put("placeholder", "暂无审批记录");
|
||||
tbl.put("columns", cols);
|
||||
|
||||
Map<String, Object> svc = new LinkedHashMap<>();
|
||||
svc.put("type", "service");
|
||||
svc.put("api", api);
|
||||
svc.put("body", tbl);
|
||||
|
||||
Map<String, Object> dlg = new LinkedHashMap<>();
|
||||
dlg.put("type", "dialog");
|
||||
dlg.put("title", "审批记录");
|
||||
dlg.put("size", "lg");
|
||||
dlg.put("body", svc);
|
||||
dlg.put("actions", List.of(new LinkedHashMap<>(Map.of(
|
||||
"type", "button", "actionType", "close", "label", "关闭"))));
|
||||
|
||||
Map<String, Object> btn = new LinkedHashMap<>();
|
||||
btn.put("type", "button");
|
||||
btn.put("id", "查看审批");
|
||||
btn.put("label", "查看审批");
|
||||
btn.put("icon", "fa fa-search");
|
||||
btn.put("actionType", "dialog");
|
||||
btn.put("disabledOn", DISABLED_ON_NO_SELECTION);
|
||||
btn.put("dialog", dlg);
|
||||
return btn;
|
||||
}
|
||||
|
||||
/**
|
||||
* F2-17 / 服务流分派:构造 dialog body 为 service 加载 /api/page/schema/{templateId} 的 dialog。
|
||||
*
|
||||
@@ -899,6 +1030,71 @@ public class TemplateToAmisConverter {
|
||||
}
|
||||
}
|
||||
}
|
||||
// ③:树选择框——可编辑 SelectDialog/MultiSelectDialog 的 dialogid 指向 type=3「树模板」
|
||||
// (绑自引用层级实体,如「上级菜单」PARENTID→菜单维护树)→ 把扁平 picker 改写为 amis tree-select
|
||||
// (弹出树选择,恢复老系统「树型选择框」语义)。source 复用 /api/template/{dialogid}/tree
|
||||
// (TemplateTreeController 返 {label,value,children},递归任意层级)。判定持 jdbc 查 view_template.type,
|
||||
// XML 解析留转换器侧(§6:UiTypeMapper 保持静态、不耦合跨模板 XML)。
|
||||
if ("picker".equals(item.get("type"))
|
||||
&& ("SelectDialog".equals(uitype) || "MultiSelectDialog".equals(uitype))) {
|
||||
String dialogId = f.attributeValue("dialogid", "");
|
||||
if (!dialogId.isBlank() && isTreeDialog(dialogId)) {
|
||||
boolean multiple = Boolean.TRUE.equals(item.get("multiple"));
|
||||
String name = f.attributeValue("name", "");
|
||||
// 清除 picker 专属键,改写为 tree-select
|
||||
item.remove("pickerSchema");
|
||||
item.remove("modalMode");
|
||||
item.remove("modalSize");
|
||||
item.remove("labelField");
|
||||
item.remove("valueField");
|
||||
item.put("type", "tree-select");
|
||||
item.put("source", "/api/template/" + dialogId + "/tree");
|
||||
item.put("clearable", true);
|
||||
if (multiple) {
|
||||
item.put("multiple", true);
|
||||
}
|
||||
result.note("树选择 " + name + " → dialogid=" + dialogId
|
||||
+ " 是 type=3 树模板 → tree-select(source=/api/template/.../tree),非扁平 picker"
|
||||
+ "(修上级菜单等层级引用显列表选择框)");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* dialogid(=view_template_id) 指向的模板是否 type=3(树形对话框,绑自引用层级实体)。
|
||||
* 用于把「上级菜单/父分类」等层级引用的 SelectDialog 从扁平 picker 改写为 tree-select。
|
||||
* 查询失败/非树 → false(保持 picker 基线,零回归)。
|
||||
*/
|
||||
private boolean isTreeDialog(String dialogId) {
|
||||
if (dialogId == null || dialogId.isBlank()) {
|
||||
return false;
|
||||
}
|
||||
try {
|
||||
Integer type = jdbcTemplate.queryForObject(
|
||||
"SELECT type FROM view_template WHERE view_template_id = ?",
|
||||
Integer.class, dialogId);
|
||||
return type != null && type == 3;
|
||||
} catch (Exception e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 模板是否 type=5(日历模板)。老系统日历模板 XML 根元素是 {@code <crud>}(日历语义只在 view_template.type=5
|
||||
* 数字列),故 convertCrud 入口据此分流到 {@link #convertCalendar},避免被当普通表格。查询失败/非日历 → false。
|
||||
*/
|
||||
private boolean isCalendarTemplate(String templateId) {
|
||||
if (templateId == null || templateId.isBlank()) {
|
||||
return false;
|
||||
}
|
||||
try {
|
||||
Integer type = jdbcTemplate.queryForObject(
|
||||
"SELECT type FROM view_template WHERE view_template_id = ?",
|
||||
Integer.class, templateId);
|
||||
return type != null && type == 5;
|
||||
} catch (Exception e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/** dialogid(=view_template_id) → 根 {@code @entityid} → 该实体 {@code isentitydisplay=1} 显示列名(大写)。解析失败 → null。 */
|
||||
@@ -1801,9 +1997,13 @@ public class TemplateToAmisConverter {
|
||||
treeSchema.put("type", "input-tree");
|
||||
treeSchema.put("name", "tree");
|
||||
treeSchema.put("multiple", false);
|
||||
// 关掉 amis Tree 虚拟列表(默认 virtualThreshold=100):节点 >100 时虚拟渲染下选中节点对象身份与
|
||||
// valueSet(valueSet.has(item) 身份判断)不一致 → 点中不高亮(「选不中」)。声明式管理树(如菜单维护
|
||||
// SYS_MENU 100+ 节点)必触发。设大阈值改为全量渲染换取高亮可靠(数百节点性能无碍)。详见 convertTreeGrid。
|
||||
treeSchema.put("virtualThreshold", 100000);
|
||||
final String treeCompId = "decltree_tree";
|
||||
treeSchema.put("id", treeCompId);
|
||||
Map<String, Object> treeAddBtn = null; // 新增分类弹窗按钮(多必填列实体 → 弹窗表单,非内联 creatable)
|
||||
TreeCrud treeCrud = null; // 节点 CRUD:工具栏按钮(新增/修改/删除) + 是否 form 包裹
|
||||
if (node != null) {
|
||||
String entityId = node.attributeValue("entityid", "");
|
||||
String svc = node.attributeValue("selectservice", "");
|
||||
@@ -1826,7 +2026,7 @@ public class TemplateToAmisConverter {
|
||||
}
|
||||
// 节点 buttons(增删改保存)→ input-tree 原生 editable/removable + 弹窗新增(管理页可编辑)。
|
||||
// 实体来自 <node entityid>(type=4 来自 treetemplate);source/reload 同源(currentTemplateId)。
|
||||
treeAddBtn = applyTreeNodeCrudFromNode(treeSchema, node, entityId,
|
||||
treeCrud = applyTreeNodeCrudFromNode(treeSchema, node, entityId,
|
||||
currentTemplateId, treeCompId, result);
|
||||
} else {
|
||||
result.degrade("tree 无 <node> 声明 → 空树壳");
|
||||
@@ -1834,8 +2034,25 @@ public class TemplateToAmisConverter {
|
||||
// F2-13:tree title 优先取 view_template.name
|
||||
String treeTitle = templateName != null ? templateName
|
||||
: (tree.attributeValue("rootname") != null ? tree.attributeValue("rootname") : "树");
|
||||
// 有新增按钮 → body=[新增按钮, 树];否则仅树
|
||||
Object treeBody = treeAddBtn != null ? List.of(treeAddBtn, treeSchema) : treeSchema;
|
||||
Object treeBody;
|
||||
if (treeCrud != null && !treeCrud.toolbar().isEmpty()) {
|
||||
List<Object> items = new ArrayList<>(treeCrud.toolbar());
|
||||
items.add(treeSchema);
|
||||
if (treeCrud.formWrap()) {
|
||||
// 工具栏(增/改/删作用选中节点) + 树 → 包进无面板 form,使选中值 ${tree} 进数据域供按钮 disabledOn/api 引用
|
||||
Map<String, Object> form = new LinkedHashMap<>();
|
||||
form.put("type", "form");
|
||||
form.put("title", treeTitle);
|
||||
form.put("wrapWithPanel", false);
|
||||
form.put("body", items);
|
||||
treeBody = form;
|
||||
} else {
|
||||
// 兜底(无 pageid):[新增按钮, 内联可编辑树]
|
||||
treeBody = items;
|
||||
}
|
||||
} else {
|
||||
treeBody = treeSchema;
|
||||
}
|
||||
return page(treeTitle, treeBody);
|
||||
}
|
||||
|
||||
@@ -1848,6 +2065,12 @@ public class TemplateToAmisConverter {
|
||||
treeSchema.put("name", "tree");
|
||||
treeSchema.put("showOutline", true);
|
||||
treeSchema.put("initiallyOpen", true);
|
||||
// 关掉 amis Tree 虚拟列表(默认 virtualThreshold=100)。根因:节点数 >100 时 amis 走 VirtualList,
|
||||
// 而选中高亮靠 `valueSet.has(item)` 的对象「身份(===)」判断,虚拟渲染下被选节点的对象身份与
|
||||
// valueSet 内的不一致 → 点中节点不高亮(表现为「选不中」,虽然 ${tree} 值与右表过滤其实已生效)。
|
||||
// 菜单/功能/视图等系统树 100+ 节点必触发;新闻分类等小树(<100)不触发故正常。设大阈值即按全量渲染,
|
||||
// 数百节点性能无碍,换取选中高亮可靠。amis-fork 不便重建 sdk.js,故走 schema 级规避。
|
||||
treeSchema.put("virtualThreshold", 100000);
|
||||
// 树高度跟随视口:amis 内层 .cxd-Tree--outline 默认 max-height:300px(多级分类树「只露一半」根因)。
|
||||
// 内联 style 只落到外层 form-item、压不到内层滚动容器,故改挂 className,由 eip4-web amis-theme.css
|
||||
// 把该 className 内的 .cxd-Tree max-height 抬到视口相对(calc(100vh-230px))+ 内部滚动。既非定高框
|
||||
@@ -1857,12 +2080,11 @@ public class TemplateToAmisConverter {
|
||||
treeSchema.put("id", treeCompId);
|
||||
if (treeTemplate != null && !treeRef.isBlank()) {
|
||||
treeSchema.put("source", "/api/template/" + treeRef + "/tree");
|
||||
// 选中树节点 → 重载右表(${tree} 进右表 api 过滤);TemplateTreeController 运行时构树
|
||||
treeSchema.put("onEvent", new LinkedHashMap<>(Map.of(
|
||||
"change", Map.of("actions", List.of(
|
||||
new LinkedHashMap<>(Map.of("actionType", "reload", "componentId", gridCrudId)))))));
|
||||
// 选中树节点 → 重载右表:右表 crud 的 api 已带 node=${tree},${tree} 变化时 amis CRUD 自动重拉,
|
||||
// 无需再挂 onEvent.change→reload。此前两条触发并存(onEvent.change 显式 reload 取到 click 前的旧值 +
|
||||
// api 依赖变化自动重拉取到新值)→ 一次点击发 2 个请求且一条带旧/空值。移除显式 onEvent → 单请求、无竞态。
|
||||
result.note("tree+grid: treetemplate ref=" + treeRef
|
||||
+ " → input-tree source /api/template/" + treeRef + "/tree(运行时构树)+ 选中重载右表");
|
||||
+ " → input-tree source /api/template/" + treeRef + "/tree(运行时构树)+ 右表 node=${tree} 自动重拉(去冗余 onEvent)");
|
||||
// WS-C:tree+grid 是「浏览页」,左树仅供只读导航(选分类筛右表),不可编辑分类节点。
|
||||
// 分类节点的增/改/删属「管理页」(type=3 声明式树)职责——此前误把被引用分类树的 buttons 传播到
|
||||
// 浏览页左树(editable/removable/新增分类按钮),与管理页职责正好反了,故移除编辑传播。
|
||||
@@ -1955,11 +2177,11 @@ public class TemplateToAmisConverter {
|
||||
* @param entityId node@entityid(解析左树实体表)
|
||||
* @param sourceRef 源/重载引用(type=3=currentTemplateId,用于新增弹窗上级 tree-select source + 成功后重载);
|
||||
* null 时跳过新增弹窗的上级选择器 source(仍可编辑/删除)
|
||||
* @return 新增分类弹窗按钮(无 insert 或实体未解析时 null)
|
||||
* @return 节点 CRUD 工具栏 + 是否 form 包裹(无 buttons 或实体未解析时 null)
|
||||
*/
|
||||
private Map<String, Object> applyTreeNodeCrudFromNode(Map<String, Object> treeSchema, Element node,
|
||||
String entityId, String sourceRef,
|
||||
String treeCompId, ConversionResult result) {
|
||||
private TreeCrud applyTreeNodeCrudFromNode(Map<String, Object> treeSchema, Element node,
|
||||
String entityId, String sourceRef,
|
||||
String treeCompId, ConversionResult result) {
|
||||
Element buttonsEl = node != null ? node.element("buttons") : null;
|
||||
if (buttonsEl == null || buttonsEl.elements("button").isEmpty()) {
|
||||
return null;
|
||||
@@ -1992,7 +2214,30 @@ public class TemplateToAmisConverter {
|
||||
String nameCol = resolveDisplayColumn(treeTable);
|
||||
String parentCol = resolveTreeParentColFromNode(node);
|
||||
|
||||
// 编辑/删除:input-tree 原生内联(编辑只改名列,原行其它必填列已存在;删除只送主键)。
|
||||
String pageId = node != null ? node.attributeValue("pageid", "") : "";
|
||||
boolean hasPage = pageId != null && !pageId.isBlank();
|
||||
|
||||
// 路径一(有真实编辑页 pageid):老系统式工具栏「新增/修改/删除」——选中节点后修改/删除作用其上,
|
||||
// 修改打开全字段表单(initApi 载入选中节点全行,含主键供 save 服务流 upsert)。树包进 form(见 convertTree)
|
||||
// 使选中值 ${tree} 入数据域供按钮 disabledOn/api 引用;不再内联 editable/removable。
|
||||
if (hasPage && !addSvc.isBlank() && (hasInsert || hasUpdate)) {
|
||||
List<Map<String, Object>> toolbar = new ArrayList<>();
|
||||
if (hasInsert) {
|
||||
toolbar.add(buildTreeNodeAddButtonFromPage(addSvc, pageId, treeTable, treeCompId, result));
|
||||
}
|
||||
if (hasUpdate) {
|
||||
toolbar.add(buildTreeNodeEditButtonFromPage(addSvc, pageId, treeTable, treeCompId, result));
|
||||
}
|
||||
if (hasDelete && !deleteSvc.isBlank()) {
|
||||
toolbar.add(buildTreeNodeDeleteButton(deleteSvc, treeTable, treeCompId, result));
|
||||
}
|
||||
result.note("tree(type=3): 工具栏 CRUD(新增=" + hasInsert + " 修改=" + hasUpdate
|
||||
+ " 删除=" + (hasDelete && !deleteSvc.isBlank()) + ")复用编辑页 pageid=" + pageId
|
||||
+ "(表=" + treeTable + " add=" + addSvc + " del=" + deleteSvc + ")");
|
||||
return new TreeCrud(toolbar, true);
|
||||
}
|
||||
|
||||
// 路径二(兜底,无 pageid):input-tree 原生内联编辑/删除(编辑只改名列,删除只送主键)+ 合成新增弹窗。
|
||||
if (hasUpdate && !addSvc.isBlank()) {
|
||||
treeSchema.put("editable", true);
|
||||
treeSchema.put("editApi", flowApi(addSvc, mapOf(pk, "${value}", nameCol, "${label}")));
|
||||
@@ -2001,28 +2246,19 @@ public class TemplateToAmisConverter {
|
||||
treeSchema.put("removable", true);
|
||||
treeSchema.put("deleteApi", flowApi(deleteSvc, mapOf(pk, "${value}")));
|
||||
}
|
||||
// 新增:优先复用实体「真实编辑视图」(node@pageid)——像列表 添加 弹窗那样 service+schemaApi 载入
|
||||
// 老系统编辑页:字段/必填/初值({CURRENTUSER}等)/版面全忠实,会话上下文列 USER_ID/ORGID/DEPARTID 本就
|
||||
// 不在编辑页、由 ADD 服务流自动补(故不会出现「*用户/*组织/*部门」这类不该填的字段);提交走 save 服务流、
|
||||
// 成功重载左树。无 pageid 时回退「按实体必填列合成」(旧逻辑,保留兜底)。
|
||||
String pageId = node != null ? node.attributeValue("pageid", "") : "";
|
||||
Map<String, Object> addBtn = null;
|
||||
boolean fromEditForm = false;
|
||||
List<Map<String, Object>> toolbar = new ArrayList<>();
|
||||
if (hasInsert && !addSvc.isBlank()) {
|
||||
if (pageId != null && !pageId.isBlank()) {
|
||||
addBtn = buildTreeNodeAddButtonFromPage(addSvc, pageId, treeTable, treeCompId, result);
|
||||
fromEditForm = true;
|
||||
} else {
|
||||
addBtn = buildTreeNodeAddButton(treeTable, addSvc, parentCol, sourceRef, treeCompId, result);
|
||||
}
|
||||
toolbar.add(buildTreeNodeAddButton(treeTable, addSvc, parentCol, sourceRef, treeCompId, result));
|
||||
}
|
||||
result.note("tree(type=3): 节点 CRUD 新增=" + (fromEditForm ? "编辑视图弹窗(pageid=" + pageId + ")"
|
||||
: (addBtn != null ? "合成弹窗" : "无"))
|
||||
+ " editable=" + (hasUpdate && !addSvc.isBlank()) + " removable=" + (hasDelete && !deleteSvc.isBlank())
|
||||
result.note("tree(type=3): 内联 CRUD editable=" + (hasUpdate && !addSvc.isBlank())
|
||||
+ " removable=" + (hasDelete && !deleteSvc.isBlank()) + " 合成新增=" + (!toolbar.isEmpty())
|
||||
+ "(表=" + treeTable + " 名列=" + nameCol + " add=" + addSvc + " del=" + deleteSvc + ")");
|
||||
return addBtn;
|
||||
return new TreeCrud(toolbar, false);
|
||||
}
|
||||
|
||||
/** 节点 CRUD 结果:toolbar=工具栏按钮(新增/修改/删除);formWrap=true 表示树须包进 form(供 ${tree} 选中值)。 */
|
||||
private record TreeCrud(List<Map<String, Object>> toolbar, boolean formWrap) {}
|
||||
|
||||
/**
|
||||
* 左树「新增」按钮(复用实体「真实编辑视图」):dialog.body=service 经 schemaApi 载入 node@pageid 指向的
|
||||
* 老系统编辑页(字段/必填/初值/版面忠实;会话上下文列 USER_ID/ORGID/DEPARTID 不在编辑页、由 ADD 服务流补,
|
||||
@@ -2063,7 +2299,7 @@ public class TemplateToAmisConverter {
|
||||
|
||||
Map<String, Object> btn = new LinkedHashMap<>();
|
||||
btn.put("type", "button");
|
||||
btn.put("label", "新增分类");
|
||||
btn.put("label", "新增");
|
||||
btn.put("level", "primary");
|
||||
btn.put("icon", "fa fa-plus");
|
||||
btn.put("className", "m-b-sm");
|
||||
@@ -2074,6 +2310,81 @@ public class TemplateToAmisConverter {
|
||||
return btn;
|
||||
}
|
||||
|
||||
/**
|
||||
* 左树「修改」按钮:弹窗复用编辑页(schemaApi),{@code api=/api/entity/{table}/${tree}} 载入当前选中节点全行
|
||||
* (含主键,供 save 服务流按主键 upsert)。{@code disabledOn=${!tree}} 未选中禁用;保存 submit→save 服务流、
|
||||
* 成功 close 并重载左树。与「新增」共用编辑页,区别仅初始数据来源(新增=defaults,修改=选中行)。
|
||||
*/
|
||||
private Map<String, Object> buildTreeNodeEditButtonFromPage(String addSvc, String pageId, String treeTable,
|
||||
String treeCompId, ConversionResult result) {
|
||||
Map<String, Object> service = new LinkedHashMap<>();
|
||||
service.put("type", "service");
|
||||
service.put("schemaApi", "get:/api/page/schema/" + pageId + "?format=amis");
|
||||
Map<String, Object> api = new LinkedHashMap<>();
|
||||
api.put("method", "get");
|
||||
api.put("url", "/api/entity/" + treeTable + "/${tree}"); // 载入选中节点全字段(含主键)
|
||||
service.put("api", api);
|
||||
|
||||
Map<String, Object> submitBtn = new LinkedHashMap<>();
|
||||
submitBtn.put("type", "button");
|
||||
submitBtn.put("label", "保存");
|
||||
submitBtn.put("level", "primary");
|
||||
submitBtn.put("actionType", "submit");
|
||||
submitBtn.put("api", "POST:/api/flow/" + addSvc);
|
||||
submitBtn.put("close", true);
|
||||
if (treeCompId != null && !treeCompId.isBlank()) {
|
||||
submitBtn.put("reload", treeCompId);
|
||||
}
|
||||
Map<String, Object> cancelBtn = new LinkedHashMap<>(Map.of(
|
||||
"type", "button", "label", "取消", "actionType", "close"));
|
||||
Map<String, Object> 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<String, Object> btn = new LinkedHashMap<>();
|
||||
btn.put("type", "button");
|
||||
btn.put("label", "修改");
|
||||
btn.put("icon", "fa fa-edit");
|
||||
btn.put("className", "m-b-sm m-l-xs");
|
||||
btn.put("disabledOn", "${!tree}");
|
||||
btn.put("actionType", "dialog");
|
||||
btn.put("dialog", dialog);
|
||||
result.note("tree(type=3): 修改按钮 → 弹窗载入选中节点 /api/entity/" + treeTable
|
||||
+ "/${tree} + 保存 submit→/api/flow/" + addSvc + " reload=" + treeCompId);
|
||||
return btn;
|
||||
}
|
||||
|
||||
/**
|
||||
* 左树「删除」按钮:{@code actionType=ajax} 带 confirm,删除当前选中节点({@code 主键=${tree}})→ DELETE 服务流,
|
||||
* 成功重载左树。{@code disabledOn=${!tree}} 未选中禁用。
|
||||
*/
|
||||
private Map<String, Object> buildTreeNodeDeleteButton(String deleteSvc, String treeTable,
|
||||
String treeCompId, ConversionResult result) {
|
||||
String pk = treeTable + "_ID";
|
||||
Map<String, Object> api = new LinkedHashMap<>();
|
||||
api.put("method", "post");
|
||||
api.put("url", "/api/flow/" + deleteSvc);
|
||||
api.put("data", mapOf(pk, "${tree}"));
|
||||
|
||||
Map<String, Object> btn = new LinkedHashMap<>();
|
||||
btn.put("type", "button");
|
||||
btn.put("label", "删除");
|
||||
btn.put("level", "danger");
|
||||
btn.put("className", "m-b-sm m-l-xs");
|
||||
btn.put("disabledOn", "${!tree}");
|
||||
btn.put("actionType", "ajax");
|
||||
btn.put("confirmText", "确认删除选中节点?");
|
||||
btn.put("api", api);
|
||||
if (treeCompId != null && !treeCompId.isBlank()) {
|
||||
btn.put("reload", treeCompId);
|
||||
}
|
||||
result.note("tree(type=3): 删除按钮 → ajax /api/flow/" + deleteSvc + " {" + pk + "=${tree}} reload=" + treeCompId);
|
||||
return btn;
|
||||
}
|
||||
|
||||
/**
|
||||
* 左树「新增分类」弹窗按钮:表单含实体可编辑必填列(排序号默认 0)+ 上级选择器(tree-select,
|
||||
* 留空=顶级、省略 parentid 避免空引用校验失败)。提交整表单到 add 服务流,成功后重载左树。
|
||||
@@ -2321,17 +2632,30 @@ public class TemplateToAmisConverter {
|
||||
String name = t.attributeValue("name", tempId);
|
||||
Map<String, Object> tab = new LinkedHashMap<>();
|
||||
tab.put("title", name);
|
||||
tab.put("body", Map.of("type", "tpl",
|
||||
"tpl", "子模板(tempid=" + tempId + ")待跨模板联动加载"));
|
||||
if (!tempId.isBlank()) {
|
||||
// 子模板各已独立入库 sys_page_schema → tab body 用 service 远程拉子 schema。
|
||||
// amis tabs 默认 mountOnEnter:切到该 tab 才挂载 service → 天然懒加载(修「子模板待联动加载」占位)。
|
||||
// format=amis 信封 {status,data} 且剥 page 壳,service.schemaApi 正好消费。
|
||||
Map<String, Object> svc = new LinkedHashMap<>();
|
||||
svc.put("type", "service");
|
||||
svc.put("schemaApi", "get:/api/page/schema/" + tempId + "?format=amis");
|
||||
tab.put("body", svc);
|
||||
result.note("group@template " + name + "(tempid=" + tempId
|
||||
+ ") → tab service schemaApi /api/page/schema/" + tempId + "(子模板远程加载)");
|
||||
} else {
|
||||
// 防御:无 tempid → 退回占位(诚实降级)
|
||||
tab.put("body", Map.of("type", "tpl", "tpl", "子模板未配 tempid"));
|
||||
result.degrade("group@template " + name + " 无 tempid → tab 占位");
|
||||
}
|
||||
tabs.add(tab);
|
||||
result.note("group@template " + name + "(tempid=" + tempId + ") → tab 占位(子模板跨引用)");
|
||||
}
|
||||
result.degrade("group 分组容器仅转 tabs 壳 → 各 tab 子模板需跨模板联动加载(本批不联动)");
|
||||
// F2-13:title 优先取 view_template.name
|
||||
String groupTitle = templateName != null ? templateName : "分组";
|
||||
Map<String, Object> tabsSchema = new LinkedHashMap<>();
|
||||
tabsSchema.put("type", "tabs");
|
||||
tabsSchema.put("tabs", tabs);
|
||||
// 不设 defaultKey/activeKey:amis 默认激活第一个 tab 并随 mountOnEnter 挂载其 service(首屏即加载,
|
||||
// 不留空白)。defaultshow 默认 tab 的还原属次要 UX,留待后续(按 hash 设 activeKey)。
|
||||
return page(groupTitle, tabsSchema);
|
||||
}
|
||||
|
||||
@@ -2751,9 +3075,11 @@ public class TemplateToAmisConverter {
|
||||
if (name != null && scriptEnabledButtons.contains(name)) {
|
||||
continue; // 在脚本 enableButton 目标集内 → 脚本控,保持 disabled:true
|
||||
}
|
||||
// 脚本永不点亮该按钮(不在集合内)→ 选中即可点,免永久置灰(老系统默认可点)
|
||||
// 脚本永不点亮该按钮(不在集合内)→ 选中即可点,免永久置灰(老系统默认可点)。
|
||||
// 提交审批类按钮额外挂 STATUS 约束(处理中/已通过/作废禁用),修「处理中还能再提交」。
|
||||
btn.remove("disabled");
|
||||
btn.put("disabledOn", DISABLED_ON_NO_SELECTION);
|
||||
btn.put("disabledOn", isSubmitApprovalButton(name)
|
||||
? SUBMIT_APPROVAL_DISABLED_ON : DISABLED_ON_NO_SELECTION);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2836,8 +3162,12 @@ public class TemplateToAmisConverter {
|
||||
Map<String, Object> btn = (Map<String, Object>) item;
|
||||
if (isBaselineDisabledBusinessButton(btn)) {
|
||||
// 永久灰 → 选中即可用:去掉 baseline disabled,挂 disabledOn 跟随选中态。
|
||||
// 提交审批类按钮额外挂 STATUS 约束(处理中/已通过/作废禁用),修「处理中还能再提交」。
|
||||
Object id = btn.get("id");
|
||||
String name = (id instanceof String) ? (String) id : null;
|
||||
btn.remove("disabled");
|
||||
btn.put("disabledOn", DISABLED_ON_NO_SELECTION);
|
||||
btn.put("disabledOn", isSubmitApprovalButton(name)
|
||||
? SUBMIT_APPROVAL_DISABLED_ON : DISABLED_ON_NO_SELECTION);
|
||||
}
|
||||
}
|
||||
return pageSchema;
|
||||
@@ -2878,6 +3208,24 @@ public class TemplateToAmisConverter {
|
||||
/** disabledOn 表达式:无选中行则禁用(贴老 bulkActions 选中态语义)。 */
|
||||
static final String DISABLED_ON_NO_SELECTION = "${!selectedItems || selectedItems.length === 0}";
|
||||
|
||||
/**
|
||||
* 提交审批类按钮的 disabledOn:无选中 <b>或</b> 选中行已在审批流程中(STATUS 非草稿/驳回/重提态)则禁用。
|
||||
*
|
||||
* <p>审批状态语义({@code sys_datastatus.datastatus},由 GeneralPO 以虚拟 STATUS 列带入每行):
|
||||
* 1=未提交/草稿、2=处理中/审批中、3=通过、4=驳回、5=重新提交、6=作废。提交审批仅在 1/4/5(草稿/驳回/重提)
|
||||
* 可用;2/3/6(处理中/已通过/作废)禁用——修「处理中还能再提交」。STATUS 缺失(无审批列)→ 仅退回选中态判断
|
||||
* ({@code STATUS &&} 短路为假,不误禁),松散 {@code !=} 兼容 STATUS 为整数或字符串。
|
||||
*/
|
||||
static final String SUBMIT_APPROVAL_DISABLED_ON =
|
||||
"${!selectedItems || selectedItems.length === 0 || (selectedItems[0].STATUS"
|
||||
+ " && selectedItems[0].STATUS != 1 && selectedItems[0].STATUS != 4"
|
||||
+ " && selectedItems[0].STATUS != 5)}";
|
||||
|
||||
/** 提交审批类按钮名判定(提交审批/提交/重新提交)——这类按钮降级时挂 STATUS-aware disabledOn 而非纯选中态。 */
|
||||
static boolean isSubmitApprovalButton(String name) {
|
||||
return name != null && name.contains("提交");
|
||||
}
|
||||
|
||||
/**
|
||||
* 判定某 headerToolbar 按钮是否为「baseline 永久禁用的业务动作按钮」:
|
||||
* {@code disabled==true} + 带 {@code /api/flow/} 对象式 api + 非 danger(删除用 disabledOn 非 baseline disabled)。
|
||||
|
||||
@@ -163,6 +163,57 @@ class TemplateToAmisConverterTest {
|
||||
assertEquals("picker", items.get(1).get("type"));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修复(菜单维护 dogfooding):可编辑 SelectDialog 的 dialogid 指向 type=3「树模板」(绑自引用层级实体,
|
||||
* 如「上级菜单」PARENTID→菜单维护树)→ 应转 amis tree-select(弹出树选择,对齐老系统「树型选择框」),
|
||||
* 而非扁平 picker(列表选择框)。判定在转换器侧(持 jdbc 查 view_template.type),UiTypeMapper 保持静态。
|
||||
*/
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void selectDialog_dialogid指向树模板_转tree_select而非picker() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class)))
|
||||
.thenReturn("PM_DEMO");
|
||||
// dialogid=TREE1 的模板 type=3(树形对话框)
|
||||
lenient().when(jdbc.queryForObject(any(String.class), eq(Integer.class), any(Object[].class)))
|
||||
.thenReturn(3);
|
||||
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
|
||||
|
||||
String xml = "<crud entityid='e1'><display/>"
|
||||
+ "<search><field name='PARENTID' label='上级菜单' uitype='SelectDialog' dialogid='TREE1'/></search>"
|
||||
+ "</crud>";
|
||||
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
||||
Map<String, Object> crud = body(r.getSchema());
|
||||
Map<String, Object> filter = (Map<String, Object>) crud.get("filter");
|
||||
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
|
||||
Map<String, Object> parent = items.get(0);
|
||||
assertEquals("tree-select", parent.get("type"));
|
||||
assertEquals("/api/template/TREE1/tree", parent.get("source"));
|
||||
assertNull(parent.get("pickerSchema")); // picker 专属键已清除
|
||||
}
|
||||
|
||||
/** 不回归:dialogid 指向非树模板(type≠3)的 SelectDialog 仍转扁平 picker。 */
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void selectDialog_dialogid指向非树模板_仍为picker() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class)))
|
||||
.thenReturn("PM_DEMO");
|
||||
lenient().when(jdbc.queryForObject(any(String.class), eq(Integer.class), any(Object[].class)))
|
||||
.thenReturn(1); // type=1 列表对话框
|
||||
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
|
||||
|
||||
String xml = "<crud entityid='e1'><display/>"
|
||||
+ "<search><field name='REFCOL' label='引用' uitype='SelectDialog' dialogid='LIST1'/></search>"
|
||||
+ "</crud>";
|
||||
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
||||
Map<String, Object> crud = body(r.getSchema());
|
||||
Map<String, Object> filter = (Map<String, Object>) crud.get("filter");
|
||||
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
|
||||
assertEquals("picker", items.get(0).get("type"));
|
||||
assertEquals("/api/picker/LIST1/list", items.get(0).get("source"));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修复:ComboBox 非 _SEARCH 命名的列表服务(推不出实体表)→ 经 sys_serviceflow.entityid 解析数据源实体
|
||||
* → /api/picker/{实体}/list(而非保底空字典)。mock jdbc 返 PM_DEMO 作实体表。
|
||||
@@ -934,6 +985,61 @@ class TemplateToAmisConverterTest {
|
||||
assertEquals("/api/flow/OA_NEWSCOLLECTIONTYPE_DELETE", deleteApi.get("url"));
|
||||
}
|
||||
|
||||
/**
|
||||
* 菜单维护 dogfooding:type=3 管理树的节点 <node pageid> 指向真实编辑页时,节点 CRUD 应升级为
|
||||
* 老系统式「工具栏(新增/修改/删除) + 树」——选中节点后修改/删除作用其上,修改打开全字段表单(initApi 载入
|
||||
* 选中节点数据)。树包进无面板 form 使选中值 ${tree} 可被工具栏按钮引用;不再用内联 editable/removable。
|
||||
*/
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void tree_type3带pageid_工具栏增改删全表单() throws Exception {
|
||||
TemplateToAmisConverter c = converterWithMeta(new String[0][], new String[0][]);
|
||||
String xml = "<tree rootname='菜单'>"
|
||||
+ "<node entityid='e1' pageid='PAGE1' isroot='true'>"
|
||||
+ "<buttons>"
|
||||
+ "<button name='添加' type='insert'/>"
|
||||
+ "<button name='修改' type='update'/>"
|
||||
+ "<button name='删除' type='delete'><method servicename='SYS_MENU_DELETE'/></button>"
|
||||
+ "<button name='保存' type='save'><method servicename='SYS_MENU_ADD'/></button>"
|
||||
+ "</buttons><nextnodes/></node></tree>";
|
||||
ConversionResult r = c.convertGraded(xml, "menu-tmpl", "菜单维护", new ArrayList<>(), noPage);
|
||||
assertEquals("tree", r.getRootElement());
|
||||
Map<String, Object> form = body(r.getSchema());
|
||||
assertEquals("form", form.get("type"), "工具栏+树须包进 form(选中值 ${tree} 供工具栏引用)");
|
||||
List<Map<String, Object>> fb = (List<Map<String, Object>>) form.get("body");
|
||||
// 末项=树本体,去内联编辑
|
||||
Map<String, Object> tree = fb.get(fb.size() - 1);
|
||||
assertEquals("input-tree", tree.get("type"));
|
||||
assertEquals("/api/template/menu-tmpl/tree", tree.get("source"));
|
||||
assertNull(tree.get("editable"), "工具栏模式不再内联改名");
|
||||
assertNull(tree.get("removable"), "工具栏模式不再内联删除");
|
||||
// 工具栏按钮:按 label 收集
|
||||
Map<String, Map<String, Object>> byLabel = new java.util.HashMap<>();
|
||||
for (Map<String, Object> it : fb) {
|
||||
if ("button".equals(it.get("type"))) {
|
||||
byLabel.put(String.valueOf(it.get("label")), it);
|
||||
}
|
||||
}
|
||||
assertTrue(byLabel.containsKey("新增"), "工具栏含 新增");
|
||||
assertTrue(byLabel.containsKey("修改"), "工具栏含 修改");
|
||||
assertTrue(byLabel.containsKey("删除"), "工具栏含 删除");
|
||||
// 修改:无选中禁用 + 弹窗 service.api 载入选中节点 /api/entity/PM_DEMO/${tree}
|
||||
Map<String, Object> edit = byLabel.get("修改");
|
||||
assertEquals("${!tree}", edit.get("disabledOn"));
|
||||
Map<String, Object> editDialog = (Map<String, Object>) edit.get("dialog");
|
||||
Map<String, Object> editService = (Map<String, Object>) editDialog.get("body");
|
||||
assertEquals("get:/api/page/schema/PAGE1?format=amis", editService.get("schemaApi"));
|
||||
Map<String, Object> editApi = (Map<String, Object>) editService.get("api");
|
||||
assertEquals("/api/entity/PM_DEMO/${tree}", editApi.get("url"));
|
||||
// 删除:无选中禁用 + ajax 删除服务流,pk=${tree}
|
||||
Map<String, Object> del = byLabel.get("删除");
|
||||
assertEquals("${!tree}", del.get("disabledOn"));
|
||||
assertEquals("ajax", del.get("actionType"));
|
||||
Map<String, Object> delApi = (Map<String, Object>) del.get("api");
|
||||
assertEquals("/api/flow/SYS_MENU_DELETE", delApi.get("url"));
|
||||
assertEquals("${tree}", ((Map<String, Object>) delApi.get("data")).get("PM_DEMO_ID"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void tree_treeGrid引用式() throws Exception {
|
||||
@@ -956,7 +1062,11 @@ class TemplateToAmisConverterTest {
|
||||
// 抬到视口相对+内部滚动(amis 默认 .cxd-Tree--outline 限高 300px 致「只露一半」)。
|
||||
assertNull(treeItem.get("heightAuto"), "不应再用 heightAuto 无限撑高");
|
||||
assertEquals("eip4-treegrid-tree", treeItem.get("className"), "BUG1:树须挂视口高度 className");
|
||||
assertNotNull(treeItem.get("onEvent"), "选中树节点应触发右表重载");
|
||||
// 大树关虚拟列表:amis VirtualList(>100 节点) 下选中节点对象身份与 valueSet 不一致→点中不高亮(「选不中」)。
|
||||
assertEquals(100000, treeItem.get("virtualThreshold"), "大树须关虚拟列表(virtualThreshold)以修选中高亮");
|
||||
// 去冗余:右表 crud 的 api 已带 node=${tree}(下方断言),${tree} 变化时 amis CRUD 自动重拉,故树不再挂
|
||||
// onEvent.change→reload。两条触发并存会一次点击发 2 请求且 onEvent 那条取到旧值(竞态)。
|
||||
assertNull(treeItem.get("onEvent"), "去冗余:树不再挂 onEvent.change(右表 node=${tree} 自动重拉,避免双请求竞态)");
|
||||
assertEquals("crud", gridItem.get("type"));
|
||||
String api = (String) gridItem.get("api");
|
||||
// BUG2:右表走子树聚合端点,携 treeRef(与左树同源)/gridTable/rcol/node=${tree}
|
||||
@@ -1000,7 +1110,8 @@ class TemplateToAmisConverterTest {
|
||||
assertNull(treeItem.get("removable"), "浏览页左树不应可删除节点");
|
||||
assertNull(treeItem.get("editApi"), "浏览页左树不应有 editApi");
|
||||
assertNull(treeItem.get("deleteApi"), "浏览页左树不应有 deleteApi");
|
||||
assertNotNull(treeItem.get("onEvent"), "浏览页左树仍须支持选中→重载右表");
|
||||
assertNull(treeItem.get("onEvent"), "去冗余:左树不再挂 onEvent.change(右表 node=${tree} 自动重拉,避免双请求竞态)");
|
||||
assertEquals(100000, treeItem.get("virtualThreshold"), "大树须关虚拟列表(virtualThreshold)以修选中高亮");
|
||||
}
|
||||
|
||||
// ── report (A 类) ────────────────────────────────────────────────────
|
||||
@@ -1150,7 +1261,8 @@ class TemplateToAmisConverterTest {
|
||||
// ── group ────────────────────────────────────────────────────────────
|
||||
|
||||
@Test
|
||||
void group_转tabs占位() {
|
||||
@SuppressWarnings("unchecked")
|
||||
void group_各tab远程加载子模板schema() {
|
||||
String xml = "<group>"
|
||||
+ "<template tempid='t1' name='已发消息'/>"
|
||||
+ "<template tempid='t2' name='已收消息' defaultshow='true'/></group>";
|
||||
@@ -1158,8 +1270,43 @@ class TemplateToAmisConverterTest {
|
||||
assertEquals("group", r.getRootElement());
|
||||
Map<String, Object> tabs = body(r.getSchema());
|
||||
assertEquals("tabs", tabs.get("type"));
|
||||
assertEquals(2, ((List<?>) tabs.get("tabs")).size());
|
||||
assertEquals(ConversionGrade.PARTIAL, r.getGrade());
|
||||
List<Map<String, Object>> tabList = (List<Map<String, Object>>) tabs.get("tabs");
|
||||
assertEquals(2, tabList.size());
|
||||
// 各 tab body = service 远程拉子模板 schema(amis mountOnEnter 天然懒加载)
|
||||
Map<String, Object> tab0Body = (Map<String, Object>) tabList.get(0).get("body");
|
||||
assertEquals("service", tab0Body.get("type"));
|
||||
assertEquals("get:/api/page/schema/t1?format=amis", tab0Body.get("schemaApi"));
|
||||
Map<String, Object> tab1Body = (Map<String, Object>) tabList.get(1).get("body");
|
||||
assertEquals("get:/api/page/schema/t2?format=amis", tab1Body.get("schemaApi"));
|
||||
// 不设 defaultKey:amis 默认激活并挂载第一个 tab(首屏即加载,不留空白)
|
||||
assertNull(tabs.get("defaultKey"));
|
||||
}
|
||||
|
||||
// ── calendar (type5) ─────────────────────────────────────────────────
|
||||
|
||||
/** type=5 日历模板:根元素是 <crud> 但 view_template.type=5 → 分流 convertCalendar → amis calendar(非表格)。 */
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void calendar_type5根crud转amis日历() {
|
||||
JdbcTemplate jdbc = mock(JdbcTemplate.class);
|
||||
lenient().when(jdbc.queryForObject(any(String.class), eq(String.class), any(Object[].class)))
|
||||
.thenReturn("HR_SCHUSERSCHEDULE"); // resolveTableName
|
||||
lenient().when(jdbc.queryForObject(any(String.class), eq(Integer.class), any(Object[].class)))
|
||||
.thenReturn(5); // isCalendarTemplate: type=5
|
||||
TemplateToAmisConverter c = new TemplateToAmisConverter(jdbc);
|
||||
|
||||
String xml = "<crud entityid='e1'><display selectservice='HR_SCHUSERSCHEDULE_SEARCH'>"
|
||||
+ "<field name='CAPTION' text='标题'/></display></crud>";
|
||||
ConversionResult r = c.convertGraded(xml, "cal-1", "单个员工排班", new ArrayList<>(), noPage);
|
||||
|
||||
Map<String, Object> svc = body(r.getSchema());
|
||||
assertEquals("service", svc.get("type"), "type=5 应转 service 包裹日历,而非普通 crud 表格");
|
||||
Map<String, Object> api = (Map<String, Object>) svc.get("api");
|
||||
assertEquals("/api/flow/HR_SCHUSERSCHEDULE_SEARCH", api.get("url"));
|
||||
assertTrue(((String) api.get("adaptor")).contains("schedules"), "adaptor 应把 items 映射成 schedules");
|
||||
Map<String, Object> cal = (Map<String, Object>) svc.get("body");
|
||||
assertEquals("calendar", cal.get("type"));
|
||||
assertEquals("${schedules}", cal.get("schedules"));
|
||||
}
|
||||
|
||||
// ── 旁路与异常 ────────────────────────────────────────────────────────
|
||||
@@ -1436,8 +1583,8 @@ class TemplateToAmisConverterTest {
|
||||
Map<String, Object> btn = (Map<String, Object>) ((List<Object>) crud.get("headerToolbar")).get(0);
|
||||
assertEquals("提交审批", btn.get("id"));
|
||||
assertNull(btn.get("disabled"), "无 onselected → 去掉 baseline disabled:true");
|
||||
assertEquals("${!selectedItems || selectedItems.length === 0}", btn.get("disabledOn"),
|
||||
"无脚本启停 → 选中即可用");
|
||||
assertEquals(TemplateToAmisConverter.SUBMIT_APPROVAL_DISABLED_ON, btn.get("disabledOn"),
|
||||
"提交审批降级时挂 STATUS-aware disabledOn(处理中/已通过/作废禁用)");
|
||||
// 有 inited(onload 脚本),但无 selectedChange
|
||||
Map<String, Object> onEvent = (Map<String, Object>) crud.get("onEvent");
|
||||
assertTrue(onEvent.containsKey("inited"));
|
||||
@@ -1595,8 +1742,8 @@ class TemplateToAmisConverterTest {
|
||||
Map<String, Object> submit = (Map<String, Object>) toolbar.get(0);
|
||||
assertEquals("提交审批", submit.get("id"));
|
||||
assertNull(submit.get("disabled"), "业务按钮去 baseline disabled:true");
|
||||
assertEquals("${!selectedItems || selectedItems.length === 0}", submit.get("disabledOn"),
|
||||
"业务按钮选中即可用(贴老 bulkActions 选中态语义)");
|
||||
assertEquals(TemplateToAmisConverter.SUBMIT_APPROVAL_DISABLED_ON, submit.get("disabledOn"),
|
||||
"提交审批降级时挂 STATUS-aware disabledOn(处理中/已通过/作废禁用,修「处理中还能再提交」)");
|
||||
// 删除按钮本就 disabledOn(非 baseline disabled),不受影响
|
||||
Map<String, Object> del = (Map<String, Object>) toolbar.get(1);
|
||||
assertEquals("删除", del.get("id"));
|
||||
@@ -1658,6 +1805,42 @@ class TemplateToAmisConverterTest {
|
||||
"树+grid 收藏页「取消收藏」选中即可点(修永久灰)");
|
||||
}
|
||||
|
||||
// ── 查看审批按钮(审批列表统一补)─────────────────────────────────────
|
||||
|
||||
/** 审批列表(有提交审批按钮)→ toolbar 统一补「查看审批」按钮(dialog→service 调 trace 端点)。 */
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void buildToolbar_审批列表补查看审批按钮() {
|
||||
String xml = "<crud entityid='e1'><display><field name='A' text='A'/></display>"
|
||||
+ "<button type='delete' name='提交审批' isshow='true'><method servicename='OA_X_SUBMIT'/></button>"
|
||||
+ "</crud>";
|
||||
Map<String, Object> schema = converter.convertGraded(xml, new ArrayList<>(), noPage).getSchema();
|
||||
List<Object> toolbar = (List<Object>) body(schema).get("headerToolbar");
|
||||
Map<String, Object> view = btnById(toolbar, "查看审批");
|
||||
assertEquals("dialog", view.get("actionType"));
|
||||
assertEquals(TemplateToAmisConverter.DISABLED_ON_NO_SELECTION, view.get("disabledOn"),
|
||||
"查看审批任何状态可查 → 纯选中态");
|
||||
Map<String, Object> svc = (Map<String, Object>) ((Map<String, Object>) view.get("dialog")).get("body");
|
||||
Map<String, Object> api = (Map<String, Object>) svc.get("api");
|
||||
assertTrue(((String) api.get("url")).contains("/api/flow/business/"), "应调 businessKey→trace 端点");
|
||||
assertTrue(((String) api.get("url")).contains("PM_DEMO_ID"), "应传选中行业务主键");
|
||||
assertTrue(((String) api.get("adaptor")).contains("nodes"), "adaptor 把裸数组包成 amis 信封");
|
||||
}
|
||||
|
||||
/** 非审批列表(无提交审批按钮)→ 不补查看审批按钮。 */
|
||||
@Test
|
||||
@SuppressWarnings("unchecked")
|
||||
void buildToolbar_非审批列表不补查看审批() {
|
||||
String xml = "<crud entityid='e1'><display><field name='A' text='A'/></display>"
|
||||
+ "<button type='delete' name='删除' isshow='true'><method servicename='OA_X_DELETE'/></button>"
|
||||
+ "</crud>";
|
||||
Map<String, Object> schema = converter.convertGraded(xml, new ArrayList<>(), noPage).getSchema();
|
||||
List<Object> toolbar = (List<Object>) body(schema).get("headerToolbar");
|
||||
boolean has = toolbar.stream().anyMatch(o -> o instanceof Map<?, ?> m
|
||||
&& "查看审批".equals(((Map<String, Object>) m).get("id")));
|
||||
assertFalse(has, "非审批列表不应有查看审批按钮");
|
||||
}
|
||||
|
||||
// ── 小修#1:per-button 降级(脚本 enableButton 目标集未引用的业务按钮 → disabledOn)──────────
|
||||
|
||||
/** 小修#1:从脚本文本提取 enableButton 目标按钮名(容忍空白、单/双引号、第二参点亮/置灰)。 */
|
||||
@@ -1709,8 +1892,8 @@ class TemplateToAmisConverterTest {
|
||||
assertNull(publish.get("disabledOn"));
|
||||
// 提交审批:脚本永不引用 → 降级 disabledOn(选中即可点,不再永久灰)
|
||||
assertNull(submit.get("disabled"), "提交审批未被脚本引用 → 去 baseline disabled:true");
|
||||
assertEquals("${!selectedItems || selectedItems.length === 0}", submit.get("disabledOn"),
|
||||
"提交审批选中即可点(贴老系统默认可点)");
|
||||
assertEquals(TemplateToAmisConverter.SUBMIT_APPROVAL_DISABLED_ON, submit.get("disabledOn"),
|
||||
"提交审批降级时挂 STATUS-aware disabledOn(处理中/已通过/作废禁用)");
|
||||
// 删除:本就 disabledOn(非 baseline disabled),不受影响
|
||||
assertEquals("${!selectedItems || selectedItems.length === 0}", del.get("disabledOn"));
|
||||
|
||||
@@ -1778,7 +1961,8 @@ class TemplateToAmisConverterTest {
|
||||
|
||||
Map<String, Object> btn = (Map<String, Object>) ((List<Object>) body(schema).get("headerToolbar")).get(0);
|
||||
assertNull(btn.get("disabled"), "空目标集 → 业务按钮去 baseline disabled:true");
|
||||
assertEquals("${!selectedItems || selectedItems.length === 0}", btn.get("disabledOn"));
|
||||
assertEquals(TemplateToAmisConverter.SUBMIT_APPROVAL_DISABLED_ON, btn.get("disabledOn"),
|
||||
"提交审批降级时挂 STATUS-aware disabledOn");
|
||||
}
|
||||
|
||||
/** 工具:按 id 在 headerToolbar 找按钮。 */
|
||||
@@ -2676,9 +2860,9 @@ class TemplateToAmisConverterTest {
|
||||
// 不再用 bulkActions 槽
|
||||
assertNull(crud.get("bulkActions"), "业务按钮已迁出 bulkActions");
|
||||
|
||||
// headerToolbar = [提交审批-btn, 文件归档-btn, pagination] = 3 项
|
||||
// headerToolbar = [提交审批-btn, 文件归档-btn, 查看审批-btn, pagination] = 4 项(审批列表补查看审批)
|
||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||
assertEquals(3, toolbar.size(), "提交审批 + 文件归档 + pagination");
|
||||
assertEquals(4, toolbar.size(), "提交审批 + 文件归档 + 查看审批 + pagination");
|
||||
|
||||
Map<String, Object> submitBtn = (Map<String, Object>) toolbar.get(0); // 提交审批
|
||||
assertEquals("提交审批", submitBtn.get("label"));
|
||||
@@ -2760,8 +2944,8 @@ class TemplateToAmisConverterTest {
|
||||
|
||||
assertNull(crud.get("bulkActions"), "WS-B:业务/删除按钮全部挂 headerToolbar,无 bulkActions 槽");
|
||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||
// [发布, 显示, 提交审批, 删除, pagination] = 5
|
||||
assertEquals(5, toolbar.size());
|
||||
// [发布, 显示, 提交审批, 删除, 查看审批, pagination] = 6(审批列表补查看审批,删除仍在 index 3)
|
||||
assertEquals(6, toolbar.size());
|
||||
|
||||
String idsExpr = "${selectedItems|pick:PM_DEMO_ID|join:','}";
|
||||
String pkExpr = "${selectedItems[0].PM_DEMO_ID}"; // C1:bracket 记法单选主键
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user