diff --git a/App.jsx b/App.jsx
index e4ee0b0..72560b0 100644
--- a/App.jsx
+++ b/App.jsx
@@ -7072,7 +7072,7 @@ function DetailTemplatePicker({ draft, set, templates, setTemplates, products, o
const imgs = [...(t.mainImages || []), ...(t.images || [])];
return (
);
@@ -7138,7 +7138,7 @@ function DetailTemplateManager({ templates, setTemplates, products, setProducts,
const mainImages = await copyFiles(t.mainImages);
// 详情图片里的 HTML 片段按"排在第几张图后面"定位,图片顺序不变,直接复制
const detailHtml = (t.detailHtml || []).map(b => ({ ...b, id: 'dh_' + Date.now().toString(36) + Math.random().toString(36).slice(2, 6) }));
- const copy = { id, name: `${t.name || '模板'} 副本`, kind: t.kind || 'images', images, mainImages, detailHtml, html: t.html || '' };
+ const copy = { id, name: `${t.name || '模板'} 副本`, kind: t.kind || 'images', images, mainImages, detailHtml, html: '', htmls: tplHtmlsOf(t).map(h => ({ ...h })) };
setTemplates(list => {
const i = list.findIndex(x => x.id === t.id);
const next = [...list];
@@ -7177,7 +7177,7 @@ function DetailTemplateManager({ templates, setTemplates, products, setProducts,
模板内容:
-
+
@@ -7403,6 +7403,7 @@ function tplModelEffective(tpl, pid) {
const mains = Array.isArray(tpl.mainImages) ? tpl.mainImages : [];
const imgs = Array.isArray(tpl.images) ? tpl.images : [];
const blocks = (Array.isArray(tpl.detailHtml) ? tpl.detailHtml : []).filter(b => String(b.html || '').trim()).map(b => b.id);
+ const hids = tplHtmlsFilled(tpl).map(h => h.id);
const pk = (tpl.modelPick || {})[pid] || {};
const ex = (tpl.modelExclude || {})[pid] || {};
const cover = (tpl.mainCover || {})[pid];
@@ -7410,16 +7411,17 @@ function tplModelEffective(tpl, pid) {
main: Array.isArray(pk.main) ? pk.main.filter(f => mains.includes(f)) : (cover && mains.includes(cover) ? [cover, ...mains.filter(f => f !== cover)] : null),
images: Array.isArray(pk.images) ? pk.images.filter(f => imgs.includes(f)) : (Array.isArray(ex.images) && ex.images.length ? imgs.filter(f => !ex.images.includes(f)) : null),
blocks: Array.isArray(pk.blocks) ? pk.blocks.filter(id => blocks.includes(id)) : (Array.isArray(ex.blocks) && ex.blocks.length ? blocks.filter(id => !ex.blocks.includes(id)) : null),
- html: typeof pk.html === 'boolean' ? pk.html : (ex.html ? false : null),
+ // HTML 内容:htmls = 选中的那几段;旧数据 html:true/false 表示全部 / 都不用
+ htmls: Array.isArray(pk.htmls) ? pk.htmls.filter(id => hids.includes(id)) : pk.html === true ? hids : (pk.html === false || ex.html) ? [] : null,
};
}
function TemplateModelPick({ tpl, products, update }) {
const mains = Array.isArray(tpl.mainImages) ? tpl.mainImages : [];
const imgs = Array.isArray(tpl.images) ? tpl.images : [];
const blocks = (Array.isArray(tpl.detailHtml) ? tpl.detailHtml : []).filter(b => String(b.html || '').trim());
- const hasHtml = !!String(tpl.html || '').trim();
+ const htmls = tplHtmlsFilled(tpl);
const users = (products || []).filter(p => Array.isArray(p.webDetailTemplateIds) && p.webDetailTemplateIds.includes(tpl.id));
- const parts = mains.length + imgs.length + blocks.length + (hasHtml ? 1 : 0);
+ const parts = mains.length + imgs.length + blocks.length + htmls.length;
if (users.length < 1 || parts < 1) return null;
const coll = new Intl.Collator('zh', { numeric: true });
const label = (p) => p.name || p.model || '未命名';
@@ -7429,7 +7431,7 @@ function TemplateModelPick({ tpl, products, update }) {
if (eff.main) pick.main = eff.main;
if (eff.images) pick.images = eff.images;
if (eff.blocks) pick.blocks = eff.blocks;
- if (typeof eff.html === 'boolean') pick.html = eff.html;
+ if (eff.htmls) pick.htmls = eff.htmls;
const mp = { ...(tpl.modelPick || {}) };
if (Object.keys(pick).length) mp[pid] = pick; else delete mp[pid];
const mc = { ...(tpl.mainCover || {}) }; delete mc[pid];
@@ -7445,7 +7447,7 @@ function TemplateModelPick({ tpl, products, update }) {
// 主图按点击顺序;详情图片 / 片段按模板顺序
setCat(pid, key, key === 'main' ? next : all.filter(x => next.includes(x)));
};
- const custom = users.filter(p => { const e = tplModelEffective(tpl, p.id); return e.main || e.images || e.blocks || typeof e.html === 'boolean'; }).length;
+ const custom = users.filter(p => { const e = tplModelEffective(tpl, p.id); return e.main || e.images || e.blocks || e.htmls; }).length;
const defBtn = (on, onClick) =>
;
const rowL = { fontSize: 12, color: 'var(--ink-soft)', width: 64, flexShrink: 0 };
const thumb = (on, isDef) => ({ padding: 0, borderRadius: 5, overflow: 'hidden', cursor: 'pointer', background: '#fff', position: 'relative',
@@ -7461,7 +7463,7 @@ function TemplateModelPick({ tpl, products, update }) {
{[...users].sort((a, b) => coll.compare(label(a), label(b))).map(p => {
const e = tplModelEffective(tpl, p.id);
- const isCustom = e.main || e.images || e.blocks || typeof e.html === 'boolean';
+ const isCustom = e.main || e.images || e.blocks || e.htmls;
return (
@@ -7513,15 +7515,16 @@ function TemplateModelPick({ tpl, products, update }) {
})}
)}
- {hasHtml && (
+ {htmls.length > 0 && (
HTML 内容
- {defBtn(typeof e.html !== 'boolean', () => setCat(p.id, 'html', null))}
- {(() => {
- const on = e.html !== false, isDef = typeof e.html !== 'boolean';
- return ;
- })()}
+ {defBtn(!e.htmls, () => setCat(p.id, 'htmls', null))}
+ {htmls.map((h, i) => {
+ const on = !e.htmls || e.htmls.includes(h.id);
+ return ;
+ })}
+ {e.htmls && !e.htmls.length && 不显示 HTML 内容}
)}
@@ -7532,13 +7535,20 @@ function TemplateModelPick({ tpl, products, update }) {
);
}
+// 模板的 HTML 内容可以有多段:htmls = [{ id, name, html }]。旧数据只有一段 html 字符串,换算成 id 为 h_main 的一段
+function tplHtmlsOf(t) {
+ if (t && Array.isArray(t.htmls)) return t.htmls;
+ return t && String(t.html || '').trim() ? [{ id: 'h_main', name: 'HTML 1', html: t.html }] : [];
+}
+const tplHtmlsFilled = (t) => tplHtmlsOf(t).filter(h => String(h.html || '').trim());
+
// 模板内容摘要:主图2 · 详情5 · HTML
function tplSummary(t) {
const parts = [];
if ((t.mainImages || []).length) parts.push(`主图${t.mainImages.length}`);
if ((t.images || []).length) parts.push(`详情${t.images.length}`);
if ((t.detailHtml || []).length) parts.push(`详情HTML${t.detailHtml.length}`);
- if (String(t.html || '').trim()) parts.push('HTML');
+ if (tplHtmlsFilled(t).length) parts.push(tplHtmlsFilled(t).length > 1 ? `HTML${tplHtmlsFilled(t).length}` : 'HTML');
return parts.length ? parts.join(' · ') : '空';
}
@@ -7567,7 +7577,50 @@ function analyzeTplHtml(html) {
return r;
}
function HtmlTemplateEditor({ tpl, update, products, onNotify }) {
- const html = tpl.html || '';
+ const list = tplHtmlsOf(tpl);
+ const [openId, setOpenId] = useState(list[0] ? list[0].id : '');
+ // 改动统一写进 htmls,旧的单段 html 字段清空
+ const save = (next) => update({ htmls: next, html: '' });
+ const patch = (id, p) => save(list.map(h => (h.id === id ? { ...h, ...p } : h)));
+ const add = () => { const h = { id: 'h_' + Date.now().toString(36) + Math.random().toString(36).slice(2, 5), name: `HTML ${list.length + 1}`, html: '' }; save([...list, h]); setOpenId(h.id); };
+ const remove = (h) => { if (String(h.html || '').trim() && !window.confirm(`删除"${h.name || 'HTML'}"?`)) return; save(list.filter(x => x.id !== h.id)); };
+ const move = (i, d) => { const j = i + d; if (j < 0 || j >= list.length) return; const next = [...list]; [next[i], next[j]] = [next[j], next[i]]; save(next); };
+ return (
+
+
+
HTML 内容({list.length} 段;网站上按这个顺序显示在详情图下方,每个型号可以在下面单独选用哪几段)
+
+
+ {list.length === 0 &&
还没有 HTML 内容,点"添加 HTML"粘贴代码或上传 .html 文件(比如系列参数表)。
}
+ {list.map((h, i) => {
+ const isOpen = openId === h.id, len = String(h.html || '').trim().length;
+ return (
+
+
+ #{i + 1}
+ patch(h.id, { name: e.target.value })} />
+ {len ? `${len.toLocaleString()} 字符` : '空'}
+
+
+
+
+
+ {isOpen && (
+
+ patch(h.id, { html: v })} products={products} onNotify={onNotify} />
+
+ )}
+
+ );
+ })}
+
+ );
+}
+
+// 单段 HTML 内容的编辑器(粘贴 / 上传 / 预览 / 发布前检查)
+function HtmlOneEditor({ tplId, html, setHtml, products, onNotify }) {
+ const tpl = { id: tplId };
+ const update = (p) => setHtml(p.html);
const [preview, setPreview] = useState(false);
const fileRef = useRef(null);
const info = useMemo(() => analyzeTplHtml(html), [html]);