diff --git a/public-api.js b/public-api.js index 657e47c..1ab7e6e 100644 --- a/public-api.js +++ b/public-api.js @@ -232,9 +232,24 @@ const tplHtmlOf = (t) => (t && String(t.html || '').trim() ? cleanTplHtml(t.html const tplDetailBlocks = (t) => arr(t && t.detailHtml).filter((b) => b && String(b.html || '').trim()); // 同一模板下给某个型号去掉部分内容:modelExclude = { 产品id: { images: [文件名], blocks: [片段id], html: true } };没设置 = 全部都用 const exclOf = (t, p) => (t && t.modelExclude && p && t.modelExclude[p.id]) || {}; -const tplImagesFor = (t, p) => { const ex = arr(exclOf(t, p).images); return tplImagesOf(t).filter((f) => !ex.includes(f)); }; -const tplBlocksFor = (t, p) => { const ex = arr(exclOf(t, p).blocks); return tplDetailBlocks(t).filter((b) => !ex.includes(b.id)); }; -const tplHtmlFor = (t, p) => (exclOf(t, p).html ? '' : tplHtmlOf(t)); +// 新的按型号选择:modelPick = { 产品id: { main?: [文件名,按点选顺序], images?: [文件名], blocks?: [片段id], html?: true/false } } +// 某一项有 = 只用点选的;没有 = 默认(全部,按模板顺序),再看旧的 modelExclude / mainCover +const pickOf = (t, p) => (t && t.modelPick && p && t.modelPick[p.id]) || {}; +const tplImagesFor = (t, p) => { + const pk = pickOf(t, p).images; + if (Array.isArray(pk)) return tplImagesOf(t).filter((f) => pk.includes(f)); + const ex = arr(exclOf(t, p).images); return tplImagesOf(t).filter((f) => !ex.includes(f)); +}; +const tplBlocksFor = (t, p) => { + const pk = pickOf(t, p).blocks; + if (Array.isArray(pk)) return tplDetailBlocks(t).filter((b) => pk.includes(b.id)); + const ex = arr(exclOf(t, p).blocks); return tplDetailBlocks(t).filter((b) => !ex.includes(b.id)); +}; +const tplHtmlFor = (t, p) => { + const pk = pickOf(t, p).html; + if (typeof pk === 'boolean') return pk ? tplHtmlOf(t) : ''; + return exclOf(t, p).html ? '' : tplHtmlOf(t); +}; // 详情图片 + HTML 片段的顺序:片段位置按模板里的原始图片序号算,去掉的图片 / 片段跳过 function tplDetailSeq(t, p) { const all = tplImagesOf(t), keep = tplImagesFor(t, p), blocks = tplBlocksFor(t, p); @@ -440,6 +455,8 @@ const tplFilesOf = (t) => [...tplImagesOf(t), ...tplMainOf(t)]; // 主图模板里给某个型号单独指定了主图(mainCover[产品id]):那张排第一,其余按模板顺序 const tplMainFor = (t, p) => { const list = !t ? [] : legacyMain(t) ? arr(t.images) : arr(t.mainImages); + const pk = pickOf(t, p).main; + if (Array.isArray(pk)) return pk.filter((f) => list.includes(f)).slice(0, 6); // 手动选的:按点选顺序 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); }; @@ -483,8 +500,10 @@ function toPublic(p, templates = [], packSpecs = []) { .map((f) => `${base}/api/public/tplmedia/${encodeURIComponent(t.id)}/${encodeURIComponent(f)}`)); const own = (Array.isArray(p[IMAGES_FIELD]) && p[IMAGES_FIELD].length) || !mainTpl.length ? imagesOf(p) : []; // 在模板管理里给这个型号单独指定了主图:它排在最前面(作列表封面),然后是产品自己的主图,再是模板其余的图 - const coverTpl = templatesOf(p, templates).find((t) => t.mainCover && t.mainCover[p.id] && tplMainFor(t, p)[0] === t.mainCover[p.id]); - const coverUrl = coverTpl ? `${base}/api/public/tplmedia/${encodeURIComponent(coverTpl.id)}/${encodeURIComponent(coverTpl.mainCover[p.id])}` : ''; + // 按型号手动选了主图(modelPick.main):选的第一张就是封面;旧数据 mainCover 同理 + const coverOf = (t) => { const pk = pickOf(t, p).main; if (Array.isArray(pk)) return tplMainFor(t, p)[0] || ''; const c = t.mainCover && t.mainCover[p.id]; return c && tplMainFor(t, p)[0] === c ? c : ''; }; + const coverTpl = templatesOf(p, templates).find((t) => coverOf(t)); + const coverUrl = coverTpl ? `${base}/api/public/tplmedia/${encodeURIComponent(coverTpl.id)}/${encodeURIComponent(coverOf(coverTpl))}` : ''; const ownUrls = own.map((f) => `${base}/api/public/media/${slug}/${encodeURIComponent(f)}`); out.images = (coverUrl ? [coverUrl, ...ownUrls, ...mainTpl.filter((u) => u !== coverUrl)] : [...ownUrls, ...mainTpl]).slice(0, 6); out.detailImages = detailsOf(p).map((f) => `${base}/api/public/media/${slug}/${encodeURIComponent(f)}`);