Update public-api.js via upload script - 2026-11-09 16:45:30

This commit is contained in:
mike 2026-11-09 16:45:39 +08:00
parent 5d2e8f7b61
commit 4e0fee9854
1 changed files with 7 additions and 4 deletions

View File

@ -308,9 +308,11 @@ const exclOf = (t, p) => (t && t.modelExclude && p && t.modelExclude[p.id]) || {
// 新的按型号选择:modelPick = { 产品id: { main?: [文件名,按点选顺序], images?: [文件名], blocks?: [片段id], html?: true/false } } // 新的按型号选择:modelPick = { 产品id: { main?: [文件名,按点选顺序], images?: [文件名], blocks?: [片段id], html?: true/false } }
// 某一项有 = 只用点选的;没有 = 默认(全部,按模板顺序),再看旧的 modelExclude / mainCover // 某一项有 = 只用点选的;没有 = 默认(全部,按模板顺序),再看旧的 modelExclude / mainCover
const pickOf = (t, p) => (t && t.modelPick && p && t.modelPick[p.id]) || {}; const pickOf = (t, p) => (t && t.modelPick && p && t.modelPick[p.id]) || {};
// 某个型号自己上传的图片(存在模板目录下):modelFiles = { 产品id: { main: [文件名], images: [文件名] } };只在手动选择里出现
const ownOf = (t, p, key) => arr(t && t.modelFiles && p && t.modelFiles[p.id] && t.modelFiles[p.id][key]);
const tplImagesFor = (t, p) => { const tplImagesFor = (t, p) => {
const pk = pickOf(t, p).images; const pk = pickOf(t, p).images;
if (Array.isArray(pk)) return tplImagesOf(t).filter((f) => pk.includes(f)); if (Array.isArray(pk)) { const all = [...tplImagesOf(t), ...ownOf(t, p, 'images')]; return pk.filter((f) => all.includes(f)); }
const ex = arr(exclOf(t, p).images); return tplImagesOf(t).filter((f) => !ex.includes(f)); const ex = arr(exclOf(t, p).images); return tplImagesOf(t).filter((f) => !ex.includes(f));
}; };
const tplBlocksFor = (t, p) => { const tplBlocksFor = (t, p) => {
@ -335,7 +337,7 @@ const tplHtmlRefs = (t) => [...tplDetailBlocks(t).flatMap((b) => htmlImgRefs(b.h
const publicHtmlImgs = (h) => String(h).replace(HTML_IMG_RE, (m, id, f) => `${conf('PUBLIC_BASE_URL')}/api/public/tplmedia/${id}/${f}`); const publicHtmlImgs = (h) => String(h).replace(HTML_IMG_RE, (m, id, f) => `${conf('PUBLIC_BASE_URL')}/api/public/tplmedia/${id}/${f}`);
// 详情图片 + HTML 片段的顺序:片段位置按模板里的原始图片序号算,去掉的图片 / 片段跳过 // 详情图片 + HTML 片段的顺序:片段位置按模板里的原始图片序号算,去掉的图片 / 片段跳过
function tplDetailSeq(t, p) { function tplDetailSeq(t, p) {
const all = tplImagesOf(t), keep = tplImagesFor(t, p), blocks = tplBlocksFor(t, p); const all = [...tplImagesOf(t), ...ownOf(t, p, 'images')], keep = tplImagesFor(t, p), blocks = tplBlocksFor(t, p);
const out = []; const out = [];
for (let i = 0; i <= all.length; i++) { for (let i = 0; i <= all.length; i++) {
for (const b of blocks) if (Math.min(Math.max(0, Math.round(+b.pos || 0)), all.length) === i) out.push({ html: publicHtmlImgs(String(b.html).replace(/\s*\[cite:[^\]]*\]/gi, '')) }); for (const b of blocks) if (Math.min(Math.max(0, Math.round(+b.pos || 0)), all.length) === i) out.push({ html: publicHtmlImgs(String(b.html).replace(/\s*\[cite:[^\]]*\]/gi, '')) });
@ -557,12 +559,13 @@ const arr = (v) => (Array.isArray(v) ? v : []).filter(Boolean);
const legacyMain = (t) => t && t.kind === 'main' && !Array.isArray(t.mainImages); const legacyMain = (t) => t && t.kind === 'main' && !Array.isArray(t.mainImages);
const tplImagesOf = (t) => (t && !legacyMain(t) ? arr(t.images).slice(0, 20) : []); const tplImagesOf = (t) => (t && !legacyMain(t) ? arr(t.images).slice(0, 20) : []);
const tplMainOf = (t) => (!t ? [] : legacyMain(t) ? arr(t.images) : arr(t.mainImages)).slice(0, 6); const tplMainOf = (t) => (!t ? [] : legacyMain(t) ? arr(t.images) : arr(t.mainImages)).slice(0, 6);
const tplFilesOf = (t) => [...tplImagesOf(t), ...tplMainOf(t)]; const tplFilesOf = (t) => [...tplImagesOf(t), ...tplMainOf(t),
...Object.values((t && t.modelFiles) || {}).flatMap((m) => [...arr(m && m.main), ...arr(m && m.images)])];
// 主图模板里给某个型号单独指定了主图(mainCover[产品id]):那张排第一,其余按模板顺序 // 主图模板里给某个型号单独指定了主图(mainCover[产品id]):那张排第一,其余按模板顺序
const tplMainFor = (t, p) => { const tplMainFor = (t, p) => {
const list = !t ? [] : legacyMain(t) ? arr(t.images) : arr(t.mainImages); const list = !t ? [] : legacyMain(t) ? arr(t.images) : arr(t.mainImages);
const pk = pickOf(t, p).main; const pk = pickOf(t, p).main;
if (Array.isArray(pk)) return pk.filter((f) => list.includes(f)).slice(0, 6); // 手动选的:按点选顺序 if (Array.isArray(pk)) { const all = [...list, ...ownOf(t, p, 'main')]; return pk.filter((f) => all.includes(f)).slice(0, 6); } // 手动选的:按点选顺序
const c = t && t.mainCover && p && t.mainCover[p.id]; const c = t && t.mainCover && p && t.mainCover[p.id];
return (c && list.includes(c) ? [c, ...list.filter((f) => f !== c)] : list).slice(0, 6); return (c && list.includes(c) ? [c, ...list.filter((f) => f !== c)] : list).slice(0, 6);
}; };