转换器 C1:补读 requirederror/minlength(编辑表单自定义必填提示与最小长度)
原 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) <noreply@anthropic.com>
This commit is contained in:
@@ -56,6 +56,14 @@ final class UiTypeMapper {
|
|||||||
boolean required = "true".equals(f.attributeValue("required"));
|
boolean required = "true".equals(f.attributeValue("required"));
|
||||||
if (required) {
|
if (required) {
|
||||||
item.put("required", true);
|
item.put("required", true);
|
||||||
|
// C1:requirederror 自定义必填提示 → amis validationErrors.required
|
||||||
|
// (非直接放 requirederror 属性;amis 校验文案走 validationErrors map)。
|
||||||
|
String reqErr = f.attributeValue("requirederror");
|
||||||
|
if (reqErr != null && !reqErr.isBlank()) {
|
||||||
|
Map<String, Object> ve = new LinkedHashMap<>();
|
||||||
|
ve.put("required", reqErr.trim());
|
||||||
|
item.put("validationErrors", ve);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if ("true".equals(f.attributeValue("readonly"))) {
|
if ("true".equals(f.attributeValue("readonly"))) {
|
||||||
item.put("disabled", true);
|
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) {
|
static String firstNonBlank(String... candidates) {
|
||||||
|
|||||||
@@ -108,6 +108,29 @@ class TemplateToAmisConverterTest {
|
|||||||
assertEquals(2, items.get(4).get("precision"));
|
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 = "<crud entityid='e1'><display/>"
|
||||||
|
+ "<search>"
|
||||||
|
+ "<field name='A' label='编码' uitype='TextField' required='true' "
|
||||||
|
+ "requirederror='请填编码!' minlength='3' maxlength='10'/>"
|
||||||
|
+ "</search></crud>";
|
||||||
|
ConversionResult r = converter.convertGraded(xml, new ArrayList<>(), noPage);
|
||||||
|
Map<String, Object> crud = body(r.getSchema());
|
||||||
|
Map<String, Object> filter = (Map<String, Object>) crud.get("filter");
|
||||||
|
List<Map<String, Object>> items = (List<Map<String, Object>>) filter.get("body");
|
||||||
|
Map<String, Object> a = items.get(0);
|
||||||
|
assertEquals(true, a.get("required"));
|
||||||
|
assertEquals(3, a.get("minLength")); // minlength 补读
|
||||||
|
assertEquals(10, a.get("maxLength"));
|
||||||
|
Map<String, Object> ve = (Map<String, Object>) a.get("validationErrors");
|
||||||
|
assertNotNull(ve);
|
||||||
|
assertEquals("请填编码!", ve.get("required")); // requirederror → 自定义必填提示
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
void crud_selectDialog转picker弹窗() {
|
void crud_selectDialog转picker弹窗() {
|
||||||
|
|||||||
Reference in New Issue
Block a user