diff --git a/App.jsx b/App.jsx index eb1c246..b63cc1b 100644 --- a/App.jsx +++ b/App.jsx @@ -10,7 +10,7 @@ import { import { MicUploadPage } from './mic-upload/MicUploadPage'; import { ImageToolPage } from './mic-upload/ImageToolPage'; import { - storageGet, storageSet, hasUnsavedChanges, uploadFile, deleteFile, + storageGet, storageSet, hasUnsavedChanges, saveTemplate, localPendingTemplates, uploadFile, deleteFile, authCheck, authLogin, authLogout, authChangePassword, getAiConfig, saveAiConfig, deleteAiConfig, testAiConfig, parseCatalogFiles, translateTerms, @@ -1631,6 +1631,17 @@ async function loadAll() { const wdt = await storageGet(STORAGE_KEYS.webDetailTemplates); if (wdt && wdt.value) webDetailTemplates = JSON.parse(wdt.value); } catch (e) { if (!e.notFound) failed.push(e.message); } + // 本机还没发到服务器的模板修改(上次关页面时没存完):以本机为准合并进来,打开页面后自动补发 + let tplPending = []; + try { + tplPending = await localPendingTemplates(); + for (const x of tplPending.sort((a, b) => a.at - b.at)) { + const i = webDetailTemplates.findIndex(t => t && t.id === x.id); + if (!x.t) { if (i >= 0) webDetailTemplates.splice(i, 1); } + else if (i >= 0) webDetailTemplates[i] = x.t; + else webDetailTemplates.splice(Number.isInteger(x.index) ? Math.min(x.index, webDetailTemplates.length) : webDetailTemplates.length, 0, x.t); + } + } catch (e) {} let webAssets = {}; try { const wa = await storageGet(STORAGE_KEYS.webAssets); @@ -1653,7 +1664,7 @@ async function loadAll() { if (od && od.value) orders = JSON.parse(od.value) || []; } catch (e) { if (!e.notFound) failed.push(e.message); } if (failed.length) { const err = new Error(failed[0]); err.loadFailed = true; throw err; } - return { orders, customers, products, quotes, sellerProfiles, certifications, productCategories, packingLists, catalogDocs, jmsLines, backPanelTemplates, suppliers, webDetailTemplates, webAssets, webNews, webPackSpecs }; + return { orders, customers, products, quotes, sellerProfiles, certifications, productCategories, packingLists, catalogDocs, jmsLines, backPanelTemplates, suppliers, webDetailTemplates, tplPendingIds: tplPending.map(x => x.id), webAssets, webNews, webPackSpecs }; } /* -------------------------------- styles -------------------------------- */ @@ -2577,6 +2588,8 @@ function MainApp({ username, onLogout }) { const [jmsLines, setJmsLines] = useState([]); const [backPanelTemplates, setBackPanelTemplates] = useState([]); const [webDetailTemplates, setWebDetailTemplates] = useState([]); + const tplSaved = useRef(new Map()); // 模板 id → 已保存到服务器的内容(JSON),用来判断哪些模板要保存 + const [tplSavedTick, setTplSavedTick] = useState(0); // 模板存上服务器后 +1:模板管理据此刷新"是否已同步到网站"的状态 const [webPackSpecs, setWebPackSpecs] = useState([]); const [webAssets, setWebAssets] = useState({}); // 网站管理:图片位 → 文件名 const [webNews, setWebNews] = useState([]); // 网站管理:近期动态 // 网站详情模板:一组公共图片(工厂、认证、包装等),产品一键引用 @@ -2637,7 +2650,12 @@ function MainApp({ username, onLogout }) { setBackPanelTemplates(data.backPanelTemplates || []); setSuppliers(data.suppliers || []); // 主图模板和详情图片分开存:早先的主图模板把图存在 images 里,这里挪到 mainImages - setWebDetailTemplates((data.webDetailTemplates || []).map(t => (t && t.kind === 'main' && !Array.isArray(t.mainImages) ? { ...t, mainImages: t.images || [], images: [] } : t))); + const tplList = (data.webDetailTemplates || []).map(t => (t && t.kind === 'main' && !Array.isArray(t.mainImages) ? { ...t, mainImages: t.images || [], images: [] } : t)); + // 记下服务器上每个模板的内容;本机待补发的模板不记,下面的保存逻辑会把它们发出去 + const pend = new Set(data.tplPendingIds || []); + tplSaved.current = new Map(tplList.filter(t => !pend.has(t.id)).map(t => [t.id, JSON.stringify(t)])); + for (const id of pend) if (!tplList.some(t => t.id === id)) tplSaved.current.set(id, '__deleted__pending'); + setWebDetailTemplates(tplList); setWebAssets(data.webAssets || {}); setWebNews(Array.isArray(data.webNews) ? data.webNews : []); setLoaded(true); @@ -2654,7 +2672,25 @@ function MainApp({ username, onLogout }) { useEffect(() => { if (loaded) storageSet(STORAGE_KEYS.jmsLines, JSON.stringify(jmsLines)).then(() => clearSaveIssue(STORAGE_KEYS.jmsLines)).catch(reportSaveError); }, [jmsLines, loaded]); useEffect(() => { if (loaded) storageSet(STORAGE_KEYS.backPanelTemplates, JSON.stringify(backPanelTemplates)).then(() => clearSaveIssue(STORAGE_KEYS.backPanelTemplates)).catch(reportSaveError); }, [backPanelTemplates, loaded]); useEffect(() => { if (loaded) storageSet(STORAGE_KEYS.suppliers, JSON.stringify(suppliers)).then(() => clearSaveIssue(STORAGE_KEYS.suppliers)).catch(reportSaveError); }, [suppliers, loaded]); - useEffect(() => { if (loaded) storageSet(STORAGE_KEYS.webDetailTemplates, JSON.stringify(webDetailTemplates)).then(() => clearSaveIssue(STORAGE_KEYS.webDetailTemplates)).catch(reportSaveError); }, [webDetailTemplates, loaded]); + // 模板一个一个保存:只发改动过的模板(先存本机,再发服务器),删除的模板单独删除。不再整份上传全部模板 + useEffect(() => { + if (!loaded) return; + const saved = tplSaved.current; + const ids = new Set(); + webDetailTemplates.forEach((t, index) => { + if (!t || !t.id) return; + ids.add(t.id); + const json = JSON.stringify(t); + if (saved.get(t.id) === json) return; + saved.set(t.id, json); + saveTemplate(t.id, t, index).then(() => { clearSaveIssue(STORAGE_KEYS.webDetailTemplates); setTplSavedTick(n => n + 1); }).catch(reportSaveError); + }); + for (const id of [...saved.keys()]) { + if (ids.has(id)) continue; + saved.delete(id); + saveTemplate(id, null).then(() => { clearSaveIssue(STORAGE_KEYS.webDetailTemplates); setTplSavedTick(n => n + 1); }).catch(reportSaveError); + } + }, [webDetailTemplates, loaded]); useEffect(() => { if (loaded) storageSet(STORAGE_KEYS.webPackSpecs, JSON.stringify(webPackSpecs)).then(() => clearSaveIssue(STORAGE_KEYS.webPackSpecs)).catch(reportSaveError); }, [webPackSpecs, loaded]); useEffect(() => { if (loaded) storageSet(STORAGE_KEYS.webAssets, JSON.stringify(webAssets)).then(() => clearSaveIssue(STORAGE_KEYS.webAssets)).catch(reportSaveError); }, [webAssets, loaded]); useEffect(() => { if (loaded) storageSet(STORAGE_KEYS.webNews, JSON.stringify(webNews)).then(() => clearSaveIssue(STORAGE_KEYS.webNews)).catch(reportSaveError); }, [webNews, loaded]); @@ -4136,7 +4172,7 @@ function MainApp({ username, onLogout }) { )} {view === 'templates' && ( + products={products} setProducts={setProducts} onNotify={notify} savedTick={tplSavedTick} /> )} {view === 'website' && ( i !== idx) }); @@ -7114,7 +7151,7 @@ function DetailTemplatePicker({ draft, set, templates, setTemplates, products, o ); } -function DetailTemplateManager({ templates, setTemplates, products, setProducts, onNotify, onClose, onCreated, inline }) { +function DetailTemplateManager({ templates, setTemplates, products, setProducts, onNotify, onClose, onCreated, inline, syncStatus }) { const [activeId, setActiveId] = useState(templates[0] ? templates[0].id : null); const active = templates.find(t => t.id === activeId) || null; const usage = (id) => products.filter(p => Array.isArray(p.webDetailTemplateIds) && p.webDetailTemplateIds.includes(id)).length; @@ -7165,7 +7202,7 @@ function DetailTemplateManager({ templates, setTemplates, products, setProducts, async function removeTemplate(t) { const n = usage(t.id); if (!window.confirm(`确定删除模板"${t.name}"?${n ? `\n有 ${n} 个产品在用它,删除后这些产品的网站详情里不再显示这组图片。` : ''}`)) return; - for (const f of [...(t.images || []), ...(t.mainImages || [])]) { try { await deleteFile(t.id, f); } catch (e) {} } + // 图片文件先不删:网站上的这个模板要等"更新到网站"时勾选同步后才去掉,在那之前网站还在用这些图 setTemplates(list => list.filter(x => x.id !== t.id)); setActiveId(null); } @@ -7174,8 +7211,11 @@ function DetailTemplateManager({ templates, setTemplates, products, setProducts, {templates.map(t => ( - setActiveId(t.id)}> + setActiveId(t.id)} + title={syncStatus ? (syncStatus[t.id] === 'synced' ? '已同步到网站' : syncStatus[t.id] === 'new' ? '新模板,还没同步到网站' : '有修改,还没同步到网站') : ''}> {t.name || '未命名模板'}({tplSummary(t)}) + {syncStatus && ✓} ))} 新建模板 @@ -7198,7 +7238,7 @@ function DetailTemplateManager({ templates, setTemplates, products, setProducts, ) : active.kind === 'main' ? ( <> update(active.id, patch)} onNotify={onNotify} field="mainImages" max={WEB_MAX_IMAGES} cover label={`主图模板(最多${WEB_MAX_IMAGES}张,建议1000×1000方图,第一张是封面,拖动可调整顺序)`} /> @@ -7206,7 +7246,7 @@ function DetailTemplateManager({ templates, setTemplates, products, setProducts, > ) : ( update(active.id, patch)} onNotify={onNotify} field="images" max={WEB_MAX_TEMPLATE_IMAGES} tall label={`模板图片(最多${WEB_MAX_TEMPLATE_IMAGES}张,建议宽1200像素,按顺序从上到下拼接显示,拖动可调整顺序)`} /> @@ -7244,16 +7284,26 @@ function DetailTemplateManager({ templates, setTemplates, products, setProducts, } // 模板管理(产品管理 → 模板管理):编辑模板 + 给模板勾选使用它的产品(一个系列一次选完,不用逐个产品去编辑) -function TemplateCenter({ templates, setTemplates, products, setProducts, onNotify }) { +function TemplateCenter({ templates, setTemplates, products, setProducts, onNotify, savedTick }) { + // 每个模板是否已经同步到网站:synced / changed / new;deleted = 后台删了、网站上还在 + const [sync, setSync] = useState({ status: {}, deleted: [], loaded: false }); + const loadSync = async () => { + try { + const r = await fetch('/api/site/templates-status'); + const d = await r.json(); + if (r.ok) setSync({ status: d.status || {}, deleted: d.deleted || [], loaded: true }); + } catch (e) {} + }; + useEffect(() => { const t = setTimeout(loadSync, savedTick ? 600 : 0); return () => clearTimeout(t); }, [savedTick]); return ( 模板管理 - + 每个模板可以包含三项内容,分开上传、互不重复:主图(同系列共用,接在产品自己的主图后面)、详情图片(工厂、认证、包装等,显示在详情图下方)、HTML(系列参数表)。选中一个模板后,在下面"使用这个模板的产品"里勾选型号;改完点右上角"更新到网站"。产品编辑页"网站发布"里也能单独添加或移除,两边是同一份数据。 - + ); @@ -8274,6 +8324,83 @@ function AiDescriptionPreview({ productId, hasManual, onUse, onClear }) { ); } +// 模板管理右上角的"更新到网站":选择要同步的模板(默认勾选有改动 / 新建的),只把选中的模板同步到网站,然后重新构建网站。 +// 没选的模板,网站上保持上次同步时的样子。 +function TemplateSyncButton({ templates, sync, reload }) { + const [open, setOpen] = useState(false); + const [sel, setSel] = useState(new Set()); + const [state, setState] = useState('idle'); + const [msg, setMsg] = useState(''); + const pending = (id) => sync.status[id] !== 'synced'; + function openPicker() { + setSel(new Set([...templates.filter(t => pending(t.id)).map(t => t.id), ...sync.deleted.map(d => d.id)])); + setMsg(''); setOpen(true); + } + const toggle = (id) => setSel(s => { const n = new Set(s); n.has(id) ? n.delete(id) : n.add(id); return n; }); + async function run() { + if (hasUnsavedChanges()) { setMsg('还有修改正在保存,请稍等几秒再点'); return; } + setState('busy'); setMsg(''); + try { + if (sel.size) { + const r = await fetch('/api/site/templates-publish', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ ids: [...sel] }) }); + const d = await r.json().catch(() => ({})); + if (!r.ok) throw new Error(d.error || `HTTP ${r.status}`); + } + const r2 = await fetch('/api/site/deploy', { method: 'POST' }); + const d2 = await r2.json().catch(() => ({})); + if (!r2.ok) throw new Error(d2.error || `HTTP ${r2.status}`); + setState('ok'); setOpen(false); + setMsg((sel.size ? `已同步 ${sel.size} 个模板,` : '') + (d2.note || '已通知网站更新,约1分钟后生效')); + reload(); + } catch (e) { setState('err'); setMsg(`更新失败:${e.message}`); } + } + const nPending = templates.filter(t => pending(t.id)).length + sync.deleted.length; + return ( + <> + {msg && !open && {msg}} + 更新到网站{sync.loaded && nPending ? `(${nPending} 个模板未同步)` : ''} + {open && ( + setOpen(false)}> + e.stopPropagation()}> + + 选择要同步到网站的模板 + setOpen(false)}> + + + 勾选的模板会把后台现在的内容同步到网站;没勾选的,网站上保持上次同步的样子。产品的修改(发布、价格、参数等)每次都会一起更新。 + + setSel(new Set([...templates.filter(t => pending(t.id)).map(t => t.id), ...sync.deleted.map(d => d.id)]))}>只选未同步的 + setSel(new Set())}>全部不选 + + {templates.map(t => ( + + toggle(t.id)} /> + {t.name || '未命名模板'} + + {sync.status[t.id] === 'synced' ? '✓ 已同步' : sync.status[t.id] === 'new' ? '新模板' : '有修改'} + + + ))} + {sync.deleted.map(d => ( + + toggle(d.id)} /> + {d.name || d.id} + 已删除,同步后网站上去掉 + + ))} + + + {msg && {msg}} + setOpen(false)}>取消 + {state === 'busy' ? '提交中…' : sel.size ? `同步 ${sel.size} 个模板并更新网站` : '只更新产品(不同步模板)'} + + + + )} + > + ); +} + // 产品详情页右上角的"更新到网站":调用 public-api.js 里的 /api/site/deploy,触发 Cloudflare 重新构建 function SiteDeployButton() { const [state, setState] = useState('idle'); // idle | busy | ok | err