From 5e55f7f37f3b4609511689622fee11882b58a0a8 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Mon, 22 Jun 2026 10:57:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(ui):=20=E5=87=80=E6=96=B0=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=A1=B5=E7=A9=BA=E6=80=81=E4=B8=A4=E4=B8=AA=20UI/UE?= =?UTF-8?q?=20=E7=BC=BA=E9=99=B7=EF=BC=88=E7=A9=BA=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=BA=A2=E6=8A=A5=E9=94=99=20+=20=E5=AD=90=E8=A1=A8=E3=80=8C=E3=80=8D=E5=8D=A0=E4=BD=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 走查主子表生成页发现并修: 1. 空列表弹红横幅「data.items 必须是数组」(每个 0 行列表页都中): FlowController.unwrapCrudResult 对空搜索 {result:{}}(空 map,引擎零行 省略 listresult/pagecount)兜底拍平为 {items:[],total:0}。此前 normalize 的空列表特判只认 LIST_RESULT/PAGE_COUNT,{result:{}} 漏网 → amis crud 找不到 items 数组。仅当内层为空 map 才兜,单记录 _LOAD(result 含字段)不受影响。 2. 空子表渲染字面量「<空>」(像占位符泄漏): PageBlueprintCompiler.childInputTable 给 input-table 加友好 placeholder 「暂无明细,点下方「新增」添加」。 验证:platform-metadata 478 单测 0 失败(新增 FlowControllerTest 5d 空 {result:{}} →{items:[],total:0}、5e 非空单记录不被误伤);重启 8094 浏览器实测:空列表只显 「暂无数据」无红横幅(console 0 error,原 1)、空子表显友好占位。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../blueprint/PageBlueprintCompiler.java | 2 + .../platform/metadata/web/FlowController.java | 18 ++++++-- .../metadata/web/FlowControllerTest.java | 44 +++++++++++++++++++ 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java index efdfa50..3ab2c9d 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java @@ -159,6 +159,8 @@ public final class PageBlueprintCompiler { table.put("removable", true); table.put("needConfirm", false); table.put("staticOn", "${__readonly}"); + // 空态友好占位:未设时 amis 对空 input-table 渲染字面量「<空>」(像占位符泄漏)。 + table.put("placeholder", "暂无明细,点下方「新增」添加"); ArrayNode columns = table.putArray("columns"); String childPk = child.childTable() + "_ID"; // 联动目标子列集合:这些列要挂 id=_${index} 供 setValue componentId 命中(id 挂列上已验证可用)。 diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java index e5b97ae..1b43c0d 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/web/FlowController.java @@ -942,9 +942,21 @@ public class FlowController { */ @SuppressWarnings("unchecked") private Object unwrapCrudResult(Object data) { - if (data instanceof Map m && m.size() == 1 && m.get("result") instanceof Map r - && r.containsKey("items") && r.containsKey("total")) { - return r; + if (data instanceof Map m && m.size() == 1 && m.get("result") instanceof Map r) { + // 已归一为 crud 形态 {items,total} → 拍平到 data 顶层(amis crud 契约 data.items/data.total) + if (r.containsKey("items") && r.containsKey("total")) { + return r; + } + // 空搜索结果集:引擎对净新实体合成 _SEARCH 零行返 {result:{}}(空 map,无 listresult/pagecount), + // normalize 的空列表特判(认 LIST_RESULT/PAGE_COUNT)不触发 → 此处兜底拍平为空列表,否则 amis crud + // 找不到 items 数组,每个 0 行列表页弹「data.items 必须是数组」红横幅。仅当内层为空 map 才兜: + // 单记录 _LOAD 的 result 含字段(非空),不受影响。 + if (r.isEmpty()) { + Map emptyList = new LinkedHashMap<>(); + emptyList.put("items", new ArrayList<>()); + emptyList.put("total", 0); + return emptyList; + } } return data; } diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java index 6c0180d..2aee45b 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/web/FlowControllerTest.java @@ -433,6 +433,50 @@ class FlowControllerTest { assertEquals(0, data.get("total"), "pagecount=0 → total=0"); } + @Test + @DisplayName("5d. 空搜索返 {result:{}}(空 map,连 pagecount 都无)→ 兜底 {items:[],total:0}" + + "(净新主子表合成 _SEARCH 零行实测形态;否则 amis crud 报「data.items 必须是数组」红横幅)") + void normalizeEmptyResultObject() { + // 5b 覆盖 {result:{pagecount:0}}(有 pagecount);但净新实体合成 _SEARCH 零行实测返 + // {result:{}}(空 map,连 pagecount 都没有)→ normalize 的空列表特判(认 LIST_RESULT/PAGE_COUNT) + // 不触发 → data 停留 {result:{}} → amis crud 找不到 items 数组 → 每个 0 行列表页弹红横幅。 + String flowId = "EIP4PT_LKM_SEARCH"; + Map output = new LinkedHashMap<>(); + output.put("result", new LinkedHashMap<>()); // {result:{}} 空 map + + FlowExcuteService engine = mock(FlowExcuteService.class); + when(engine.excute(any(), any(), any())).thenReturn(output); + FlowController controller = new FlowController(engine, resolverReturning(flowId, uuidPassthrough())); + + ResponseEntity> resp = controller.executeGet(flowId, new HashMap<>()); + @SuppressWarnings("unchecked") + Map data = (Map) resp.getBody().get("data"); + assertInstanceOf(List.class, data.get("items"), "空 {result:{}} 也须兜出 items 数组"); + assertEquals(0, ((List) data.get("items")).size(), "空结果 items 为空数组"); + assertEquals(0, data.get("total"), "空结果 total=0"); + } + + @Test + @DisplayName("5e. 单记录 load 返 {result:{字段...}}(非空)→ 保持 result 形态不被空列表兜底误伤") + @SuppressWarnings("unchecked") + void nonEmptyResultStaysAsRecord() { + String flowId = "SYS_X_LOAD"; + Map record = new LinkedHashMap<>(); + record.put("TITLE", "标题"); + Map output = new LinkedHashMap<>(); + output.put("result", record); + + FlowExcuteService engine = mock(FlowExcuteService.class); + when(engine.excute(any(), any(), any())).thenReturn(output); + FlowController controller = new FlowController(engine, resolverReturning(flowId, namedHit())); + + ResponseEntity> resp = controller.executeGet(flowId, new HashMap<>()); + Map data = (Map) resp.getBody().get("data"); + Map loaded = (Map) data.get("result"); + assertNotNull(loaded, "非空单记录仍走 result 形态(不被空列表兜底改写)"); + assertEquals("标题", loaded.get("TITLE")); + } + @Test @DisplayName("5c. 引擎执行抛异常(如视图缺失)→ 优雅 status:1 而非裸 500") void engineExceptionGraceful() { From ea69edf18b4b9dafb08884edea35f517e81df481 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Mon, 22 Jun 2026 11:20:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(ui):=20=E4=B8=BB=E5=AD=90=E8=A1=A8?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=80=81=E4=B8=A4=E4=B8=AA=20dogfooding=20?= =?UTF-8?q?=E7=9C=9F=20bug=EF=BC=88=E5=AD=90=E8=A1=8C=E4=B8=8D=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=20+=20LIST=20=E5=88=97=E6=B3=84=E6=BC=8F=E6=88=90=20J?= =?UTF-8?q?SON=20=E6=96=87=E6=9C=AC=E6=A1=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 实际走完 CRUD 闭环(新增→保存→编辑)揪出,纯功能 e2e 测不到: 1. 编辑态子表子行全空(若保存会丢子行):编辑表单 initApi=_LOAD 返 {data:{result:{TITLE,DETAILS:[子行]}}},但表单字段期望顶层名 → 子表 input-table(name=DETAILS)绑不上 result 内子行数组。主字段"看似"回显仅因选中行 铺进了对话框作用域(非 _LOAD 生效)。修:PageBlueprintCompiler 编辑表单 initApi 加 responseData {"&":"${result}"} 把 result 拆到表单数据顶层。 2. 主子表发布后再 compile,主表单冒出一个显原始 JSON 数组的"明细"文本框 + 列表列 + 查询条件:主子表链接给主实体加了 DETAILS(LIST)列,而 refToApiType("LIST") 因 长度<32 落 default→"string",被当普通字段渲染。修:EntityAttributesService 排除 引擎内部列 LIST/BLOB/STATUS(非可建模标量列,与 appendColumnDdl 跳过集一致), 从源头不进属性表→表单/列表/查询/建模器字段表都干净。 验证:platform-metadata 481 单测 0 失败(PageBlueprintCompilerTest 编辑表单 responseData 断言 + EntityAttributesServiceTest LIST/BLOB/STATUS 不可建模 3 测);重启 8094+重生成页+ 浏览器编辑实测:子行 钢筋/3/10/30 正确回显、无 JSON 文本框、列表/查询只剩 标题。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../meta/EntityAttributesService.java | 15 +++++++ .../blueprint/PageBlueprintCompiler.java | 6 ++- .../meta/EntityAttributesServiceTest.java | 43 +++++++++++++++++++ .../blueprint/PageBlueprintCompilerTest.java | 4 ++ 4 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 platform-metadata/src/test/java/com/eip4/platform/metadata/meta/EntityAttributesServiceTest.java diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/meta/EntityAttributesService.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/meta/EntityAttributesService.java index 2c0da99..9267410 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/meta/EntityAttributesService.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/meta/EntityAttributesService.java @@ -64,6 +64,13 @@ public class EntityAttributesService { for (Map r : raw) { String col = (String) r.get("COLUMNNAME"); String refId = (String) r.get("REFERENCEID"); + // 引擎内部列(LIST=子表集合 / BLOB=大对象 / STATUS=流程状态)非可建模标量列, + // 不进可建模属性表——否则建模器把它当字段、recipe 把它渲成表单/列表/查询控件 + // (LIST 经 refToApiType 误落 "string"→编辑表单渲成文本框显子行 JSON 数组,实测 bug)。 + // 与 MetaController.appendColumnDdl 的跳过集一致(这些列本就无物理 DDL 列)。 + if (!isModelableColumn(refId)) { + continue; + } boolean isKey = asInt(r.get("ISKEY")) == 1; boolean isEntityDisplay = asInt(r.get("ISENTITYDISPLAY")) == 1; boolean mandatory = asInt(r.get("ISMANDATORY")) == 1; @@ -88,6 +95,14 @@ public class EntityAttributesService { return new Result(t, displayColumn, columns); } + /** + * 该列是否「可建模标量列」。引擎内部列 LIST(子表集合) / BLOB(大对象) / STATUS(流程状态) + * 非用户可填的标量字段,排除出可建模属性表(与 {@code MetaController.appendColumnDdl} 跳过集一致)。 + */ + public static boolean isModelableColumn(String referenceId) { + return !("LIST".equals(referenceId) || "BLOB".equals(referenceId) || "STATUS".equals(referenceId)); + } + /** REFERENCEID 反映射成 API 语义类型;36 位 uuid(外键引用) → reference。 */ public static String refToApiType(String referenceId) { if (referenceId == null) { diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java index 3ab2c9d..59e3f5e 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java @@ -130,12 +130,16 @@ public final class PageBlueprintCompiler { editForm.put("type", "form"); editForm.put("api", masterDetailFormApi(blueprint, "_UPDATE")); editForm.put("reload", crudName); - // 经 _LOAD 回显主+子行(data.result.=子行,已实测)。 + // 经 _LOAD 回显主+子行。_LOAD 返 {data:{result:{TITLE, :[子行]}}}, + // 而表单字段(TITLE/子表)期望顶层名 → 必须 responseData {"&":"${result}"} 把 result 拆到表单数据顶层, + // 否则子表(input-table name=)绑不上 result 内的子行数组 → 编辑态子行全空(浏览器实测 bug; + // 主字段曾"看似"回显仅因选中行铺进了对话框作用域,非 _LOAD 生效)。 ObjectNode initApi = editForm.putObject("initApi"); initApi.put("method", "post"); initApi.put("url", "/api/flow/" + blueprint.tableName() + "_LOAD"); initApi.putObject("data").put(blueprint.primaryKey(), "${" + blueprint.primaryKey() + "}"); + initApi.putObject("responseData").put("&", "${result}"); // 选中行铺进对话框作用域,主键经 initApi 拉 _LOAD(主+子)。 dialog.putObject("data").put("&", "${selectedItems[0]}"); ArrayNode editControls = masterDetailFormControls(blueprint); diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/meta/EntityAttributesServiceTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/meta/EntityAttributesServiceTest.java new file mode 100644 index 0000000..bff9302 --- /dev/null +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/meta/EntityAttributesServiceTest.java @@ -0,0 +1,43 @@ +package com.eip4.platform.metadata.meta; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +/** + * 可建模属性的纯静态判定单测。重点:引擎内部列 LIST/BLOB/STATUS 不可建模—— + * 否则主子表主实体的 DETAILS(LIST) 列会泄漏成表单文本框(显子行 JSON 数组)/列表列/查询条件(浏览器实测 bug)。 + */ +class EntityAttributesServiceTest { + + @Test + @DisplayName("LIST/BLOB/STATUS 引擎内部列不可建模(排除出属性表)") + void internalColumnsNotModelable() { + assertFalse(EntityAttributesService.isModelableColumn("LIST"), "子表集合列"); + assertFalse(EntityAttributesService.isModelableColumn("BLOB"), "大对象列"); + assertFalse(EntityAttributesService.isModelableColumn("STATUS"), "流程状态列"); + } + + @Test + @DisplayName("普通标量/引用列可建模") + void scalarAndReferenceColumnsModelable() { + assertTrue(EntityAttributesService.isModelableColumn("NVARCHAR")); + assertTrue(EntityAttributesService.isModelableColumn("INTEGER")); + assertTrue(EntityAttributesService.isModelableColumn("DECIMAL")); + assertTrue(EntityAttributesService.isModelableColumn("BOOLEAN")); + assertTrue(EntityAttributesService.isModelableColumn("CHAR")); + assertTrue(EntityAttributesService.isModelableColumn(null), "无 refId 缺省按可建模(refToApiType 兜 string)"); + assertTrue(EntityAttributesService.isModelableColumn("11111111-1111-1111-1111-111111111111"), + "36 位 uuid 外键引用列可建模"); + } + + @Test + @DisplayName("LIST 经 refToApiType 会误落 string(故须在 isModelableColumn 这层拦,不能靠类型映射)") + void listMisTypedAsStringJustifiesExplicitExclusion() { + assertEquals("string", EntityAttributesService.refToApiType("LIST"), + "LIST 长度<32 落 default→string,证明必须显式排除而非靠类型识别"); + } +} diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java index 367a201..33707e7 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java @@ -242,6 +242,10 @@ class PageBlueprintCompilerTest { assertEquals("/api/flow/EIP4AI_PURCHASE_LOAD", editForm.path("initApi").path("url").asText()); assertEquals("${EIP4AI_PURCHASE_ID}", editForm.path("initApi").path("data").path("EIP4AI_PURCHASE_ID").asText()); + // _LOAD 返回 {data:{result:{TITLE, DETAILS:[...]}}};表单字段(TITLE/DETAILS)期望顶层名, + // 故 initApi 必须 responseData 拆 result 到顶层,否则子表 DETAILS 绑不上→编辑态子行全空(实测 bug)。 + assertEquals("${result}", editForm.path("initApi").path("responseData").path("&").asText(), + "编辑表单 initApi 须 responseData {\"&\":\"${result}\"} 拆 _LOAD 的 result 嵌套,子表才回显"); ArrayNode editBody = (ArrayNode) editForm.path("body"); ObjectNode editChild = findByType(editBody, "input-table"); assertEquals("DETAILS", editChild.path("name").asText()); From f90e11686e9fd653643d6834c408202f9c0feca5 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Mon, 22 Jun 2026 11:48:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(ui):=20=E6=A0=91=E9=A1=B5=E3=80=8C?= =?UTF-8?q?=E5=8A=A0=E5=AD=90=E3=80=8D=E8=A1=A8=E5=8D=95=E9=A2=84=E5=A1=AB?= =?UTF-8?q?=E7=88=B6=E8=8A=82=E7=82=B9=E5=90=8D=EF=BC=88dogfooding=20?= =?UTF-8?q?=E5=AE=9E=E6=B5=8B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 树页点行级「加子」时,新增子节点表单的「名称」被预填成父节点的名字 (要先清空才能输入)。根因:加子对话框从行级按钮打开会继承父行数据作用域, 业务字段按 name 自动从父行回填。修:PageBlueprintCompiler.addChildAction — ① 表单 data 只播 PARENTID=父主键(从父行求值);② canAccessSuperData:false 关掉按 name 自动取父作用域值。对话框标题仍用外层作用域显「在<父名>下新增」。 验证:481 单测(PageBlueprintCompilerTest 加子表单 data.PARENTID + canAccessSuperData 断言);重启 8094+重生成树页+浏览器实测:加子表单名称空白、标题「在华东区下新增」、 保存后 PARENTID 正确指向父节点(上海分部→华东区,psql 核实)。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../metadata/schema/blueprint/PageBlueprintCompiler.java | 8 +++++++- .../schema/blueprint/PageBlueprintCompilerTest.java | 8 ++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java index 59e3f5e..0ebdf98 100644 --- a/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java +++ b/platform-metadata/src/main/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompiler.java @@ -666,8 +666,14 @@ public final class PageBlueprintCompiler { form.put("type", "form"); form.put("api", "post:/api/flow/" + blueprint.tableName() + "_ADD"); form.put("reload", crudName); + // 加子表单从行级按钮打开,会继承父行作用域 → 业务字段(如名称)按 name 自动回填父行值 + // (实测:加子时「名称」预填了父节点名,要先清空才能输入)。故: + // ① 表单数据域只播 PARENTID=父节点主键(从父行作用域求值),业务字段不在其中→空白起步; + // ② canAccessSuperData:false 关掉按 name 自动从父作用域取值。两者合力让加子表单干净。 + form.put("canAccessSuperData", false); + form.putObject("data").put("PARENTID", "${" + blueprint.primaryKey() + "}"); ArrayNode controls = objectMapper.createArrayNode(); - controls.add(hidden("PARENTID", "${" + blueprint.primaryKey() + "}")); + controls.add(hidden("PARENTID", "${PARENTID}")); controls.addAll(formControlsExcluding(blueprint, false, "PARENTID")); form.set("body", controls); } diff --git a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java index 33707e7..0774ca1 100644 --- a/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java +++ b/platform-metadata/src/test/java/com/eip4/platform/metadata/schema/blueprint/PageBlueprintCompilerTest.java @@ -150,6 +150,14 @@ class PageBlueprintCompilerTest { crud.path("columns").get(2).path("buttons").get(2).path("api").path("url").asText()); assertEquals("${EIP4AI_CATEGORY_ID}", crud.path("columns").get(2).path("buttons").get(2).path("api").path("data").path("ids").asText()); + + // 加子表单作用域隔离:数据域只播 PARENTID=父主键(从父行求值)+ 关 canAccessSuperData, + // 否则业务字段(名称)按 name 自动回填父节点值,加子时要先清空才能输入(浏览器实测 bug)。 + var addChildForm = crud.path("columns").get(2).path("buttons").get(0).path("dialog").path("body"); + assertEquals("${EIP4AI_CATEGORY_ID}", addChildForm.path("data").path("PARENTID").asText(), + "加子表单数据域只播 PARENTID=父主键"); + assertFalse(addChildForm.path("canAccessSuperData").asBoolean(true), + "加子表单须关 canAccessSuperData 防名称预填父节点值"); } @Test