From f620fb23f6914326a93d1aa74b33641cc019f177 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Fri, 12 Jun 2026 05:33:49 +0800 Subject: [PATCH] =?UTF-8?q?F2-4b:=20ScriptFacade=20=E8=A1=A5=20Vaadin=20Co?= =?UTF-8?q?ntainer=20=E5=8A=A8=E8=AF=8D=20+=20AmisSchemaController=20?= =?UTF-8?q?=E6=87=92=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ScriptFacade.FieldProxy: - firstItemId()/lastItemId(): 返回 null(服务端无容器实例) - removeItem(itemId): 委托 removeFieldItem - size(): 返回 0 AmisSchemaController: - SchemaGate 改为懒加载 volatile + DCL,避免启动时 OOM (amis-schema-6.13.0.json 929KB 展开后对象树过大) Co-Authored-By: Claude Fable 5 --- .../metadata/script/ScriptFacade.java | 29 +++++++++++++++++++ .../metadata/web/AmisSchemaController.java | 19 ++++++++++-- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/script/ScriptFacade.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/script/ScriptFacade.java index a5df244..6c516ae 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/script/ScriptFacade.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/script/ScriptFacade.java @@ -427,5 +427,34 @@ public class ScriptFacade { public Object setFilter(Object filter) { return facade.setFieldFilter(field, filter); } + + /** + * F2-4b: Vaadin Container.firstItemId() 语义迁移 — 服务端无容器实例, + * 返回 null(EIP4 脚本应改为 getFieldValue 获取当前值,此处保证不抛异常)。 + */ + public Object firstItemId() { + return null; + } + + /** + * F2-4b: Vaadin Container.lastItemId() 语义迁移 — 服务端无容器实例,返回 null。 + */ + public Object lastItemId() { + return null; + } + + /** + * F2-4b: Vaadin Container.removeItem(itemId) 语义迁移 — 委托 removeFieldItem。 + */ + public Object removeItem(Object itemId) { + return facade.removeFieldItem(field, itemId); + } + + /** + * F2-4b: Vaadin Container.size() 语义迁移 — 服务端无容器实例,返回 0。 + */ + public int size() { + return 0; + } } } diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/AmisSchemaController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/AmisSchemaController.java index 74e0b29..ffec6cc 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/AmisSchemaController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/AmisSchemaController.java @@ -28,7 +28,20 @@ public class AmisSchemaController { private final TemplateToAmisConverter converter; private final JdbcTemplate jdbcTemplate; - private final SchemaGate schemaGate = new SchemaGate(); + // F2-4b: 懒加载 SchemaGate — amis-schema-6.13.0.json (929KB) 被 networknt 展开为 + // 大量对象树,启动时加载会触发 OOM。改为首次 validate 调用时才初始化。 + private volatile SchemaGate schemaGate; + + private SchemaGate getSchemaGate() { + if (schemaGate == null) { + synchronized (this) { + if (schemaGate == null) { + schemaGate = new SchemaGate(); + } + } + } + return schemaGate; + } public AmisSchemaController(TemplateToAmisConverter converter, JdbcTemplate jdbcTemplate) { this.converter = converter; @@ -45,7 +58,7 @@ public class AmisSchemaController { List notes = new ArrayList<>(); Map schema = converter.convert(loadXml(template), notes); - List errors = schemaGate.validate(schema); + List errors = getSchemaGate().validate(schema); Map resp = new LinkedHashMap<>(); resp.put("template", template); @@ -59,7 +72,7 @@ public class AmisSchemaController { /** 校验任意 amis 页面 schema(WS5:AI 生成的 schema 走这里过闸)。 */ @org.springframework.web.bind.annotation.PostMapping("/api/poc/validate-schema") public Map validateSchema(@org.springframework.web.bind.annotation.RequestBody JsonNode schema) throws Exception { - List errors = schemaGate.validate(schema); + List errors = getSchemaGate().validate(schema); Map resp = new LinkedHashMap<>(); resp.put("schemaValid", errors.isEmpty()); resp.put("validationErrors", errors.stream().limit(20).collect(Collectors.toList()));