xueteng/video-flow-b
1
0
Fork 0
forked from 77media/video-flow
Code Pull Requests Activity

修复视频被遮挡

Browse Source
This commit is contained in:
北枳 2025-07-04 16:22:17 +08:00
parent 04de8dd6d1
commit baca9081dd
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compile.sh
View File

@ -24,9 +24,20 @@ if [ -n "$(git status --porcelain)" ]; then
exit 1
fi
# 获取最新的远程分支信息
echo "正在获取最新的远程分支信息..." | tee -a $LOGFILE
git fetch origin
# 检查远程分支是否和本地分支一致
if [ "$(git rev-parse HEAD)" != "$(git rev-parse origin/dev)" ]; then
echo "本地分支和远程分支不一致"
local_commit=$(git rev-parse HEAD)
remote_commit=$(git rev-parse origin/dev)
if [ "$local_commit" != "$remote_commit" ]; then
echo "本地分支和远程分支不一致" | tee -a $LOGFILE
echo "本地分支: $local_commit" | tee -a $LOGFILE
echo "远程分支: $remote_commit" | tee -a $LOGFILE
echo "请运行以下命令之一来解决:" | tee -a $LOGFILE
echo " git pull origin dev # 如果远程有新提交" | tee -a $LOGFILE
echo " git push origin dev # 如果本地有新提交" | tee -a $LOGFILE
exit 1
fi

2
components/pages/work-flow.tsx
View File

@ -230,7 +230,7 @@ export default function WorkFlow() {
</div>
)}
</div>
<div className="imageGrid-ymZV9z hide-scrollbar">
<div className="imageGrid-ymZV9z hide-scrollbar" style={{ display: currentStep === '6' ? 'none' : 'block' }}>
<ErrorBoundary>
<ThumbnailGrid
isLoading={isLoading}

4
components/pages/work-flow/media-viewer.tsx
View File

@ -300,7 +300,7 @@ export function MediaViewer({
clipPath: { duration: 1.2, ease: [0.43, 0.13, 0.23, 0.96] },
filter: { duration: 0.6, delay: 0.3 }
}}
className="relative z-10"
className="relative z-10 w-full h-full"
>
<video
ref={finalVideoRef}
@ -490,7 +490,7 @@ export function MediaViewer({
initial={{ clipPath: "inset(0 100% 0 0)" }}
animate={{ clipPath: "inset(0 0% 0 0)" }}
transition={{ duration: 0.8, ease: [0.43, 0.13, 0.23, 0.96] }}
className="relative z-10"
className="relative z-10 w-full h-full"
>
<video
ref={mainVideoRef}