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 bcf7aa6..b8715fd 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 @@ -18,6 +18,8 @@ import java.util.TreeMap; import java.util.function.Function; import java.util.stream.Collectors; +import org.dom4j.DocumentHelper; +import org.dom4j.Element; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.SingleConnectionDataSource; @@ -30,8 +32,11 @@ import com.fasterxml.jackson.databind.SerializationFeature; *

流程:从客户库(PostgreSQL,只读)拉全部 view_template.xml → 逐个 {@link TemplateToAmisConverter} * 转换 → 闸一 {@link SchemaGate} 官方 schema 校验 → 产物落盘 + 分级清单 CSV。 * - *

F1-4b 扩展:第 5 参数为改写产物根目录(含 full_auto_index.json),转换完成后自动调用 - * {@link TemplateToAmisConverter#attachScriptOnEvent} 补挂 onEvent 脚本钩子。 + *

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 两类脚本。 * *

用法(本地 eip4dev): *

{@code
@@ -107,26 +112,31 @@ public final class BatchConvertCli {
     }
 
     /**
-     * 从 full_auto_index.json 加载 templateId → seqs 映射。
-     * 文件结构:[{"template_id":"...","seq":1,...}, ...]
+     * 从源模板 XML 解析事件绑定(onselectedscript/onloadscript → scriptKey)。
+     * 委托 {@link TemplateToAmisConverter#extractEventBindings};XML 不可解析则返回空列表(不挂 onEvent)。
      */
-    @SuppressWarnings("unchecked")
-    static Map> loadFullAutoIndex(Path rewriterDir) throws IOException {
-        Path indexFile = rewriterDir.resolve("full_auto_index.json");
-        if (!Files.exists(indexFile)) {
+    static List parseEventBindings(String xml) {
+        try {
+            Element root = DocumentHelper.parseText(xml).getRootElement();
+            TemplateToAmisConverter helper = new TemplateToAmisConverter(null);
+            return helper.extractEventBindings(root);
+        } catch (Exception e) {
+            return List.of();
+        }
+    }
+
+    /**
+     * 从源模板 XML 解析 scriptKey→seq({@code } 1-based 文档序,与 rewriter 落盘 seq 对齐)。
+     * 委托 {@link TemplateToAmisConverter#scriptKeyToSeq};XML 不可解析则返回空 map。
+     */
+    static Map parseKeyToSeq(String xml) {
+        try {
+            Element root = DocumentHelper.parseText(xml).getRootElement();
+            TemplateToAmisConverter helper = new TemplateToAmisConverter(null);
+            return helper.scriptKeyToSeq(root);
+        } catch (Exception e) {
             return Map.of();
         }
-        ObjectMapper om = new ObjectMapper();
-        List> entries = om.readValue(indexFile.toFile(), List.class);
-        Map> result = new LinkedHashMap<>();
-        for (Map entry : entries) {
-            String tid = (String) entry.get("template_id");
-            Object seqObj = entry.get("seq");
-            if (tid == null || seqObj == null) continue;
-            int seq = ((Number) seqObj).intValue();
-            result.computeIfAbsent(tid, k -> new ArrayList<>()).add(seq);
-        }
-        return result;
     }
 
     static BatchSummary run(Connection conn, Path outDir) throws IOException, SQLException {
@@ -142,10 +152,11 @@ public final class BatchConvertCli {
         SchemaGate gate = new SchemaGate();
         Function pageResolver = pageId -> loadPageXml(conn, pageId);
 
-        // F1-4b:加载 full_auto_index.json(rewriterDir 为空则不挂 onEvent)
-        Map> fullAutoIndex = (rewriterDir != null)
-                ? loadFullAutoIndex(rewriterDir) : Map.of();
-        System.out.println("[F1-4b] full_auto_index 已加载:" + fullAutoIndex.size() + " 个模板有 FULL_AUTO 脚本");
+        // WS-B:onEvent 挂回改由 XML 事件绑定驱动(onselectedscript/onloadscript → 脚本 key →  文档序 seq),
+        // 覆盖 NO_S3+FULL_AUTO 两类脚本,不再依赖 full_auto_index.json 决定挂哪段。rewriterDir 仍作为「是否挂 onEvent」总开关。
+        boolean attachOnEvent = rewriterDir != null;
+        System.out.println("[WS-B] onEvent 挂回:" + (attachOnEvent
+                ? "启用(按 XML onselected/onload 事件绑定驱动,覆盖 NO_S3+FULL_AUTO)" : "关闭(未传 rewriterDir)"));
 
         ObjectMapper json = new ObjectMapper();
         json.enable(SerializationFeature.INDENT_OUTPUT);
@@ -180,12 +191,20 @@ public final class BatchConvertCli {
                 boolean gate1 = false;
                 boolean onEventAttached = false;
                 if (result.getSchema() != null) {
-                    // F1-4b:闸一通过前先挂 onEvent(挂后再校验,确保含 onEvent 的 schema 也能过闸)
-                    List seqs = fullAutoIndex.get(id);
-                    if (seqs != null && !seqs.isEmpty()) {
-                        converter.attachScriptOnEvent(result.getSchema(), id, seqs);
-                        onEventAttached = true;
-                        summary.onEventCount++;
+                    // WS-B:闸一通过前先挂 onEvent(挂后再校验,确保含 onEvent 的 schema 也能过闸)。
+                    // 从源 XML 解析事件绑定(onselected/onload→scriptKey) + scripts 文档序(key→seq),
+                    // 按事件类型挂到正确 amis 事件(onselected→selectedChange / onload→inited),覆盖 NO_S3+FULL_AUTO。
+                    if (attachOnEvent) {
+                        List bindings = parseEventBindings(xml);
+                        if (!bindings.isEmpty()) {
+                            Map keyToSeq = parseKeyToSeq(xml);
+                            converter.attachScriptOnEvent(result.getSchema(), id, bindings, keyToSeq);
+                            Object body = result.getSchema().get("body");
+                            if (body instanceof Map && ((Map) body).containsKey("onEvent")) {
+                                onEventAttached = true;
+                                summary.onEventCount++;
+                            }
+                        }
                     }
 
                     List errors = gate.validate(result.getSchema());
diff --git a/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java b/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java
index 7678fa7..7ce83f3 100644
--- a/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java
+++ b/platform-converter/src/main/java/com/eip4/platform/converter/TemplateToAmisConverter.java
@@ -464,6 +464,9 @@ public class TemplateToAmisConverter {
             String btnName = UiTypeMapper.firstNonBlank(b.attributeValue("name"), b.attributeValue("id"), btnType);
             Map btn = new LinkedHashMap<>();
             btn.put("type", "button");
+            // WS-B:按钮 id = 中文名(= label = ScriptFacade.enableButton 实参,三者同源、零规范化),
+            // 供 onselectedscript 脚本经 amis 内置 enabled/disabled 动作按 componentId 精准启停工具栏按钮。
+            btn.put("id", btnName);
             btn.put("label", btnName);
             switch (btnType) {
                 case "insert" -> {
@@ -1678,29 +1681,119 @@ public class TemplateToAmisConverter {
     /** 前端 AmisRenderer 注册的自定义重放动作名(拿到指令数组逐条 doAction)。 */
     static final String REPLAY_ACTION = "replayScriptCommands";
 
+    /** crud 行选中事件名(Phase 0 spike 已用真实 amis 6.13+SDK 源码验证)。 */
+    static final String EVENT_SELECTED_CHANGE = "selectedChange";
+
+    /** 页面/表单初次渲染事件名。 */
+    static final String EVENT_INITED = "inited";
+
+    /** 老模板事件绑定属性:行选中(按钮联动) / 加载(字段只读·显隐联动)。 */
+    static final String ATTR_ON_SELECTED = "onselectedscript";
+    static final String ATTR_ON_LOAD = "onloadscript";
+    private static final List EVENT_ATTRS = List.of(ATTR_ON_SELECTED, ATTR_ON_LOAD);
+
     /**
-     * 把模板的 FULL_AUTO 改写脚本挂回 amis 页面 schema 的 {@code onEvent}(P4-5 事件生成段)。
+     * 一条事件绑定:原始事件属性名({@code onselectedscript}/{@code onloadscript})+ 引用的脚本 key。
      *
-     * 

每段脚本生成两类联动触发: + *

scriptKey 对到模板 {@code " + + "" + + ""; + 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")); } + /** Phase 1.1:无 段返回空 map(不抛异常)。 */ + @Test + void scriptKeyToSeq_无scripts段返回空() throws Exception { + org.dom4j.Element root = org.dom4j.DocumentHelper.parseText("").getRootElement(); + assertTrue(converter.scriptKeyToSeq(root).isEmpty()); + } + + /** Phase 1.2:递归收集 onselectedscript / onloadscript 事件绑定。 */ + @Test + void extractEventBindings_收集onselected与onload() throws Exception { + String xml = "" + + "" + + "

"; + 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(2, sig.size()); + assertTrue(sig.contains("onselectedscript:K1")); + assertTrue(sig.contains("onloadscript:K2")); + } + + /** Phase 1.2:无事件属性返回空列表。 */ + @Test + void extractEventBindings_无事件属性返回空() throws Exception { + org.dom4j.Element root = org.dom4j.DocumentHelper.parseText( + "").getRootElement(); + assertTrue(converter.extractEventBindings(root).isEmpty()); + } + + /** Phase 2.1:scriptActionChain 支持自定义 item 表达式。 */ + @Test + void scriptActionChain_自定义item表达式() throws Exception { + // 经 attachScriptOnEvent 间接验证选中链的 item 表达式 + String xml = ""; + Map 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 onEvent = (Map) body(schema).get("onEvent"); + Map selected = (Map) onEvent.get("selectedChange"); + List actions = (List) selected.get("actions"); + Map ajax = (Map) actions.get(0); + Map data = (Map) ((Map) ajax.get("api")).get("data"); + assertEquals("${event.data.selectedItems[0]}", data.get("item")); + } + + /** Phase 2.2:onselected→selectedChange(item=选中行) / onload→inited(item=${&})。 */ + @Test + void attachScriptOnEvent_onselected挂selectedChange_onload挂inited() { + String xml = ""; + Map schema = converter.convertGraded(xml, new ArrayList<>(), noPage).getSchema(); + var bindings = List.of( + new TemplateToAmisConverter.EventBinding("onselectedscript", "K1"), + new TemplateToAmisConverter.EventBinding("onloadscript", "K2")); + converter.attachScriptOnEvent(schema, "tid", bindings, Map.of("K1", 1, "K2", 2)); + + Map onEvent = (Map) body(schema).get("onEvent"); + assertNotNull(onEvent); + assertTrue(onEvent.containsKey("selectedChange")); + assertTrue(onEvent.containsKey("inited")); + // 旧语义(change/把每段同挂 inited+change)已作废 + assertFalse(onEvent.containsKey("change")); + + // selectedChange 链:seq=1 + item=选中行 + Map selected = (Map) onEvent.get("selectedChange"); + List selActions = (List) selected.get("actions"); + assertEquals(2, selActions.size()); // ajax + 重放 + Map selData = (Map) + ((Map) ((Map) selActions.get(0)).get("api")).get("data"); + assertEquals(1, selData.get("seq")); + assertEquals("${event.data.selectedItems[0]}", selData.get("item")); + + // inited 链:seq=2 + item=${&} + Map inited = (Map) onEvent.get("inited"); + List initActions = (List) inited.get("actions"); + Map initData = (Map) + ((Map) ((Map) initActions.get(0)).get("api")).get("data"); + assertEquals(2, initData.get("seq")); + assertEquals("${&}", initData.get("item")); + } + + /** Phase 2.2:动作链调执行端点并重放指令(含 templateId)。 */ @Test void attachScriptOnEvent_动作链调执行端点并重放指令() { String xml = ""; Map schema = converter.convertGraded(xml, new ArrayList<>(), noPage).getSchema(); - converter.attachScriptOnEvent(schema, "tid-x", List.of(1)); + var bindings = List.of(new TemplateToAmisConverter.EventBinding("onloadscript", "K1")); + converter.attachScriptOnEvent(schema, "tid-x", bindings, Map.of("K1", 1)); Map onEvent = (Map) body(schema).get("onEvent"); Map inited = (Map) onEvent.get("inited"); @@ -1002,7 +1086,6 @@ class TemplateToAmisConverterTest { Map data = (Map) api.get("data"); assertEquals("tid-x", data.get("templateId")); assertEquals(1, data.get("seq")); - assertEquals("${&}", data.get("item")); // 全量表单数据作脚本 item Map replay = (Map) actions.get(1); assertEquals("replayScriptCommands", replay.get("actionType")); @@ -1010,28 +1093,73 @@ class TemplateToAmisConverterTest { assertTrue(((String) args.get("commands")).contains("commands")); } + /** Phase 2.2:NO_S3 脚本(不在任何 full_auto_index)也挂——只要事件绑定引用了存在的 key。 */ @Test - void attachScriptOnEvent_多段脚本动作链累加() { + void attachScriptOnEvent_NO_S3脚本也挂() { + // 模拟 ddb75614:seq=1 NO_S3 按钮联动(onselected)、seq=2 FULL_AUTO 只读(onload) String xml = ""; Map schema = converter.convertGraded(xml, new ArrayList<>(), noPage).getSchema(); - converter.attachScriptOnEvent(schema, "tid-x", List.of(1, 2, 3)); + var bindings = List.of( + new TemplateToAmisConverter.EventBinding("onselectedscript", "K_NO_S3"), + new TemplateToAmisConverter.EventBinding("onloadscript", "K_FULL")); + converter.attachScriptOnEvent(schema, "ddb75614", bindings, Map.of("K_NO_S3", 1, "K_FULL", 2)); Map onEvent = (Map) body(schema).get("onEvent"); - Map change = (Map) onEvent.get("change"); - List actions = (List) change.get("actions"); - assertEquals(6, actions.size()); // 3 段 × (ajax + 重放) + // NO_S3 的 onselected 必须挂到 selectedChange(旧逻辑会丢) + assertTrue(onEvent.containsKey("selectedChange")); + Map selData = (Map) + ((Map) ((Map) + ((List) ((Map) onEvent.get("selectedChange")).get("actions")).get(0)) + .get("api")).get("data"); + assertEquals(1, selData.get("seq")); } + /** Phase 2.2:事件绑定引用了不存在的 key → 跳过(fail-closed,不挂错脚本)。 */ + @Test + void attachScriptOnEvent_引用不存在key跳过() { + String xml = ""; + Map schema = converter.convertGraded(xml, new ArrayList<>(), noPage).getSchema(); + var bindings = List.of( + new TemplateToAmisConverter.EventBinding("onselectedscript", "K_MISSING"), + new TemplateToAmisConverter.EventBinding("onloadscript", "K_OK")); + converter.attachScriptOnEvent(schema, "tid", bindings, Map.of("K_OK", 5)); + + Map onEvent = (Map) body(schema).get("onEvent"); + // 不存在的 K_MISSING → 无 selectedChange;K_OK 存在 → 有 inited + assertFalse(onEvent.containsKey("selectedChange")); + assertTrue(onEvent.containsKey("inited")); + } + + /** Phase 2.2:空入参/空绑定/空 templateId 不挂 onEvent。 */ @Test void attachScriptOnEvent_无脚本或空入参不挂onEvent() { String xml = ""; Map schema = converter.convertGraded(xml, new ArrayList<>(), noPage).getSchema(); - converter.attachScriptOnEvent(schema, "tid-x", List.of()); // 空序号列表 + converter.attachScriptOnEvent(schema, "tid-x", List.of(), Map.of("K1", 1)); // 空绑定 assertNull(body(schema).get("onEvent")); - converter.attachScriptOnEvent(schema, "", List.of(1)); // 空 templateId + var b = List.of(new TemplateToAmisConverter.EventBinding("onloadscript", "K1")); + converter.attachScriptOnEvent(schema, "", b, Map.of("K1", 1)); // 空 templateId assertNull(body(schema).get("onEvent")); } + /** Phase 3:工具栏按钮补 id(= 中文名,与 enableButton 实参同源),供脚本启停定位。 */ + @Test + void buildToolbar_按钮含id等于中文名() { + // insert 按钮 name=「添加」→ headerToolbar 中应有 id=「添加」的按钮 + String xml = "" + + "