diff --git a/platform-converter/src/main/java/com/eip4/platform/converter/BatchConvertCli.java b/platform-converter/src/main/java/com/eip4/platform/converter/BatchConvertCli.java
index b8715fd..c88a801 100644
--- a/platform-converter/src/main/java/com/eip4/platform/converter/BatchConvertCli.java
+++ b/platform-converter/src/main/java/com/eip4/platform/converter/BatchConvertCli.java
@@ -34,9 +34,10 @@ import com.fasterxml.jackson.databind.SerializationFeature;
*
*
WS-B:第 5 参数为改写产物根目录(rewriterDir),传入即启用 onEvent 挂回。挂回不再读
* full_auto_index.json,而是从每个模板源 XML 解析事件绑定(onselectedscript/onloadscript →
- * scriptKey)+ {@code } 文档序(key→seq),按事件类型调用
- * {@link TemplateToAmisConverter#attachScriptOnEvent}(onselected→selectedChange / onload→inited),
- * 覆盖 NO_S3+FULL_AUTO 两类脚本。
+ * scriptKey)+ scriptKey→seq(复刻改写器枚举:{@code //script} 文档序 + strip<5 跳过 + 1-based 连续),
+ * 按事件类型调用 {@link TemplateToAmisConverter#attachScriptOnEvent}(onselected→selectedChange /
+ * onload→inited),覆盖 NO_S3+FULL_AUTO 两类脚本。仅当盘上确有 {@code rewritten//.*.groovy}
+ * 时才挂该绑定(fail-closed),并对「转换器算 keyed-script 数 vs 盘上文件数」做对齐校验告警。
*
* 用法(本地 eip4dev):
*
{@code
@@ -58,7 +59,7 @@ public final class BatchConvertCli {
private static final String DEFAULT_USER = "ceshi";
private static final String DEFAULT_PASS = "ceshi";
private static final String DEFAULT_OUT = "转换产物";
- /** 第 5 参数:改写产物根目录(含 full_auto_index.json),为空则不挂 onEvent。 */
+ /** 第 5 参数:改写产物根目录(含 rewritten/<id>/<seq>.*.groovy),为空则不挂 onEvent。 */
private static final String DEFAULT_REWRITER_DIR = "";
private BatchConvertCli() {
@@ -126,7 +127,7 @@ public final class BatchConvertCli {
}
/**
- * 从源模板 XML 解析 scriptKey→seq({@code } 1-based 文档序,与 rewriter 落盘 seq 对齐)。
+ * 从源模板 XML 解析 scriptKey→seq(复刻改写器枚举:{@code //script} 文档序 + strip<5 跳过 + 1-based 连续)。
* 委托 {@link TemplateToAmisConverter#scriptKeyToSeq};XML 不可解析则返回空 map。
*/
static Map parseKeyToSeq(String xml) {
@@ -139,6 +140,56 @@ public final class BatchConvertCli {
}
}
+ /**
+ * 从源模板 XML 算「占 seq 的脚本数」(= {@link TemplateToAmisConverter#countKeptScripts}),
+ * 供与盘上文件数比对的对齐校验(WS-B C2)。XML 不可解析返回 -1(跳过校验)。
+ */
+ static int parseCountKeptScripts(String xml) {
+ try {
+ Element root = DocumentHelper.parseText(xml).getRootElement();
+ return new TemplateToAmisConverter(null).countKeptScripts(root);
+ } catch (Exception e) {
+ return -1;
+ }
+ }
+
+ /**
+ * 扫描 {@code rewriterDir//} 下落盘的脚本文件,返回其 seq 集合
+ * (文件名形如 {@code ."
+ + ""
+ + ""
+ + "";
+
+ @Test
+ void parseKeyToSeq_复刻改写器枚举_短脚本跳过且连续编号() {
+ Map m = BatchConvertCli.parseKeyToSeq(MULTI_SCRIPT_XML);
+ assertEquals(1, m.get("K_BTN"));
+ assertEquals(2, m.get("K_FILTER")); // 跳过空脚本后连续 → seq=2(旧实现会算成 3)
+ assertNull(m.get("K_EMPTY")); // 短脚本被跳,不进映射
+ }
+
+ @Test
+ void parseCountKeptScripts_只计保留脚本() {
+ assertEquals(2, BatchConvertCli.parseCountKeptScripts(MULTI_SCRIPT_XML)); // 空脚本不计
+ assertEquals(0, BatchConvertCli.parseCountKeptScripts(""));
+ }
+
+ @Test
+ void parseKeyToSeq_不可解析XML返回空() {
+ assertTrue(BatchConvertCli.parseKeyToSeq("not-xml<<<").isEmpty());
+ assertEquals(-1, BatchConvertCli.parseCountKeptScripts("not-xml<<<"));
+ }
+
+ @Test
+ void parseEventBindings_收集onselected与onload并去重() {
+ List bs = BatchConvertCli.parseEventBindings(MULTI_SCRIPT_XML);
+ assertEquals(2, bs.size());
+ boolean hasSel = false, hasLoad = false;
+ for (TemplateToAmisConverter.EventBinding b : bs) {
+ if ("onselectedscript".equals(b.eventType) && "K_BTN".equals(b.scriptKey)) hasSel = true;
+ if ("onloadscript".equals(b.eventType) && "K_FILTER".equals(b.scriptKey)) hasLoad = true;
+ }
+ assertTrue(hasSel);
+ assertTrue(hasLoad);
+ }
+
+ @Test
+ void parseEventBindings_不可解析XML返回空() {
+ assertTrue(BatchConvertCli.parseEventBindings("not-xml<<<").isEmpty());
+ }
+
+ /** existingSeqs:rewriterDir 传 output(含 rewritten//)时按文件名前缀解析 seq 集合。 */
+ @Test
+ void existingSeqs_扫描output根下rewritten子目录(@TempDir Path output) throws IOException {
+ Path dir = output.resolve("rewritten").resolve("ddb75614");
+ Files.createDirectories(dir);
+ writeFile(dir.resolve("1.NO_S3.groovy"), "// h\nenableButton(\"x\")");
+ writeFile(dir.resolve("2.FULL_AUTO.groovy"), "// h\nsetFieldViewOnly(\"y\",true)");
+ writeFile(dir.resolve("notes.txt"), "ignore"); // 非 .groovy 忽略
+
+ Set seqs = BatchConvertCli.existingSeqs(output, "ddb75614");
+ assertEquals(Set.of(1, 2), seqs);
+ assertTrue(BatchConvertCli.existingSeqs(output, "no-such").isEmpty());
+ }
+
+ /** existingSeqs:rewriterDir 直接传 rewritten 根(含 /)也能解析。 */
+ @Test
+ void existingSeqs_扫描rewritten根下模板目录(@TempDir Path rewritten) throws IOException {
+ Path dir = rewritten.resolve("tidX");
+ Files.createDirectories(dir);
+ writeFile(dir.resolve("3.PARTIAL.groovy"), "// h\nsetFieldFilter(\"z\")");
+ Set seqs = BatchConvertCli.existingSeqs(rewritten, "tidX");
+ assertEquals(Set.of(3), seqs);
+ }
+
+ @Test
+ void existingSeqs_目录不存在返回空() {
+ assertTrue(BatchConvertCli.existingSeqs(Path.of("/no/such/dir"), "x").isEmpty());
+ assertTrue(BatchConvertCli.existingSeqs(null, "x").isEmpty());
+ }
+
+ /**
+ * 契约(C1-a + C2 合流):转换器算出的 seq 必须命中盘上文件——以 d1f64d77 结构验证
+ * K_FILTER→seq=2 命中 {@code 2.*.groovy}(旧 bug 会算成 3 → 盘上无 3.* → 运行时「未找到」)。
+ */
+ @Test
+ void attached_seq_命中盘上文件契约(@TempDir Path output) throws IOException {
+ Path dir = output.resolve("rewritten").resolve("d1f64d77");
+ Files.createDirectories(dir);
+ writeFile(dir.resolve("1.NO_S3.groovy"), "// h\nenableButton(\"发布\",false)");
+ writeFile(dir.resolve("2.PARTIAL.groovy"), "// h\nsetFieldFilter(\"C\")");
+
+ Map keyToSeq = BatchConvertCli.parseKeyToSeq(MULTI_SCRIPT_XML);
+ Set seqsOnDisk = BatchConvertCli.existingSeqs(output, "d1f64d77");
+ List bindings = BatchConvertCli.parseEventBindings(MULTI_SCRIPT_XML);
+
+ // 每个绑定解析出的 seq 都必须存在于盘上(无悬挂、无错位)
+ for (TemplateToAmisConverter.EventBinding b : bindings) {
+ Integer seq = keyToSeq.get(b.scriptKey);
+ assertTrue(seq != null && seqsOnDisk.contains(seq),
+ "绑定 " + b + " → seq=" + seq + " 应命中盘上文件 " + seqsOnDisk);
+ }
+ // 对齐校验:转换器算的保留脚本数 == 盘上文件数
+ assertEquals(seqsOnDisk.size(), BatchConvertCli.parseCountKeptScripts(MULTI_SCRIPT_XML));
+ }
+
+ private static void writeFile(Path p, String content) throws IOException {
+ Files.writeString(p, content, StandardCharsets.UTF_8);
+ }
+}
diff --git a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java
index dbd2d87..fc1fe24 100644
--- a/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java
+++ b/platform-converter/src/test/java/com/eip4/platform/converter/TemplateToAmisConverterTest.java
@@ -970,12 +970,12 @@ class TemplateToAmisConverterTest {
// ── WS-B 脚本挂回 onEvent(事件绑定驱动:onselected→selectedChange / onload→inited)──────────
- /** Phase 1.1:解析 "
- + ""
+ + ""
+ + ""
+ "";
org.dom4j.Element root = org.dom4j.DocumentHelper.parseText(xml).getRootElement();
Map m = converter.scriptKeyToSeq(root);
@@ -983,13 +983,63 @@ class TemplateToAmisConverterTest {
assertEquals(2, m.get("K2"));
}
- /** Phase 1.1:无 段返回空 map(不抛异常)。 */
+ /** Phase 1.1:无 " // ≥5 → seq=1
+ + "" // strip<5 → 跳过
+ + "" // ≥5 → seq=2(非 3!)
+ + "";
+ org.dom4j.Element root = org.dom4j.DocumentHelper.parseText(xml).getRootElement();
+ Map m = converter.scriptKeyToSeq(root);
+ assertEquals(1, m.get("K_BTN"));
+ assertEquals(2, m.get("K_FILTER")); // 跳过空脚本后连续编号,对齐盘上 2.*.groovy
+ assertNull(m.get("K_EMPTY")); // 被跳过的短脚本不进映射
+ assertEquals(2, converter.countKeptScripts(root));
+ }
+
+ /**
+ * C2 核心:{@code //script} 全局范围——{@code } 之外的 script 也计入枚举
+ * (改写器用 xpath('//script'),非仅 直接子;旧实现会漏号)。
+ */
+ @Test
+ void scriptKeyToSeq_scripts外的script也计入() throws Exception {
+ String xml = ""
+ + ""
+ + "" // 外
+ + "";
+ org.dom4j.Element root = org.dom4j.DocumentHelper.parseText(xml).getRootElement();
+ Map m = converter.scriptKeyToSeq(root);
+ assertEquals(1, m.get("K1"));
+ assertEquals(2, m.get("K2")); // 旧实现(仅 子)会漏掉 K2
+ assertEquals(2, converter.countKeptScripts(root));
+ }
+
+ /** C2:keyless 脚本占 seq(不入 key 映射,但消耗号位),保证后续脚本编号对齐盘上文件。 */
+ @Test
+ void scriptKeyToSeq_keyless脚本占号() throws Exception {
+ String xml = ""
+ + "" // 占 seq=1,无 key
+ + "" // seq=2
+ + "";
+ org.dom4j.Element root = org.dom4j.DocumentHelper.parseText(xml).getRootElement();
+ Map m = converter.scriptKeyToSeq(root);
+ assertNull(m.get(null)); // keyless 不入映射
+ assertEquals(2, m.get("K2")); // 但占了号,K2 落 seq=2
+ assertEquals(2, converter.countKeptScripts(root));
+ }
+
/** Phase 1.2:递归收集 onselectedscript / onloadscript 事件绑定。 */
@Test
void extractEventBindings_收集onselected与onload() throws Exception {
@@ -1130,6 +1180,52 @@ class TemplateToAmisConverterTest {
assertTrue(onEvent.containsKey("inited"));
}
+ /** C1-a:seqExists 判定——seq 不在「存在集」→ 不挂(fail-closed);在 → 挂。 */
+ @Test
+ void attachScriptOnEvent_seq不存在则不挂存在则挂() {
+ String xml = "";
+ // 绑定:onselected→seq1(不存在)、onload→seq2(存在)
+ var bindings = List.of(
+ new TemplateToAmisConverter.EventBinding("onselectedscript", "K1"),
+ new TemplateToAmisConverter.EventBinding("onloadscript", "K2"));
+ Map keyToSeq = Map.of("K1", 1, "K2", 2);
+
+ // 只有 seq=2 存在
+ Map schema = converter.convertGraded(xml, new ArrayList<>(), noPage).getSchema();
+ converter.attachScriptOnEvent(schema, "tid", bindings, keyToSeq, seq -> seq == 2);
+ Map onEvent = (Map) body(schema).get("onEvent");
+ assertFalse(onEvent.containsKey("selectedChange")); // seq=1 缺文件 → 不挂
+ assertTrue(onEvent.containsKey("inited")); // seq=2 存在 → 挂
+
+ // 两者都存在
+ Map schema2 = converter.convertGraded(xml, new ArrayList<>(), noPage).getSchema();
+ converter.attachScriptOnEvent(schema2, "tid", bindings, keyToSeq, seq -> true);
+ Map onEvent2 = (Map) body(schema2).get("onEvent");
+ assertTrue(onEvent2.containsKey("selectedChange"));
+ assertTrue(onEvent2.containsKey("inited"));
+ }
+
+ /** I2:同一 (eventType,scriptKey) 在多元素重复出现 → extractEventBindings 只收一次(免 ajax 双发)。 */
+ @Test
+ void extractEventBindings_同绑定去重() throws Exception {
+ String xml = ""
+ + "" // 同 (onselected,K1) 重复
+ + ""
+ + "" // 同 (onload,K2) 重复
+ + "" // 不同 eventType 同 key → 保留
+ + "";
+ org.dom4j.Element root = org.dom4j.DocumentHelper.parseText(xml).getRootElement();
+ List bs = converter.extractEventBindings(root);
+ List sig = new ArrayList<>();
+ for (TemplateToAmisConverter.EventBinding b : bs) {
+ sig.add(b.eventType + ":" + b.scriptKey);
+ }
+ assertEquals(3, sig.size()); // K1×onselected, K2×onload, K2×onselected
+ assertEquals(1, java.util.Collections.frequency(sig, "onselectedscript:K1"));
+ assertEquals(1, java.util.Collections.frequency(sig, "onloadscript:K2"));
+ assertTrue(sig.contains("onselectedscript:K2"));
+ }
+
/** Phase 2.2:空入参/空绑定/空 templateId 不挂 onEvent。 */
@Test
void attachScriptOnEvent_无脚本或空入参不挂onEvent() {
diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/ScriptExecuteController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/ScriptExecuteController.java
index f08204e..2078822 100644
--- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/ScriptExecuteController.java
+++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/ScriptExecuteController.java
@@ -138,8 +138,14 @@ public class ScriptExecuteController {
String script = rewrittenScriptStore.load(templateId, seq);
if (script == null || script.isBlank()) {
- resp.put("passed", false);
- resp.put("error", "改写后脚本未找到: templateId=" + templateId + " seq=" + seq);
+ // WS-B C1-b:脚本未找到(残余缺脚本/seq 偏差)退化为「无联动」no-op,而非用户可见 ajax 报错。
+ // 转换期 fail-closed 已尽量不挂缺文件的绑定;此处兜底任何残余,返空 commands → 前端无动作可重放。
+ resp.put("templateId", templateId);
+ resp.put("seq", seq);
+ resp.put("passed", true);
+ resp.put("commands", List.of());
+ resp.put("commandCount", 0);
+ resp.put("note", "改写后脚本未找到,按无联动处理(no-op): templateId=" + templateId + " seq=" + seq);
return resp;
}
resp.put("templateId", templateId);
diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/ScriptExecuteControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/ScriptExecuteControllerTest.java
index cac6e5a..53df892 100644
--- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/ScriptExecuteControllerTest.java
+++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/ScriptExecuteControllerTest.java
@@ -3,6 +3,7 @@ package com.eip4.platform.metadata.web;
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 static org.mockito.Mockito.mock;
@@ -88,21 +89,33 @@ class ScriptExecuteControllerTest {
assertEquals("S-99", args.get("value")); // getFieldValue 从 item 求值闭环
}
+ /** 缺 templateId 是真错 → passed=false + error(保留)。 */
@Test
- void executeTemplateRewritten_缺templateId或脚本未找到时passed为false(@TempDir Path root) {
+ void executeTemplateRewritten_缺templateId时passed为false(@TempDir Path root) {
ScriptExecuteController c = controller(root);
Map noTid = new LinkedHashMap<>();
Map r1 = c.executeTemplateRewritten(noTid);
assertEquals(Boolean.FALSE, r1.get("passed"));
assertNotNull(r1.get("error"));
+ assertTrue(((String) r1.get("error")).contains("templateId"));
+ }
+
+ /** WS-B C1-b:脚本未找到(残余缺脚本/seq 偏差)退化为 no-op(passed=true + 空 commands),不报 ajax 错。 */
+ @SuppressWarnings("unchecked")
+ @Test
+ void executeTemplateRewritten_脚本未找到时退化为noop(@TempDir Path root) {
+ ScriptExecuteController c = controller(root);
Map missing = new LinkedHashMap<>();
missing.put("templateId", "no-such");
missing.put("seq", 1);
Map r2 = c.executeTemplateRewritten(missing);
- assertEquals(Boolean.FALSE, r2.get("passed"));
- assertTrue(((String) r2.get("error")).contains("未找到"));
+ assertEquals(Boolean.TRUE, r2.get("passed")); // no-op,非用户可见报错
+ assertNull(r2.get("error")); // 不再返 error
+ List