From 5799abbca3f46cd26196053a7847cb617fc00960 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Fri, 4 Sep 2026 17:02:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E7=89=87=E6=AE=B5?= =?UTF-8?q?=E6=97=B6=E9=95=BF=E6=98=BE=E7=A4=BA=20+=20=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=8A=A0=E5=8F=B7=E7=9B=B4=E6=8E=A5=E6=B7=BB=E5=8A=A0=E7=89=87?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ClipCard: 移除时间线卡片上的 clip.duration 显示 - EditorClipList: 移除右侧片段列表的时长显示 + 删除未使用的 formatDuration - TimelinePanel: 点击加号直接调用 handleConfirmAdd,移除 AddClipPicker 弹窗 - 清理未使用的变量: availableTypes, pickerRef, pickerPos, addType, setAddType, handleTogglePicker --- .../components/EditorClipList.tsx | 7 ------ .../components/TimelinePanel.tsx | 23 +------------------ .../components/timeline/ClipCard.tsx | 13 ++++------- 3 files changed, 6 insertions(+), 37 deletions(-) diff --git a/apps/web/src/pages/editing-planner/components/EditorClipList.tsx b/apps/web/src/pages/editing-planner/components/EditorClipList.tsx index 3440b67db..f2db07ecb 100644 --- a/apps/web/src/pages/editing-planner/components/EditorClipList.tsx +++ b/apps/web/src/pages/editing-planner/components/EditorClipList.tsx @@ -40,12 +40,6 @@ const clipTypeLabel: Record = { pip: "混剪", } -const formatDuration = (sec: number) => { - if (sec < 60) return `${sec.toFixed(1)}s` - const m = Math.floor(sec / 60) - const s = (sec % 60).toFixed(0) - return `${m}m${s.padStart(2, "0")}s` -} const EditorClipList: React.FC = ({ clips, @@ -102,7 +96,6 @@ const EditorClipList: React.FC = ({ {clipTypeLabel[clip.type] || "片段"} - {formatDuration(clip.duration)} {/* 文案预览 */} diff --git a/apps/web/src/pages/editing-planner/components/TimelinePanel.tsx b/apps/web/src/pages/editing-planner/components/TimelinePanel.tsx index 29e439560..15a564a50 100644 --- a/apps/web/src/pages/editing-planner/components/TimelinePanel.tsx +++ b/apps/web/src/pages/editing-planner/components/TimelinePanel.tsx @@ -7,7 +7,6 @@ * - ClipCard - 片段卡片 * - ClipTrack - 片段轨道(播放头+片段列表+添加卡片) * - TimelineHeader - 时间线头部(标题+缩放+操作按钮) - * - AddClipPicker - 添加片段选择器 * - TrimPreview - 裁剪预览 tooltip * - ContextMenu - 右键菜单 * @@ -27,7 +26,6 @@ import { usePlayheadDrag } from "./timeline/hooks/usePlayheadDrag" import { TimeRuler } from "./timeline/TimeRuler" import { ClipTrack } from "./timeline/ClipTrack" import { TimelineHeader } from "./timeline/TimelineHeader" -import { AddClipPicker } from "./timeline/AddClipPicker" import { TrimPreview } from "./timeline/TrimPreview" import { ContextMenu } from "./timeline/ContextMenu" @@ -100,14 +98,7 @@ const TimelinePanel: React.FC = ({ handleContextSplit, handleContextResetTrim, handleContextDelete, - showAddPicker, - pickerRef, addCardRef, - pickerPos, - availableTypes, - addType, - setAddType, - handleTogglePicker, handleConfirmAdd, hoveredClipId, setHoveredClipId, @@ -175,7 +166,7 @@ const TimelinePanel: React.FC = ({ onClipMouseLeave={() => setHoveredClipId(null)} onTrimHandleMouseDown={handleTrimHandleMouseDown} onClipRemove={onClipRemove} - onTogglePicker={handleTogglePicker} + onTogglePicker={handleConfirmAdd} /> )} @@ -202,18 +193,6 @@ const TimelinePanel: React.FC = ({ onDelete={handleContextDelete} /> )} - - {/* 类型+时长选择面板 */} - {showAddPicker && ( - - )} ) } diff --git a/apps/web/src/pages/editing-planner/components/timeline/ClipCard.tsx b/apps/web/src/pages/editing-planner/components/timeline/ClipCard.tsx index a7c402ba7..f4fb38f3b 100644 --- a/apps/web/src/pages/editing-planner/components/timeline/ClipCard.tsx +++ b/apps/web/src/pages/editing-planner/components/timeline/ClipCard.tsx @@ -105,14 +105,11 @@ export const ClipCard: React.FC = ({ {CLIP_TYPE_LABELS[clip.type] || "片段"} {idx + 1} - - {clip.duration}s - {hasTrim && ( - - ✂ - - )} - + {hasTrim && ( + + ✂ + + )} {/* 速度徽章 */} -- 2.54.0