From ab5d682a1572ec19fd57636e2463eec5c69ad17d Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Sun, 19 Jul 2026 07:03:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(P2):=20=E7=94=BB=E4=B8=AD=E7=94=BB?= =?UTF-8?q?=E6=94=B9=E5=90=8D=E4=B8=BA=E6=B7=B7=E5=89=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 编辑器所有'画中画'文案改为'混剪' - '口播+画中画'改为'口播+混剪' - 功能逻辑保持不变，纯文案替换 --- apps/web/src/api/editingPlanner.ts | 6 +++--- .../src/pages/editing-planner/EditingPlanner.css | 2 +- .../src/pages/editing-planner/EditingPlanner.tsx | 10 +++++----- .../components/ClipPropertiesPanel.tsx | 14 +++++++------- .../editing-planner/components/EditorClipList.tsx | 2 +- .../editing-planner/components/PipConfigPanel.tsx | 4 ++-- .../editing-planner/components/PreviewPlayer.tsx | 2 +- .../editing-planner/components/TimelinePanel.tsx | 2 +- apps/web/src/pages/editing-planner/types.ts | 10 +++++----- 9 files changed, 26 insertions(+), 26 deletions(-) mode change 100644 => 100755 apps/web/src/api/editingPlanner.ts mode change 100644 => 100755 apps/web/src/pages/editing-planner/components/ClipPropertiesPanel.tsx mode change 100644 => 100755 apps/web/src/pages/editing-planner/components/PipConfigPanel.tsx mode change 100644 => 100755 apps/web/src/pages/editing-planner/components/PreviewPlayer.tsx diff --git a/apps/web/src/api/editingPlanner.ts b/apps/web/src/api/editingPlanner.ts old mode 100644 new mode 100755 index c80d97e62..da0d9e789 --- a/apps/web/src/api/editingPlanner.ts +++ b/apps/web/src/api/editingPlanner.ts @@ -20,7 +20,7 @@ export type TemplateMode = "pip" | "voice_over" | "one_take" | "voice_pip" /** 模式显示名称映射 */ export const MODE_LABELS: Record = { - pip: "画中画", + pip: "混剪", voice_over: "人物口播", one_take: "一镜到底", voice_pip: "口播+混剪", @@ -85,7 +85,7 @@ export interface EditingTemplate { watermark_config?: WatermarkConfig /** 片头片尾配置（后端就绪后启用） */ intro_outro_config?: IntroOutroConfig - /** 画中画配置 */ + /** 混剪配置 */ pip_config?: PipConfig /** 滤镜调色配置 */ filter_config?: FilterConfig @@ -122,7 +122,7 @@ export interface SaveTemplatePayload { watermark_config?: WatermarkConfig /** 片头片尾配置（后端就绪后启用） */ intro_outro_config?: IntroOutroConfig - /** 画中画配置 */ + /** 混剪配置 */ pip_config?: PipConfig /** 滤镜调色配置 */ filter_config?: FilterConfig diff --git a/apps/web/src/pages/editing-planner/EditingPlanner.css b/apps/web/src/pages/editing-planner/EditingPlanner.css index 9efaaf4c9..ad358b927 100755 --- a/apps/web/src/pages/editing-planner/EditingPlanner.css +++ b/apps/web/src/pages/editing-planner/EditingPlanner.css @@ -4257,7 +4257,7 @@ } /* ═══════════════════════════════════════════════ - 画中画配置面板 (PiP Configuration Panel) + 混剪配置面板 (PiP Configuration Panel) ═══════════════════════════════════════════════ */ .pip-config-panel-drawer .ant-drawer-body { diff --git a/apps/web/src/pages/editing-planner/EditingPlanner.tsx b/apps/web/src/pages/editing-planner/EditingPlanner.tsx index 15a5f4968..ca96d6d22 100755 --- a/apps/web/src/pages/editing-planner/EditingPlanner.tsx +++ b/apps/web/src/pages/editing-planner/EditingPlanner.tsx @@ -105,10 +105,10 @@ import "./EditingPlanner.css" /* ──────────── 常量 ──────────── */ const MODE_LIST: { key: TemplateMode; label: string; icon: string }[] = [ - { key: "pip", label: "画中画", icon: "🖼️" }, + { key: "pip", label: "混剪", icon: "🖼️" }, { key: "voice_over", label: "人物口播", icon: "🎙️" }, { key: "one_take", label: "一镜到底", icon: "🎥" }, - { key: "voice_pip", label: "口播+画中画", icon: "🎭" }, + { key: "voice_pip", label: "口播+混剪", icon: "🎭" }, ] const COVER_SCHEMES = [ @@ -203,7 +203,7 @@ const EditingPlanner: React.FC = () => { const [watermarkDrawerOpen, setWatermarkDrawerOpen] = useState(false) const [introOutroDrawerOpen, setIntroOutroDrawerOpen] = useState(false) - /* ── 画中画 ── */ + /* ── 混剪 ── */ const [pipSettings, setPipSettings] = useState({ ...DEFAULT_PIP_CONFIG, }) @@ -774,7 +774,7 @@ const EditingPlanner: React.FC = () => { setIntroOutroSettings(config) }, []) - /* ── 画中画配置变更 ── */ + /* ── 混剪配置变更 ── */ const handlePipChange = useCallback((config: PipConfig) => { setPipSettings(config) }, []) @@ -1723,7 +1723,7 @@ const EditingPlanner: React.FC = () => { onChange={handleIntroOutroChange} /> - {/* ═══ 画中画配置面板 ═══ */} + {/* ═══ 混剪配置面板 ═══ */} setPipDrawerOpen(false)} diff --git a/apps/web/src/pages/editing-planner/components/ClipPropertiesPanel.tsx b/apps/web/src/pages/editing-planner/components/ClipPropertiesPanel.tsx old mode 100644 new mode 100755 index ed1286729..e8f5c8f34 --- a/apps/web/src/pages/editing-planner/components/ClipPropertiesPanel.tsx +++ b/apps/web/src/pages/editing-planner/components/ClipPropertiesPanel.tsx @@ -65,7 +65,7 @@ interface ClipPropertiesPanelProps { onOpenWatermarkDrawer?: () => void /** 打开片头片尾设置面板 Drawer */ onOpenIntroOutroDrawer?: () => void - /** 打开画中画设置面板 Drawer */ + /** 打开混剪设置面板 Drawer */ onOpenPipDrawer?: () => void /** 打开滤镜调色面板 Drawer */ onOpenFilterDrawer?: () => void @@ -264,7 +264,7 @@ function getActivePreset(settings: TitleSettings): string | null { const CLIP_TYPE_ICONS: Record = { voice: "🎙️", pip: "🖼️" } const CLIP_TYPE_LABELS: Record = { voice: "口播", - pip: "画中画", + pip: "混剪", } const ClipPropertiesPanel: React.FC = ({ @@ -622,16 +622,16 @@ const ClipPropertiesPanel: React.FC = ({ )} - {/* ═══ 画中画 ═══ */} + {/* ═══ 混剪 ═══ */}
🖼️ - 画中画 + 混剪
{onOpenPipDrawer && ( )} @@ -941,12 +941,12 @@ const ClipPropertiesPanel: React.FC = ({
当前模式
{currentMode === "pip" - ? "画中画" + ? "混剪" : currentMode === "voice_over" ? "人物口播" : currentMode === "one_take" ? "一镜到底" - : "口播+画中画"} + : "口播+混剪"}
diff --git a/apps/web/src/pages/editing-planner/components/EditorClipList.tsx b/apps/web/src/pages/editing-planner/components/EditorClipList.tsx index 751c21a44..3440b67db 100755 --- a/apps/web/src/pages/editing-planner/components/EditorClipList.tsx +++ b/apps/web/src/pages/editing-planner/components/EditorClipList.tsx @@ -37,7 +37,7 @@ const clipTypeLabel: Record = { video: "视频", image: "图片", voice: "配音", - pip: "画中画", + pip: "混剪", } const formatDuration = (sec: number) => { diff --git a/apps/web/src/pages/editing-planner/components/PipConfigPanel.tsx b/apps/web/src/pages/editing-planner/components/PipConfigPanel.tsx old mode 100644 new mode 100755 index 8781e4e6c..51b24252b --- a/apps/web/src/pages/editing-planner/components/PipConfigPanel.tsx +++ b/apps/web/src/pages/editing-planner/components/PipConfigPanel.tsx @@ -1,5 +1,5 @@ /** - * 画中画配置面板 — Drawer 形式 + * 混剪配置面板 — Drawer 形式 * 左侧图层列表 + 右侧单图层配置 + 迷你预览区 */ import React, { useCallback, useMemo } from "react" @@ -187,7 +187,7 @@ const PipConfigPanel: React.FC = ({ return ( = { const CLIP_TYPE_LABELS: Record = { voice: "口播", - pip: "画中画", + pip: "混剪", } const PreviewPlayer: React.FC = ({ diff --git a/apps/web/src/pages/editing-planner/components/TimelinePanel.tsx b/apps/web/src/pages/editing-planner/components/TimelinePanel.tsx index 18162ce65..d561ecb52 100755 --- a/apps/web/src/pages/editing-planner/components/TimelinePanel.tsx +++ b/apps/web/src/pages/editing-planner/components/TimelinePanel.tsx @@ -47,7 +47,7 @@ const CLIP_TYPE_ICONS: Record = { /** 片段类型标签 */ const CLIP_TYPE_LABELS: Record = { voice: "口播", - pip: "画中画", + pip: "混剪", } /** 裁剪拖拽方向 */ diff --git a/apps/web/src/pages/editing-planner/types.ts b/apps/web/src/pages/editing-planner/types.ts index 645369f5a..4be6060a2 100755 --- a/apps/web/src/pages/editing-planner/types.ts +++ b/apps/web/src/pages/editing-planner/types.ts @@ -176,7 +176,7 @@ export const DEFAULT_INTRO_OUTRO: IntroOutroConfig = { outro: { kind: "none", duration: 3 }, } -/* ──────── 画中画配置 ──────── */ +/* ──────── 混剪配置 ──────── */ /** 九宫格位置 */ export type PipGridPosition = @@ -196,7 +196,7 @@ export type PipAnimType = "none" | "fade_in" | "slide_in" /** 入场方向 */ export type PipSlideDirection = "left" | "right" | "up" | "down" -/** 画中画图层 */ +/** 混剪图层 */ export interface PipLayer { id: string /** 图层名称（用户可编辑） */ @@ -235,9 +235,9 @@ export interface PipLayer { z_index: number } -/** 画中画配置 */ +/** 混剪配置 */ export interface PipConfig { - /** 是否启用画中画 */ + /** 是否启用混剪 */ enabled: boolean /** 图层列表 */ layers: PipLayer[] @@ -507,7 +507,7 @@ export const DEFAULT_COVER_CONFIG: CoverConfig = { export interface ClipData { id: string - type: ClipType // 片段类型：voice（口播）或 pip（画中画） + type: ClipType // 片段类型：voice（口播）或 pip（混剪） duration: number // 时长（秒） startOffset: number // 仅 voice 类型：在口播素材中的起始时间（秒） /** 素材库素材 ID（main/pip 类型片段使用） */ -- 2.54.0