diff --git a/src/app/app/dashboard/resumes/CreateResumeModal.tsx b/src/app/app/dashboard/resumes/CreateResumeModal.tsx index 9262256..e317d21 100644 --- a/src/app/app/dashboard/resumes/CreateResumeModal.tsx +++ b/src/app/app/dashboard/resumes/CreateResumeModal.tsx @@ -137,7 +137,7 @@ const TemplateThumbnail = ({ height: "297mm", transform: `scale(${scale})`, padding: `${template.spacing?.contentPadding || 32}px`, - fontFamily: "Alibaba PuHuiTi, sans-serif", + fontFamily: previewData.globalSettings?.fontFamily || "Alibaba PuHuiTi, sans-serif", }} > - ({ - ...baseData, - id: mockId, - templateId: template.id, - globalSettings: { - ...baseData.globalSettings, - themeColor: selectedColor || template.colorScheme.primary, - sectionSpacing: template.spacing.sectionGap, - paragraphSpacing: template.spacing.itemGap, - pagePadding: template.spacing.contentPadding, - }, - basic: { - ...baseData.basic, - layout: template.basic.layout, - }, - } as any); +({ + ...baseData, + id: mockId, + templateId: template.id, + globalSettings: { + ...baseData.globalSettings, + themeColor: selectedColor || template.colorScheme.primary, + sectionSpacing: template.spacing.sectionGap, + paragraphSpacing: template.spacing.itemGap, + pagePadding: template.spacing.contentPadding, + }, + basic: { + ...baseData.basic, + layout: template.basic.layout, + }, +} as any); interface TemplateCardItemProps { index: number; @@ -138,7 +138,7 @@ const TemplateCardItem = ({ transform: `scale(${scale})`, transformOrigin: "top left", padding: `${template.spacing.contentPadding}px`, - fontFamily: "Alibaba PuHuiTi, sans-serif", + fontFamily: previewData.globalSettings?.fontFamily || "Alibaba PuHuiTi, sans-serif", }} > @@ -352,7 +352,7 @@ const TemplatesPage = () => { transform: `scale(${PREVIEW_MODAL_SCALE})`, transformOrigin: "top left", padding: `${activePreviewTemplate.spacing.contentPadding}px`, - fontFamily: "Alibaba PuHuiTi, sans-serif", + fontFamily: selectedColor ? `Alibaba PuHuiTi, sans-serif` : `Alibaba PuHuiTi, sans-serif`, // Base on standard since it's just a general preview }} >
- {/*
+
-
*/} +
{/* 行高选择 */}
diff --git a/src/components/preview/IframeTemplateViewer.tsx b/src/components/preview/IframeTemplateViewer.tsx index 34ea406..46e6104 100644 --- a/src/components/preview/IframeTemplateViewer.tsx +++ b/src/components/preview/IframeTemplateViewer.tsx @@ -10,14 +10,14 @@ import { ResumeTemplate } from "../../types/template"; const IframeTemplateViewer = () => { const { id } = useParams({ from: "/app/preview-template/$id" }); - + // Use cookie to determine locale const locale = typeof document !== "undefined" ? document.cookie - .split("; ") - .find((row) => row.startsWith("NEXT_LOCALE=")) - ?.split("=")[1] || "zh" + .split("; ") + .find((row) => row.startsWith("NEXT_LOCALE=")) + ?.split("=")[1] || "zh" : "zh"; const template = useMemo(() => { @@ -55,7 +55,7 @@ const IframeTemplateViewer = () => { "relative mx-auto origin-top-left" )} style={{ - fontFamily: "Alibaba PuHuiTi, sans-serif", + fontFamily: mockData.globalSettings?.fontFamily || "Alibaba PuHuiTi, sans-serif", padding: `${template.spacing.contentPadding}px`, }} > diff --git a/src/components/preview/index.tsx b/src/components/preview/index.tsx index 71bd2a2..1b22937 100644 --- a/src/components/preview/index.tsx +++ b/src/components/preview/index.tsx @@ -181,7 +181,7 @@ const PreviewPanel = React.forwardRef( ref={previewRef} className="relative w-full h-full bg-gray-100" style={{ - fontFamily: "Alibaba PuHuiTi, sans-serif", + fontFamily: activeResume.globalSettings?.fontFamily || "Alibaba PuHuiTi, sans-serif", }} >
diff --git a/src/components/shared/TemplateSheet.tsx b/src/components/shared/TemplateSheet.tsx index 9e97482..8751bec 100644 --- a/src/components/shared/TemplateSheet.tsx +++ b/src/components/shared/TemplateSheet.tsx @@ -89,7 +89,7 @@ const TemplatePreview = ({ transformOrigin: "top left", boxSizing: "border-box", padding: `${template.spacing.contentPadding}px`, - fontFamily: "Alibaba PuHuiTi, sans-serif", + fontFamily: baseData.globalSettings?.fontFamily || "Alibaba PuHuiTi, sans-serif", }} > { try { const doc = iframeWindow.document; - + // 等待字体加载 if (doc.fonts?.ready) { await doc.fonts.ready;