From f4b6e37a0239f9dedfb5493450e49715913a6f08 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Sat, 13 Jun 2026 23:59:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=99=A8=20C1:=E8=A1=A5?= =?UTF-8?q?=E8=AF=BB=20requirederror/minlength(=E7=BC=96=E8=BE=91=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E8=87=AA=E5=AE=9A=E4=B9=89=E5=BF=85=E5=A1=AB=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=B8=8E=E6=9C=80=E5=B0=8F=E9=95=BF=E5=BA=A6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 原 required 只置 boolean、applyLength 只读 maxlength,丢失两项校验语义: - requirederror(自定义必填提示,1237 页)→ amis validationErrors.required (非直接放 requirederror 属性;amis 校验文案走 validationErrors map) - minlength(1219 页)→ amis minLength 新增单测;platform-converter 73 测试全绿,validationErrors/minLength 经 amis 6.13 SchemaGate 闸一确认合法。 产物随下次全量重转生效(与 A0-A3/A2 同口径)。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../eip4/platform/converter/UiTypeMapper.java | 17 ++++++++++++++ .../TemplateToAmisConverterTest.java | 23 +++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java b/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java index aa0a4f9..601bc5e 100644 --- a/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java +++ b/platform-converter/src/main/java/com/eip4/platform/converter/UiTypeMapper.java @@ -56,6 +56,14 @@ final class UiTypeMapper { boolean required = "true".equals(f.attributeValue("required")); if (required) { item.put("required", true); + // C1:requirederror 自定义必填提示 → amis validationErrors.required + // (非直接放 requirederror 属性;amis 校验文案走 validationErrors map)。 + String reqErr = f.attributeValue("requirederror"); + if (reqErr != null && !reqErr.isBlank()) { + Map ve = new LinkedHashMap<>(); + ve.put("required", reqErr.trim()); + item.put("validationErrors", ve); + } } if ("true".equals(f.attributeValue("readonly"))) { item.put("disabled", true); @@ -396,6 +404,15 @@ final class UiTypeMapper { // 忽略非数值长度约束 } } + // C1:minlength 补读 → amis minLength(原只处理 maxlength) + String min = f.attributeValue("minlength"); + if (min != null && !min.isBlank()) { + try { + item.put("minLength", Integer.parseInt(min)); + } catch (NumberFormatException ignore) { + // 忽略非数值长度约束 + } + } } static String firstNonBlank(String... candidates) { 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 22e0e45..20d9dfa 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 @@ -108,6 +108,29 @@ class TemplateToAmisConverterTest { assertEquals(2, items.get(4).get("precision")); } + @Test + @SuppressWarnings("unchecked") + void c1_补读requirederror与minlength() { + // C1:requirederror(自定义必填提示,1237 页)→ amis validationErrors.required; + // minlength(1219 页)→ amis minLength。原 applyLength 只读 maxlength、required 只置 boolean。 + String xml = "" + + "" + + "" + + ""; + ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage); + Map crud = body(r.getSchema()); + Map filter = (Map) crud.get("filter"); + List> items = (List>) filter.get("body"); + Map a = items.get(0); + assertEquals(true, a.get("required")); + assertEquals(3, a.get("minLength")); // minlength 补读 + assertEquals(10, a.get("maxLength")); + Map ve = (Map) a.get("validationErrors"); + assertNotNull(ve); + assertEquals("请填编码!", ve.get("required")); // requirederror → 自定义必填提示 + } + @Test @SuppressWarnings("unchecked") void crud_selectDialog转picker弹窗() {