feat(converter): 业务动作按钮脚本联动真生效——迁 headerToolbar+id+选中行+复位
WS-B 最后一环:让新闻管理 8 个业务动作按钮(发布/显示/隐藏/置顶/文件归档/
取消置顶/提交审批/删除)的脚本联动(选中行→按 STATUS 点亮/置灰)在 UI 真生效。
根因(修前):type=delete+servicename 的业务按钮走 bulkActions 分支,bulkActions
按钮无 id → onselectedscript 脚本的 enabled/disabled 指令(componentId=按钮中文名)
定位不到 → 静默 no-op;且 amis 选中行自动点亮全部 bulkActions → 全亮失真。
改法(buildToolbar):业务/删除按钮全部改挂 headerToolbar,补 id=中文名(供脚本
componentId 精准启停),不再用 bulkActions 槽(删除 buildToolbar 的 bulkActions 形参
+ "bulkActions" 占位 token;convertCrud/treegrid 两调用点同步)。
四处 amis 6.13 实证(playwright 真实渲染+抓包,spike 2026-06-14)决定的关键细节:
1) 选中行表达式:${ids} 仅 bulkActions 路径注入、headerToolbar 取不到(POST 空);
改 ${selectedItems|pick:<PK>|join:','} 在 headerToolbar 作用域可读。
2) baseline:业务按钮 disabled:true(贴老 Vaadin「先禁用、脚本据 STATUS 点亮」,见
rewritten/ddb75614 seq1 仅 enableButton(...,true) 不复位);脚本 enabled 指令
覆盖 baseline、无冲突。删除是「选中即可」语义 → disabledOn 随选中态。
3) 切行防残留:attachScriptOnEvent 在 selectedChange 链最前对所有 baseline 禁用业务
按钮发 disabled 复位,再跑脚本(脚本只 enable 不 disable 对侧,不复位则 ISSHOW=1
行点亮「隐藏」切到 ISSHOW=0 行仍亮)。
4) api 形态+data 键:字符串式 api("POST:...")同级 data 被 amis 当局部数据域、请求体
只剩 {page:1} 丢选中行 → 改对象式 api 内嵌 data;且业务流(PUBLISH/ISSHOW…)input
只声明 map、脚本读 map[<PK>],须把单选主键放 data[<PK>]=${selectedItems.0.<PK>}
(放 ids 不识别 → status:0 但 result:null 空转),删除族(input 声明 <PK> required)
仍带 ids 走 FlowController fanout,一份 schema 覆盖两族。
浏览器端到端实证(8093 live + 5173,admin):初始全业务按钮灰;选 STATUS=3/ISSEND=1/
ISSHOW=1 行→隐藏+置顶点亮、发布灰;切 ISSHOW=0 行→显示点亮、隐藏复位转灰;点亮的
「显示」点击→POST /api/flow/OA_NEWSMANAGE_ISSHOW 带正确选中行 id、200、DB 行 ISSHOW
0→1 真落库;console 0 ajax 报错。
测试:platform-converter 102 绿(TemplateToAmisConverterTest 新增「新闻业务动作按钮挂
headerToolbar 脚本可联动」「selectedChange 先复位再跑脚本」「无业务按钮不加复位」3 用例,
改写 delete/业务 delete/安全中和/index 偏移等既有用例至 headerToolbar+对象式 api 契约)。
全量重转 crud 956/956、[WS-B]对齐告警 0,SchemaImportCli upsert 659。
base=47d03b7
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -165,8 +165,7 @@ public class TemplateToAmisConverter {
|
|||||||
List<Map<String, Object>> columns = display != null ? buildColumns(display, entityId, result) : new ArrayList<>();
|
List<Map<String, Object>> columns = display != null ? buildColumns(display, entityId, result) : new ArrayList<>();
|
||||||
|
|
||||||
Map<String, Object> filter = buildSearchFilter(crud.element("search"), result, entityId);
|
Map<String, Object> filter = buildSearchFilter(crud.element("search"), result, entityId);
|
||||||
List<Map<String, Object>> bulkActions = new ArrayList<>();
|
List<Object> toolbar = buildToolbar(collectButtons(crud), table, entityId, result);
|
||||||
List<Object> toolbar = buildToolbar(collectButtons(crud), table, entityId, bulkActions, result);
|
|
||||||
|
|
||||||
// 主子表识别:display 段含 <subtemplate>/<detail> 指向子表,或 crud 含 ismaster 标记
|
// 主子表识别:display 段含 <subtemplate>/<detail> 指向子表,或 crud 含 ismaster 标记
|
||||||
boolean masterSub = crud.element("subtemplate") != null
|
boolean masterSub = crud.element("subtemplate") != null
|
||||||
@@ -186,11 +185,8 @@ public class TemplateToAmisConverter {
|
|||||||
}
|
}
|
||||||
crudSchema.put("columns", columns);
|
crudSchema.put("columns", columns);
|
||||||
crudSchema.put("headerToolbar", toolbar);
|
crudSchema.put("headerToolbar", toolbar);
|
||||||
// F2-17:删除走 bulkActions(amis 标准批量操作槽,可靠提供 ${ids};headerToolbar
|
// WS-B(最后一环):删除/业务动作按钮已全部改挂 headerToolbar(补 id 供脚本 enabled/disabled
|
||||||
// 单选 radio 不填充 selectedItems 字段访问)。bulkActions 非空才设。
|
// 联动 + ${selectedItems|pick:<PK>|join:','} 读选中行主键),不再用 bulkActions 槽。
|
||||||
if (!bulkActions.isEmpty()) {
|
|
||||||
crudSchema.put("bulkActions", bulkActions);
|
|
||||||
}
|
|
||||||
crudSchema.put("primaryField", table + "_ID");
|
crudSchema.put("primaryField", table + "_ID");
|
||||||
|
|
||||||
return page(title, crudSchema);
|
return page(title, crudSchema);
|
||||||
@@ -454,9 +450,10 @@ public class TemplateToAmisConverter {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private List<Object> buildToolbar(List<Element> buttons, String table, String entityId,
|
private List<Object> buildToolbar(List<Element> buttons, String table, String entityId,
|
||||||
List<Map<String, Object>> bulkActions, ConversionResult result) {
|
ConversionResult result) {
|
||||||
|
// WS-B(最后一环):删除/业务动作按钮全部改挂 headerToolbar(补 id 供脚本联动 + selectedItems
|
||||||
|
// 表达式读选中行),不再用 bulkActions 槽(其按钮无 id 致脚本指令静默 no-op + 选中自动全亮)。
|
||||||
List<Object> toolbar = new ArrayList<>();
|
List<Object> toolbar = new ArrayList<>();
|
||||||
toolbar.add("bulkActions");
|
|
||||||
for (Element b : buttons) {
|
for (Element b : buttons) {
|
||||||
if ("false".equals(b.attributeValue("isshow"))) {
|
if ("false".equals(b.attributeValue("isshow"))) {
|
||||||
continue;
|
continue;
|
||||||
@@ -489,46 +486,49 @@ public class TemplateToAmisConverter {
|
|||||||
.map(m -> m.attributeValue("servicename", ""))
|
.map(m -> m.attributeValue("servicename", ""))
|
||||||
.filter(s -> !s.isBlank())
|
.filter(s -> !s.isBlank())
|
||||||
.findFirst().orElse("");
|
.findFirst().orElse("");
|
||||||
|
// WS-B(最后一环):选中行主键表达式(headerToolbar 作用域可读,见 selectedIdsExpr)。
|
||||||
|
String pkCol = table + "_ID";
|
||||||
|
String idsExpr = selectedIdsExpr(pkCol);
|
||||||
if (isTrueDeleteButton(btnName)) {
|
if (isTrueDeleteButton(btnName)) {
|
||||||
// 真删除按钮:入 bulkActions(amis 批量操作槽,自动注入 ${ids}=选中行主键逗号串)。
|
// 真删除按钮:改挂 headerToolbar(补 id 供脚本 enabled/disabled 定位),
|
||||||
// WS-B M2 note:bulkActions 槽内按钮不设 amis id,故 enableButton("删除",…) 的
|
// 点击仍 ajax POST 删除接口、引用选中行主键串。删除是「选中即可」语义
|
||||||
// enabled/disabled 指令(componentId=按钮名)无法定位 bulkActions 删除按钮——但实测
|
// (非按 STATUS 联动),故 baseline 用 disabledOn 跟随选中态(无选中→灰)。
|
||||||
// 删除按钮极少被 onselectedscript 联动启停(联动几乎都针对 headerToolbar 业务按钮),
|
btn.put("level", "danger");
|
||||||
// 暂不强制补 id(amis bulkActions 对自定义 id 的启停支持亦不稳)。
|
btn.put("actionType", "ajax");
|
||||||
Map<String, Object> del = new LinkedHashMap<>();
|
btn.put("disabledOn", "${!selectedItems || selectedItems.length === 0}");
|
||||||
del.put("type", "button");
|
btn.put("confirmText", UiTypeMapper.firstNonBlank(b.attributeValue("showmsg"), "确认删除选中记录?"));
|
||||||
del.put("label", btnName);
|
|
||||||
del.put("level", "danger");
|
|
||||||
del.put("actionType", "ajax");
|
|
||||||
del.put("confirmText", UiTypeMapper.firstNonBlank(b.attributeValue("showmsg"), "确认删除选中记录?"));
|
|
||||||
// 优先走服务流,无 servicename 保底走实体删除接口
|
// 优先走服务流,无 servicename 保底走实体删除接口
|
||||||
String delApi = delSvc.isBlank()
|
String delUrl = delSvc.isBlank()
|
||||||
? "POST:/api/entity/" + table + "/delete"
|
? "/api/entity/" + table + "/delete"
|
||||||
: "POST:/api/flow/" + delSvc;
|
: "/api/flow/" + delSvc;
|
||||||
del.put("api", delApi);
|
btn.put("api", ajaxPostApi(delUrl, pkCol));
|
||||||
del.put("data", new LinkedHashMap<>(Map.of("ids", "${ids}")));
|
result.note("button[delete] " + btnName + " → headerToolbar ajax POST " + delUrl
|
||||||
bulkActions.add(del);
|
+ "(id=" + btnName + ",ids=" + idsExpr + ",disabledOn=选中态)");
|
||||||
result.note("button[delete] " + btnName + " → bulkActions ajax " + delApi + "(ids=${ids})");
|
toolbar.add(btn);
|
||||||
} else if (!delSvc.isBlank()) {
|
} else if (!delSvc.isBlank()) {
|
||||||
// 业务型 type=delete 有服务流(提交审批/文件归档等):入 bulkActions。
|
// 业务型 type=delete 有服务流(发布/显示/隐藏/置顶/文件归档/取消置顶/提交审批等):
|
||||||
|
// 改挂 headerToolbar(补 id=中文名 供 onselectedscript 脚本 enabled/disabled 按
|
||||||
|
// componentId 精准联动启停),点击 ajax POST /api/flow/{svc} 引用选中行主键串。
|
||||||
//
|
//
|
||||||
// 关键作用域修复(amis 6.13 实证 CRUD.handleBulkAction):${ids}=选中行主键
|
// 作用域实证(amis 6.13 抓包,spike 2026-06-14):${ids} 仅 bulkActions 路径注入、
|
||||||
// 逗号串仅在 bulkActions 路径由 amis 注入数据域;headerToolbar 按钮不经该路径,
|
// headerToolbar 取不到;改用 ${selectedItems|pick:<PK>|join:','}(selectedIdsExpr)
|
||||||
// ${ids} 取不到 → POST body 空 → SUBMIT 报「该通知已被删除」。
|
// 在 headerToolbar 作用域可读,抓包返真实逗号串。bulkActions 按钮无 id 无法被脚本
|
||||||
// 故移入 bulkActions(与删除按钮同槽),data:{ids:${ids}} 才能读到选中行。
|
// 定位(旧实现致脚本指令静默 no-op + 满屏自动点亮),故迁出 bulkActions。
|
||||||
Map<String, Object> bulkBtn = new LinkedHashMap<>();
|
//
|
||||||
bulkBtn.put("type", "button");
|
// baseline:业务按钮默认 disabled(贴老 Vaadin「按钮先禁用、脚本据 STATUS 点亮」语义,
|
||||||
bulkBtn.put("label", btnName);
|
// 见 rewritten/ddb75614 seq1:status==3 仅 enableButton(...,true) 不复位)。脚本
|
||||||
|
// enabled 指令(statusStore.setDisable)覆盖 baseline——spike 实证 enabled 胜 baseline、
|
||||||
|
// 无冲突;取消选中时脚本 else 分支置灰。
|
||||||
|
btn.put("actionType", "ajax");
|
||||||
|
btn.put("disabled", true);
|
||||||
String confirmMsg = UiTypeMapper.firstNonBlank(b.attributeValue("showmsg"), "");
|
String confirmMsg = UiTypeMapper.firstNonBlank(b.attributeValue("showmsg"), "");
|
||||||
if (!confirmMsg.isBlank()) {
|
if (!confirmMsg.isBlank()) {
|
||||||
bulkBtn.put("confirmText", confirmMsg);
|
btn.put("confirmText", confirmMsg);
|
||||||
}
|
}
|
||||||
bulkBtn.put("actionType", "ajax");
|
btn.put("api", ajaxPostApi("/api/flow/" + delSvc, pkCol));
|
||||||
bulkBtn.put("api", "POST:/api/flow/" + delSvc);
|
result.note("button[delete/flow] " + btnName + " → headerToolbar ajax POST /api/flow/" + delSvc
|
||||||
bulkBtn.put("data", new LinkedHashMap<>(Map.of("ids", "${ids}")));
|
+ "(id=" + btnName + ",ids=" + idsExpr + ",baseline disabled,脚本据 STATUS 点亮)");
|
||||||
bulkActions.add(bulkBtn);
|
toolbar.add(btn);
|
||||||
result.note("button[delete/flow] " + btnName + " → bulkActions ajax POST /api/flow/" + delSvc + "(ids=${ids})");
|
|
||||||
continue;
|
|
||||||
} else {
|
} else {
|
||||||
// 无服务流 + 非删除名:安全禁用,等待后续服务流接入
|
// 无服务流 + 非删除名:安全禁用,等待后续服务流接入
|
||||||
btn.put("disabled", true);
|
btn.put("disabled", true);
|
||||||
@@ -1192,6 +1192,65 @@ public class TemplateToAmisConverter {
|
|||||||
|| n.equals("删除记录") || n.equals("删除选中");
|
|| n.equals("删除记录") || n.equals("删除选中");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* WS-B(最后一环):headerToolbar 业务动作按钮读取「选中行主键逗号串」的 amis 表达式。
|
||||||
|
*
|
||||||
|
* <p>实证(amis 6.13 真实渲染 + 抓包,spike 2026-06-14):
|
||||||
|
* <ul>
|
||||||
|
* <li>{@code ${ids}} 仅在 <b>bulkActions</b> 路径由 CRUD.handleBulkAction 注入数据域,
|
||||||
|
* headerToolbar 按钮取不到(POST 出 {@code ids:""});</li>
|
||||||
|
* <li>但 {@code ${selectedItems}} 数组本身在 headerToolbar 数据域<b>可见</b>(amis 官方
|
||||||
|
* crud 文档 selectable 示例同源),故用 {@code pick:<PK列>|join:','} 取主键串
|
||||||
|
* —— 抓包实证返真实逗号串(如 {@code 8cfccab2…,5fd57431…})。</li>
|
||||||
|
* </ul>
|
||||||
|
* 把业务按钮从 bulkActions 改挂 headerToolbar(补 id 供脚本 enabled/disabled 定位)后,
|
||||||
|
* 用此表达式让「点击 → POST /api/flow/{svc}」仍带选中行主键。
|
||||||
|
*
|
||||||
|
* @param pkCol 主键列名(= {@code table + "_ID"} = crud.primaryField)
|
||||||
|
*/
|
||||||
|
private static String selectedIdsExpr(String pkCol) {
|
||||||
|
return "${selectedItems|pick:" + pkCol + "|join:','}";
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 选中行(单选)的主键表达式:{@code ${selectedItems[0].<PK>}}(业务流读 map[PK] 用)。 */
|
||||||
|
private static String selectedSingleIdExpr(String pkCol) {
|
||||||
|
return "${selectedItems.0." + pkCol + "}";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* WS-B(最后一环):构造 amis ajax 按钮的 <b>对象式 api</b>(含 {@code method/url/data})。
|
||||||
|
*
|
||||||
|
* <p><b>① api 形态(对象式 vs 字符串式)</b>:实证(amis 6.13 抓包,radio 单选 crud,spike
|
||||||
|
* 2026-06-14):按钮用字符串式 api({@code "POST:/api/flow/X"})+ 同级 {@code data} 时,amis 把
|
||||||
|
* 同级 data 当按钮局部数据域、而非请求体 → POST 实际只带 crud 查询参数 {@code {page:1}},选中行
|
||||||
|
* 丢失。改用对象式 api 把 data 内嵌进 api → 抓包实证请求体正确携带选中行。
|
||||||
|
*
|
||||||
|
* <p><b>② data 键(兼容两族服务流契约)</b>:实证两类 sys_serviceflow input 契约:
|
||||||
|
* <ul>
|
||||||
|
* <li><b>删除族</b>(OA_*_DELETE):input 直接声明 {@code <field name="<PK>" required>}
|
||||||
|
* → FlowController 命中 {@code missingRequiredIdInput} 后按 {@code ids} 逗号串拆分逐 id 跑流;</li>
|
||||||
|
* <li><b>业务动作族</b>(PUBLISH/ISSHOW/HIDE/ISTOP/...):input 只声明 {@code map},脚本里
|
||||||
|
* {@code map.put("ISSHOW",1)} 后 {@code pojoCRUDService.update(map,...)} 按 {@code map[<PK>]}
|
||||||
|
* 定位行 → 须把选中行主键放在 <b>{@code map[<PK>]}</b>(放 {@code ids} 不识别 → status:0
|
||||||
|
* 但 result:null 空转,实证)。</li>
|
||||||
|
* </ul>
|
||||||
|
* 故 data 同时带 {@code ids}(逗号串,删除族 fanout 用)+ {@code <PK>}(单选主键,业务族 map[PK] 用),
|
||||||
|
* 一份 schema 覆盖两族;单选 radio 下二者指向同一行,多选时删除族走 ids fanout。
|
||||||
|
*
|
||||||
|
* @param url 请求路径(如 {@code /api/flow/OA_NEWSMANAGE_PUBLISH})
|
||||||
|
* @param pkCol 主键列名(= {@code table + "_ID"})
|
||||||
|
*/
|
||||||
|
private static Map<String, Object> ajaxPostApi(String url, String pkCol) {
|
||||||
|
Map<String, Object> data = new LinkedHashMap<>();
|
||||||
|
data.put("ids", selectedIdsExpr(pkCol)); // 删除族:FlowController 按逗号串拆分 fanout
|
||||||
|
data.put(pkCol, selectedSingleIdExpr(pkCol)); // 业务族:脚本 map[<PK>] 定位选中行
|
||||||
|
Map<String, Object> api = new LinkedHashMap<>();
|
||||||
|
api.put("method", "post");
|
||||||
|
api.put("url", url);
|
||||||
|
api.put("data", data);
|
||||||
|
return api;
|
||||||
|
}
|
||||||
|
|
||||||
// ──────────────────────────────────────────────────────────────────────
|
// ──────────────────────────────────────────────────────────────────────
|
||||||
// tree(树 / 树+grid)
|
// tree(树 / 树+grid)
|
||||||
// ──────────────────────────────────────────────────────────────────────
|
// ──────────────────────────────────────────────────────────────────────
|
||||||
@@ -1312,16 +1371,13 @@ public class TemplateToAmisConverter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 右表工具栏:复用普通列表的 collectButtons/buildToolbar(添加/修改/删除/查看 + EDITFORM
|
// 右表工具栏:复用普通列表的 collectButtons/buildToolbar(添加/修改/删除/查看 + EDITFORM
|
||||||
// 映射 + 删除走 bulkActions ${ids}),与 convertCrud 同源,treegrid 右表此前完全无按钮。
|
// 映射 + 删除/业务动作挂 headerToolbar 带选中行主键串),与 convertCrud 同源,
|
||||||
|
// treegrid 右表此前完全无按钮。
|
||||||
if (gridTableUpper != null && !gridTableUpper.isBlank()) {
|
if (gridTableUpper != null && !gridTableUpper.isBlank()) {
|
||||||
List<Map<String, Object>> bulkActions = new ArrayList<>();
|
|
||||||
List<Object> toolbar = buildToolbar(collectButtons(gridRoot), gridTableUpper,
|
List<Object> toolbar = buildToolbar(collectButtons(gridRoot), gridTableUpper,
|
||||||
gridEntityId, bulkActions, result);
|
gridEntityId, result);
|
||||||
gridSchema.put("selectable", true);
|
gridSchema.put("selectable", true);
|
||||||
gridSchema.put("headerToolbar", toolbar);
|
gridSchema.put("headerToolbar", toolbar);
|
||||||
if (!bulkActions.isEmpty()) {
|
|
||||||
gridSchema.put("bulkActions", bulkActions);
|
|
||||||
}
|
|
||||||
gridSchema.put("primaryField", gridTableUpper + "_ID");
|
gridSchema.put("primaryField", gridTableUpper + "_ID");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1894,7 +1950,15 @@ public class TemplateToAmisConverter {
|
|||||||
|
|
||||||
Map<String, Object> onEvent = new LinkedHashMap<>();
|
Map<String, Object> onEvent = new LinkedHashMap<>();
|
||||||
if (!selectedActions.isEmpty()) {
|
if (!selectedActions.isEmpty()) {
|
||||||
onEvent.put(EVENT_SELECTED_CHANGE, Map.of("actions", selectedActions));
|
// WS-B(最后一环):每次行选中先「复位」——把所有 baseline 禁用的业务动作按钮 disabled,
|
||||||
|
// 再跑脚本据本行 STATUS enable 适用按钮。原因:迁移脚本(如 rewritten/ddb75614 seq1)对
|
||||||
|
// status==3 分支只 enableButton(...,true) 不复位对侧(贴老 Vaadin「选中即重置按钮态」生命周期),
|
||||||
|
// 不复位则切行残留上一行点亮态(如 ISSHOW=1 行点亮「隐藏」→切 ISSHOW=0 行「隐藏」仍亮)。
|
||||||
|
// 复位指令 = 对 headerToolbar 里 disabled:true 的业务按钮逐个 amis disabled(componentId=id)。
|
||||||
|
List<Object> resetActions = buildButtonResetActions(body);
|
||||||
|
List<Object> withReset = new ArrayList<>(resetActions);
|
||||||
|
withReset.addAll(selectedActions);
|
||||||
|
onEvent.put(EVENT_SELECTED_CHANGE, Map.of("actions", withReset));
|
||||||
}
|
}
|
||||||
if (!initedActions.isEmpty()) {
|
if (!initedActions.isEmpty()) {
|
||||||
onEvent.put(EVENT_INITED, Map.of("actions", initedActions));
|
onEvent.put(EVENT_INITED, Map.of("actions", initedActions));
|
||||||
@@ -1905,6 +1969,38 @@ public class TemplateToAmisConverter {
|
|||||||
return pageSchema;
|
return pageSchema;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* WS-B(最后一环):构造行选中前的「按钮态复位」动作——对 headerToolbar 中 baseline {@code disabled:true}
|
||||||
|
* 的业务动作按钮逐个发 amis {@code disabled} 动作(componentId=按钮 id=中文名)。
|
||||||
|
*
|
||||||
|
* <p>挂在 selectedChange 脚本链最前,使每次选中从「全禁用」干净起点重算,由脚本据本行 STATUS
|
||||||
|
* enable 适用按钮,避免切行残留上一行的点亮态(迁移脚本只 enable 不 disable 对侧)。仅取 baseline
|
||||||
|
* 禁用的按钮(= 业务动作按钮);添加/修改/查看/删除(dialog 或 disabledOn 选中态)不在复位之列。
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
private List<Object> buildButtonResetActions(Map<String, Object> body) {
|
||||||
|
List<Object> reset = new ArrayList<>();
|
||||||
|
Object tbObj = body.get("headerToolbar");
|
||||||
|
if (!(tbObj instanceof List)) {
|
||||||
|
return reset;
|
||||||
|
}
|
||||||
|
for (Object item : (List<Object>) tbObj) {
|
||||||
|
if (!(item instanceof Map)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
Map<String, Object> btn = (Map<String, Object>) item;
|
||||||
|
Object id = btn.get("id");
|
||||||
|
// 仅复位 baseline disabled=true 的业务按钮(脚本据 STATUS 点亮的那批)
|
||||||
|
if (Boolean.TRUE.equals(btn.get("disabled")) && id instanceof String && !((String) id).isBlank()) {
|
||||||
|
Map<String, Object> dis = new LinkedHashMap<>();
|
||||||
|
dis.put("actionType", "disabled");
|
||||||
|
dis.put("componentId", id);
|
||||||
|
reset.add(dis);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return reset;
|
||||||
|
}
|
||||||
|
|
||||||
/** 单段脚本的动作链:ajax 调执行端点 → 自定义动作重放返回的指令数组(item 默认全量数据域 {@code ${&}})。 */
|
/** 单段脚本的动作链:ajax 调执行端点 → 自定义动作重放返回的指令数组(item 默认全量数据域 {@code ${&}})。 */
|
||||||
private List<Object> scriptActionChain(String templateId, int seq) {
|
private List<Object> scriptActionChain(String templateId, int seq) {
|
||||||
return scriptActionChain(templateId, seq, "${&}");
|
return scriptActionChain(templateId, seq, "${&}");
|
||||||
|
|||||||
@@ -277,20 +277,28 @@ class TemplateToAmisConverterTest {
|
|||||||
+ "<method servicename='X_DELETE'/></button></crud>";
|
+ "<method servicename='X_DELETE'/></button></crud>";
|
||||||
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
Map<String, Object> crud = body(r.getSchema());
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
// F2-17: 删除入 bulkActions(amis 批量槽,${ids}),不在 headerToolbar
|
// WS-B(最后一环):删除改挂 headerToolbar(补 id 供脚本联动),不再用 bulkActions 槽
|
||||||
List<Map<String, Object>> bulk = (List<Map<String, Object>>) crud.get("bulkActions");
|
assertNull(crud.get("bulkActions"), "删除已迁出 bulkActions");
|
||||||
assertNotNull(bulk);
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
assertEquals(1, bulk.size());
|
// headerToolbar = [删除-btn, pagination](无 bulkActions 占位)
|
||||||
Map<String, Object> btn = bulk.get(0);
|
assertEquals(2, toolbar.size());
|
||||||
|
Map<String, Object> btn = (Map<String, Object>) toolbar.get(0);
|
||||||
|
assertEquals("button", btn.get("type"));
|
||||||
|
assertEquals("删除", btn.get("id"), "id=中文名供脚本 enabled/disabled 定位");
|
||||||
|
assertEquals("删除", btn.get("label"));
|
||||||
assertEquals("ajax", btn.get("actionType"));
|
assertEquals("ajax", btn.get("actionType"));
|
||||||
assertEquals("确认删除?", btn.get("confirmText"));
|
assertEquals("确认删除?", btn.get("confirmText"));
|
||||||
// 删除按钮带 <method servicename='X_DELETE'> → 走服务流 /api/flow/X_DELETE(非通用实体删除)
|
// 删除按钮带 <method servicename='X_DELETE'> → 走服务流 /api/flow/X_DELETE(非通用实体删除)
|
||||||
assertEquals("POST:/api/flow/X_DELETE", btn.get("api"));
|
// 对象式 api(method/url/data 内嵌):amis radio 单选下字符串式 api 同级 data 会丢失,故内嵌(spike 实证)
|
||||||
Map<String, Object> data = (Map<String, Object>) btn.get("data");
|
Map<String, Object> api = (Map<String, Object>) btn.get("api");
|
||||||
assertEquals("${ids}", data.get("ids"));
|
assertEquals("post", api.get("method"));
|
||||||
// headerToolbar 只剩 bulkActions 占位 + pagination
|
assertEquals("/api/flow/X_DELETE", api.get("url"));
|
||||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
// 选中行主键串表达式(headerToolbar 作用域可读,spike 实证)
|
||||||
assertEquals(2, toolbar.size());
|
Map<String, Object> data = (Map<String, Object>) api.get("data");
|
||||||
|
assertEquals("${selectedItems|pick:PM_DEMO_ID|join:','}", data.get("ids"));
|
||||||
|
assertNull(btn.get("data"), "data 已内嵌进 api,不再做按钮同级键");
|
||||||
|
// 删除随选中态启停
|
||||||
|
assertEquals("${!selectedItems || selectedItems.length === 0}", btn.get("disabledOn"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -300,9 +308,8 @@ class TemplateToAmisConverterTest {
|
|||||||
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
Map<String, Object> crud = body(r.getSchema());
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
// bulkActions + pagination,无删除按钮
|
// 仅 pagination,无删除按钮(isshow=false 跳过)
|
||||||
assertEquals(2, toolbar.size());
|
assertEquals(1, toolbar.size());
|
||||||
// isshow=false 的删除不进 bulkActions
|
|
||||||
assertNull(crud.get("bulkActions"));
|
assertNull(crud.get("bulkActions"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1116,6 +1123,55 @@ class TemplateToAmisConverterTest {
|
|||||||
assertEquals("${&}", initData.get("item"));
|
assertEquals("${&}", initData.get("item"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** WS-B(最后一环):selectedChange 链先复位 baseline 禁用业务按钮,再跑脚本(切行防残留点亮态)。 */
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
void attachScriptOnEvent_selectedChange先复位业务按钮再跑脚本() {
|
||||||
|
// crud 含 3 个业务动作按钮(baseline disabled)+ 真删除(disabledOn,非 baseline disabled)
|
||||||
|
String xml = "<crud entityid='e1'><display><field name='A' text='A'/></display>"
|
||||||
|
+ "<button type='delete' name='发布' isshow='true'><method servicename='OA_NEWSMANAGE_PUBLISH'/></button>"
|
||||||
|
+ "<button type='delete' name='隐藏' isshow='true'><method servicename='OA_NEWSMANAGE_HIDE'/></button>"
|
||||||
|
+ "<button type='delete' name='显示' isshow='true'><method servicename='OA_NEWSMANAGE_ISSHOW'/></button>"
|
||||||
|
+ "<button type='delete' name='删除' isshow='true'><method servicename='OA_NEWSMANAGE_DELETE'/></button>"
|
||||||
|
+ "</crud>";
|
||||||
|
Map<String, Object> schema = converter.convertGraded(xml, new ArrayList<>(), noPage).getSchema();
|
||||||
|
var bindings = List.of(new TemplateToAmisConverter.EventBinding("onselectedscript", "K1"));
|
||||||
|
converter.attachScriptOnEvent(schema, "ddb75614", bindings, Map.of("K1", 1));
|
||||||
|
|
||||||
|
Map<String, Object> onEvent = (Map<String, Object>) body(schema).get("onEvent");
|
||||||
|
List<Object> actions = (List<Object>) ((Map<String, Object>) onEvent.get("selectedChange")).get("actions");
|
||||||
|
// 3 个 disabled 复位(发布/隐藏/显示,baseline disabled)+ ajax + replay = 5
|
||||||
|
assertEquals(5, actions.size(), "复位 3 业务按钮 + 脚本 ajax + replay");
|
||||||
|
|
||||||
|
// 前 3 个动作是对业务按钮的 disabled 复位(componentId=中文名),删除不复位(非 baseline disabled)
|
||||||
|
java.util.Set<String> resetTargets = new java.util.HashSet<>();
|
||||||
|
for (int i = 0; i < 3; i++) {
|
||||||
|
Map<String, Object> a = (Map<String, Object>) actions.get(i);
|
||||||
|
assertEquals("disabled", a.get("actionType"), "前 3 动作应是 disabled 复位");
|
||||||
|
resetTargets.add((String) a.get("componentId"));
|
||||||
|
}
|
||||||
|
assertEquals(java.util.Set.of("发布", "隐藏", "显示"), resetTargets, "复位 3 个 baseline 禁用业务按钮");
|
||||||
|
assertFalse(resetTargets.contains("删除"), "删除用 disabledOn(非 baseline disabled),不复位");
|
||||||
|
|
||||||
|
// 第 4、5 个是脚本 ajax + replay
|
||||||
|
assertEquals("ajax", ((Map<String, Object>) actions.get(3)).get("actionType"));
|
||||||
|
assertEquals("replayScriptCommands", ((Map<String, Object>) actions.get(4)).get("actionType"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** WS-B:crud 无 baseline 禁用业务按钮时,selectedChange 链不加复位(只 ajax+replay)。 */
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
void attachScriptOnEvent_无业务按钮时不加复位() {
|
||||||
|
String xml = "<crud entityid='e1'><display><field name='A' text='A'/></display></crud>";
|
||||||
|
Map<String, Object> schema = converter.convertGraded(xml, new ArrayList<>(), noPage).getSchema();
|
||||||
|
var bindings = List.of(new TemplateToAmisConverter.EventBinding("onselectedscript", "K1"));
|
||||||
|
converter.attachScriptOnEvent(schema, "tid", bindings, Map.of("K1", 1));
|
||||||
|
Map<String, Object> onEvent = (Map<String, Object>) body(schema).get("onEvent");
|
||||||
|
List<Object> actions = (List<Object>) ((Map<String, Object>) onEvent.get("selectedChange")).get("actions");
|
||||||
|
assertEquals(2, actions.size(), "无业务按钮 → 无复位,仅 ajax+replay");
|
||||||
|
assertEquals("ajax", ((Map<String, Object>) actions.get(0)).get("actionType"));
|
||||||
|
}
|
||||||
|
|
||||||
/** Phase 2.2:动作链调执行端点并重放指令(含 templateId)。 */
|
/** Phase 2.2:动作链调执行端点并重放指令(含 templateId)。 */
|
||||||
@Test
|
@Test
|
||||||
void attachScriptOnEvent_动作链调执行端点并重放指令() {
|
void attachScriptOnEvent_动作链调执行端点并重放指令() {
|
||||||
@@ -1508,7 +1564,7 @@ class TemplateToAmisConverterTest {
|
|||||||
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
Map<String, Object> crud = body(r.getSchema());
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
Map<String, Object> btn = (Map<String, Object>) toolbar.get(1);
|
Map<String, Object> btn = (Map<String, Object>) toolbar.get(0);
|
||||||
|
|
||||||
assertEquals("dialog", btn.get("actionType"));
|
assertEquals("dialog", btn.get("actionType"));
|
||||||
assertEquals("primary", btn.get("level"));
|
assertEquals("primary", btn.get("level"));
|
||||||
@@ -1541,7 +1597,7 @@ class TemplateToAmisConverterTest {
|
|||||||
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
Map<String, Object> crud = body(r.getSchema());
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
Map<String, Object> btn = (Map<String, Object>) toolbar.get(1);
|
Map<String, Object> btn = (Map<String, Object>) toolbar.get(0);
|
||||||
|
|
||||||
assertEquals("dialog", btn.get("actionType"));
|
assertEquals("dialog", btn.get("actionType"));
|
||||||
// 禁用条件:未选行时 disabled
|
// 禁用条件:未选行时 disabled
|
||||||
@@ -1576,7 +1632,7 @@ class TemplateToAmisConverterTest {
|
|||||||
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
Map<String, Object> crud = body(r.getSchema());
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
Map<String, Object> btn = (Map<String, Object>) toolbar.get(1);
|
Map<String, Object> btn = (Map<String, Object>) toolbar.get(0);
|
||||||
|
|
||||||
assertEquals("dialog", btn.get("actionType"));
|
assertEquals("dialog", btn.get("actionType"));
|
||||||
assertNotNull(btn.get("disabledOn"));
|
assertNotNull(btn.get("disabledOn"));
|
||||||
@@ -1609,7 +1665,7 @@ class TemplateToAmisConverterTest {
|
|||||||
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
Map<String, Object> crud = body(r.getSchema());
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
Map<String, Object> btn = (Map<String, Object>) toolbar.get(1);
|
Map<String, Object> btn = (Map<String, Object>) toolbar.get(0);
|
||||||
Map<String, Object> dlg = (Map<String, Object>) btn.get("dialog");
|
Map<String, Object> dlg = (Map<String, Object>) btn.get("dialog");
|
||||||
assertNotNull(dlg);
|
assertNotNull(dlg);
|
||||||
Map<String, Object> dlgBody = (Map<String, Object>) dlg.get("body");
|
Map<String, Object> dlgBody = (Map<String, Object>) dlg.get("body");
|
||||||
@@ -1664,7 +1720,7 @@ class TemplateToAmisConverterTest {
|
|||||||
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
Map<String, Object> crud = body(r.getSchema());
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
Map<String, Object> btn = (Map<String, Object>) toolbar.get(1);
|
Map<String, Object> btn = (Map<String, Object>) toolbar.get(0);
|
||||||
Map<String, Object> dlg = (Map<String, Object>) btn.get("dialog");
|
Map<String, Object> dlg = (Map<String, Object>) btn.get("dialog");
|
||||||
Map<String, Object> dlgBody = (Map<String, Object>) dlg.get("body");
|
Map<String, Object> dlgBody = (Map<String, Object>) dlg.get("body");
|
||||||
assertFalse("tpl".equals(dlgBody.get("type")), "view_page 命中后不应再是 tpl「未配编辑表单」");
|
assertFalse("tpl".equals(dlgBody.get("type")), "view_page 命中后不应再是 tpl「未配编辑表单」");
|
||||||
@@ -1674,19 +1730,21 @@ class TemplateToAmisConverterTest {
|
|||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void f2_17_button_delete_POST端点含ids数据() {
|
void f2_17_button_delete_POST端点含ids数据() {
|
||||||
// F2-17: 删除入 bulkActions(amis 批量槽),data={ids:${ids}} 多删
|
// WS-B(最后一环):删除挂 headerToolbar,data={ids:${selectedItems|pick:<PK>|join:','}} 多删
|
||||||
String xml = "<crud entityid='e1'><display/>"
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
+ "<button type='delete' name='删除' isshow='true' showmsg='确认删除?'/></crud>";
|
+ "<button type='delete' name='删除' isshow='true' showmsg='确认删除?'/></crud>";
|
||||||
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
Map<String, Object> crud = body(r.getSchema());
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
List<Map<String, Object>> bulk = (List<Map<String, Object>>) crud.get("bulkActions");
|
assertNull(crud.get("bulkActions"), "删除已迁出 bulkActions");
|
||||||
assertNotNull(bulk);
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
Map<String, Object> btn = bulk.get(0);
|
Map<String, Object> btn = (Map<String, Object>) toolbar.get(0);
|
||||||
assertEquals("ajax", btn.get("actionType"));
|
assertEquals("ajax", btn.get("actionType"));
|
||||||
assertEquals("POST:/api/entity/PM_DEMO/delete", btn.get("api"));
|
Map<String, Object> api = (Map<String, Object>) btn.get("api");
|
||||||
Map<String, Object> data = (Map<String, Object>) btn.get("data");
|
assertEquals("post", api.get("method"));
|
||||||
|
assertEquals("/api/entity/PM_DEMO/delete", api.get("url"));
|
||||||
|
Map<String, Object> data = (Map<String, Object>) api.get("data");
|
||||||
assertNotNull(data);
|
assertNotNull(data);
|
||||||
assertEquals("${ids}", data.get("ids"));
|
assertEquals("${selectedItems|pick:PM_DEMO_ID|join:','}", data.get("ids"));
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── 通知页缺陷 ①②(editform 精确匹配 / 富文本映射 / 弹窗单按钮)─────────────
|
// ── 通知页缺陷 ①②(editform 精确匹配 / 富文本映射 / 弹窗单按钮)─────────────
|
||||||
@@ -1823,9 +1881,9 @@ class TemplateToAmisConverterTest {
|
|||||||
|
|
||||||
Map<String, Object> crud = body(r.getSchema());
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
// toolbar = [bulkActions, 添加-btn, 查看-btn, pagination]
|
// toolbar = [添加-btn, 查看-btn, pagination](WS-B:无 bulkActions 占位)
|
||||||
Map<String, Object> insertBtn = (Map<String, Object>) toolbar.get(1);
|
Map<String, Object> insertBtn = (Map<String, Object>) toolbar.get(0);
|
||||||
Map<String, Object> readBtn = (Map<String, Object>) toolbar.get(2);
|
Map<String, Object> readBtn = (Map<String, Object>) toolbar.get(1);
|
||||||
|
|
||||||
// insert 精确命中 EDIT_FORM_TID
|
// insert 精确命中 EDIT_FORM_TID
|
||||||
Map<String, Object> insertDlg = (Map<String, Object>) insertBtn.get("dialog");
|
Map<String, Object> insertDlg = (Map<String, Object>) insertBtn.get("dialog");
|
||||||
@@ -1935,7 +1993,7 @@ class TemplateToAmisConverterTest {
|
|||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void 安全中和_typeDelete非删除名_无servicename_禁用占位() {
|
void 安全中和_typeDelete非删除名_无servicename_禁用占位() {
|
||||||
// type=delete 非删除名 且 无 <method servicename>(提交审批/文件归档若漏配服务流)→ 禁用占位,
|
// type=delete 非删除名 且 无 <method servicename>(提交审批/文件归档若漏配服务流)→ 禁用占位,
|
||||||
// bulkActions 无这两个按钮,防误删;真"删除"按钮仍正常生成 POST /delete。
|
// 防误删;真"删除"按钮仍正常生成 POST /delete。WS-B(最后一环):全部挂 headerToolbar,无 bulkActions。
|
||||||
// 注:真实通知页这些按钮都带 <method servicename>,走 /api/flow(见 buildToolbar_业务型delete_走服务流)。
|
// 注:真实通知页这些按钮都带 <method servicename>,走 /api/flow(见 buildToolbar_业务型delete_走服务流)。
|
||||||
String xml = "<crud entityid='e1'><display/>"
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
+ "<button type='delete' name='删除' isshow='true' showmsg='确认删除?'/>"
|
+ "<button type='delete' name='删除' isshow='true' showmsg='确认删除?'/>"
|
||||||
@@ -1945,16 +2003,17 @@ class TemplateToAmisConverterTest {
|
|||||||
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
Map<String, Object> crud = body(r.getSchema());
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
|
|
||||||
// bulkActions 只含真删除按钮
|
// 无 bulkActions(全部按钮挂 headerToolbar)
|
||||||
List<Map<String, Object>> bulk = (List<Map<String, Object>>) crud.get("bulkActions");
|
assertNull(crud.get("bulkActions"), "WS-B:不再使用 bulkActions 槽");
|
||||||
assertNotNull(bulk);
|
|
||||||
assertEquals(1, bulk.size(), "bulkActions 应只有 1 个真删除按钮");
|
|
||||||
assertEquals("删除", bulk.get(0).get("label"));
|
|
||||||
assertEquals("POST:/api/entity/PM_DEMO/delete", bulk.get(0).get("api"));
|
|
||||||
|
|
||||||
// headerToolbar: bulkActions占位 + 提交审批-禁用 + 文件归档-禁用 + pagination = 4 项
|
// headerToolbar: 删除 + 提交审批-禁用 + 文件归档-禁用 + pagination = 4 项
|
||||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
assertEquals(4, toolbar.size(), "headerToolbar 应含 2 个禁用占位 + bulkActions + pagination");
|
assertEquals(4, toolbar.size(), "headerToolbar 应含 删除 + 2 个禁用占位 + pagination");
|
||||||
|
|
||||||
|
Map<String, Object> delBtn = (Map<String, Object>) toolbar.get(0); // 删除(真删除)
|
||||||
|
assertEquals("删除", delBtn.get("label"));
|
||||||
|
assertEquals("/api/entity/PM_DEMO/delete", ((Map<String, Object>) delBtn.get("api")).get("url"));
|
||||||
|
assertEquals("ajax", delBtn.get("actionType"));
|
||||||
|
|
||||||
Map<String, Object> zhBtn = (Map<String, Object>) toolbar.get(1); // 提交审批
|
Map<String, Object> zhBtn = (Map<String, Object>) toolbar.get(1); // 提交审批
|
||||||
Map<String, Object> gdBtn = (Map<String, Object>) toolbar.get(2); // 文件归档
|
Map<String, Object> gdBtn = (Map<String, Object>) toolbar.get(2); // 文件归档
|
||||||
@@ -1976,11 +2035,12 @@ class TemplateToAmisConverterTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void buildToolbar_业务型delete_带servicename_入bulkActions带ids() {
|
void buildToolbar_业务型delete_带servicename_挂headerToolbar带id与选中行() {
|
||||||
// 提交审批(_SUBMIT)/文件归档(_UPDATE_AC):type=delete 但带 <method servicename>,
|
// 提交审批(_SUBMIT)/文件归档(_UPDATE_AC):type=delete 但带 <method servicename>,
|
||||||
// 且 name≠删除词汇 → bulkActions ajax POST /api/flow/{svc},amis 注入选中行 ${ids}。
|
// 且 name≠删除词汇 → 业务动作按钮挂 headerToolbar(补 id=中文名 供 onselectedscript
|
||||||
// 作用域修复:headerToolbar 拿不到 ${ids}(CRUD.handleBulkAction 仅在 bulkActions 路径
|
// 脚本 enabled/disabled 按 componentId 联动启停),ajax POST /api/flow/{svc},
|
||||||
// 注入 ids 数据域),故业务按钮必须入 bulkActions 才能让选中行主键进 POST body。
|
// data:{ids:${selectedItems|pick:<PK>|join:','}} 读选中行主键(headerToolbar 作用域可读,spike 实证)。
|
||||||
|
// baseline disabled=true:贴老 Vaadin「按钮先禁用、脚本据 STATUS 点亮」语义。
|
||||||
String xml = "<crud entityid='e1'><display/>"
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
+ "<button type='delete' name='提交审批' isshow='true'>"
|
+ "<button type='delete' name='提交审批' isshow='true'>"
|
||||||
+ " <method servicename='OA_NOTICEMANAGE_SUBMIT'/></button>"
|
+ " <method servicename='OA_NOTICEMANAGE_SUBMIT'/></button>"
|
||||||
@@ -1990,45 +2050,54 @@ class TemplateToAmisConverterTest {
|
|||||||
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
Map<String, Object> crud = body(r.getSchema());
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
|
|
||||||
// 业务型 delete 入 bulkActions(amis 批量槽可靠提供 ${ids}=选中行主键)
|
// 不再用 bulkActions 槽
|
||||||
List<Map<String, Object>> bulk = (List<Map<String, Object>>) crud.get("bulkActions");
|
assertNull(crud.get("bulkActions"), "业务按钮已迁出 bulkActions");
|
||||||
assertNotNull(bulk, "业务型 type=delete 应入 bulkActions 以拿到 ${ids}");
|
|
||||||
assertEquals(2, bulk.size(), "提交审批 + 文件归档 两个 bulkActions");
|
|
||||||
|
|
||||||
Map<String, Object> submitBtn = bulk.get(0); // 提交审批
|
// headerToolbar = [提交审批-btn, 文件归档-btn, pagination] = 3 项
|
||||||
assertEquals("提交审批", submitBtn.get("label"));
|
|
||||||
assertEquals("ajax", submitBtn.get("actionType"));
|
|
||||||
assertEquals("POST:/api/flow/OA_NOTICEMANAGE_SUBMIT", submitBtn.get("api"));
|
|
||||||
assertEquals("${ids}", ((Map<String, Object>) submitBtn.get("data")).get("ids"));
|
|
||||||
assertNull(submitBtn.get("disabled"), "带服务流的业务按钮不应是禁用占位");
|
|
||||||
|
|
||||||
Map<String, Object> archiveBtn = bulk.get(1); // 文件归档
|
|
||||||
assertEquals("文件归档", archiveBtn.get("label"));
|
|
||||||
assertEquals("POST:/api/flow/OA_NOTICEMANAGE_UPDATE_AC", archiveBtn.get("api"));
|
|
||||||
assertEquals("${ids}", ((Map<String, Object>) archiveBtn.get("data")).get("ids"));
|
|
||||||
assertEquals("确认要发送归档吗?", archiveBtn.get("confirmText"));
|
|
||||||
|
|
||||||
// headerToolbar 不再含这两个业务按钮:bulkActions占位 + pagination = 2 项
|
|
||||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
assertEquals(2, toolbar.size(), "业务按钮已移出 headerToolbar,仅剩 bulkActions 槽 + pagination");
|
assertEquals(3, toolbar.size(), "提交审批 + 文件归档 + pagination");
|
||||||
|
|
||||||
|
Map<String, Object> submitBtn = (Map<String, Object>) toolbar.get(0); // 提交审批
|
||||||
|
assertEquals("提交审批", submitBtn.get("label"));
|
||||||
|
assertEquals("提交审批", submitBtn.get("id"), "id=中文名供脚本 enabled/disabled 定位");
|
||||||
|
assertEquals("ajax", submitBtn.get("actionType"));
|
||||||
|
Map<String, Object> submitApi = (Map<String, Object>) submitBtn.get("api");
|
||||||
|
assertEquals("post", submitApi.get("method"));
|
||||||
|
assertEquals("/api/flow/OA_NOTICEMANAGE_SUBMIT", submitApi.get("url"));
|
||||||
|
assertEquals("${selectedItems|pick:PM_DEMO_ID|join:','}",
|
||||||
|
((Map<String, Object>) submitApi.get("data")).get("ids"));
|
||||||
|
assertEquals(true, submitBtn.get("disabled"), "业务按钮 baseline 禁用,脚本据 STATUS 点亮");
|
||||||
|
|
||||||
|
Map<String, Object> archiveBtn = (Map<String, Object>) toolbar.get(1); // 文件归档
|
||||||
|
assertEquals("文件归档", archiveBtn.get("label"));
|
||||||
|
assertEquals("文件归档", archiveBtn.get("id"));
|
||||||
|
Map<String, Object> archiveApi = (Map<String, Object>) archiveBtn.get("api");
|
||||||
|
assertEquals("/api/flow/OA_NOTICEMANAGE_UPDATE_AC", archiveApi.get("url"));
|
||||||
|
assertEquals("${selectedItems|pick:PM_DEMO_ID|join:','}",
|
||||||
|
((Map<String, Object>) archiveApi.get("data")).get("ids"));
|
||||||
|
assertEquals("确认要发送归档吗?", archiveBtn.get("confirmText"));
|
||||||
|
assertEquals(true, archiveBtn.get("disabled"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void buildToolbar_真删除_带servicename_走服务流bulkAction() {
|
void buildToolbar_真删除_带servicename_走服务流headerToolbar() {
|
||||||
// 删除按钮带 <method servicename='OA_NOTICEMANAGE_DELETE'> → bulkActions ajax /api/flow/{svc},ids
|
// 删除按钮带 <method servicename='OA_NOTICEMANAGE_DELETE'> → headerToolbar ajax /api/flow/{svc},选中行
|
||||||
String xml = "<crud entityid='e1'><display/>"
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
+ "<button type='delete' name='删除' isshow='true' showmsg='确认要删除此记录吗?'>"
|
+ "<button type='delete' name='删除' isshow='true' showmsg='确认要删除此记录吗?'>"
|
||||||
+ " <method servicename='OA_NOTICEMANAGE_DELETE'/></button>"
|
+ " <method servicename='OA_NOTICEMANAGE_DELETE'/></button>"
|
||||||
+ "</crud>";
|
+ "</crud>";
|
||||||
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
Map<String, Object> crud = body(r.getSchema());
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
List<Map<String, Object>> bulk = (List<Map<String, Object>>) crud.get("bulkActions");
|
assertNull(crud.get("bulkActions"));
|
||||||
assertNotNull(bulk);
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
assertEquals(1, bulk.size());
|
Map<String, Object> del = (Map<String, Object>) toolbar.get(0);
|
||||||
Map<String, Object> del = bulk.get(0);
|
assertEquals("删除", del.get("id"));
|
||||||
assertEquals("POST:/api/flow/OA_NOTICEMANAGE_DELETE", del.get("api"));
|
Map<String, Object> delApi = (Map<String, Object>) del.get("api");
|
||||||
assertEquals("${ids}", ((Map<String, Object>) del.get("data")).get("ids"));
|
assertEquals("/api/flow/OA_NOTICEMANAGE_DELETE", delApi.get("url"));
|
||||||
|
assertEquals("${selectedItems|pick:PM_DEMO_ID|join:','}",
|
||||||
|
((Map<String, Object>) delApi.get("data")).get("ids"));
|
||||||
|
assertEquals("${!selectedItems || selectedItems.length === 0}", del.get("disabledOn"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -2040,10 +2109,65 @@ class TemplateToAmisConverterTest {
|
|||||||
+ "</crud>";
|
+ "</crud>";
|
||||||
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
Map<String, Object> crud = body(r.getSchema());
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
List<Map<String, Object>> bulk = (List<Map<String, Object>>) crud.get("bulkActions");
|
assertNull(crud.get("bulkActions"));
|
||||||
assertNotNull(bulk);
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
assertEquals(1, bulk.size());
|
Map<String, Object> del = (Map<String, Object>) toolbar.get(0);
|
||||||
assertEquals("POST:/api/entity/PM_DEMO/delete", bulk.get(0).get("api"));
|
assertEquals("/api/entity/PM_DEMO/delete", ((Map<String, Object>) del.get("api")).get("url"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
void buildToolbar_新闻业务动作按钮_挂headerToolbar脚本可联动() {
|
||||||
|
// WS-B(最后一环)端到端契约:新闻管理的业务动作按钮(发布/显示/隐藏/置顶/...)= type=delete
|
||||||
|
// 带 servicename,且 name≠删除词汇 → 全部挂 headerToolbar,每按钮 id=中文名(供 onselectedscript
|
||||||
|
// 脚本 enabled/disabled 按 componentId 精准联动),baseline disabled=true(脚本据 STATUS 点亮),
|
||||||
|
// ajax POST /api/flow/{svc}、data:{ids:${selectedItems|pick:<PK>|join:','}}(headerToolbar 作用域可读)。
|
||||||
|
// 真删除则 disabledOn 随选中态。全程不入 bulkActions。
|
||||||
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
|
+ "<button type='delete' name='发布' isshow='true'><method servicename='OA_NEWSMANAGE_PUBLISH'/></button>"
|
||||||
|
+ "<button type='delete' name='显示' isshow='true'><method servicename='OA_NEWSMANAGE_ISSHOW'/></button>"
|
||||||
|
+ "<button type='delete' name='提交审批' isshow='true'><method servicename='OA_NEWSMANAGE_SUBMIT'/></button>"
|
||||||
|
+ "<button type='delete' name='删除' isshow='true' showmsg='确认删除?'><method servicename='OA_NEWSMANAGE_DELETE'/></button>"
|
||||||
|
+ "</crud>";
|
||||||
|
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
|
|
||||||
|
assertNull(crud.get("bulkActions"), "WS-B:业务/删除按钮全部挂 headerToolbar,无 bulkActions 槽");
|
||||||
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
|
// [发布, 显示, 提交审批, 删除, pagination] = 5
|
||||||
|
assertEquals(5, toolbar.size());
|
||||||
|
|
||||||
|
String idsExpr = "${selectedItems|pick:PM_DEMO_ID|join:','}";
|
||||||
|
String pkExpr = "${selectedItems.0.PM_DEMO_ID}";
|
||||||
|
|
||||||
|
// 业务动作按钮(前 3 个):id=中文名 + baseline disabled + ajax /api/flow + 选中行表达式 + 无 disabledOn
|
||||||
|
String[] bizNames = {"发布", "显示", "提交审批"};
|
||||||
|
String[] bizSvcs = {"OA_NEWSMANAGE_PUBLISH", "OA_NEWSMANAGE_ISSHOW", "OA_NEWSMANAGE_SUBMIT"};
|
||||||
|
for (int i = 0; i < bizNames.length; i++) {
|
||||||
|
Map<String, Object> btn = (Map<String, Object>) toolbar.get(i);
|
||||||
|
assertEquals(bizNames[i], btn.get("id"), "业务按钮 id=中文名供脚本 componentId 定位");
|
||||||
|
assertEquals(bizNames[i], btn.get("label"));
|
||||||
|
assertEquals("ajax", btn.get("actionType"));
|
||||||
|
Map<String, Object> bizApi = (Map<String, Object>) btn.get("api");
|
||||||
|
assertEquals("post", bizApi.get("method"));
|
||||||
|
assertEquals("/api/flow/" + bizSvcs[i], bizApi.get("url"));
|
||||||
|
Map<String, Object> bizData = (Map<String, Object>) bizApi.get("data");
|
||||||
|
// 删除族 fanout 用 ids 逗号串;业务族脚本 map[<PK>] 定位行 → 同时带 PK 单选主键
|
||||||
|
assertEquals(idsExpr, bizData.get("ids"));
|
||||||
|
assertEquals(pkExpr, bizData.get("PM_DEMO_ID"), "业务流脚本读 map[<PK>],须带选中行单选主键");
|
||||||
|
assertNull(btn.get("data"), "data 内嵌进 api(字符串式同级 data 会丢失,spike 实证)");
|
||||||
|
assertEquals(true, btn.get("disabled"), "业务按钮 baseline 禁用,脚本据 STATUS 点亮");
|
||||||
|
assertNull(btn.get("disabledOn"), "业务按钮用脚本控制,不叠 disabledOn 避免冲突");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 真删除(第 4 个):id=删除 + 选中态 disabledOn(非 baseline disabled)
|
||||||
|
Map<String, Object> del = (Map<String, Object>) toolbar.get(3);
|
||||||
|
assertEquals("删除", del.get("id"));
|
||||||
|
Map<String, Object> delApi = (Map<String, Object>) del.get("api");
|
||||||
|
assertEquals("/api/flow/OA_NEWSMANAGE_DELETE", delApi.get("url"));
|
||||||
|
assertEquals(idsExpr, ((Map<String, Object>) delApi.get("data")).get("ids"));
|
||||||
|
assertEquals("${!selectedItems || selectedItems.length === 0}", del.get("disabledOn"));
|
||||||
|
assertNull(del.get("disabled"), "删除随选中态 disabledOn,不设 baseline disabled");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@@ -2068,7 +2192,7 @@ class TemplateToAmisConverterTest {
|
|||||||
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
ConversionResult r = c.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
Map<String, Object> crud = body(r.getSchema());
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
Map<String, Object> addBtn = (Map<String, Object>) toolbar.get(1);
|
Map<String, Object> addBtn = (Map<String, Object>) toolbar.get(0);
|
||||||
Map<String, Object> dlg = (Map<String, Object>) addBtn.get("dialog");
|
Map<String, Object> dlg = (Map<String, Object>) addBtn.get("dialog");
|
||||||
List<Object> actions = (List<Object>) dlg.get("actions");
|
List<Object> actions = (List<Object>) dlg.get("actions");
|
||||||
assertNotNull(actions, "insert dialog 应有服务流提交 actions");
|
assertNotNull(actions, "insert dialog 应有服务流提交 actions");
|
||||||
|
|||||||
Reference in New Issue
Block a user