From bf69419c681477996034f1c909bb063a5239d5a7 Mon Sep 17 00:00:00 2001 From: jinghui Date: Fri, 20 Nov 2026 21:17:16 +0800 Subject: [PATCH] v1.4.15: fix getOriginalUrl/getThumbnailUrl URL encoding for paths with Chinese/spaces/#/? --- CHANGELOG.md | 4 +++- backend/utils/hub.js | 2 +- docker-compose.yml | 2 +- frontend/src/api/endpoints/image.js | 7 +++++-- frontend/src/components/Header.jsx | 2 +- frontend/src/components/SettingsModal.jsx | 2 +- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40a5971..b23d3b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,9 @@ - 🔧 **新增「学习资料」目录挂载**:docker-compose.yml 与 README(compose / docker run 两种方式)补挂载 `/vol2/1000/HD2/学习资料`(同上修复「素材库路径不存在」,端到端建库验证通过) - 🔧 **挂载方式升级为整盘**:`/vol2/1000/HD2` 下 5 个逐目录挂载合并为一行整盘挂载 `- /vol2/1000/HD2:/vol2/1000/HD2` —— 该盘下任意子目录(含以后在飞牛上新建的文件夹)可直接在页面添加为素材库,不再需要改配置重启;README compose / docker run 示例同步简化 -## 2026-11-19 → v1.4.13 +## 2026-11-20 → v1.4.15 + +- 🐛 **修复「部分目录图片双击不弹出灯箱」**:`getOriginalUrl`/`getThumbnailUrl` 未对含中文/空格/#/? 的路径做 URL 编码,原图请求 404 → 灯箱图片加载失败 → 用户感知「双击不弹」。按 `/` 分段 `encodeURIComponent` 修复,灯箱/新窗口打开/导出/编辑 全链路受益 - ✨ **灯箱底部新增缩略图条**:双击图片放大后,底部列出当前文件夹(含筛选结果)的全部图片缩略图,点任意一张直接跳转查看,不用一张张翻 - 缩略图条显示「当前序号 / 总数」,当前图紫色高亮并自动滚动居中;切图时(含左右方向键/箭头按钮)缩略图条同步跟随 diff --git a/backend/utils/hub.js b/backend/utils/hub.js index 4234359..9b6f661 100644 --- a/backend/utils/hub.js +++ b/backend/utils/hub.js @@ -16,7 +16,7 @@ const { getSettings } = require('./settings'); const HUB_URL = (process.env.HUB_URL || 'https://auth.88531.cn/api').replace(/\/+$/, ''); const HUB_PROJECT_ID = process.env.HUB_PROJECT_ID || ''; const HUB_API_KEY = process.env.HUB_API_KEY || ''; -const SITE_VERSION = process.env.SITE_VERSION || '1.4.14'; +const SITE_VERSION = process.env.SITE_VERSION || '1.4.15'; const TIMEOUT_MS = 8000; const state = { diff --git a/docker-compose.yml b/docker-compose.yml index 224d017..6a50ed1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: - HUB_API_KEY=${HUB_API_KEY:-} - NEWAPI_KEY=${NEWAPI_KEY:-} # 当前站点版本(与 frontend/package.json、CHANGELOG 保持一致,界面版本徽标来源) - - SITE_VERSION=1.4.14 + - SITE_VERSION=1.4.15 # 让容器经 host.docker.internal 访问宿主机的 AI 侧车 extra_hosts: - "host.docker.internal:host-gateway" diff --git a/frontend/src/api/endpoints/image.js b/frontend/src/api/endpoints/image.js index 25a666e..f0ad928 100644 --- a/frontend/src/api/endpoints/image.js +++ b/frontend/src/api/endpoints/image.js @@ -50,7 +50,8 @@ export async function getCacheMeta(libraryId) { * 使用分片结构,不再需要 size 参数 */ export function getThumbnailUrl(libraryId, filename, version) { - const base = `/api/image/thumbnail/${libraryId}/${filename}`; + const encoded = encodeURIComponent(filename); + const base = `/api/image/thumbnail/${libraryId}/${encoded}`; // version=文件 modified_at,编辑保存后变化以穿透浏览器缓存 return version ? `${base}?v=${version}` : base; } @@ -59,7 +60,9 @@ export function getThumbnailUrl(libraryId, filename, version) { * 获取原图 URL */ export function getOriginalUrl(libraryId, path) { - return `/api/image/original/${libraryId}/${path}`; + // 按 '/' 分段编码,避免中文/空格/#/? 等字符导致原图 URL 404(灯箱/新窗口打开失败) + const encoded = String(path).split('/').map(encodeURIComponent).join('/'); + return `/api/image/original/${libraryId}/${encoded}`; } /** diff --git a/frontend/src/components/Header.jsx b/frontend/src/components/Header.jsx index 5951b6b..80d1ccb 100644 --- a/frontend/src/components/Header.jsx +++ b/frontend/src/components/Header.jsx @@ -40,7 +40,7 @@ const [showAIVideo, setShowAIVideo] = useState(false); // 授权系统 hub:版本 / 公告 / 在线人数 const hub = useHub(); const announcements = hub.announcements || []; - const appVersion = hub.version ? `v${String(hub.version).replace(/^v/, '')}` : 'v1.4.14'; + const appVersion = hub.version ? `v${String(hub.version).replace(/^v/, '')}` : 'v1.4.15'; // 从全局 store 获取筛选状态 const selectedFormats = filters.formats || []; diff --git a/frontend/src/components/SettingsModal.jsx b/frontend/src/components/SettingsModal.jsx index 59c6782..855c2c4 100644 --- a/frontend/src/components/SettingsModal.jsx +++ b/frontend/src/components/SettingsModal.jsx @@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'; import { X, ScanText, Info, Save, FlaskConical, Github, ExternalLink, Wand2, Film } from 'lucide-react'; import { settingsAPI, aigenAPI } from '../api'; -const APP_VERSION = 'v1.4.14'; +const APP_VERSION = 'v1.4.15'; const REPO_URL = 'https://gitea.88531.cn/jinghui/flypic'; /**