From 0c4c4960e6ff55db0e34fb785f2e932aef850655 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 14 Sep 2026 19:27:44 +0800 Subject: [PATCH 01/15] fix(frontend): #1896 apps/web/src/pages/generate/constants.ts --- apps/web/src/pages/generate/constants.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/apps/web/src/pages/generate/constants.ts b/apps/web/src/pages/generate/constants.ts index c0c37d3bc..e6e93d383 100644 --- a/apps/web/src/pages/generate/constants.ts +++ b/apps/web/src/pages/generate/constants.ts @@ -54,10 +54,8 @@ export const FONT_OPTIONS = [ "思源黑体", "思源宋体", "苹方", - "PingFang", "微软雅黑", "楷体", - "华康俪金黑", ] /* ── 标题字体 CSS font-family 映射（中文显示名 → 浏览器可识别的字体栈） ── */ @@ -68,7 +66,6 @@ export const FONT_FAMILY_MAP: Record = { PingFang: '"PingFang SC", -apple-system, "Helvetica Neue", sans-serif', 微软雅黑: '"Microsoft YaHei", "PingFang SC", sans-serif', 楷体: '"KaiTi", "STKaiti", "DFKai-SB", serif', - 华康俪金黑: '"华康俪金黑", "DFLiJinHei-W8", "Source Han Sans SC", "Microsoft YaHei", sans-serif', } export function getFontFamily(font: string): string { -- 2.54.0 From 6bf4338f674f555219cc3a9df3272654037acb1b Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 14 Sep 2026 19:27:58 +0800 Subject: [PATCH 02/15] fix(frontend): #1896 apps/web/src/index.css --- apps/web/src/index.css | 9 --------- 1 file changed, 9 deletions(-) diff --git a/apps/web/src/index.css b/apps/web/src/index.css index 349209f27..054ded766 100644 --- a/apps/web/src/index.css +++ b/apps/web/src/index.css @@ -25,15 +25,6 @@ body { background-color: var(--bg-secondary); } -/* ── 自定义字体 ── */ -@font-face { - font-family: "华康俪金黑"; - src: url("/fonts/DFLiJinHei-W8.ttf") format("truetype"); - font-weight: 700; - font-style: normal; - font-display: swap; -} - /* 滚动条 - V21 样式 */ ::-webkit-scrollbar { width: 8px; -- 2.54.0 From 9a3f333d408512819ac823dc0ab9deb963ae49b3 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 14 Sep 2026 19:28:12 +0800 Subject: [PATCH 03/15] fix(frontend): #1896 apps/web/src/pages/editing-planner/components/PreviewPlayer.tsx --- .../src/pages/editing-planner/components/PreviewPlayer.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/web/src/pages/editing-planner/components/PreviewPlayer.tsx b/apps/web/src/pages/editing-planner/components/PreviewPlayer.tsx index 8bf4ed57f..b56abe469 100644 --- a/apps/web/src/pages/editing-planner/components/PreviewPlayer.tsx +++ b/apps/web/src/pages/editing-planner/components/PreviewPlayer.tsx @@ -5,6 +5,7 @@ import React from "react" import type { ClipData, ClipType } from "../types" import type { TitleConfig } from "@/api/template-editor" +import { getFontFamily } from "@/pages/generate/constants" interface SubtitleSettings { enabled: boolean @@ -80,7 +81,7 @@ const PreviewPlayer: React.FC = ({ className="ep-preview-title" style={{ fontSize: `${Math.min(titleConfig.font_size, 20)}px`, - fontFamily: titleConfig.font_preset, + fontFamily: getFontFamily(titleConfig.font_preset), fontWeight: "bold", fontStyle: "normal", textShadow: "2px 2px 4px rgba(0,0,0,0.5)", @@ -106,7 +107,7 @@ const PreviewPlayer: React.FC = ({ className="ep-preview-subtitle" style={{ fontSize: `${Math.min(subtitleSettings.size, 14)}px`, - fontFamily: subtitleSettings.font, + fontFamily: getFontFamily(subtitleSettings.font), top: subtitleSettings.position === "top" ? "8px" -- 2.54.0 From 6d7e773b4a326d8981707c2e55bc7876636a1a07 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 14 Sep 2026 19:28:25 +0800 Subject: [PATCH 04/15] fix(frontend): #1896 apps/web/src/pages/generate/components/FrontendPreviewPlayer.tsx --- .../src/pages/generate/components/FrontendPreviewPlayer.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/web/src/pages/generate/components/FrontendPreviewPlayer.tsx b/apps/web/src/pages/generate/components/FrontendPreviewPlayer.tsx index 5a6be9574..8e9f62530 100644 --- a/apps/web/src/pages/generate/components/FrontendPreviewPlayer.tsx +++ b/apps/web/src/pages/generate/components/FrontendPreviewPlayer.tsx @@ -17,6 +17,8 @@ import type { EditPlanClip } from "@/api/template-editor" import { useSegmentScheduler, type PlaybackSegment } from "../hooks/useSegmentScheduler" import { usePreviewAudio } from "../hooks/usePreviewAudio" import { PreviewControls } from "./PreviewControls" +import { getFontFamily } from "../constants" + interface FrontendPreviewPlayerProps { assets: AssetItem[] videoRatio: string @@ -555,7 +557,7 @@ const FrontendPreviewPlayer: React.FC = ({ = ({ } export default FrontendPreviewPlayer + -- 2.54.0 From 413760fa1f929a5330c60dd0f71b4703edcd5aee Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 14 Sep 2026 19:28:37 +0800 Subject: [PATCH 05/15] fix(frontend): #1896 apps/web/src/pages/editing-planner/constants/clipProperties.ts --- .../pages/editing-planner/constants/clipProperties.ts | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/apps/web/src/pages/editing-planner/constants/clipProperties.ts b/apps/web/src/pages/editing-planner/constants/clipProperties.ts index fed8b70be..e4d6d9927 100644 --- a/apps/web/src/pages/editing-planner/constants/clipProperties.ts +++ b/apps/web/src/pages/editing-planner/constants/clipProperties.ts @@ -9,15 +9,8 @@ export const POSITION_OPTIONS = [ { value: "bottom", label: "底部" }, ] -export const FONT_OPTIONS = [ - "思源黑体", - "思源宋体", - "苹方", - "PingFang", - "微软雅黑", - "楷体", - "华康俪金黑", -] +// FONT_OPTIONS 统一从 generate/constants 导入，避免多处维护遗漏 +export { FONT_OPTIONS } from "@/pages/generate/constants" export const ANIMATION_OPTIONS = [ { value: "none", label: "无" }, -- 2.54.0 From 89fafbe6e905bf3e549b21e4fa1093122e596bc8 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 14 Sep 2026 19:28:49 +0800 Subject: [PATCH 06/15] fix(frontend): #1896 apps/web/src/pages/editing-planner/constants/subtitleStyle.ts --- .../pages/editing-planner/constants/subtitleStyle.ts | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/apps/web/src/pages/editing-planner/constants/subtitleStyle.ts b/apps/web/src/pages/editing-planner/constants/subtitleStyle.ts index e2392e1f8..203cee81d 100644 --- a/apps/web/src/pages/editing-planner/constants/subtitleStyle.ts +++ b/apps/web/src/pages/editing-planner/constants/subtitleStyle.ts @@ -7,15 +7,8 @@ export const POSITION_OPTIONS = [ { value: "bottom", label: "底部" }, ] -export const FONT_OPTIONS = [ - "思源黑体", - "思源宋体", - "苹方", - "PingFang", - "微软雅黑", - "楷体", - "华康俪金黑", -] +// FONT_OPTIONS 统一从 generate/constants 导入 +export { FONT_OPTIONS } from "@/pages/generate/constants" export const ANIMATION_OPTIONS = [ { value: "none", label: "无" }, @@ -28,3 +21,4 @@ export const ASR_LANGUAGE_OPTIONS = [ { value: "zh", label: "中文" }, { value: "en", label: "English" }, ] + -- 2.54.0 From 0283fb08971237acc5930f5f3daa1297aa94c7ce Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 14 Sep 2026 19:33:13 +0800 Subject: [PATCH 07/15] style: prettier format --- apps/web/src/pages/generate/constants.ts | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/apps/web/src/pages/generate/constants.ts b/apps/web/src/pages/generate/constants.ts index e6e93d383..f229ef740 100644 --- a/apps/web/src/pages/generate/constants.ts +++ b/apps/web/src/pages/generate/constants.ts @@ -50,13 +50,7 @@ export const POSITION_OPTIONS = [ ] /* ── 标题字体选项 ── */ -export const FONT_OPTIONS = [ - "思源黑体", - "思源宋体", - "苹方", - "微软雅黑", - "楷体", -] +export const FONT_OPTIONS = ["思源黑体", "思源宋体", "苹方", "微软雅黑", "楷体"] /* ── 标题字体 CSS font-family 映射（中文显示名 → 浏览器可识别的字体栈） ── */ export const FONT_FAMILY_MAP: Record = { -- 2.54.0 From ff2a780c5f9f75dc570d7c299e2906c6fd34c997 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 14 Sep 2026 19:33:26 +0800 Subject: [PATCH 08/15] style: prettier format --- apps/web/src/index.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/web/src/index.css b/apps/web/src/index.css index 054ded766..6e2d6474b 100644 --- a/apps/web/src/index.css +++ b/apps/web/src/index.css @@ -16,8 +16,7 @@ body, } body { - font-family: - -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; -- 2.54.0 From f3a94d2f9fc8778d6c189955efcd89192313fc52 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 14 Sep 2026 19:33:42 +0800 Subject: [PATCH 09/15] style: prettier format --- apps/web/src/pages/generate/components/FrontendPreviewPlayer.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/web/src/pages/generate/components/FrontendPreviewPlayer.tsx b/apps/web/src/pages/generate/components/FrontendPreviewPlayer.tsx index 8e9f62530..c0ca9a43a 100644 --- a/apps/web/src/pages/generate/components/FrontendPreviewPlayer.tsx +++ b/apps/web/src/pages/generate/components/FrontendPreviewPlayer.tsx @@ -600,4 +600,3 @@ const FrontendPreviewPlayer: React.FC = ({ } export default FrontendPreviewPlayer - -- 2.54.0 From bf954a2f5dab329e3b2d2fe0830409d333ef9ee9 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 14 Sep 2026 19:39:45 +0800 Subject: [PATCH 10/15] style: prettier 3.9 format -- 2.54.0 From 0b29b1f1ff970fd45896d57a7d56ccb1b6437868 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 14 Sep 2026 19:40:09 +0800 Subject: [PATCH 11/15] style: prettier 3.9 format --- apps/web/src/index.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/web/src/index.css b/apps/web/src/index.css index 6e2d6474b..054ded766 100644 --- a/apps/web/src/index.css +++ b/apps/web/src/index.css @@ -16,7 +16,8 @@ body, } body { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", + font-family: + -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; -- 2.54.0 From dd35c2f7b7d422426e834aa21ea555c172e77bea Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 14 Sep 2026 19:40:25 +0800 Subject: [PATCH 12/15] style: prettier 3.9 format -- 2.54.0 From a4f0b28124062173c86d8106ab6005893bde3b51 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 14 Sep 2026 19:40:40 +0800 Subject: [PATCH 13/15] style: prettier 3.9 format -- 2.54.0 From 4d100c3c165f0a4fd714352547ec8f8475ce76ba Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 14 Sep 2026 19:40:55 +0800 Subject: [PATCH 14/15] style: prettier 3.9 format -- 2.54.0 From dde1543d6e2753c9b53638c9a7b69bd53a710bea Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 14 Sep 2026 19:41:12 +0800 Subject: [PATCH 15/15] style: prettier 3.9 format --- apps/web/src/pages/editing-planner/constants/subtitleStyle.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/web/src/pages/editing-planner/constants/subtitleStyle.ts b/apps/web/src/pages/editing-planner/constants/subtitleStyle.ts index 203cee81d..65aca8fcc 100644 --- a/apps/web/src/pages/editing-planner/constants/subtitleStyle.ts +++ b/apps/web/src/pages/editing-planner/constants/subtitleStyle.ts @@ -21,4 +21,3 @@ export const ASR_LANGUAGE_OPTIONS = [ { value: "zh", label: "中文" }, { value: "en", label: "English" }, ] - -- 2.54.0