biss/Letters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正导入错误
Vercel Deploy / deploy (push) Successful in 1m7s
Details

Browse Source
This commit is contained in:
biss
2026-05-04 21:43:46 +08:00
Unverified
parent 065c73f25e
commit 96c43240aa
1 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gen-esp/js/main.js
+43 -24
View File
@@ -518,6 +518,47 @@ function serializeCountdownRegions() {
};
}
function findCanvasSizeName(width, height) {
const size = canvasSizes.find((item) => item.width === width && item.height === height);
return size ? size.name : null;
}
function applyImportedCountdownCanvasSize(regionData) {
const sourceCanvas = regionData && (regionData.canvas || regionData.size);
if (!sourceCanvas || !canvas) return;
const width = Number(sourceCanvas.width || sourceCanvas.w);
const height = Number(sourceCanvas.height || sourceCanvas.h);
if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0) return;
if (canvas.width === width && canvas.height === height) return;
const canvasSizeSelect = document.getElementById('canvasSize');
const matchedName = findCanvasSizeName(width, height);
if (canvasSizeSelect && matchedName) canvasSizeSelect.value = matchedName;
canvas.width = width;
canvas.height = height;
}
function applyImportedCountdownTemplate(rawData) {
const importedState = rawData && typeof rawData === 'object' && rawData.countdown ? rawData.countdown : rawData;
const importedRegions = rawData && typeof rawData === 'object'
? (rawData.countdownRegions || rawData.regions || (importedState && importedState.regions))
: null;
countdownState = normalizeCountdownState(importedState);
if (!countdownState.single.date) countdownState.single.date = getTodayISODate();
applyImportedCountdownCanvasSize(importedRegions);
countdownManualRegions = normalizeCountdownRegions(importedRegions);
countdownDateRegion = normalizeCountdownDateRegion(importedRegions);
refreshCountdownTemplateUI();
applyCountdownTemplate();
renderCountdownRegions(countdownManualRegions || autoTemplateRegions());
saveCountdownState();
setActivePanelTab('countdown-template-panel');
}
function syncCountdownRegionInputs(index) {
const container = document.getElementById('countdown-region-items');
if (!container) return;
@@ -1423,18 +1464,7 @@ function importCountdownTemplate(file) {
reader.onload = () => {
try {
const rawData = JSON.parse(reader.result);
const importedState = rawData && typeof rawData === 'object' && rawData.countdown ? rawData.countdown : rawData;
countdownState = normalizeCountdownState(importedState);
const importedRegions = rawData && typeof rawData === 'object'
? (rawData.countdownRegions || rawData.regions || (importedState && importedState.regions))
: null;
countdownManualRegions = normalizeCountdownRegions(importedRegions);
countdownDateRegion = normalizeCountdownDateRegion(importedRegions);
if (!countdownState.single.date) countdownState.single.date = getTodayISODate();
saveCountdownState();
refreshCountdownTemplateUI();
renderCountdownRegions(countdownManualRegions || autoTemplateRegions());
setActivePanelTab('countdown-template-panel');
applyImportedCountdownTemplate(rawData);
addLog('Countdown 模板已导入。');
} catch (error) {
console.error(error);
@@ -1473,18 +1503,7 @@ function importCountdownTemplate(file) {
reader.onload = () => {
try {
const rawData = JSON.parse(reader.result);
const importedState = rawData && typeof rawData === 'object' && rawData.countdown ? rawData.countdown : rawData;
countdownState = normalizeCountdownState(importedState);
const importedRegions = rawData && typeof rawData === 'object'
? (rawData.countdownRegions || rawData.regions || (importedState && importedState.regions))
: null;
countdownManualRegions = normalizeCountdownRegions(importedRegions);
countdownDateRegion = normalizeCountdownDateRegion(importedRegions);
if (!countdownState.single.date) countdownState.single.date = getTodayISODate();
saveCountdownState();
refreshCountdownTemplateUI();
renderCountdownRegions(countdownManualRegions || autoTemplateRegions());
setActivePanelTab('countdown-template-panel');
applyImportedCountdownTemplate(rawData);
addLog('倒计时模板已导入。');
} catch (error) {
console.error(error);