fix(converter): WS-B B4 两 Critical——删除恢复 fanout(ids-only)+无脚本页业务按钮 disabledOn 解除永久灰
修 B4(8df37e9) code-review 两个 Critical:
C1 多选删除只删第一行(dual-key 抑制 fanout):
B4 真删除按钮 data 同送 ids(逗号串)+PK(首行),但删除族流 <input> 声明
<PK> required → FlowInputCoercer.missingRequiredIdInput 因 map.containsKey(PK)
返 null → FlowController fanout 分支(291-318)被跳过 → 只对 selectedItems.0
执行一次(确认文案却说删全部)。改:按分支拆 data——
· 真删除按钮(ajaxPostDeleteApi):data 只送 {ids},恢复 fanout 批量删除;
· 业务动作按钮(ajaxPostBusinessApi):data 只送 {<PK>}(业务流读 map[PK])。
PK 表达式改 bracket 记法 ${selectedItems[0].<PK>}(与既有 ${selectedItems[0]}
一致,非 dot-zero);纠正 B4 javadoc(写 bracket 实际 emit dot)。
C2 无脚本页业务按钮永久置灰(55 模板,含「提交审批」):
buildToolbar 给业务按钮无条件 baseline disabled:true,靠 onselectedscript
脚本点亮;但 DB 实测 55 个 crud 模板有 disabled:true 业务按钮却无 onEvent
→ 永久灰、点不动。新增 demoteUnscriptedBusinessButtons:仅当页面无
onEvent.selectedChange(无脚本控启停)时,把带 /api/flow/ 的 baseline disabled
业务按钮降级为 disabledOn:"${!selectedItems...}"(选中即可用,贴老 bulkActions
选中态语义);有脚本控则 no-op(保持 disabled:true 由脚本点亮)。调用点:
attachScriptOnEvent 内(仅 onload 无 onselected 时)+ BatchConvertCli 对
bindings.isEmpty() 的无绑定页兜底(attachScriptOnEvent 不被调用)。
测试(TDD):
· TemplateToAmisConverterTest +5:删除 data 只含 ids、业务 data 只含 PK(bracket)、
有脚本页保持 disabled:true、仅 onload 降级 disabledOn、无脚本页 demote 降级、
有脚本控 demote no-op;改写 2 个 B4 既有用例至 C1 拆分契约。converter 107 绿。
· FlowControllerTest +1(17d):body 只送 ids="a,b,c"(不含 PK) → 删除族(PK required)
fanout 执行 3 次,锁住「ids-only→fanout」。metadata 60 绿(未改 metadata 生产代码)。
重转+入库(eip4dev):crud 956/956、[WS-B]对齐告警 0,SchemaImportCli upsert 782。
DB 复核:C2 victims 55→0。
浏览器端到端实证(8093 live + 5173,admin/111111):
· C1 fanout:POST /api/flow/OA_NEWSMANAGE_DELETE {ids:"3 主键"} → count:3、
3 行真删除(DB count 3→0),证明 fanout 恢复(API 实证,避免破坏真实数据)。
· C2:8093 实服 schema 中 PM_REWARDSANDPUNISHMENTS「提交审批」按钮已为
disabledOn(非 disabled:true)、data=PK-only;删除按钮 data=ids-only。
· 新闻不退化:ddb75614 选中可见行→隐藏/置顶/删除点亮、发布灰(B4 行为保持)。
· console 0 ajax 报错。
边角现状:少数「页面有 onselectedscript 但某业务按钮未被脚本 enableButton 引用」
仍可能永久灰——属脚本覆盖问题,本次未处理(demote 仅作用于 no-script 页,
有 selectedChange 页保守 no-op,避免覆盖脚本控语义)。
base=8df37e9
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -266,6 +266,12 @@ public final class BatchConvertCli {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// C2:无 onselectedscript(脚本控启停)的 crud 页——含完全无绑定的页(attachScriptOnEvent
|
||||||
|
// 不会被调用)——把 headerToolbar 里 baseline disabled:true 的业务按钮降级为 disabledOn
|
||||||
|
// (选中即可用),否则永久置灰、点不动(DB 实测 55 模板,含「提交审批」)。idempotent:
|
||||||
|
// 已挂 selectedChange(脚本控)的页 no-op。放在校验前,让降级后的 schema 入闸/落盘。
|
||||||
|
converter.demoteUnscriptedBusinessButtons(result.getSchema());
|
||||||
|
|
||||||
List<String> errors = gate.validate(result.getSchema());
|
List<String> errors = gate.validate(result.getSchema());
|
||||||
gate1 = errors.isEmpty();
|
gate1 = errors.isEmpty();
|
||||||
if (!gate1) {
|
if (!gate1) {
|
||||||
|
|||||||
@@ -501,9 +501,10 @@ public class TemplateToAmisConverter {
|
|||||||
String delUrl = delSvc.isBlank()
|
String delUrl = delSvc.isBlank()
|
||||||
? "/api/entity/" + table + "/delete"
|
? "/api/entity/" + table + "/delete"
|
||||||
: "/api/flow/" + delSvc;
|
: "/api/flow/" + delSvc;
|
||||||
btn.put("api", ajaxPostApi(delUrl, pkCol));
|
// C1:删除 data 只送 ids(恢复 fanout 批量删除),绝不送 PK(送 PK 抑制 fanout→只删首行)。
|
||||||
|
btn.put("api", ajaxPostDeleteApi(delUrl, pkCol));
|
||||||
result.note("button[delete] " + btnName + " → headerToolbar ajax POST " + delUrl
|
result.note("button[delete] " + btnName + " → headerToolbar ajax POST " + delUrl
|
||||||
+ "(id=" + btnName + ",ids=" + idsExpr + ",disabledOn=选中态)");
|
+ "(id=" + btnName + ",ids-only=" + idsExpr + " 走 fanout,disabledOn=选中态)");
|
||||||
toolbar.add(btn);
|
toolbar.add(btn);
|
||||||
} else if (!delSvc.isBlank()) {
|
} else if (!delSvc.isBlank()) {
|
||||||
// 业务型 type=delete 有服务流(发布/显示/隐藏/置顶/文件归档/取消置顶/提交审批等):
|
// 业务型 type=delete 有服务流(发布/显示/隐藏/置顶/文件归档/取消置顶/提交审批等):
|
||||||
@@ -525,9 +526,11 @@ public class TemplateToAmisConverter {
|
|||||||
if (!confirmMsg.isBlank()) {
|
if (!confirmMsg.isBlank()) {
|
||||||
btn.put("confirmText", confirmMsg);
|
btn.put("confirmText", confirmMsg);
|
||||||
}
|
}
|
||||||
btn.put("api", ajaxPostApi("/api/flow/" + delSvc, pkCol));
|
// C1:业务 data 只送 PK(bracket 单选主键),不送 ids(业务流读 map[PK],送 ids 不识别)。
|
||||||
|
btn.put("api", ajaxPostBusinessApi("/api/flow/" + delSvc, pkCol));
|
||||||
result.note("button[delete/flow] " + btnName + " → headerToolbar ajax POST /api/flow/" + delSvc
|
result.note("button[delete/flow] " + btnName + " → headerToolbar ajax POST /api/flow/" + delSvc
|
||||||
+ "(id=" + btnName + ",ids=" + idsExpr + ",baseline disabled,脚本据 STATUS 点亮)");
|
+ "(id=" + btnName + ",PK-only=" + selectedSingleIdExpr(pkCol)
|
||||||
|
+ ",baseline disabled,脚本据 STATUS 点亮)");
|
||||||
toolbar.add(btn);
|
toolbar.add(btn);
|
||||||
} else {
|
} else {
|
||||||
// 无服务流 + 非删除名:安全禁用,等待后续服务流接入
|
// 无服务流 + 非删除名:安全禁用,等待后续服务流接入
|
||||||
@@ -1212,38 +1215,28 @@ public class TemplateToAmisConverter {
|
|||||||
return "${selectedItems|pick:" + pkCol + "|join:','}";
|
return "${selectedItems|pick:" + pkCol + "|join:','}";
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 选中行(单选)的主键表达式:{@code ${selectedItems[0].<PK>}}(业务流读 map[PK] 用)。 */
|
/**
|
||||||
|
* 选中行(单选)的主键表达式:{@code ${selectedItems[0].<PK>}}(业务流读 map[PK] 用)。
|
||||||
|
*
|
||||||
|
* <p>用 <b>bracket 记法</b> {@code selectedItems[0]}(与本类既有 {@code ${selectedItems[0]}}
|
||||||
|
* 一致,见 dialog data 注入),非 dot-zero {@code selectedItems.0}——后者在 amis 数据域取值不稳。
|
||||||
|
*/
|
||||||
private static String selectedSingleIdExpr(String pkCol) {
|
private static String selectedSingleIdExpr(String pkCol) {
|
||||||
return "${selectedItems.0." + pkCol + "}";
|
return "${selectedItems[0]." + pkCol + "}";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* WS-B(最后一环):构造 amis ajax 按钮的 <b>对象式 api</b>(含 {@code method/url/data})。
|
* WS-B(最后一环):构造 amis ajax 按钮的 <b>对象式 api</b>(含 {@code method/url/data})。
|
||||||
*
|
*
|
||||||
* <p><b>① api 形态(对象式 vs 字符串式)</b>:实证(amis 6.13 抓包,radio 单选 crud,spike
|
* <p><b>api 形态(对象式 vs 字符串式)</b>:实证(amis 6.13 抓包,radio 单选 crud,spike
|
||||||
* 2026-06-14):按钮用字符串式 api({@code "POST:/api/flow/X"})+ 同级 {@code data} 时,amis 把
|
* 2026-06-14):按钮用字符串式 api({@code "POST:/api/flow/X"})+ 同级 {@code data} 时,amis 把
|
||||||
* 同级 data 当按钮局部数据域、而非请求体 → POST 实际只带 crud 查询参数 {@code {page:1}},选中行
|
* 同级 data 当按钮局部数据域、而非请求体 → POST 实际只带 crud 查询参数 {@code {page:1}},选中行
|
||||||
* 丢失。改用对象式 api 把 data 内嵌进 api → 抓包实证请求体正确携带选中行。
|
* 丢失。改用对象式 api 把 data 内嵌进 api → 抓包实证请求体正确携带选中行。
|
||||||
*
|
*
|
||||||
* <p><b>② data 键(兼容两族服务流契约)</b>:实证两类 sys_serviceflow input 契约:
|
* @param url 请求路径(如 {@code /api/flow/OA_NEWSMANAGE_PUBLISH})
|
||||||
* <ul>
|
* @param data 请求体表达式键值(按调用族不同:删除族只送 ids、业务族只送 PK,见下两个构造器)
|
||||||
* <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) {
|
private static Map<String, Object> ajaxPostApi(String url, Map<String, Object> data) {
|
||||||
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<>();
|
Map<String, Object> api = new LinkedHashMap<>();
|
||||||
api.put("method", "post");
|
api.put("method", "post");
|
||||||
api.put("url", url);
|
api.put("url", url);
|
||||||
@@ -1251,6 +1244,43 @@ public class TemplateToAmisConverter {
|
|||||||
return api;
|
return api;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* C1:<b>真删除按钮</b>的对象式 api——data <b>只送 {@code ids}</b>(选中行主键逗号串),<b>绝不送 PK</b>。
|
||||||
|
*
|
||||||
|
* <p>删除族 sys_serviceflow {@code <input>} 直接声明 {@code <field name="<PK>" required>}。
|
||||||
|
* FlowController 仅当 map <b>不含</b>该 PK 键时({@code missingRequiredIdInput} 返非空)才走
|
||||||
|
* {@code ids} 逗号串拆分的 <b>fanout 批量删除</b>(FlowController.java:291-318)。
|
||||||
|
* 若 data 同时塞了 PK(B4 旧实现),{@code map.containsKey(field)} 为真
|
||||||
|
* → {@code missingRequiredIdInput} 返 null → fanout 分支被跳过 → <b>多选只删第一行</b>(C1 回归)。
|
||||||
|
* 故删除按钮 data 必须只含 ids。
|
||||||
|
*
|
||||||
|
* @param url 删除接口路径(服务流 {@code /api/flow/<svc>} 或实体 {@code /api/entity/<table>/delete})
|
||||||
|
* @param pkCol 主键列名(= {@code table + "_ID"} = crud.primaryField),用于 ids 表达式 pick 列
|
||||||
|
*/
|
||||||
|
private static Map<String, Object> ajaxPostDeleteApi(String url, String pkCol) {
|
||||||
|
Map<String, Object> data = new LinkedHashMap<>();
|
||||||
|
data.put("ids", selectedIdsExpr(pkCol)); // 删除族:FlowController 按逗号串拆分 fanout(不可加 PK)
|
||||||
|
return ajaxPostApi(url, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* C1:<b>业务动作按钮</b>(发布/显示/隐藏/置顶/文件归档/取消置顶/提交审批等带 servicename 的非删除)的
|
||||||
|
* 对象式 api——data <b>只送 {@code <PK>}</b>(单选主键,bracket 记法),<b>不送 {@code ids}</b>。
|
||||||
|
*
|
||||||
|
* <p>业务动作族 {@code <input>} 只声明 {@code map},脚本里 {@code map.put("ISSHOW",1)} 后
|
||||||
|
* {@code pojoCRUDService.update(map,...)} 按 {@code map[<PK>]} 定位行。把选中行主键放在 {@code map[<PK>]}
|
||||||
|
* (实证:放 {@code ids} 业务流不识别 → status:0 但 result:null 空转)。不送 ids 还避免与删除族混淆
|
||||||
|
* (业务流不是删除族,不应触发 ids fanout 语义)。
|
||||||
|
*
|
||||||
|
* @param url 服务流路径(如 {@code /api/flow/OA_NEWSMANAGE_PUBLISH})
|
||||||
|
* @param pkCol 主键列名(= {@code table + "_ID"})
|
||||||
|
*/
|
||||||
|
private static Map<String, Object> ajaxPostBusinessApi(String url, String pkCol) {
|
||||||
|
Map<String, Object> data = new LinkedHashMap<>();
|
||||||
|
data.put(pkCol, selectedSingleIdExpr(pkCol)); // 业务族:脚本 map[<PK>] 定位选中行(bracket 单选)
|
||||||
|
return ajaxPostApi(url, data);
|
||||||
|
}
|
||||||
|
|
||||||
// ──────────────────────────────────────────────────────────────────────
|
// ──────────────────────────────────────────────────────────────────────
|
||||||
// tree(树 / 树+grid)
|
// tree(树 / 树+grid)
|
||||||
// ──────────────────────────────────────────────────────────────────────
|
// ──────────────────────────────────────────────────────────────────────
|
||||||
@@ -1966,9 +1996,92 @@ public class TemplateToAmisConverter {
|
|||||||
if (!onEvent.isEmpty()) {
|
if (!onEvent.isEmpty()) {
|
||||||
body.put("onEvent", onEvent);
|
body.put("onEvent", onEvent);
|
||||||
}
|
}
|
||||||
|
// C2:本页若无 onselectedscript(脚本控启停)——例如只挂 onloadscript——则 headerToolbar 里
|
||||||
|
// baseline disabled:true 的业务按钮没有任何「点亮」指令 → 永久置灰。把它们降级为 disabledOn
|
||||||
|
// (选中即可用,贴老 bulkActions 选中态语义)。有 onselected 时保持 disabled:true + 脚本控 + reset。
|
||||||
|
if (selectedActions.isEmpty()) {
|
||||||
|
demoteUnscriptedBusinessButtons(pageSchema);
|
||||||
|
}
|
||||||
return pageSchema;
|
return pageSchema;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* C2:把 headerToolbar 中<b>永久置灰</b>的业务动作按钮(baseline {@code disabled:true} 但无脚本启停)
|
||||||
|
* 降级为 {@code disabledOn:"${!selectedItems || selectedItems.length === 0}"}(选中即可用)。
|
||||||
|
*
|
||||||
|
* <p>背景:{@code buildToolbar} 给业务按钮的 baseline 是 {@code disabled:true},依赖 onselectedscript
|
||||||
|
* 脚本的 enabled 指令点亮。但 DB 实测 <b>55 个 crud 模板</b>有 disabled:true 业务按钮却<b>无 onEvent</b>
|
||||||
|
* (如 PM_WEEKPLAN/HR_PROJECTREVIEW 的「提交审批」)→ 永久灰、点不动。
|
||||||
|
*
|
||||||
|
* <p>本方法是无脚本页的兜底:仅当页面<b>无 {@code onEvent.selectedChange}</b>(= 无脚本控启停)时,
|
||||||
|
* 把 headerToolbar 里 {@code disabled:true} 且为业务动作(带 {@code /api/flow/} api、非 danger 删除)的
|
||||||
|
* 按钮改成 {@code disabledOn} 跟随选中态。有 selectedChange(脚本控)时 <b>no-op</b>(保持 disabled:true)。
|
||||||
|
*
|
||||||
|
* <p>调用点:①{@link #attachScriptOnEvent} 内(页面只挂 onload、无 onselected 时);
|
||||||
|
* ②{@code BatchConvertCli} 对 {@code bindings.isEmpty()} 的无绑定页兜底(attachScriptOnEvent 不被调用)。
|
||||||
|
*
|
||||||
|
* @param pageSchema 顶层 page schema(body=crud)
|
||||||
|
* @return 同一引用(便于链式)
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
public Map<String, Object> demoteUnscriptedBusinessButtons(Map<String, Object> pageSchema) {
|
||||||
|
if (pageSchema == null) {
|
||||||
|
return pageSchema;
|
||||||
|
}
|
||||||
|
Object bodyObj = pageSchema.get("body");
|
||||||
|
if (!(bodyObj instanceof Map)) {
|
||||||
|
return pageSchema;
|
||||||
|
}
|
||||||
|
Map<String, Object> body = (Map<String, Object>) bodyObj;
|
||||||
|
// 有脚本控启停(selectedChange)→ no-op:业务按钮由脚本据 STATUS 点亮,保持 disabled:true。
|
||||||
|
Object onEvent = body.get("onEvent");
|
||||||
|
if (onEvent instanceof Map && ((Map<String, Object>) onEvent).containsKey(EVENT_SELECTED_CHANGE)) {
|
||||||
|
return pageSchema;
|
||||||
|
}
|
||||||
|
Object tbObj = body.get("headerToolbar");
|
||||||
|
if (!(tbObj instanceof List)) {
|
||||||
|
return pageSchema;
|
||||||
|
}
|
||||||
|
for (Object item : (List<Object>) tbObj) {
|
||||||
|
if (!(item instanceof Map)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
Map<String, Object> btn = (Map<String, Object>) item;
|
||||||
|
if (isBaselineDisabledBusinessButton(btn)) {
|
||||||
|
// 永久灰 → 选中即可用:去掉 baseline disabled,挂 disabledOn 跟随选中态。
|
||||||
|
btn.remove("disabled");
|
||||||
|
btn.put("disabledOn", DISABLED_ON_NO_SELECTION);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return pageSchema;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** disabledOn 表达式:无选中行则禁用(贴老 bulkActions 选中态语义)。 */
|
||||||
|
static final String DISABLED_ON_NO_SELECTION = "${!selectedItems || selectedItems.length === 0}";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判定某 headerToolbar 按钮是否为「baseline 永久禁用的业务动作按钮」:
|
||||||
|
* {@code disabled==true} + 带 {@code /api/flow/} 对象式 api + 非 danger(删除用 disabledOn 非 baseline disabled)。
|
||||||
|
*/
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
private static boolean isBaselineDisabledBusinessButton(Map<String, Object> btn) {
|
||||||
|
if (!Boolean.TRUE.equals(btn.get("disabled"))) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if ("danger".equals(btn.get("level"))) {
|
||||||
|
return false; // 真删除按钮(danger)走 disabledOn,不会是 baseline disabled,稳妥再排除
|
||||||
|
}
|
||||||
|
Object api = btn.get("api");
|
||||||
|
String url = null;
|
||||||
|
if (api instanceof Map) {
|
||||||
|
Object u = ((Map<String, Object>) api).get("url");
|
||||||
|
url = (u instanceof String) ? (String) u : null;
|
||||||
|
} else if (api instanceof String) {
|
||||||
|
url = (String) api;
|
||||||
|
}
|
||||||
|
return url != null && url.contains("/api/flow/");
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* WS-B(最后一环):构造行选中前的「按钮态复位」动作——对 headerToolbar 中 baseline {@code disabled:true}
|
* WS-B(最后一环):构造行选中前的「按钮态复位」动作——对 headerToolbar 中 baseline {@code disabled:true}
|
||||||
* 的业务动作按钮逐个发 amis {@code disabled} 动作(componentId=按钮 id=中文名)。
|
* 的业务动作按钮逐个发 amis {@code disabled} 动作(componentId=按钮 id=中文名)。
|
||||||
|
|||||||
@@ -293,14 +293,44 @@ class TemplateToAmisConverterTest {
|
|||||||
Map<String, Object> api = (Map<String, Object>) btn.get("api");
|
Map<String, Object> api = (Map<String, Object>) btn.get("api");
|
||||||
assertEquals("post", api.get("method"));
|
assertEquals("post", api.get("method"));
|
||||||
assertEquals("/api/flow/X_DELETE", api.get("url"));
|
assertEquals("/api/flow/X_DELETE", api.get("url"));
|
||||||
// 选中行主键串表达式(headerToolbar 作用域可读,spike 实证)
|
// C1:真删除按钮 data 只送 ids(逗号串)→ FlowController 命中 missingRequiredIdInput → fanout 批量删除。
|
||||||
|
// 绝不可同送 PK:删除族 <input> 声明 <PK> required,map 含 PK 时 missingRequiredIdInput 返 null
|
||||||
|
// → fanout 分支被跳过 → 多选只删第一行(C1 回归根因)。
|
||||||
Map<String, Object> data = (Map<String, Object>) api.get("data");
|
Map<String, Object> data = (Map<String, Object>) api.get("data");
|
||||||
assertEquals("${selectedItems|pick:PM_DEMO_ID|join:','}", data.get("ids"));
|
assertEquals("${selectedItems|pick:PM_DEMO_ID|join:','}", data.get("ids"));
|
||||||
|
assertFalse(data.containsKey("PM_DEMO_ID"), "C1:删除 data 不得含 PK(含则抑制 fanout,多选只删首行)");
|
||||||
|
assertEquals(1, data.size(), "C1:删除 data 只含 ids 一个键");
|
||||||
assertNull(btn.get("data"), "data 已内嵌进 api,不再做按钮同级键");
|
assertNull(btn.get("data"), "data 已内嵌进 api,不再做按钮同级键");
|
||||||
// 删除随选中态启停
|
// 删除随选中态启停
|
||||||
assertEquals("${!selectedItems || selectedItems.length === 0}", btn.get("disabledOn"));
|
assertEquals("${!selectedItems || selectedItems.length === 0}", btn.get("disabledOn"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** C1:业务动作按钮(非删除,带 servicename)data 只送 PK(bracket 记法),不送 ids(避免与删除族混淆)。 */
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
void crud_业务动作按钮data只送PK不送ids() {
|
||||||
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
|
+ "<button type='delete' name='发布' isshow='true'>"
|
||||||
|
+ "<method servicename='PM_DEMO_PUBLISH'/></button></crud>";
|
||||||
|
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
|
Map<String, Object> btn = (Map<String, Object>) toolbar.get(0);
|
||||||
|
assertEquals("发布", btn.get("id"));
|
||||||
|
assertEquals("ajax", btn.get("actionType"));
|
||||||
|
// baseline disabled(脚本据 STATUS 点亮;本页若无脚本,后续 attachScriptOnEvent/demote 改 disabledOn)
|
||||||
|
assertEquals(Boolean.TRUE, btn.get("disabled"));
|
||||||
|
Map<String, Object> api = (Map<String, Object>) btn.get("api");
|
||||||
|
assertEquals("post", api.get("method"));
|
||||||
|
assertEquals("/api/flow/PM_DEMO_PUBLISH", api.get("url"));
|
||||||
|
// 业务族 <input> 只声明 map、脚本读 map[PK]:data 只送单选主键(bracket 记法 selectedItems[0],
|
||||||
|
// 与 codebase 既有 ${selectedItems[0]} 一致),不送 ids(送 ids 业务流不识别 + 删除族会误 fanout)。
|
||||||
|
Map<String, Object> data = (Map<String, Object>) api.get("data");
|
||||||
|
assertEquals("${selectedItems[0].PM_DEMO_ID}", data.get("PM_DEMO_ID"), "bracket 记法单选主键");
|
||||||
|
assertFalse(data.containsKey("ids"), "C1:业务按钮 data 不得含 ids");
|
||||||
|
assertEquals(1, data.size(), "C1:业务 data 只含 PK 一个键");
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void crud_isshowFalse按钮跳过() {
|
void crud_isshowFalse按钮跳过() {
|
||||||
String xml = "<crud entityid='e1'><display/>"
|
String xml = "<crud entityid='e1'><display/>"
|
||||||
@@ -1172,6 +1202,101 @@ class TemplateToAmisConverterTest {
|
|||||||
assertEquals("ajax", ((Map<String, Object>) actions.get(0)).get("actionType"));
|
assertEquals("ajax", ((Map<String, Object>) actions.get(0)).get("actionType"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* C2:页面有 onselectedscript 绑定(脚本控启停)→ 业务按钮保持 baseline disabled:true(脚本据 STATUS 点亮)。
|
||||||
|
* 这是「脚本控」分支,不降级为 disabledOn(与无脚本分支区分)。
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
void attachScriptOnEvent_有脚本页业务按钮保持disabled() {
|
||||||
|
String xml = "<crud entityid='e1'><display><field name='A' text='A'/></display>"
|
||||||
|
+ "<button type='delete' name='发布' isshow='true'><method servicename='OA_X_PUBLISH'/></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> crud = body(schema);
|
||||||
|
Map<String, Object> btn = (Map<String, Object>) ((List<Object>) crud.get("headerToolbar")).get(0);
|
||||||
|
assertEquals("发布", btn.get("id"));
|
||||||
|
assertEquals(Boolean.TRUE, btn.get("disabled"), "有脚本页保持 baseline disabled:true(脚本控)");
|
||||||
|
assertNull(btn.get("disabledOn"), "有脚本页不降级 disabledOn");
|
||||||
|
// 仍有 selectedChange(脚本挂上)
|
||||||
|
assertTrue(((Map<String, Object>) crud.get("onEvent")).containsKey("selectedChange"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* C2:页面只有 onloadscript(无 onselectedscript)→ attachScriptOnEvent 把业务按钮 disabled:true
|
||||||
|
* 降级为 disabledOn(选中即可用),否则永久置灰。
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
void attachScriptOnEvent_仅onload无onselected时业务按钮降级disabledOn() {
|
||||||
|
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();
|
||||||
|
var bindings = List.of(new TemplateToAmisConverter.EventBinding("onloadscript", "K1"));
|
||||||
|
converter.attachScriptOnEvent(schema, "tid", bindings, Map.of("K1", 1));
|
||||||
|
|
||||||
|
Map<String, Object> crud = body(schema);
|
||||||
|
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"),
|
||||||
|
"无脚本启停 → 选中即可用");
|
||||||
|
// 有 inited(onload 脚本),但无 selectedChange
|
||||||
|
Map<String, Object> onEvent = (Map<String, Object>) crud.get("onEvent");
|
||||||
|
assertTrue(onEvent.containsKey("inited"));
|
||||||
|
assertFalse(onEvent.containsKey("selectedChange"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* C2:页面无任何脚本绑定(55 模板的典型)→ demoteUnscriptedBusinessButtons 把永久灰的业务按钮
|
||||||
|
* 降级为 disabledOn(选中即可用)。这是 BatchConvertCli 对 bindings.isEmpty() 页的兜底。
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
void demoteUnscriptedBusinessButtons_无脚本页业务按钮降级disabledOn() {
|
||||||
|
String xml = "<crud entityid='e1'><display><field name='A' text='A'/></display>"
|
||||||
|
+ "<button type='delete' name='提交审批' isshow='true'><method servicename='OA_X_SUBMIT'/></button>"
|
||||||
|
+ "<button type='delete' name='删除' isshow='true'><method servicename='OA_X_DELETE'/></button>"
|
||||||
|
+ "</crud>";
|
||||||
|
Map<String, Object> schema = converter.convertGraded(xml, new ArrayList<>(), noPage).getSchema();
|
||||||
|
// 模拟 BatchConvertCli 对无绑定页的兜底调用
|
||||||
|
converter.demoteUnscriptedBusinessButtons(schema);
|
||||||
|
|
||||||
|
Map<String, Object> crud = body(schema);
|
||||||
|
List<Object> toolbar = (List<Object>) crud.get("headerToolbar");
|
||||||
|
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 选中态语义)");
|
||||||
|
// 删除按钮本就 disabledOn(非 baseline disabled),不受影响
|
||||||
|
Map<String, Object> del = (Map<String, Object>) toolbar.get(1);
|
||||||
|
assertEquals("删除", del.get("id"));
|
||||||
|
assertEquals("${!selectedItems || selectedItems.length === 0}", del.get("disabledOn"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/** C2:demote 是幂等 no-op——页面已有 selectedChange 脚本(脚本控)时不动业务按钮。 */
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
void demoteUnscriptedBusinessButtons_有脚本控时不降级() {
|
||||||
|
String xml = "<crud entityid='e1'><display><field name='A' text='A'/></display>"
|
||||||
|
+ "<button type='delete' name='发布' isshow='true'><method servicename='OA_X_PUBLISH'/></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));
|
||||||
|
// 再调 demote:因有 selectedChange,应 no-op
|
||||||
|
converter.demoteUnscriptedBusinessButtons(schema);
|
||||||
|
|
||||||
|
Map<String, Object> btn = (Map<String, Object>) ((List<Object>) body(schema).get("headerToolbar")).get(0);
|
||||||
|
assertEquals(Boolean.TRUE, btn.get("disabled"), "有脚本控页 demote no-op,保持 disabled:true");
|
||||||
|
assertNull(btn.get("disabledOn"));
|
||||||
|
}
|
||||||
|
|
||||||
/** Phase 2.2:动作链调执行端点并重放指令(含 templateId)。 */
|
/** Phase 2.2:动作链调执行端点并重放指令(含 templateId)。 */
|
||||||
@Test
|
@Test
|
||||||
void attachScriptOnEvent_动作链调执行端点并重放指令() {
|
void attachScriptOnEvent_动作链调执行端点并重放指令() {
|
||||||
@@ -2064,8 +2189,10 @@ class TemplateToAmisConverterTest {
|
|||||||
Map<String, Object> submitApi = (Map<String, Object>) submitBtn.get("api");
|
Map<String, Object> submitApi = (Map<String, Object>) submitBtn.get("api");
|
||||||
assertEquals("post", submitApi.get("method"));
|
assertEquals("post", submitApi.get("method"));
|
||||||
assertEquals("/api/flow/OA_NOTICEMANAGE_SUBMIT", submitApi.get("url"));
|
assertEquals("/api/flow/OA_NOTICEMANAGE_SUBMIT", submitApi.get("url"));
|
||||||
assertEquals("${selectedItems|pick:PM_DEMO_ID|join:','}",
|
// C1:业务按钮 data 只送 PK(bracket 单选主键),不送 ids(业务流读 map[PK])。
|
||||||
((Map<String, Object>) submitApi.get("data")).get("ids"));
|
Map<String, Object> submitData = (Map<String, Object>) submitApi.get("data");
|
||||||
|
assertEquals("${selectedItems[0].PM_DEMO_ID}", submitData.get("PM_DEMO_ID"));
|
||||||
|
assertFalse(submitData.containsKey("ids"), "C1:业务按钮 data 不送 ids");
|
||||||
assertEquals(true, submitBtn.get("disabled"), "业务按钮 baseline 禁用,脚本据 STATUS 点亮");
|
assertEquals(true, submitBtn.get("disabled"), "业务按钮 baseline 禁用,脚本据 STATUS 点亮");
|
||||||
|
|
||||||
Map<String, Object> archiveBtn = (Map<String, Object>) toolbar.get(1); // 文件归档
|
Map<String, Object> archiveBtn = (Map<String, Object>) toolbar.get(1); // 文件归档
|
||||||
@@ -2073,8 +2200,9 @@ class TemplateToAmisConverterTest {
|
|||||||
assertEquals("文件归档", archiveBtn.get("id"));
|
assertEquals("文件归档", archiveBtn.get("id"));
|
||||||
Map<String, Object> archiveApi = (Map<String, Object>) archiveBtn.get("api");
|
Map<String, Object> archiveApi = (Map<String, Object>) archiveBtn.get("api");
|
||||||
assertEquals("/api/flow/OA_NOTICEMANAGE_UPDATE_AC", archiveApi.get("url"));
|
assertEquals("/api/flow/OA_NOTICEMANAGE_UPDATE_AC", archiveApi.get("url"));
|
||||||
assertEquals("${selectedItems|pick:PM_DEMO_ID|join:','}",
|
Map<String, Object> archiveData = (Map<String, Object>) archiveApi.get("data");
|
||||||
((Map<String, Object>) archiveApi.get("data")).get("ids"));
|
assertEquals("${selectedItems[0].PM_DEMO_ID}", archiveData.get("PM_DEMO_ID"));
|
||||||
|
assertFalse(archiveData.containsKey("ids"), "C1:业务按钮 data 不送 ids");
|
||||||
assertEquals("确认要发送归档吗?", archiveBtn.get("confirmText"));
|
assertEquals("确认要发送归档吗?", archiveBtn.get("confirmText"));
|
||||||
assertEquals(true, archiveBtn.get("disabled"));
|
assertEquals(true, archiveBtn.get("disabled"));
|
||||||
}
|
}
|
||||||
@@ -2138,7 +2266,7 @@ class TemplateToAmisConverterTest {
|
|||||||
assertEquals(5, toolbar.size());
|
assertEquals(5, toolbar.size());
|
||||||
|
|
||||||
String idsExpr = "${selectedItems|pick:PM_DEMO_ID|join:','}";
|
String idsExpr = "${selectedItems|pick:PM_DEMO_ID|join:','}";
|
||||||
String pkExpr = "${selectedItems.0.PM_DEMO_ID}";
|
String pkExpr = "${selectedItems[0].PM_DEMO_ID}"; // C1:bracket 记法单选主键
|
||||||
|
|
||||||
// 业务动作按钮(前 3 个):id=中文名 + baseline disabled + ajax /api/flow + 选中行表达式 + 无 disabledOn
|
// 业务动作按钮(前 3 个):id=中文名 + baseline disabled + ajax /api/flow + 选中行表达式 + 无 disabledOn
|
||||||
String[] bizNames = {"发布", "显示", "提交审批"};
|
String[] bizNames = {"发布", "显示", "提交审批"};
|
||||||
@@ -2152,20 +2280,24 @@ class TemplateToAmisConverterTest {
|
|||||||
assertEquals("post", bizApi.get("method"));
|
assertEquals("post", bizApi.get("method"));
|
||||||
assertEquals("/api/flow/" + bizSvcs[i], bizApi.get("url"));
|
assertEquals("/api/flow/" + bizSvcs[i], bizApi.get("url"));
|
||||||
Map<String, Object> bizData = (Map<String, Object>) bizApi.get("data");
|
Map<String, Object> bizData = (Map<String, Object>) bizApi.get("data");
|
||||||
// 删除族 fanout 用 ids 逗号串;业务族脚本 map[<PK>] 定位行 → 同时带 PK 单选主键
|
// C1:业务族脚本读 map[<PK>] 定位行 → 只送 PK 单选主键(bracket),不送 ids(避免与删除族混淆)
|
||||||
assertEquals(idsExpr, bizData.get("ids"));
|
|
||||||
assertEquals(pkExpr, bizData.get("PM_DEMO_ID"), "业务流脚本读 map[<PK>],须带选中行单选主键");
|
assertEquals(pkExpr, bizData.get("PM_DEMO_ID"), "业务流脚本读 map[<PK>],须带选中行单选主键");
|
||||||
|
assertFalse(bizData.containsKey("ids"), "C1:业务按钮 data 不送 ids(送 ids 业务流不识别)");
|
||||||
|
assertEquals(1, bizData.size(), "C1:业务 data 只含 PK 一个键");
|
||||||
assertNull(btn.get("data"), "data 内嵌进 api(字符串式同级 data 会丢失,spike 实证)");
|
assertNull(btn.get("data"), "data 内嵌进 api(字符串式同级 data 会丢失,spike 实证)");
|
||||||
assertEquals(true, btn.get("disabled"), "业务按钮 baseline 禁用,脚本据 STATUS 点亮");
|
assertEquals(true, btn.get("disabled"), "业务按钮 baseline 禁用,脚本据 STATUS 点亮");
|
||||||
assertNull(btn.get("disabledOn"), "业务按钮用脚本控制,不叠 disabledOn 避免冲突");
|
assertNull(btn.get("disabledOn"), "业务按钮用脚本控制,不叠 disabledOn 避免冲突");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 真删除(第 4 个):id=删除 + 选中态 disabledOn(非 baseline disabled)
|
// 真删除(第 4 个):id=删除 + 选中态 disabledOn(非 baseline disabled)+ data 只送 ids(fanout)
|
||||||
Map<String, Object> del = (Map<String, Object>) toolbar.get(3);
|
Map<String, Object> del = (Map<String, Object>) toolbar.get(3);
|
||||||
assertEquals("删除", del.get("id"));
|
assertEquals("删除", del.get("id"));
|
||||||
Map<String, Object> delApi = (Map<String, Object>) del.get("api");
|
Map<String, Object> delApi = (Map<String, Object>) del.get("api");
|
||||||
assertEquals("/api/flow/OA_NEWSMANAGE_DELETE", delApi.get("url"));
|
assertEquals("/api/flow/OA_NEWSMANAGE_DELETE", delApi.get("url"));
|
||||||
assertEquals(idsExpr, ((Map<String, Object>) delApi.get("data")).get("ids"));
|
Map<String, Object> delData = (Map<String, Object>) delApi.get("data");
|
||||||
|
assertEquals(idsExpr, delData.get("ids"));
|
||||||
|
assertFalse(delData.containsKey("PM_DEMO_ID"), "C1:删除 data 不送 PK(送则抑制 fanout→只删首行)");
|
||||||
|
assertEquals(1, delData.size(), "C1:删除 data 只含 ids 一个键");
|
||||||
assertEquals("${!selectedItems || selectedItems.length === 0}", del.get("disabledOn"));
|
assertEquals("${!selectedItems || selectedItems.length === 0}", del.get("disabledOn"));
|
||||||
assertNull(del.get("disabled"), "删除随选中态 disabledOn,不设 baseline disabled");
|
assertNull(del.get("disabled"), "删除随选中态 disabledOn,不设 baseline disabled");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -521,6 +521,49 @@ class FlowControllerTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@DisplayName("17d. C1 多选删除:body 只送 ids=3 主键(不含 PK)→ 删除族(PK required) fanout 执行 3 次")
|
||||||
|
void writeFlowFansOutThreeIdsWhenBodyHasOnlyIds() {
|
||||||
|
// C1 锁:转换器修正后真删除按钮 data 只送 ids(不送 PK)→ map 不含 PK
|
||||||
|
// → missingRequiredIdInput 返必填主键名 → FlowController 拆 ids 逐 id fanout。
|
||||||
|
// (若 data 误带 PK,map.containsKey(field) 为真 → missingRequiredIdInput 返 null
|
||||||
|
// → fanout 分支被跳过 → 多选只删第一行,正是 C1 回归。见 FlowInputCoercerTest 17。)
|
||||||
|
String flowId = "OA_NEWSMANAGE_DELETE";
|
||||||
|
FlowExcuteService engine = mock(FlowExcuteService.class);
|
||||||
|
when(engine.excute(any(), any(), eq(flowId))).thenReturn(new HashMap<>());
|
||||||
|
com.eip4.platform.metadata.flow.FlowInputCoercer coercer =
|
||||||
|
mock(com.eip4.platform.metadata.flow.FlowInputCoercer.class);
|
||||||
|
when(coercer.missingRequiredIdInput(eq(flowId), any())).thenReturn("OA_NEWSMANAGE_ID");
|
||||||
|
FlowController controller = new FlowController(
|
||||||
|
engine, resolverReturning(flowId, namedWrite()), null, null, coercer);
|
||||||
|
|
||||||
|
Properties realUser = new Properties();
|
||||||
|
realUser.setProperty(LoggedInUser.CURRENTUSER, "ceshi");
|
||||||
|
try (MockedStatic<UserSession> us = org.mockito.Mockito.mockStatic(UserSession.class)) {
|
||||||
|
us.when(UserSession::get).thenReturn(realUser);
|
||||||
|
|
||||||
|
Map<String, Object> body = new HashMap<>();
|
||||||
|
body.put("ids", "id-a,id-b,id-c"); // 多选 3 行主键逗号串(C1 修正后删除按钮只送此键)
|
||||||
|
ResponseEntity<Map<String, Object>> resp = controller.executePost(flowId, body);
|
||||||
|
|
||||||
|
assertEquals(HttpStatus.OK, resp.getStatusCode());
|
||||||
|
assertEquals(0, resp.getBody().get("status"));
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
ArgumentCaptor<Map<String, Object>> mapCap = ArgumentCaptor.forClass(Map.class);
|
||||||
|
org.mockito.Mockito.verify(engine, org.mockito.Mockito.times(3))
|
||||||
|
.excute(mapCap.capture(), any(Properties.class), eq(flowId));
|
||||||
|
java.util.List<Map<String, Object>> sent = mapCap.getAllValues();
|
||||||
|
assertEquals("id-a", sent.get(0).get("OA_NEWSMANAGE_ID"));
|
||||||
|
assertEquals("id-b", sent.get(1).get("OA_NEWSMANAGE_ID"));
|
||||||
|
assertEquals("id-c", sent.get(2).get("OA_NEWSMANAGE_ID"));
|
||||||
|
for (Map<String, Object> m : sent) {
|
||||||
|
org.junit.jupiter.api.Assertions.assertFalse(m.containsKey("ids"),
|
||||||
|
"fanout 后每条不再透传 ids");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@DisplayName("17c. NAMED_WRITE + ids 但流无必填 *_ID 入参 → 不扇出,原样单次执行")
|
@DisplayName("17c. NAMED_WRITE + ids 但流无必填 *_ID 入参 → 不扇出,原样单次执行")
|
||||||
void writeFlowKeepsIdsWhenFlowHasNoPkInput() {
|
void writeFlowKeepsIdsWhenFlowHasNoPkInput() {
|
||||||
|
|||||||
Reference in New Issue
Block a user