feat(附件): 双态组件 + 新建/编辑保存落库打通

- 转换器 buildAttachmentField: 附件字段收敛为单个 input-file 双态组件
  (staticOn ${__readonly} 查看只读可下载/编辑可增删; joinValues:false,extractValue:false
  提交附件对象数组), 删除 each+service 容器, 查看/编辑同位置同布局
- FlowController 读路径 resolveAttachmentFields: 把保真层大写 DOCUMENT
  ({SYS_DOC_ID,FILENAME,FILESIZE}) 归一为 amis 小写契约 {id,name,value,url,sizeKb},
  修掉"查看附件空白图标"
- FlowController 写路径 normalizeAttachmentFieldsForWrite(按 url=/api/file/ 签名识别):
  修改流 → [{SYS_DOC_ID}] 交保真层 updateAttachments 对账(留/软删/不重复插);
  新建流 → 捕获 docId+剥离 DOCUMENT, 保存后用返回主键 relinkInsertedAttachments
  UPDATE sys_doc.businesskey 改挂(直接改挂、非复制 → 无 UNKNOWN 孤儿)
- FileController.upload: businesskey 右补白 36 位对齐保真层 getDoc(CHAR(36) 主键),
  否则 loadDoc 读不到新附件; 响应补 value
- 测试: converter 154 + metadata 368 全绿
  (新增 4c 读契约归一 / 4d 修改归一 / 4e 新建改挂 / FileController 补白)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-18 13:09:36 +08:00
parent 75885f9d7d
commit 22211b2557
6 changed files with 464 additions and 81 deletions

View File

@@ -2063,39 +2063,34 @@ public class TemplateToAmisConverter {
continue;
}
formItems.set(i, buildAttachmentField(item, upper, pkCol));
result.note("WS-D 附件字段 " + item.get("name") + " → service 容器(已有附件只读下载列表 "
+ "/api/file/list?tableName=" + upper + "&businessKey=${" + pkCol + "} + 保留上传控件)");
result.note("WS-D 附件字段 " + item.get("name") + " → input-file 双态(staticOn ${__readonly}: "
+ "查看只读显名可下载/编辑可增删; 上传 receiver 带 tableName=" + upper
+ "&businessKey=${" + pkCol + "} 关联本记录)");
}
}
/** 构造附件 service 容器:已有附件下载列表(each) + 原上传控件(input-file)。 */
/**
* 附件字段(input-file)配置为查看/编辑双态单组件:
* <ul>
* <li>{@code staticOn:${__readonly}}:查看(只读)态静态化 → 只读文件名列表可点下载、不渲删除/上传按钮;
* 编辑态正常增删。同位置同组件,查看/编辑布局一致。</li>
* <li>{@code receiver} 带业务键:编辑态上传的新附件按 {@code sys_doc.tablename+businesskey} 关联本记录。</li>
* </ul>
* 已有附件由后端按 amis 契约 {@code [{id,name,value,url}]} 返回(FlowController 响应边界
* {@code resolveAttachmentFields} 把保真层大写 {@code SYS_DOC_ID/FILENAME} 归一为小写),
* input-file 默认字段({@code name/value/url})即可显名+下载,无需额外 service/each 容器。
*/
private static Map<String, Object> buildAttachmentField(Map<String, Object> uploadItem,
String upperTable, String pkCol) {
// 已有附件下载链接(文件名(大小KB)),下载走 FileController.download(Content-Disposition: attachment)
Map<String, Object> link = new LinkedHashMap<>();
link.put("type", "tpl");
link.put("tpl", "<a href=\"/api/file/${id}\" target=\"_blank\" download>${name}(${sizeKb}KB)</a>");
Map<String, Object> each = new LinkedHashMap<>();
each.put("type", "each");
each.put("name", "items"); // service api data.items
each.put("placeholder", "无附件");
each.put("items", link);
Map<String, Object> service = new LinkedHashMap<>();
service.put("type", "service");
// 业务键绑表单主键;空主键(新增态)时 list 端点返空,不误列
service.put("api", "get:/api/file/list?tableName=" + upperTable + "&businessKey=${" + pkCol + "}");
// M4:service.name 与内层 input-file 同名(皆 DOCUMENT)。service.name 仅作布局归位 key
// (供 <div location="DOCUMENT"> 把本容器排到正确位置),表单实际取值由内层 input-file 绑定;
// amis 容忍二者同名(外层 service 不抢绑该字段值)——已浏览器实证(查看页附件下载列表+上传控件正常)。
service.put("name", uploadItem.get("name")); // 保 <div location="DOCUMENT"> 归位
service.put("label", uploadItem.get("label"));
List<Map<String, Object>> body = new ArrayList<>();
body.add(each);
body.add(uploadItem); // 保留上传控件(编辑态加附件;static 态自禁用)
service.put("body", body);
return service; // type=service → isWideField 判宽控件独占整行
uploadItem.put("receiver",
"/api/file/upload?tableName=" + upperTable + "&businessKey=${" + pkCol + "}");
uploadItem.put("staticOn", "${__readonly}");
// 提交时保留附件对象数组(而非默认 joinValues 拼成的逗号串):保真层
// POJOServiceImpl.updateAttachments 要求 DOCUMENT 是 List<Map>,String 会 ClassCastException。
// 由 FlowController 写路径把对象数组归一为 [{SYS_DOC_ID:id}] 供保真层按 id 对账(增/留/删)。
uploadItem.put("joinValues", false);
uploadItem.put("extractValue", false);
return uploadItem;
}
/**

View File

@@ -1813,8 +1813,8 @@ class TemplateToAmisConverterTest {
@SuppressWarnings("unchecked")
void form_附件字段MultiFileUploadField转inputFile() {
// F2-8 实证:MultiFileUploadField / FileUploadField → input-file(receiver + downloadUrl)
// WS-D D.2:附件字段进而被包进 service 容器(已有附件下载列表 + 上传控件),
// 内层 input-file 契约不变(receiver/downloadUrl/multiple)。
// Tier1:附件字段就是单个 input-file 双态组件(staticOn ${__readonly}: 查看只读可下载/编辑可增删),
// receiver 带 tableName+businessKey 使编辑态上传关联本记录。
String pageXml = "<page entityid='e9'><fields>"
+ "<field name='TITLE' label='主题' uitype='TextField' required='true'/>"
+ "<field name='DOCUMENT' label='附件' uitype='MultiFileUploadField'/>"
@@ -1829,20 +1829,20 @@ class TemplateToAmisConverterTest {
List<Map<String, Object>> items = flattenFormBody(form);
assertEquals(3, items.size());
// MultiFileUploadField → service 容器;内层 input-file multiple=true
// MultiFileUploadField → 单个 input-file(双态),multiple=true,receiver 带业务键,staticOn 只读
Map<String, Object> docField = items.get(1);
Map<String, Object> docUpload = attachmentUploadOf(docField);
assertEquals("input-file", docUpload.get("type"));
assertEquals("/api/file/upload", docUpload.get("receiver"));
assertEquals("/api/file/${id}", docUpload.get("downloadUrl"));
assertEquals(true, docUpload.get("multiple"));
assertEquals("input-file", docField.get("type"));
assertEquals("/api/file/upload?tableName=PM_DEMO&businessKey=${PM_DEMO_ID}", docField.get("receiver"));
assertEquals("/api/file/${id}", docField.get("downloadUrl"));
assertEquals(true, docField.get("multiple"));
assertEquals("${__readonly}", docField.get("staticOn"));
// FileUploadField → service 容器;内层 input-file 无 multiple
// FileUploadField → 单个 input-file,无 multiple
Map<String, Object> singleField = items.get(2);
Map<String, Object> singleUpload = attachmentUploadOf(singleField);
assertEquals("input-file", singleUpload.get("type"));
assertEquals("/api/file/upload", singleUpload.get("receiver"));
assertNull(singleUpload.get("multiple"));
assertEquals("input-file", singleField.get("type"));
assertEquals("/api/file/upload?tableName=PM_DEMO&businessKey=${PM_DEMO_ID}", singleField.get("receiver"));
assertNull(singleField.get("multiple"));
assertEquals("${__readonly}", singleField.get("staticOn"));
// 映射台账中有 input-file 记录
assertTrue(notes.stream().anyMatch(n -> n.contains("input-file")));
@@ -1850,9 +1850,10 @@ class TemplateToAmisConverterTest {
@Test
@SuppressWarnings("unchecked")
void form_附件字段_查看态只读下载列表() {
// WS-D D.2:附件字段(input-file) → service 容器(api 按业务 id 拉 /api/file/list,
// each 渲染已有附件下载链接 + 保留上传控件),对齐老系统查看页附件可下载列表。
void form_附件字段_查看编辑双态单组件() {
// Tier1:附件字段 = 单个 input-file 双态组件。查看(${__readonly}=真)静态只读显名可下载、
// 编辑可增删;已有附件由后端按 amis 契约 [{id,name,value,url}] 返回
// (FlowController.resolveAttachmentFields 把保真层大写 SYS_DOC_ID/FILENAME 归一),无需 service/each。
String pageXml = "<page entityid='e9'><fields>"
+ "<field name='DOCUMENT' label='附件' uitype='MultiFileUploadField'/>"
+ "</fields></page>";
@@ -1865,25 +1866,16 @@ class TemplateToAmisConverterTest {
List<Map<String, Object>> items = flattenFormBody(form);
Map<String, Object> doc = items.get(0);
// 附件容器:service,按业务 id 拉已有附件,name=DOCUMENT(保布局归位),label=附件
assertEquals("service", doc.get("type"));
assertEquals("input-file", doc.get("type"));
assertEquals("DOCUMENT", doc.get("name"));
assertEquals("附件", doc.get("label"));
assertEquals("get:/api/file/list?tableName=PM_DEMO&businessKey=${PM_DEMO_ID}", doc.get("api"));
List<Map<String, Object>> svcBody = (List<Map<String, Object>>) doc.get("body");
assertEquals(2, svcBody.size());
// (1) each 渲染已有附件下载列表
Map<String, Object> each = svcBody.get(0);
assertEquals("each", each.get("type"));
assertEquals("items", each.get("name"));
Map<String, Object> link = (Map<String, Object>) each.get("items");
assertEquals("tpl", link.get("type"));
assertTrue(String.valueOf(link.get("tpl")).contains("/api/file/${id}"), "下载链接指向 FileController.download");
assertTrue(String.valueOf(link.get("tpl")).contains("${name}"), "显示文件名");
assertTrue(String.valueOf(link.get("tpl")).contains("${sizeKb}"), "显示大小KB");
// (2) 保留上传控件
assertEquals("input-file", svcBody.get(1).get("type"));
assertEquals("${__readonly}", doc.get("staticOn"), "查看态静态只读、编辑态可增删");
assertEquals("/api/file/upload?tableName=PM_DEMO&businessKey=${PM_DEMO_ID}", doc.get("receiver"));
assertEquals("/api/file/${id}", doc.get("downloadUrl"));
assertNull(doc.get("api"), "不再用 service/each 容器");
// 提交为对象数组(非 joinValues 逗号串),供保真层 updateAttachments 按 SYS_DOC_ID 对账
assertEquals(false, doc.get("joinValues"), "提交附件对象数组而非逗号串");
assertEquals(false, doc.get("extractValue"), "保留对象(含 url 签名)供写路径归一");
}
@Test
@@ -1916,18 +1908,6 @@ class TemplateToAmisConverterTest {
assertNull(doc.get("api"), "降级时不应配 /api/file/list(表名不可靠)");
}
/** 从 WS-D 附件 service 容器里取内层上传控件(input-file)。 */
@SuppressWarnings("unchecked")
private static Map<String, Object> attachmentUploadOf(Map<String, Object> attachmentField) {
assertEquals("service", attachmentField.get("type"), "附件字段应被包进 service 容器");
List<Map<String, Object>> svcBody = (List<Map<String, Object>>) attachmentField.get("body");
for (Map<String, Object> b : svcBody) {
if ("input-file".equals(b.get("type"))) {
return b;
}
}
throw new AssertionError("附件 service 容器内未找到 input-file 上传控件");
}
@Test
@SuppressWarnings("unchecked")
@@ -1951,12 +1931,13 @@ class TemplateToAmisConverterTest {
// PasswordField → input-password(不再明文 input-text)
assertEquals("input-password", items.get(1).get("type"));
// SingleFileUploadField → input-file 单文件(无 multiple);WS-D 包进 service 容器,内层 input-file
Map<String, Object> certUpload = attachmentUploadOf(items.get(2));
// SingleFileUploadField → 单个 input-file 单文件(无 multiple),双态 staticOn ${__readonly}
Map<String, Object> certUpload = items.get(2);
assertEquals("input-file", certUpload.get("type"));
assertEquals("/api/file/upload", certUpload.get("receiver"));
assertEquals("/api/file/upload?tableName=PM_DEMO&businessKey=${PM_DEMO_ID}", certUpload.get("receiver"));
assertEquals("/api/file/${id}", certUpload.get("downloadUrl"));
assertNull(certUpload.get("multiple"));
assertEquals("${__readonly}", certUpload.get("staticOn"));
// DateField → input-date(复用 PopupDateField 无时分支)
assertEquals("input-date", items.get(3).get("type"));
@@ -4134,10 +4115,10 @@ class TemplateToAmisConverterTest {
assertEquals("group", row2.get("type"), "落单窄字段也包 group(保持行结构一致)");
assertEquals(1, ((List<?>) row2.get("body")).size());
// 附件字段(WS-D)包进 service 容器,仍作宽控件独占整行;内层含 input-file 上传控件
assertEquals("service", rows.get(3).get("type"), "附件 service 容器独占整行(宽控件)");
assertEquals("DOC", rows.get(3).get("name"), "附件容器保留字段 name 以归位布局");
assertTrue(rows.get(3).toString().contains("input-file"), "附件容器内保留上传控件");
// 附件字段(Tier1)= 单个 input-file 双态组件,input-file 本即宽控件独占整行
assertEquals("input-file", rows.get(3).get("type"), "附件 input-file 独占整行(宽控件)");
assertEquals("DOC", rows.get(3).get("name"), "附件字段保留 name 以归位布局");
assertEquals("${__readonly}", rows.get(3).get("staticOn"), "查看只读/编辑可增删");
assertEquals("textarea", rows.get(4).get("type"));
// actions 仍为空(单按钮契约不变)