rain/jiapu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改完成

Browse Source
This commit is contained in:
rain
2026-09-13 19:41:13 +08:00
parent 15b301b358
commit d040507cb8
27 changed files with 2238 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/relative-pages.js
+6 -16
View File
@@ -150,7 +150,7 @@
else if (!isExactJsonNumber(amountText, body.giftAmount)) body.invalidGiftPrecision = true;
}
if (recordContent !== undefined) body.recordContent = recordContent;
if (mediaOssIds !== undefined) body.mediaOssIds = mediaOssIds;
if (source.mediaOssIds !== undefined) body.mediaOssIds = mediaOssIds || '';
if (sortOrderText !== undefined) {
body.sortOrder = toSafeInteger(sortOrderText);
if (body.sortOrder === undefined) body.invalidSortOrder = true;
@@ -168,7 +168,7 @@
if (body.eventTime !== undefined && !isValidBackendDateTime(body.eventTime)) {
return '事件时间格式无效';
}
if (body.mediaOssIds !== undefined && !/^[1-9][0-9]*(,[1-9][0-9]*)*$/.test(body.mediaOssIds)) {
if (body.mediaOssIds !== undefined && body.mediaOssIds !== '' && !/^[1-9][0-9]*(,[1-9][0-9]*)*$/.test(body.mediaOssIds)) {
return '附件上传结果无效';
}
if (body.invalidSortOrder || (Object.prototype.hasOwnProperty.call(body, 'sortOrder') && !Number.isSafeInteger(body.sortOrder))) {
@@ -576,14 +576,8 @@
setFieldValue('eventTime', toDateTimeInputValue(record.eventTime));
setFieldValue('giftAmount', record.giftAmount);
setFieldValue('recordContent', record.recordContent);
setFieldValue('mediaOssIds', record.mediaOssIds);
setFieldValue('sortOrder', record.sortOrder);
setFieldValue('status', '0');
if (query('[data-relative-media-status]')) {
query('[data-relative-media-status]').textContent = record.mediaOssIds
? '已保留 ' + attachmentCount(record.mediaOssIds) + ' 个附件，可继续选择追加'
: '未选择文件';
}
}
async function loadRelativeEditor() {
@@ -603,9 +597,11 @@
await loadCapability(api, genealogyId);
if (!canEditContent) throw { status: 403, message: '当前账号无权维护该家谱的亲友记录。' };
if (relativeId) {
record = normalizeRelativeRecord(await api.relativeRecordDetail(genealogyId, relativeId));
var relativeResponse = await api.relativeRecordDetail(genealogyId, relativeId);
record = normalizeRelativeRecord(relativeResponse);
if (!record) throw new Error('亲友记录详情响应缺少稳定 RelativeRecordVo 字段');
fillRelativeForm(record);
root.AttachmentEditor.setFiles('#relativeMediaOssIds', relativeResponse.mediaFiles || []);
if (query('[data-relative-editor-title]')) query('[data-relative-editor-title]').textContent = '编辑亲友记录';
}
setEditorEnabled(true);
@@ -688,13 +684,7 @@
}
function clearMediaSelection() {
var target = query('[data-relative-form] [name="mediaOssIds"]');
var status = query('[data-relative-media-status]');
var fileInput = query('[data-relative-media-input]');
if (target) target.value = '';
if (fileInput) fileInput.value = '';
if (status) status.textContent = '未选择文件';
root.AttachmentEditor.clear('#relativeMediaOssIds');
}
function bindActions() {