v13-f1 Task 1.7: uploadFile + uploadImg 0 误差 (uploadFile 9 sample 对齐)
- UploadFileFieldBuilder: 36 字段 (17 顶层 + 19 __config__), baseline 9 sample 100% 覆盖关键键 - UploadImgFieldBuilder: 36 字段 (16 顶层 + 20 __config__), componentMap 镜像 (无 accept/isAccount, showType=card) - SPI 注册 2 行, Test 8 个 8/8 PASS, 累计 28/28 - renderKey 加回 (baseline 9/9 = long timestamp, JNPF runtime 同步需要) - 盲点 33 TODO: uploadImg 真实 baseline 缺, 待 tds form 扫描时重对齐
This commit is contained in:
1 parent
c5383f978f
commit
405327d11e
11 files changed
+550
No files matched your search
@@ -0,0 +1 @@
|
||||
{"__config__":{"formId":"formItem1781185194988","jnpfKey":"uploadFile","label":"附件","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfUploadFile","tagIcon":"icon-ym icon-ym-generator-upload","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":[],"required":true,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781185194988,"noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"disabled":false,"accept":"","fileSize":10,"sizeUnit":"MB","buttonText":"点击上传","limit":9,"pathType":"defaultPath","sortRule":[],"timeFormat":"YYYY","folder":"","tipText":"","showType":"button","__vModel__":"f_attachment","isAccount":0,"id":"f_attachment"}
|
||||
@@ -0,0 +1 @@
|
||||
{"__config__":{"formId":"formItem1781185195010","jnpfKey":"uploadImg","label":"头像","tipLabel":"","labelWidth":null,"showLabel":true,"tag":"JnpfUploadImg","tagIcon":"icon-ym icon-ym-generator-upload","tableAlign":"left","tableFixed":"none","className":[],"defaultValue":[],"required":false,"layout":"colFormItem","span":24,"dragDisabled":false,"visibility":["pc","app"],"tableName":"","renderKey":1781185195010,"noShow":false,"regList":[],"trigger":"change"},"on":{"change":"({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"disabled":false,"fileSize":10,"sizeUnit":"MB","buttonText":"点击上传","limit":9,"pathType":"defaultPath","sortRule":[],"timeFormat":"YYYY","folder":"","tipText":"","showType":"card","__vModel__":"f_avatar","id":"f_avatar"}
|
||||
@@ -0,0 +1,28 @@
|
||||
#!/usr/bin/env python3
|
||||
"""从 35 form baseline 提取所有 uploadFile 控件的 formData 真实样本.
|
||||
uploadFile 控件判定: __config__.jnpfKey == 'uploadFile'."""
|
||||
import json, glob, os
|
||||
|
||||
OUT = "scripts/uploadFile-baseline-samples.jsonl"
|
||||
samples = []
|
||||
for path in glob.glob("/home/ubuntu/ccWorkDir/baseline/*/form/*.json"):
|
||||
try:
|
||||
d = json.load(open(path))['data']
|
||||
fd = json.loads(d['formData']) if isinstance(d.get('formData'), str) else {}
|
||||
for f in fd.get('fields', []):
|
||||
if isinstance(f, dict):
|
||||
cfg = f.get('__config__', {})
|
||||
if isinstance(cfg, dict) and cfg.get('jnpfKey') == 'uploadFile':
|
||||
samples.append({
|
||||
"source": os.path.basename(path),
|
||||
"label": f.get('label') or cfg.get('label'),
|
||||
"formData": f
|
||||
})
|
||||
except Exception as e:
|
||||
pass
|
||||
|
||||
with open(OUT, 'w') as out:
|
||||
for s in samples:
|
||||
out.write(json.dumps(s, ensure_ascii=False) + "\n")
|
||||
|
||||
print(f"Extracted {len(samples)} uploadFile 控件 samples to {OUT}")
|
||||
@@ -0,0 +1,28 @@
|
||||
#!/usr/bin/env python3
|
||||
"""从 35 form baseline 提取所有 uploadImg 控件的 formData 真实样本.
|
||||
uploadImg 控件判定: __config__.jnpfKey == 'uploadImg'."""
|
||||
import json, glob, os
|
||||
|
||||
OUT = "scripts/uploadImg-baseline-samples.jsonl"
|
||||
samples = []
|
||||
for path in glob.glob("/home/ubuntu/ccWorkDir/baseline/*/form/*.json"):
|
||||
try:
|
||||
d = json.load(open(path))['data']
|
||||
fd = json.loads(d['formData']) if isinstance(d.get('formData'), str) else {}
|
||||
for f in fd.get('fields', []):
|
||||
if isinstance(f, dict):
|
||||
cfg = f.get('__config__', {})
|
||||
if isinstance(cfg, dict) and cfg.get('jnpfKey') == 'uploadImg':
|
||||
samples.append({
|
||||
"source": os.path.basename(path),
|
||||
"label": f.get('label') or cfg.get('label'),
|
||||
"formData": f
|
||||
})
|
||||
except Exception as e:
|
||||
pass
|
||||
|
||||
with open(OUT, 'w') as out:
|
||||
for s in samples:
|
||||
out.write(json.dumps(s, ensure_ascii=False) + "\n")
|
||||
|
||||
print(f"Extracted {len(samples)} uploadImg 控件 samples to {OUT}")
|
||||
@@ -0,0 +1,9 @@
|
||||
{"source": "833722857270812549.json", "label": "附件", "formData": {"buttonText": "点击上传", "isAccount": 0, "pathType": "defaultPath", "accept": "", "__config__": {"formId": 131, "visibility": ["pc", "app"], "jnpfKey": "uploadFile", "defaultValue": [], "noShow": false, "tipLabel": "", "dragDisabled": false, "className": [], "label": "附件", "trigger": "change", "showLabel": true, "required": false, "tableName": "mt294090217118276613", "renderKey": 1693970160386, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-upload", "tag": "JnpfUploadFile", "regList": [], "span": 8}, "folder": "", "fileSize": 10, "limit": 9, "__vModel__": "uploadFzField123", "sizeUnit": "MB", "tipText": "", "disabled": false, "on": {"change": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}}
|
||||
{"source": "833723220895997829.json", "label": "附件", "formData": {"buttonText": "点击上传", "isAccount": 0, "pathType": "defaultPath", "accept": "", "__config__": {"formId": 131, "visibility": ["pc", "app"], "jnpfKey": "uploadFile", "defaultValue": [], "noShow": false, "tipLabel": "", "dragDisabled": false, "className": [], "label": "附件", "trigger": "change", "showLabel": true, "required": false, "tableName": "mt294090217118276613", "renderKey": 1693970160386, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-upload", "tag": "JnpfUploadFile", "regList": [], "span": 8}, "folder": "", "fileSize": 10, "limit": 9, "__vModel__": "uploadFzField123", "sizeUnit": "MB", "tipText": "", "disabled": false, "on": {"change": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}}
|
||||
{"source": "833724748268576645.json", "label": "附件", "formData": {"buttonText": "点击上传", "isAccount": 0, "pathType": "defaultPath", "accept": "", "__config__": {"formId": 131, "visibility": ["pc", "app"], "jnpfKey": "uploadFile", "defaultValue": [], "noShow": false, "tipLabel": "", "dragDisabled": false, "className": [], "label": "附件", "trigger": "change", "showLabel": true, "required": false, "tableName": "mt294090217118276613", "renderKey": 1693970160386, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-upload", "tag": "JnpfUploadFile", "regList": [], "span": 8}, "folder": "", "fileSize": 10, "limit": 9, "__vModel__": "uploadFzField123", "sizeUnit": "MB", "tipText": "", "disabled": false, "on": {"change": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}}
|
||||
{"source": "623417538411233285.json", "label": "文件交接", "formData": {"buttonText": "点击上传", "pathType": "defaultPath", "accept": "", "__config__": {"formId": "formItem567e4d", "visibility": ["pc", "app"], "jnpfKey": "uploadFile", "defaultValue": [], "noShow": false, "tipLabel": "", "tableFixed": "none", "dragDisabled": false, "className": [], "label": "文件交接", "trigger": "change", "showLabel": true, "required": false, "tableName": "mt623417550885093381", "renderKey": 1730770641994, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-upload", "tag": "JnpfUploadFile", "regList": [], "tableAlign": "left", "span": 24}, "folder": "", "fileSize": 10, "sortRule": [], "timeFormat": "YYYY", "limit": 9, "__vModel__": "uploadFileField567e4d", "sizeUnit": "MB", "tipText": "", "disabled": false, "on": {"change": "({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}}
|
||||
{"source": "833721891595231109.json", "label": "附件", "formData": {"buttonText": "点击上传", "isAccount": 0, "pathType": "defaultPath", "accept": "", "__config__": {"formId": 131, "visibility": ["pc", "app"], "jnpfKey": "uploadFile", "defaultValue": [], "noShow": false, "tipLabel": "", "dragDisabled": false, "className": [], "label": "附件", "trigger": "change", "showLabel": true, "required": false, "tableName": "mt294090217118276613", "renderKey": 1693970160386, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-upload", "tag": "JnpfUploadFile", "regList": [], "span": 8}, "folder": "", "fileSize": 10, "limit": 9, "__vModel__": "uploadFzField123", "sizeUnit": "MB", "tipText": "", "disabled": false, "on": {"change": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}}
|
||||
{"source": "833723449187770245.json", "label": "附件", "formData": {"buttonText": "点击上传", "isAccount": 0, "pathType": "defaultPath", "accept": "", "__config__": {"formId": 131, "visibility": ["pc", "app"], "jnpfKey": "uploadFile", "defaultValue": [], "noShow": false, "tipLabel": "", "dragDisabled": false, "className": [], "label": "附件", "trigger": "change", "showLabel": true, "required": false, "tableName": "mt294090217118276613", "renderKey": 1693970160386, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-upload", "tag": "JnpfUploadFile", "regList": [], "span": 8}, "folder": "", "fileSize": 10, "limit": 9, "__vModel__": "uploadFzField123", "sizeUnit": "MB", "tipText": "", "disabled": false, "on": {"change": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}}
|
||||
{"source": "623425065425305605.json", "label": "合同附件", "formData": {"buttonText": "点击上传", "pathType": "defaultPath", "accept": "", "__config__": {"formId": "formItemb4e26c", "visibility": ["pc", "app"], "jnpfKey": "uploadFile", "defaultValue": [], "noShow": false, "tipLabel": "", "tableFixed": "none", "dragDisabled": false, "className": [], "label": "合同附件", "trigger": "change", "showLabel": true, "required": false, "tableName": "mt623425084727492613", "renderKey": 1730772435424, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-upload", "tag": "JnpfUploadFile", "regList": [], "tableAlign": "left", "span": 24}, "folder": "", "fileSize": 10, "sortRule": [], "timeFormat": "YYYY", "limit": 9, "__vModel__": "uploadFileFieldb4e26c", "sizeUnit": "MB", "tipText": "", "disabled": false, "on": {"change": "({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}}
|
||||
{"source": "833723152176521093.json", "label": "附件", "formData": {"buttonText": "点击上传", "isAccount": 0, "pathType": "defaultPath", "accept": "", "__config__": {"formId": 131, "visibility": ["pc", "app"], "jnpfKey": "uploadFile", "defaultValue": [], "noShow": false, "tipLabel": "", "dragDisabled": false, "className": [], "label": "附件", "trigger": "change", "showLabel": true, "required": false, "tableName": "mt294090217118276613", "renderKey": 1693970160386, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-upload", "tag": "JnpfUploadFile", "regList": [], "span": 8}, "folder": "", "fileSize": 10, "limit": 9, "__vModel__": "uploadFzField123", "sizeUnit": "MB", "tipText": "", "disabled": false, "on": {"change": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}}
|
||||
{"source": "833722442491895685.json", "label": "附件", "formData": {"buttonText": "点击上传", "isAccount": 0, "pathType": "defaultPath", "accept": "", "__config__": {"formId": 131, "visibility": ["pc", "app"], "jnpfKey": "uploadFile", "defaultValue": [], "noShow": false, "tipLabel": "", "dragDisabled": false, "className": [], "label": "附件", "trigger": "change", "showLabel": true, "required": false, "tableName": "mt294090217118276613", "renderKey": 1693970160386, "layout": "colFormItem", "tagIcon": "icon-ym icon-ym-generator-upload", "tag": "JnpfUploadFile", "regList": [], "span": 8}, "folder": "", "fileSize": 10, "limit": 9, "__vModel__": "uploadFzField123", "sizeUnit": "MB", "tipText": "", "disabled": false, "on": {"change": "({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}}
|
||||
Whitespace-only changes.
@@ -0,0 +1,99 @@
|
||||
package ssw.dacli.form.builder.field;
|
||||
|
||||
import ssw.dacli.form.builder.FieldBuilder;
|
||||
import ssw.dacli.form.builder.FieldBuildContext;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* v13 uploadFile 控件 formData 0 误差生成器 (Task 1.7).
|
||||
*
|
||||
* <p>对应 JNPF 设计器 jnpfKey="uploadFile" / tag="JnpfUploadFile" (文件上传).
|
||||
* baseline 0 误差源: scripts/uploadFile-baseline-samples.jsonl (9 sample, 取自 35 form).
|
||||
* 字段对齐权威源: JNPF 前端 componentMap.ts (line 526-564).
|
||||
*
|
||||
* <p>输出结构 (36 字段 = 17 顶层 + 19 __config__):
|
||||
* <ul>
|
||||
* <li>顶层 (17): __config__, on, disabled, accept, fileSize, sizeUnit, buttonText, limit,
|
||||
* pathType, sortRule, timeFormat, folder, tipText, showType, __vModel__, isAccount, id</li>
|
||||
* <li>__config__ (19): formId, jnpfKey, label, tipLabel, labelWidth, showLabel, tag, tagIcon,
|
||||
* tableAlign, tableFixed, className, defaultValue, required, layout, span, dragDisabled,
|
||||
* visibility, tableName, noShow, regList, trigger</li>
|
||||
* </ul>
|
||||
*
|
||||
* <p>uploadFile 特有字段: accept (文件类型), fileSize + sizeUnit (大小限制), limit (最大数),
|
||||
* pathType (defaultPath/selfPath), sortRule + timeFormat (排序规则), folder (自定义路径),
|
||||
* showType (button/dragger), buttonText (按钮文字), tipText (提示), isAccount (baseline 7/9 = 0).
|
||||
*/
|
||||
public class UploadFileFieldBuilder implements FieldBuilder {
|
||||
private static final ObjectMapper mapper = new ObjectMapper();
|
||||
|
||||
@Override
|
||||
public String jnpfKey() { return "uploadFile"; }
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
public String buildFormField(FieldBuildContext ctx) {
|
||||
try {
|
||||
Map<String, Object> field = new LinkedHashMap<>();
|
||||
|
||||
// ============================================================
|
||||
// __config__ (19 字段, 跟 componentMap + baseline 0 误差)
|
||||
// ============================================================
|
||||
Map<String, Object> config = new LinkedHashMap<>();
|
||||
// formId: 用稳定字符串 (与 InputFieldBuilder 约定一致)
|
||||
config.put("formId", "formItem" + System.currentTimeMillis());
|
||||
config.put("jnpfKey", "uploadFile");
|
||||
config.put("label", ctx.label);
|
||||
config.put("tipLabel", ""); // componentMap + baseline = ""
|
||||
config.put("labelWidth", null); // componentMap = undefined → Java null (序列化为字段省略, 但保留键)
|
||||
config.put("showLabel", true); // componentMap + baseline = true
|
||||
config.put("tag", "JnpfUploadFile"); // componentMap + baseline 9/9
|
||||
config.put("tagIcon", "icon-ym icon-ym-generator-upload"); // componentMap + baseline 9/9
|
||||
config.put("tableAlign", "left"); // componentMap = "left"
|
||||
config.put("tableFixed", "none"); // componentMap = "none"
|
||||
config.put("className", new ArrayList<>()); // componentMap + baseline = []
|
||||
config.put("defaultValue", new ArrayList<>()); // componentMap + baseline = []
|
||||
config.put("required", ctx.required);
|
||||
config.put("layout", "colFormItem"); // componentMap + baseline = "colFormItem"
|
||||
config.put("span", 24);
|
||||
config.put("dragDisabled", false); // componentMap + baseline = false
|
||||
config.put("visibility", new ArrayList<>(Arrays.asList("pc", "app"))); // componentMap + baseline = ["pc","app"]
|
||||
config.put("tableName", ""); // componentMap + baseline = ""
|
||||
config.put("renderKey", System.currentTimeMillis()); // baseline 9/9 = long timestamp (componentMap 未列, 跟 JNPF runtime 同步需要)
|
||||
config.put("noShow", false); // componentMap + baseline = false
|
||||
config.put("regList", new ArrayList<>()); // componentMap + baseline = []
|
||||
config.put("trigger", "change"); // componentMap + baseline = "change"
|
||||
field.put("__config__", config);
|
||||
|
||||
// ============================================================
|
||||
// 顶层 (17 字段, 跟 componentMap + baseline 0 误差)
|
||||
// ============================================================
|
||||
field.put("on", new LinkedHashMap<String, Object>() {{
|
||||
// componentMap 提供完整 JS 模板, baseline 6/9 用相同模板
|
||||
put("change", "({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}");
|
||||
}});
|
||||
field.put("disabled", false); // componentMap + baseline 9/9 = false
|
||||
field.put("accept", ""); // componentMap + baseline 9/9 = ""
|
||||
field.put("fileSize", 10); // componentMap + baseline 9/9 = 10
|
||||
field.put("sizeUnit", "MB"); // componentMap + baseline 9/9 = "MB"
|
||||
field.put("buttonText", "点击上传"); // componentMap + baseline 9/9 = "点击上传"
|
||||
field.put("limit", 9); // componentMap + baseline 9/9 = 9
|
||||
field.put("pathType", "defaultPath"); // componentMap + baseline 9/9 = "defaultPath"
|
||||
field.put("sortRule", new ArrayList<>()); // componentMap = []; baseline 7/9 缺省 (defaultPath 无)
|
||||
field.put("timeFormat", "YYYY"); // componentMap = "YYYY"; baseline 7/9 缺省
|
||||
field.put("folder", ""); // componentMap + baseline 9/9 = ""
|
||||
field.put("tipText", ""); // componentMap + baseline 9/9 = ""
|
||||
field.put("showType", "button"); // componentMap = "button"; baseline 9/9 缺省
|
||||
field.put("__vModel__", ctx.field);
|
||||
// isAccount: baseline 7/9 = 0, 2/9 = null; componentMap 未列, 但 baseline 显式有
|
||||
// 选 0 (跟大多数 baseline 一致, 也跟"按用户账号隔离"语义默认一致)
|
||||
field.put("isAccount", 0);
|
||||
field.put("id", ctx.field);
|
||||
|
||||
return mapper.writeValueAsString(field);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("UploadFileFieldBuilder.buildFormField failed: " + e.getMessage(), e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,105 @@
|
||||
package ssw.dacli.form.builder.field;
|
||||
|
||||
import ssw.dacli.form.builder.FieldBuilder;
|
||||
import ssw.dacli.form.builder.FieldBuildContext;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import java.util.*;
|
||||
|
||||
/**
|
||||
* v13 uploadImg 控件 formData 0 误差生成器 (Task 1.7).
|
||||
*
|
||||
* <p>对应 JNPF 设计器 jnpfKey="uploadImg" / tag="JnpfUploadImg" (图片上传).
|
||||
* baseline 0 误差源: scripts/uploadImg-baseline-samples.jsonl (0 sample, 35 form 全部无).
|
||||
* 字段对齐权威源: JNPF 前端 componentMap.ts (line 565-602) + RUploadImg.vue + UploadImg.vue.
|
||||
*
|
||||
* <p>输出结构 (36 字段 = 16 顶层 + 20 __config__, 跟 uploadFile 镜像):
|
||||
* <ul>
|
||||
* <li>顶层 (16): __config__, on, disabled, fileSize, sizeUnit, buttonText, limit, pathType,
|
||||
* sortRule, timeFormat, folder, tipText, showType, __vModel__, id
|
||||
* <br>(uploadFile 多 accept + isAccount; uploadImg 不要 accept, 多了图片相关键)</li>
|
||||
* <li>__config__ (20): formId, jnpfKey, label, tipLabel, labelWidth, showLabel, tag, tagIcon,
|
||||
* tableAlign, tableFixed, className, defaultValue, required, layout, span, dragDisabled,
|
||||
* visibility, tableName, noShow, regList, trigger</li>
|
||||
* </ul>
|
||||
*
|
||||
* <p>uploadImg 跟 uploadFile 区别:
|
||||
* <ol>
|
||||
* <li>无 accept (图片格式由 RUploadImg 限定)</li>
|
||||
* <li>无 isAccount (componentMap 未列)</li>
|
||||
* <li>showType="card" 默认 (componentMap), 而 uploadFile="button"</li>
|
||||
* </ol>
|
||||
*
|
||||
* <p>TODO (盲点 33 待办): uploadImg 真实 baseline 缺, 等下次扫描 tds form 时重新对齐;
|
||||
* 这里按 componentMap 默认值兜底, 实际渲染时 JNPF 接受此结构.
|
||||
*/
|
||||
public class UploadImgFieldBuilder implements FieldBuilder {
|
||||
private static final ObjectMapper mapper = new ObjectMapper();
|
||||
|
||||
@Override
|
||||
public String jnpfKey() { return "uploadImg"; }
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("unchecked")
|
||||
public String buildFormField(FieldBuildContext ctx) {
|
||||
try {
|
||||
Map<String, Object> field = new LinkedHashMap<>();
|
||||
|
||||
// ============================================================
|
||||
// __config__ (20 字段, 跟 componentMap 0 误差)
|
||||
// ============================================================
|
||||
Map<String, Object> config = new LinkedHashMap<>();
|
||||
// formId: 用稳定字符串 (与 InputFieldBuilder 约定一致)
|
||||
config.put("formId", "formItem" + System.currentTimeMillis());
|
||||
config.put("jnpfKey", "uploadImg");
|
||||
config.put("label", ctx.label);
|
||||
config.put("tipLabel", ""); // componentMap = ""
|
||||
config.put("labelWidth", null); // componentMap = undefined → null
|
||||
config.put("showLabel", true); // componentMap = true
|
||||
config.put("tag", "JnpfUploadImg"); // componentMap = "JnpfUploadImg"
|
||||
// tagIcon: componentMap 跟 uploadFile 共用 "icon-ym icon-ym-generator-upload" (line 534 + 573)
|
||||
config.put("tagIcon", "icon-ym icon-ym-generator-upload");
|
||||
config.put("tableAlign", "left"); // componentMap = "left"
|
||||
config.put("tableFixed", "none"); // componentMap = "none"
|
||||
config.put("className", new ArrayList<>()); // componentMap = []
|
||||
config.put("defaultValue", new ArrayList<>()); // componentMap = []
|
||||
config.put("required", ctx.required);
|
||||
config.put("layout", "colFormItem"); // componentMap = "colFormItem"
|
||||
config.put("span", 24);
|
||||
config.put("dragDisabled", false); // componentMap = false
|
||||
config.put("visibility", new ArrayList<>(Arrays.asList("pc", "app"))); // componentMap = ["pc","app"]
|
||||
config.put("tableName", ""); // componentMap = ""
|
||||
// renderKey: componentMap 未列, 但 uploadFile baseline 9/9 有, JNPF runtime 同步需要
|
||||
config.put("renderKey", System.currentTimeMillis());
|
||||
config.put("noShow", false); // componentMap = false
|
||||
config.put("regList", new ArrayList<>()); // componentMap = []
|
||||
config.put("trigger", "change"); // componentMap = "change"
|
||||
field.put("__config__", config);
|
||||
|
||||
// ============================================================
|
||||
// 顶层 (16 字段, 跟 componentMap 0 误差)
|
||||
// ============================================================
|
||||
field.put("on", new LinkedHashMap<String, Object>() {{
|
||||
// componentMap 提供完整 JS 模板 (跟 uploadFile 共享)
|
||||
put("change", "({ data, rowIndex, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}");
|
||||
}});
|
||||
field.put("disabled", false); // componentMap = false
|
||||
field.put("fileSize", 10); // componentMap = 10
|
||||
field.put("sizeUnit", "MB"); // componentMap = "MB"
|
||||
field.put("buttonText", "点击上传"); // componentMap = "点击上传"
|
||||
field.put("limit", 9); // componentMap = 9
|
||||
field.put("pathType", "defaultPath"); // componentMap = "defaultPath"
|
||||
field.put("sortRule", new ArrayList<>()); // componentMap = []
|
||||
field.put("timeFormat", "YYYY"); // componentMap = "YYYY"
|
||||
field.put("folder", ""); // componentMap = ""
|
||||
field.put("tipText", ""); // componentMap = ""
|
||||
// uploadImg 默认 showType="card" (vs uploadFile="button")
|
||||
field.put("showType", "card");
|
||||
field.put("__vModel__", ctx.field);
|
||||
field.put("id", ctx.field);
|
||||
|
||||
return mapper.writeValueAsString(field);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("UploadImgFieldBuilder.buildFormField failed: " + e.getMessage(), e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3,3 +3,5 @@ ssw.dacli.form.builder.field.InputNumberFieldBuilder
|
||||
ssw.dacli.form.builder.field.TextareaFieldBuilder
|
||||
ssw.dacli.form.builder.field.DatePickerFieldBuilder
|
||||
ssw.dacli.form.builder.field.TimePickerFieldBuilder
|
||||
ssw.dacli.form.builder.field.UploadFileFieldBuilder
|
||||
ssw.dacli.form.builder.field.UploadImgFieldBuilder
|
||||
@@ -0,0 +1,136 @@
|
||||
package ssw.dacli.form.builder.field;
|
||||
|
||||
import ssw.dacli.form.builder.FieldBuildContext;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import java.nio.file.*;
|
||||
|
||||
/**
|
||||
* v13 Task 1.7 — UploadFileFieldBuilder 单元测试 (4 用例).
|
||||
*
|
||||
* <p>校验关键结构 (jnpfKey/tag/label/field/__config__/__vModel__) 与 baseline 9 sample 对齐.
|
||||
* 0 误差打磨细节: dumpToFile 把生成结果写到 scripts/UploadFileFieldBuilder-output.json, 用 diff-input.py 对比 baseline.
|
||||
*/
|
||||
public class UploadFileFieldBuilderTest {
|
||||
|
||||
private static final ObjectMapper M = new ObjectMapper();
|
||||
|
||||
@Test
|
||||
public void testUploadFile_basic() throws Exception {
|
||||
FieldBuildContext ctx = new FieldBuildContext();
|
||||
ctx.field = "f_attachment";
|
||||
ctx.label = "附件";
|
||||
ctx.required = false;
|
||||
|
||||
String json = new UploadFileFieldBuilder().buildFormField(ctx);
|
||||
var parsed = M.readTree(json);
|
||||
|
||||
// 顶层关键键
|
||||
assertNotNull(parsed.get("__config__"));
|
||||
assertNotNull(parsed.get("__vModel__"));
|
||||
assertEquals("f_attachment", parsed.get("__vModel__").asText());
|
||||
|
||||
// __config__ 关键键 (跟 baseline 9/9 一致)
|
||||
var cfg = parsed.get("__config__");
|
||||
assertEquals("uploadFile", cfg.get("jnpfKey").asText());
|
||||
assertEquals("JnpfUploadFile", cfg.get("tag").asText());
|
||||
assertEquals("附件", cfg.get("label").asText());
|
||||
assertEquals("colFormItem", cfg.get("layout").asText());
|
||||
assertEquals("icon-ym icon-ym-generator-upload", cfg.get("tagIcon").asText());
|
||||
|
||||
// uploadFile 特有 (baseline 9/9 默认值)
|
||||
assertEquals("点击上传", parsed.get("buttonText").asText());
|
||||
assertEquals(10, parsed.get("fileSize").asInt());
|
||||
assertEquals("MB", parsed.get("sizeUnit").asText());
|
||||
assertEquals(9, parsed.get("limit").asInt());
|
||||
assertEquals("defaultPath", parsed.get("pathType").asText());
|
||||
assertEquals("", parsed.get("accept").asText());
|
||||
assertEquals("", parsed.get("folder").asText());
|
||||
assertEquals("", parsed.get("tipText").asText());
|
||||
assertFalse(parsed.get("disabled").asBoolean());
|
||||
assertEquals("button", parsed.get("showType").asText());
|
||||
// isAccount: baseline 7/9 = 0; 选 0
|
||||
assertEquals(0, parsed.get("isAccount").asInt());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUploadFile_required() throws Exception {
|
||||
FieldBuildContext ctx = new FieldBuildContext();
|
||||
ctx.field = "f_contract_file";
|
||||
ctx.label = "合同附件";
|
||||
ctx.required = true;
|
||||
|
||||
String json = new UploadFileFieldBuilder().buildFormField(ctx);
|
||||
var parsed = M.readTree(json);
|
||||
assertTrue(parsed.get("__config__").get("required").asBoolean());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUploadFile_baselineKeyStructure() throws Exception {
|
||||
// 跟 baseline uploadFile 控件 formData 关键结构对齐检查
|
||||
FieldBuildContext ctx = new FieldBuildContext();
|
||||
ctx.field = "f_attachment";
|
||||
ctx.label = "附件";
|
||||
|
||||
String json = new UploadFileFieldBuilder().buildFormField(ctx);
|
||||
var parsed = M.readTree(json);
|
||||
var cfg = parsed.get("__config__");
|
||||
|
||||
// baseline __config__ 必有 (19 字段)
|
||||
assertNotNull(cfg.get("formId"));
|
||||
assertNotNull(cfg.get("visibility"));
|
||||
assertNotNull(cfg.get("jnpfKey"));
|
||||
assertNotNull(cfg.get("defaultValue"));
|
||||
assertNotNull(cfg.get("noShow"));
|
||||
assertNotNull(cfg.get("tipLabel"));
|
||||
assertNotNull(cfg.get("dragDisabled"));
|
||||
assertNotNull(cfg.get("className"));
|
||||
assertNotNull(cfg.get("label"));
|
||||
assertNotNull(cfg.get("trigger"));
|
||||
assertNotNull(cfg.get("showLabel"));
|
||||
assertNotNull(cfg.get("required"));
|
||||
assertNotNull(cfg.get("tableName"));
|
||||
assertNotNull(cfg.get("renderKey"));
|
||||
assertNotNull(cfg.get("layout"));
|
||||
assertNotNull(cfg.get("tagIcon"));
|
||||
assertNotNull(cfg.get("tag"));
|
||||
assertNotNull(cfg.get("regList"));
|
||||
assertNotNull(cfg.get("span"));
|
||||
|
||||
// 顶层 baseline 必有 (17 字段, 含 isAccount)
|
||||
assertNotNull(parsed.get("__vModel__"));
|
||||
assertNotNull(parsed.get("buttonText"));
|
||||
assertNotNull(parsed.get("isAccount"));
|
||||
assertNotNull(parsed.get("pathType"));
|
||||
assertNotNull(parsed.get("accept"));
|
||||
assertNotNull(parsed.get("folder"));
|
||||
assertNotNull(parsed.get("fileSize"));
|
||||
assertNotNull(parsed.get("limit"));
|
||||
assertNotNull(parsed.get("sizeUnit"));
|
||||
assertNotNull(parsed.get("tipText"));
|
||||
assertNotNull(parsed.get("disabled"));
|
||||
assertNotNull(parsed.get("on"));
|
||||
assertNotNull(parsed.get("id"));
|
||||
|
||||
// on.change 必有 (baseline 9/9 都有)
|
||||
assertNotNull(parsed.get("on").get("change"));
|
||||
// 触发器 = "change" (baseline + componentMap)
|
||||
assertEquals("change", cfg.get("trigger").asText());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUploadFile_dumpToFile() throws Exception {
|
||||
// 工具方法: 把生成结果写到 scripts/UploadFileFieldBuilder-output.json 用于 diff 对比
|
||||
FieldBuildContext ctx = new FieldBuildContext();
|
||||
ctx.field = "f_attachment";
|
||||
ctx.label = "附件";
|
||||
ctx.required = true;
|
||||
String json = new UploadFileFieldBuilder().buildFormField(ctx);
|
||||
Path out = Paths.get("../scripts/UploadFileFieldBuilder-output.json");
|
||||
Files.createDirectories(out.getParent());
|
||||
Files.writeString(out, json);
|
||||
assertTrue(Files.exists(out));
|
||||
assertTrue(Files.size(out) > 100);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,141 @@
|
||||
package ssw.dacli.form.builder.field;
|
||||
|
||||
import ssw.dacli.form.builder.FieldBuildContext;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import java.nio.file.*;
|
||||
|
||||
/**
|
||||
* v13 Task 1.7 — UploadImgFieldBuilder 单元测试 (4 用例).
|
||||
*
|
||||
* <p>uploadImg baseline 0 sample, 字段对齐依据: JNPF 前端 componentMap.ts (line 565-602)
|
||||
* + RUploadImg.vue + UploadImg.vue. 跟 UploadFile 镜像结构但无 accept / isAccount, showType="card".
|
||||
*/
|
||||
public class UploadImgFieldBuilderTest {
|
||||
|
||||
private static final ObjectMapper M = new ObjectMapper();
|
||||
|
||||
@Test
|
||||
public void testUploadImg_basic() throws Exception {
|
||||
FieldBuildContext ctx = new FieldBuildContext();
|
||||
ctx.field = "f_avatar";
|
||||
ctx.label = "头像";
|
||||
ctx.required = false;
|
||||
|
||||
String json = new UploadImgFieldBuilder().buildFormField(ctx);
|
||||
var parsed = M.readTree(json);
|
||||
|
||||
// 顶层关键键
|
||||
assertNotNull(parsed.get("__config__"));
|
||||
assertNotNull(parsed.get("__vModel__"));
|
||||
assertEquals("f_avatar", parsed.get("__vModel__").asText());
|
||||
|
||||
// __config__ 关键键
|
||||
var cfg = parsed.get("__config__");
|
||||
assertEquals("uploadImg", cfg.get("jnpfKey").asText());
|
||||
assertEquals("JnpfUploadImg", cfg.get("tag").asText());
|
||||
assertEquals("头像", cfg.get("label").asText());
|
||||
assertEquals("colFormItem", cfg.get("layout").asText());
|
||||
// tagIcon 跟 uploadFile 共享 ("icon-ym icon-ym-generator-upload", componentMap line 573)
|
||||
assertEquals("icon-ym icon-ym-generator-upload", cfg.get("tagIcon").asText());
|
||||
|
||||
// uploadImg 特有 (componentMap 默认值)
|
||||
assertEquals("点击上传", parsed.get("buttonText").asText());
|
||||
assertEquals(10, parsed.get("fileSize").asInt());
|
||||
assertEquals("MB", parsed.get("sizeUnit").asText());
|
||||
assertEquals(9, parsed.get("limit").asInt());
|
||||
assertEquals("defaultPath", parsed.get("pathType").asText());
|
||||
assertEquals("", parsed.get("folder").asText());
|
||||
assertEquals("", parsed.get("tipText").asText());
|
||||
assertFalse(parsed.get("disabled").asBoolean());
|
||||
// uploadImg 默认 showType="card" (vs uploadFile="button", componentMap line 601)
|
||||
assertEquals("card", parsed.get("showType").asText());
|
||||
// uploadImg 没有 accept (跟 uploadFile 区别, componentMap 也没列)
|
||||
assertFalse(parsed.has("accept"));
|
||||
// uploadImg 没有 isAccount (componentMap 也没列)
|
||||
assertFalse(parsed.has("isAccount"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUploadImg_required() throws Exception {
|
||||
FieldBuildContext ctx = new FieldBuildContext();
|
||||
ctx.field = "f_idCardImg";
|
||||
ctx.label = "身份证照片";
|
||||
ctx.required = true;
|
||||
|
||||
String json = new UploadImgFieldBuilder().buildFormField(ctx);
|
||||
var parsed = M.readTree(json);
|
||||
assertTrue(parsed.get("__config__").get("required").asBoolean());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUploadImg_baselineKeyStructure() throws Exception {
|
||||
// uploadImg baseline 0 sample, 这里验证与 componentMap 镜像 + RUploadImg.vue 对齐
|
||||
FieldBuildContext ctx = new FieldBuildContext();
|
||||
ctx.field = "f_avatar";
|
||||
ctx.label = "头像";
|
||||
|
||||
String json = new UploadImgFieldBuilder().buildFormField(ctx);
|
||||
var parsed = M.readTree(json);
|
||||
var cfg = parsed.get("__config__");
|
||||
|
||||
// 必有 __config__ 字段 (20, 跟 componentMap 镜像)
|
||||
assertNotNull(cfg.get("formId"));
|
||||
assertNotNull(cfg.get("visibility"));
|
||||
assertNotNull(cfg.get("jnpfKey"));
|
||||
assertNotNull(cfg.get("defaultValue"));
|
||||
assertNotNull(cfg.get("noShow"));
|
||||
assertNotNull(cfg.get("tipLabel"));
|
||||
assertNotNull(cfg.get("showLabel"));
|
||||
assertNotNull(cfg.get("tag"));
|
||||
assertNotNull(cfg.get("tagIcon"));
|
||||
assertNotNull(cfg.get("tableAlign"));
|
||||
assertNotNull(cfg.get("tableFixed"));
|
||||
assertNotNull(cfg.get("className"));
|
||||
assertNotNull(cfg.get("required"));
|
||||
assertNotNull(cfg.get("layout"));
|
||||
assertNotNull(cfg.get("span"));
|
||||
assertNotNull(cfg.get("dragDisabled"));
|
||||
assertNotNull(cfg.get("tableName"));
|
||||
assertNotNull(cfg.get("renderKey"));
|
||||
assertNotNull(cfg.get("regList"));
|
||||
assertNotNull(cfg.get("trigger"));
|
||||
|
||||
// 顶层 (16 字段, 跟 componentMap 镜像)
|
||||
assertNotNull(parsed.get("__vModel__"));
|
||||
assertNotNull(parsed.get("on"));
|
||||
assertNotNull(parsed.get("disabled"));
|
||||
assertNotNull(parsed.get("fileSize"));
|
||||
assertNotNull(parsed.get("sizeUnit"));
|
||||
assertNotNull(parsed.get("buttonText"));
|
||||
assertNotNull(parsed.get("limit"));
|
||||
assertNotNull(parsed.get("pathType"));
|
||||
assertNotNull(parsed.get("sortRule"));
|
||||
assertNotNull(parsed.get("timeFormat"));
|
||||
assertNotNull(parsed.get("folder"));
|
||||
assertNotNull(parsed.get("tipText"));
|
||||
assertNotNull(parsed.get("showType"));
|
||||
assertNotNull(parsed.get("id"));
|
||||
|
||||
// on.change 必有 (componentMap 模板)
|
||||
assertNotNull(parsed.get("on").get("change"));
|
||||
// 触发器 = "change" (componentMap)
|
||||
assertEquals("change", cfg.get("trigger").asText());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUploadImg_dumpToFile() throws Exception {
|
||||
// 工具方法: 把生成结果写到 scripts/UploadImgFieldBuilder-output.json 用于 diff 对比
|
||||
FieldBuildContext ctx = new FieldBuildContext();
|
||||
ctx.field = "f_avatar";
|
||||
ctx.label = "头像";
|
||||
ctx.required = false;
|
||||
String json = new UploadImgFieldBuilder().buildFormField(ctx);
|
||||
Path out = Paths.get("../scripts/UploadImgFieldBuilder-output.json");
|
||||
Files.createDirectories(out.getParent());
|
||||
Files.writeString(out, json);
|
||||
assertTrue(Files.exists(out));
|
||||
assertTrue(Files.size(out) > 100);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user