Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.
TypeScript albumsexif-extractiongeocodinglive-photomotion-photophoto-galleryphoto-sharingwebgl-viewer
feat(photo): 新增图片缩放级别显示和操作提示
Timothy Yin91422fb25547
diff --git a/app/components/photo/ProgressiveImage.vue b/app/components/photo/ProgressiveImage.vueindex 888bb66e..4c2053b5 100644--- a/app/components/photo/ProgressiveImage.vue+++ b/app/components/photo/ProgressiveImage.vue@@ -16,8 +16,9 @@ interface Props {loadingIndicatorRef: LoadingIndicatorRef | nullonProgress?: (progress: number) => voidonError?: () => void- onZoomChange?: (isZoomed: boolean) => void+ onZoomChange?: (isZoomed: boolean, level?: number) => voidonBlobSrcChange?: (blobSrc: string | null) => void+ onImageLoaded?: () => voidisLivePhoto?: booleanlivePhotoVideoUrl?: stringisHDR?: boolean@@ -68,6 +69,7 @@ const loadImage = () => {(loaded) => (highResLoaded.value = loaded),(error) => (hasError.value = error),(rendered) => (highResRendered.value = rendered),+ props.onImageLoaded,)}@@ -125,7 +127,7 @@ const handleWebGLStateChange = useWebGLWorkState(props.loadingIndicatorRef)const handleZoomChange = (originalScale: number, relativeScale: number) => {const isZoomed = relativeScale > 1.1 // 认为缩放超过 1.1 倍算作缩放状态if (props.onZoomChange) {- props.onZoomChange(isZoomed)+ props.onZoomChange(isZoomed, Math.round(originalScale * 10) / 10) // 传递绝对倍率并保留一位小数}}@@ -162,7 +164,7 @@ onUnmounted(() => {:limit-to-bounds="true":smooth="true":min-scale="1"- :max-scale="5"+ :max-scale="12":wheel="{ step: 0.2, wheelDisabled: false, touchPadDisabled: false }":pinch="{ step: 0.2 }":double-click="{ mode: 'toggle', step: 2.4, animationTime: 400 }"diff --git a/app/components/photo/Viewer.vue b/app/components/photo/Viewer.vueindex 7ca72b10..03b94b55 100644--- a/app/components/photo/Viewer.vue+++ b/app/components/photo/Viewer.vue@@ -34,6 +34,9 @@ const loadingIndicatorRef = ref<LoadingIndicatorRef>()const isImageZoomed = ref(false)const showExifPanel = ref(false)const currentBlobSrc = ref<string | null>(null)+const zoomLevel = ref(0)+const showZoomLevel = ref(false)+const zoomLevelTimer = ref<NodeJS.Timeout | null>(null)// Computedconst currentPhoto = computed(() => props.photos[props.currentIndex])@@ -47,6 +50,12 @@ watch(isImageZoomed.value = falseshowExifPanel.value = falsecurrentBlobSrc.value = null+ zoomLevel.value = 0+ showZoomLevel.value = false+ if (zoomLevelTimer.value) {+ clearTimeout(zoomLevelTimer.value)+ zoomLevelTimer.value = null+ }// TODO: 实现自定义的 ScrollArea 后移除document.body.style.overflow = ''} else {@@ -75,6 +84,7 @@ watch(}// 切换图片时重置缩放状态isImageZoomed.value = false+ zoomLevel.value = 0},)@@ -111,20 +121,52 @@ const handleSlideChange = (swiper: SwiperType) => {}// Handle image events-const handleZoomChange = (isZoomed: boolean) => {+const handleZoomChange = (isZoomed: boolean, level?: number) => {isImageZoomed.value = isZoomed+ if (level !== undefined) {+ zoomLevel.value = level+ // 缩放变化时显示缩放倍率 2 秒+ showZoomLevel.value = true+ if (zoomLevelTimer.value) {+ clearTimeout(zoomLevelTimer.value)+ }+ zoomLevelTimer.value = setTimeout(() => {+ showZoomLevel.value = false+ zoomLevelTimer.value = null+ }, 2000)+ }}const handleBlobSrcChange = (blobSrc: string | null) => {currentBlobSrc.value = blobSrc}+const handleImageLoaded = () => {+ // 图片加载完成时显示缩放倍率 2 秒+ showZoomLevel.value = true+ if (zoomLevelTimer.value) {+ clearTimeout(zoomLevelTimer.value)+ }+ zoomLevelTimer.value = setTimeout(() => {+ showZoomLevel.value = false+ zoomLevelTimer.value = null+ }, 2000)+}+defineShortcuts({escape: () => {emit('close')},})+// 清理定时器+onUnmounted(() => {+ if (zoomLevelTimer.value) {+ clearTimeout(zoomLevelTimer.value)+ zoomLevelTimer.value = null+ }+})+// Swiper modulesconst swiperModules = [Navigation, Keyboard, Virtual]</script>@@ -285,7 +327,42 @@ const swiperModules = [Navigation, Keyboard, Virtual]:on-blob-src-change="index === currentIndex ? handleBlobSrcChange : undefined"+ :on-image-loaded="+ index === currentIndex ? handleImageLoaded : undefined+ "/>++ <!-- 缩放倍率提示 -->+ <AnimatePresence>+ <motion.div+ v-if="showZoomLevel && zoomLevel > 0"+ :initial="{ opacity: 0, y: 10 }"+ :animate="{ opacity: 1, y: 0 }"+ :exit="{ opacity: 0, y: 10 }"+ :transition="{ duration: 0.2 }"+ class="absolute bottom-4 left-4 z-20 bg-black/40 backdrop-blur-3xl rounded-xl border border-white/10 px-4 py-2 shadow-2xl"+ >+ <span class="text-white font-medium"+ >{{ zoomLevel }}x</span+ >+ </motion.div>+ </AnimatePresence>++ <!-- 操作提示 -->+ <AnimatePresence>+ <motion.div+ v-if="!isImageZoomed"+ :initial="{ opacity: 0, scale: 0.95 }"+ :animate="{ opacity: 0.6, scale: 1 }"+ :exit="{ opacity: 0, scale: 0.95 }"+ :transition="{ duration: 0.2 }"+ class="absolute bottom-6 left-1/2 z-20 -translate-x-1/2 bg-black/50 rounded-lg border border-white/10 px-2 py-1 shadow-2xl text-white text-xs font-bold"+ >+ {{+ isMobile ? '双击或捏合缩放' : '双击或用鼠标滚轮缩放'+ }}+ </motion.div>+ </AnimatePresence></motion.div></SwiperSlide></Swiper>diff --git a/app/composables/useImageLoader.ts b/app/composables/useImageLoader.tsindex e159467a..a625ef44 100644--- a/app/composables/useImageLoader.ts+++ b/app/composables/useImageLoader.ts@@ -12,7 +12,8 @@ export const useImageLoader = (updateBlobSrc?: (blobSrc: string | null) => void,updateHighResLoaded?: (highResLoaded: boolean) => void,updateError?: (error: boolean) => void,- updateHighResImageRendered?: (isRendered: boolean) => void+ updateHighResImageRendered?: (isRendered: boolean) => void,+ onImageLoaded?: () => void) => {if (highResLoaded || !isCurrentImage || error) return null@@ -38,6 +39,7 @@ export const useImageLoader = (updateBlobSrc?.(loadResult.blobSrc)updateHighResLoaded?.(true)+ onImageLoaded?.() // 通知图片加载完成} catch (err) {updateError?.(true)loadingIndicatorRef?.updateLoadingState({