F2-3:运行时动词闭包子指令机制 + staging 晋级(FULL_AUTO 507/HARD 74)
ScriptFacade:addFieldButton 扩第3参闭包(onClick 子指令数组)+ showConfirm 新动词,服务端急切求值闭包,子指令收进子缓冲,输出嵌套指令 JSON。 前端 scriptCommands.ts/registerReplayAction.ts:处理 addButton onClick/ confirmDialog onOk 嵌套重放,onClickActions/onOkActions 透传给 amis。 ScriptFacadeTest 补 7 个正反例(24/24 全绿)。 staging 晋级:FULL_AUTO 507(+10)/HARD 74(-12)/自动化率 82.7%, 双库各更新 801 条,e2e 30/30 全绿。 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -175,8 +175,76 @@ public class ScriptFacade {
|
||||
return emit("removeOption", field, args("value", value));
|
||||
}
|
||||
|
||||
/**
|
||||
* addFieldButton("FIELD","文案",{闭包},N) — F2-3 运行时动词:闭包子指令机制。
|
||||
*
|
||||
* <p>服务端急切求值闭包({@link Closure}),闭包内动词产生的指令收进子缓冲,
|
||||
* 输出 {@code {actionType:"addButton",componentId:"FIELD",args:{label,index:N,onClick:[子指令数组]}}}。
|
||||
* 非闭包参数(null 或旧版 handler 占位)按原有行为退化(onClick 不含子指令数组)。
|
||||
*/
|
||||
public Object addFieldButton(String field, Object label, Object handler) {
|
||||
return emit("addButton", field, args("label", label));
|
||||
return addFieldButton(field, label, handler, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* addFieldButton("FIELD","文案",{闭包},N) 四参完整形态。
|
||||
*/
|
||||
public Object addFieldButton(String field, Object label, Object handler, Object index) {
|
||||
List<Map<String, Object>> onClick = evalClosure(handler);
|
||||
Map<String, Object> a = new LinkedHashMap<>();
|
||||
a.put("label", label);
|
||||
if (index != null) {
|
||||
a.put("index", index);
|
||||
}
|
||||
if (onClick != null) {
|
||||
a.put("onClick", onClick);
|
||||
}
|
||||
return emit("addButton", field, a);
|
||||
}
|
||||
|
||||
/**
|
||||
* showConfirm("消息",{闭包}) — F2-3 运行时动词:弹确认框。
|
||||
*
|
||||
* <p>同闭包子指令机制:闭包内动词收进子缓冲,
|
||||
* 输出 {@code {actionType:"confirmDialog",args:{msg,onOk:[子指令数组]}}}。
|
||||
*/
|
||||
public Object showConfirm(Object msg, Object handler) {
|
||||
List<Map<String, Object>> onOk = evalClosure(handler);
|
||||
Map<String, Object> a = new LinkedHashMap<>();
|
||||
a.put("msg", msg);
|
||||
if (onOk != null) {
|
||||
a.put("onOk", onOk);
|
||||
}
|
||||
return emit("confirmDialog", null, a);
|
||||
}
|
||||
|
||||
/**
|
||||
* 急切求值闭包,返回闭包执行期间产生的子指令列表。
|
||||
* 非 Closure 入参(含 null)返回 null(调用方按无 onClick/onOk 处理)。
|
||||
*/
|
||||
private List<Map<String, Object>> evalClosure(Object handler) {
|
||||
if (!(handler instanceof Closure)) {
|
||||
return null;
|
||||
}
|
||||
// 用子 facade 执行闭包,闭包内所有动词写入子缓冲
|
||||
ScriptFacade child = new ScriptFacade(this.item);
|
||||
Bindings childBindings = child.buildBindings(this.item);
|
||||
@SuppressWarnings("unchecked")
|
||||
Closure<Object> closure = (Closure<Object>) handler;
|
||||
closure.setDelegate(child);
|
||||
closure.setResolveStrategy(Closure.DELEGATE_FIRST);
|
||||
// 用子 bindings 注入的闭包变量替代 delegate 属性查找——
|
||||
// Groovy Closure 内调用动词走 MissingPropertyException→delegate,
|
||||
// 但直接把子 bindings 里的闭包先塞进当前脚本执行的 binding 会互相污染。
|
||||
// 最简可靠做法:在新 ScriptEngine 上下文内 eval 闭包体(保持隔离)。
|
||||
// 这里直接 call closure,delegate=child,闭包内动词调用经 delegate 走到 child 方法。
|
||||
try {
|
||||
closure.call();
|
||||
} catch (Exception e) {
|
||||
// 闭包内业务异常(如缺行数据)不阻断外层指令收集,子指令仍返回已产生部分
|
||||
}
|
||||
List<Map<String, Object>> sub = child.getCommands();
|
||||
return sub.isEmpty() ? new ArrayList<>() : sub;
|
||||
}
|
||||
|
||||
public Object addSubTableButton(String field, Object targetField, Object index) {
|
||||
@@ -293,7 +361,8 @@ public class ScriptFacade {
|
||||
|
||||
// UI 语义动词(字段 + 2 参)
|
||||
bind(b, "addFieldOption", a -> addFieldOption(str(a, 0), arg(a, 1), arg(a, 2)));
|
||||
bind(b, "addFieldButton", a -> addFieldButton(str(a, 0), arg(a, 1), arg(a, 2)));
|
||||
// addFieldButton 支持 3 参(旧)和 4 参(F2-3 闭包+index 形态)
|
||||
bind(b, "addFieldButton", a -> addFieldButton(str(a, 0), arg(a, 1), arg(a, 2), arg(a, 3)));
|
||||
bind(b, "addSubTableButton", a -> addSubTableButton(str(a, 0), arg(a, 1), arg(a, 2)));
|
||||
|
||||
// 组级动词(无字段参)
|
||||
@@ -302,6 +371,7 @@ public class ScriptFacade {
|
||||
|
||||
// 通知/按钮/基础绑定
|
||||
bind(b, "showToast", a -> showToast(arg(a, 0)));
|
||||
bind(b, "showConfirm", a -> showConfirm(arg(a, 0), arg(a, 1))); // F2-3 确认框
|
||||
bind(b, "enableButton", a -> enableButton(str(a, 0), arg(a, 1)));
|
||||
bind(b, "bindField", a -> bindField(str(a, 0), arg(a, 1)));
|
||||
|
||||
|
||||
@@ -2,6 +2,8 @@ package com.eip4.platform.metadata.script;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
@@ -230,6 +232,118 @@ class ScriptFacadeTest {
|
||||
// G. 端到端:真实改写后脚本组合多动词
|
||||
// ──────────────────────────────────────────────
|
||||
|
||||
// ──────────────────────────────────────────────
|
||||
// H. F2-3:addFieldButton 闭包子指令 + showConfirm(正反例)
|
||||
// ──────────────────────────────────────────────
|
||||
|
||||
@Test
|
||||
void addFieldButton_withClosure_emitsOnClickSubCommands() {
|
||||
// 闭包体内动词产生子指令,输出 onClick 数组
|
||||
String groovy =
|
||||
"addFieldButton(\"BTN_FIELD\", \"全选签到\", {\n" +
|
||||
" setFieldVisible(\"DETAIL\", true)\n" +
|
||||
" showToast(\"已全选\")\n" +
|
||||
"}, 1)";
|
||||
List<Map<String, Object>> cmds = run(groovy, item());
|
||||
assertEquals(1, cmds.size(), "外层仅 1 条 addButton 指令");
|
||||
Map<String, Object> cmd = cmds.get(0);
|
||||
assertEquals("addButton", cmd.get("actionType"));
|
||||
assertEquals("BTN_FIELD", cmd.get("componentId"));
|
||||
Map<?, ?> args = (Map<?, ?>) cmd.get("args");
|
||||
assertEquals("全选签到", args.get("label"));
|
||||
assertEquals(1, args.get("index"));
|
||||
@SuppressWarnings("unchecked")
|
||||
List<Map<String, Object>> onClick = (List<Map<String, Object>>) args.get("onClick");
|
||||
assertNotNull(onClick, "onClick 子指令不应为 null");
|
||||
assertEquals(2, onClick.size(), "闭包内 2 个动词产生 2 条子指令");
|
||||
assertEquals("show", onClick.get(0).get("actionType"));
|
||||
assertEquals("DETAIL", onClick.get(0).get("componentId"));
|
||||
assertEquals("toast", onClick.get(1).get("actionType"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void addFieldButton_emptyClosure_emitsEmptyOnClick() {
|
||||
// 空闭包产生空 onClick 数组(非 null)
|
||||
String groovy = "addFieldButton(\"BTN\", \"操作\", {}, 0)";
|
||||
List<Map<String, Object>> cmds = run(groovy, item());
|
||||
assertEquals(1, cmds.size());
|
||||
@SuppressWarnings("unchecked")
|
||||
List<?> onClick = (List<?>) ((Map<?, ?>) cmds.get(0).get("args")).get("onClick");
|
||||
assertNotNull(onClick);
|
||||
assertEquals(0, onClick.size(), "空闭包产生空 onClick 数组");
|
||||
}
|
||||
|
||||
@Test
|
||||
void addFieldButton_nullHandler_noOnClick() {
|
||||
// null handler(旧版三参形态)不含 onClick 字段
|
||||
String groovy = "addFieldButton(\"BTN\", \"文案\", null)";
|
||||
List<Map<String, Object>> cmds = run(groovy, item());
|
||||
assertEquals(1, cmds.size());
|
||||
Map<?, ?> args = (Map<?, ?>) cmds.get(0).get("args");
|
||||
assertFalse(args.containsKey("onClick"), "null handler 不产生 onClick");
|
||||
}
|
||||
|
||||
@Test
|
||||
void showConfirm_withClosure_emitsOnOkSubCommands() {
|
||||
// showConfirm 闭包内动词收进 onOk 子指令数组
|
||||
String groovy =
|
||||
"showConfirm(\"确认删除?\", {\n" +
|
||||
" setFieldEnabled(\"NAME\", false)\n" +
|
||||
" showToast(\"已删除\")\n" +
|
||||
"})";
|
||||
List<Map<String, Object>> cmds = run(groovy, item());
|
||||
assertEquals(1, cmds.size(), "外层仅 1 条 confirmDialog 指令");
|
||||
Map<String, Object> cmd = cmds.get(0);
|
||||
assertEquals("confirmDialog", cmd.get("actionType"));
|
||||
assertNull(cmd.get("componentId"), "confirmDialog 无 componentId");
|
||||
Map<?, ?> args = (Map<?, ?>) cmd.get("args");
|
||||
assertEquals("确认删除?", args.get("msg"));
|
||||
@SuppressWarnings("unchecked")
|
||||
List<Map<String, Object>> onOk = (List<Map<String, Object>>) args.get("onOk");
|
||||
assertNotNull(onOk);
|
||||
assertEquals(2, onOk.size());
|
||||
assertEquals("disabled", onOk.get(0).get("actionType"));
|
||||
assertEquals("toast", onOk.get(1).get("actionType"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void showConfirm_emptyClosure_emitsEmptyOnOk() {
|
||||
String groovy = "showConfirm(\"确认?\", {})";
|
||||
List<Map<String, Object>> cmds = run(groovy, item());
|
||||
assertEquals(1, cmds.size());
|
||||
@SuppressWarnings("unchecked")
|
||||
List<?> onOk = (List<?>) ((Map<?, ?>) cmds.get(0).get("args")).get("onOk");
|
||||
assertNotNull(onOk);
|
||||
assertEquals(0, onOk.size());
|
||||
}
|
||||
|
||||
@Test
|
||||
void showConfirm_nullHandler_noOnOk() {
|
||||
String groovy = "showConfirm(\"确认?\", null)";
|
||||
List<Map<String, Object>> cmds = run(groovy, item());
|
||||
assertEquals(1, cmds.size());
|
||||
Map<?, ?> args = (Map<?, ?>) cmds.get(0).get("args");
|
||||
assertFalse(args.containsKey("onOk"), "null handler 不产生 onOk");
|
||||
}
|
||||
|
||||
@Test
|
||||
void addFieldButton_nestedClosure_closureBodyExceptionStillReturnsPartialSubCommands() {
|
||||
// 闭包内前段指令已产生,后段抛异常 → 已产生的子指令仍收集返回
|
||||
String groovy =
|
||||
"addFieldButton(\"BTN\", \"测试\", {\n" +
|
||||
" setFieldVisible(\"A\", true)\n" +
|
||||
" def x = null; x.nope()\n" + // 抛 NullPointerException
|
||||
" showToast(\"不应到达\")\n" +
|
||||
"}, 0)";
|
||||
List<Map<String, Object>> cmds = run(groovy, item());
|
||||
assertEquals(1, cmds.size());
|
||||
@SuppressWarnings("unchecked")
|
||||
List<Map<String, Object>> onClick = (List<Map<String, Object>>) ((Map<?, ?>) cmds.get(0).get("args")).get("onClick");
|
||||
// 异常前已产生 1 条子指令(show),异常后的 toast 不产生
|
||||
assertEquals(1, onClick.size(), "异常前已产生的子指令应收集");
|
||||
assertEquals("show", onClick.get(0).get("actionType"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void realRewrittenScript_multiVerbCombo_capturedAsAmisCommandArray() {
|
||||
// 形态取自真实 FULL_AUTO 改写产出(addSubTableButton + setFieldReadOnly + getFieldValue 分支)
|
||||
|
||||
Reference in New Issue
Block a user