2 Commits
Author SHA1 Message Date
jinghui 7d0023949b feat(v1.4.5): 侧栏文件夹按日期倒序,最新文件夹排最前
- FolderModel.getTree() 按文件夹名解析日期倒序排序(兼容 YYYY-MM-DD 与
  YYYYMMDD 混排;纯字符串倒序会把 20261016 压过 2026-11-18,_归档 排最前)
- 解析不出日期的文件夹(_归档、纯数字名)排最后,组内名称倒序
- 子文件夹同样倒序;侧栏与 Dashboard 共用接口同步生效
- 版本 1.4.4 -> 1.4.5
2026-11-18 19:33:29 +08:00
jinghui 9c7c72e3e7 fix: 视频文件右侧面板显示图片信息 — RightPanel 增加视频判定(v1.4.4) 2026-11-18 18:56:30 +08:00
10 changed files with 124 additions and 34 deletions

No files matched your search

+19
View File
@@ -1,5 +1,24 @@
# 更新日志
## 2026-11-18 → v1.4.5
**优化:侧栏文件夹按日期倒序,最新的文件夹排最前**——原先侧栏/仪表盘文件夹顺序来自后端 `SELECT ... ORDER BY path`(名称字典序升序),最旧的文件夹排最前,最新日期沉底。现改为在 `FolderModel.getTree()` 按文件夹名解析出的真实日期倒序排序:
- 兼容两种命名格式混排:`YYYY-MM-DD` 与 `YYYYMMDD`(原纯字符串倒序会把 `20261016` 压过 `2026-11-18`,日期顺序错乱;`_归档` 还会因首字符 `_` 排到最前)
- 无法解析为日期的文件夹(如 `_归档`、`1217`)排在所有日期文件夹之后,组内按名称倒序
- 子文件夹同样按日期倒序
- 侧栏与仪表盘(Dashboard)共用同一接口数据,同步生效
## 2026-11-18 → v1.4.4
**修复:选中视频文件,右侧详情面板仍显示图片信息**——根因是 `RightPanel.jsx` 全组件没有任何视频判定(`fileType === 'video'`),预览区把视频当图片渲染缩略图、底部按钮硬编码「编辑图片 / 复制图片 / 导出图片」,点「编辑图片」还会把视频塞进图片编辑器。修复:
- **预览区**:视频改为直接播放原文件(`<video controls>`,缩略图作 poster),不再以图片形式展示
- **按钮按类型分流**:单选视频显示「编辑视频 / 复制视频 / 导出视频」——「编辑视频」打开视频编辑弹窗(水印/字幕声音),「复制视频」只写应用内剪贴板(视频无法转成图片写系统剪贴板,原先会走失败兜底弹 alert)
- **新增时长字段**:视频详情显示「时长: m:ss」(取 `duration` 字段,与瀑布流角标同格式)
- **多选文案**:选中集合含视频时,「已选择 N 张图片 / 数量 N 张图片 / 复制图片 / 导出图片」等改为「个文件 / 复制文件 / 导出文件」,计数单位「张」→「个」
- **弹窗状态提升**:视频编辑弹窗状态从 `ImageWaterfall` 局部 state 提升到 `useUIStore`,弹窗渲染移到 App 层——原先只挂在 `ImageWaterfall` 内,而该组件在 Dashboard 视图下不渲染,某些页面点编辑视频弹窗不会出现;右侧面板与右键菜单现共用同一入口,不再重复挂载
## 2026-11-18 → v1.4.3
**优化**:侧栏首项文案「全部图片」改为「全部」(`Sidebar.jsx`)。
+19
View File
@@ -28,9 +28,28 @@ class FolderModel extends BaseModel {
*/
getTree() {
const folders = this.findAll();
// 最新文件夹排最前:按文件夹名解析出的日期倒序(兼容 YYYY-MM-DD 与 YYYYMMDD 两种命名),
// 无法解析为日期的(如 _归档、纯数字名)排在日期文件夹之后
folders.sort((a, b) => {
const diff = this._dateKey(b.name) - this._dateKey(a.name);
if (diff !== 0) return diff;
return String(b.name).localeCompare(String(a.name));
});
return this._buildTree(folders);
}
/**
* 将文件夹名解析为日期键(YYYYMMDD 整数),解析不出返回 0
*/
_dateKey(name) {
const m = String(name || '').match(/(\d{4})-?(\d{2})-?(\d{2})/);
if (!m) return 0;
const month = Number(m[2]);
const day = Number(m[3]);
if (month < 1 || month > 12 || day < 1 || day > 31) return 0;
return Number(m[1] + m[2] + m[3]);
}
/**
* 插入文件夹
*/
+1 -1
View File
@@ -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.3';
const SITE_VERSION = process.env.SITE_VERSION || '1.4.5';
const TIMEOUT_MS = 8000;
const state = {
+1 -1
View File
@@ -28,7 +28,7 @@ services:
- HUB_API_KEY=${HUB_API_KEY:-}
- NEWAPI_KEY=${NEWAPI_KEY:-}
# 当前站点版本(与 frontend/package.json、CHANGELOG 保持一致,界面版本徽标来源)
- SITE_VERSION=1.4.3
- SITE_VERSION=1.4.5
# 让容器经 host.docker.internal 访问宿主机的 AI 侧车
extra_hosts:
- "host.docker.internal:host-gateway"
+25 -5
View File
@@ -14,6 +14,7 @@ import Header from './components/Header';
import LibraryMissingModal from './components/LibraryMissingModal';
import BackToTop from './components/BackToTop';
import ImageEditor from './components/ImageEditor';
import VideoEditModal from './components/VideoEditModal';
import { createLogger } from './utils/logger';
const logger = createLogger('App');
@@ -22,13 +23,14 @@ function App() {
// 使用统一的主题管理 Hook
useTheme();
const { mobileView, setMobileView } = useUIStore();
const {
setLibraries,
setCurrentLibrary,
const { mobileView, setMobileView, videoEditFile, setVideoEditFile } = useUIStore();
const {
setLibraries,
setCurrentLibrary,
removeLibrary,
setShowAddLibraryForm,
triggerExpandLibrarySelector
triggerExpandLibrarySelector,
currentLibraryId
} = useLibraryStore();
const { selectedImage } = useImageStore();
const { setScanProgress } = useScanStore();
@@ -515,6 +517,15 @@ function App() {
onCreateNew={handleCreateNewLibrary}
/>
<ImageEditor />
{/* 视频编辑弹窗(store 全局状态,右侧面板/瀑布流均可触发) */}
{videoEditFile && (
<VideoEditModal
file={videoEditFile}
libraryId={currentLibraryId}
onClose={() => setVideoEditFile(null)}
onDone={() => { setVideoEditFile(null); window.location.reload(); }}
/>
)}
<div className="flex-1 overflow-hidden relative">
{/* 侧边栏视图 */}
<div className={`absolute inset-0 transition-transform duration-300 ${mobileView === 'sidebar' ? 'translate-x-0' : '-translate-x-full'
@@ -590,6 +601,15 @@ function App() {
onCreateNew={handleCreateNewLibrary}
/>
<ImageEditor />
{/* 视频编辑弹窗(store 全局状态,右侧面板/瀑布流均可触发) */}
{videoEditFile && (
<VideoEditModal
file={videoEditFile}
libraryId={currentLibraryId}
onClose={() => setVideoEditFile(null)}
onDone={() => { setVideoEditFile(null); window.location.reload(); }}
/>
)}
<div ref={containerRef} className="flex flex-1 overflow-hidden">
{/* 左侧边栏 */}
<div id="left-panel" style={{ width: `${leftWidth}px` }} className="flex-shrink-0 h-full bg-white dark:bg-gray-800">
+1 -1
View File
@@ -38,7 +38,7 @@ function Header() {
// 授权系统 hub:版本 / 公告 / 在线人数
const hub = useHub();
const announcements = hub.announcements || [];
const appVersion = hub.version ? `v${String(hub.version).replace(/^v/, '')}` : 'v1.4.3';
const appVersion = hub.version ? `v${String(hub.version).replace(/^v/, '')}` : 'v1.4.5';
// 从全局 store 获取筛选状态
const selectedFormats = filters.formats || [];
+1 -13
View File
@@ -40,7 +40,6 @@ import UndoToast from './UndoToast';
import RatingToast from './RatingToast';
import FolderSelector from './FolderSelector';
import ConflictDialog from './ConflictDialog';
import VideoEditModal from './VideoEditModal';
import AIVideoModal from './AIVideoModal';
// 虚拟滚动阈值
@@ -58,13 +57,12 @@ function ImageWaterfall() {
toggleImageSelection, clearSelection, imageLoadingState, selectedFolder,
searchKeywords, filters, folders, setSelectedFolderItem, updateImage
} = useImageStore();
const { setEditingImage, setMergeImages } = useUIStore();
const { setEditingImage, setMergeImages, setVideoEditFile } = useUIStore();
// 状态
const [photoIndex, setPhotoIndex] = useState(-1);
const [lastSelectedIndex, setLastSelectedIndex] = useState(null);
const [viewerFile, setViewerFile] = useState(null);
const [videoEditFile, setVideoEditFile] = useState(null); // 视频编辑弹窗
const [aiVideoOpen, setAiVideoOpen] = useState(false); // AI 生成视频弹窗
const [contextMenu, setContextMenu] = useState({ isOpen: false, position: null, image: null });
// 统一图片移动/删除撤销顺序的栈:按操作时间顺序记录 'move' | 'delete'
@@ -667,16 +665,6 @@ onToggleFavorite={handleToggleFavorite}
/>
)}
{/* 视频编辑弹窗 */}
{videoEditFile && (
<VideoEditModal
file={videoEditFile}
libraryId={currentLibraryId}
onClose={() => setVideoEditFile(null)}
onDone={() => { setVideoEditFile(null); window.location.reload(); }}
/>
)}
{/* AI 生成视频弹窗 */}
{aiVideoOpen && (
<AIVideoModal
+52 -12
View File
@@ -15,7 +15,7 @@ const logger = createLogger('RightPanel');
function RightPanel() {
const { currentLibraryId } = useLibraryStore();
const { selectedImage, selectedImages, selectedFolder, selectedFolderItem, images, setSelectedImage, setSelectedImages, updateImage } = useImageStore();
const { setMobileView, isResizingPanels, resizingSide, setEditingImage } = useUIStore();
const { setMobileView, isResizingPanels, resizingSide, setEditingImage, setVideoEditFile } = useUIStore();
const { copyToClipboard } = useClipboardStore();
const [isMobile, setIsMobile] = useState(false);
const [imageUrl, setImageUrl] = useState(''); // 当前显示的图片URL
@@ -50,6 +50,8 @@ function RightPanel() {
// 判断是单选还是多选
const isMultiSelect = actualSelectedCount > 1;
const displayImage = selectedImages.length > 0 ? selectedImages[0] : selectedImage;
// 视频文件判定:右侧面板按文件类型展示,视频不再套用图片文案/操作
const singleIsVideo = !isMultiSelect && (displayImage?.fileType === 'video');
const { getCurrentLibrary } = useLibraryStore();
const currentLibrary = getCurrentLibrary();
@@ -597,7 +599,14 @@ function RightPanel() {
// 2. 获取原图URL,写入系统剪贴板
const imageUrl = imageAPI.getOriginalUrl(currentLibraryId, selectedImage.path);
// 视频无法转换为图片写入系统剪贴板,仅保留应用内复制(供粘贴移动)
if (selectedImage?.fileType === 'video') {
setImageCopied(true);
setTimeout(() => setImageCopied(false), 2000);
return;
}
// 方案1:尝试现代 Clipboard API(需要 HTTPS)
if (isClipboardApiSupported()) {
try {
@@ -770,6 +779,9 @@ function RightPanel() {
return selectedImage ? [selectedImage] : [];
};
// 选中集合是否含视频(决定多选计数单位文案:视频用「个」,图片用「张」)
const selectionHasVideo = getImagesToProcess().some(img => img?.fileType === 'video');
// 批量复制图片
const copyMultipleImages = async () => {
try {
@@ -1312,7 +1324,16 @@ function RightPanel() {
}}
title="双击查看原文件"
>
{imageUrl ? (
{singleIsVideo ? (
// 视频:直接播放原文件(不再以图片缩略图形式展示)
<video
src={getOriginalUrl()}
poster={imageUrl || undefined}
controls
preload="metadata"
className="w-full h-full object-contain bg-black"
/>
) : imageUrl ? (
<img
src={imageUrl}
alt={displayImage.filename}
@@ -1346,7 +1367,7 @@ function RightPanel() {
<div className="flex-1 overflow-y-auto p-4 space-y-4 min-h-0">
<div>
<h3 className="text-xs font-semibold text-gray-700 dark:text-gray-300 mb-2">
{isMultiSelect ? `已选择 ${actualSelectedCount} 张图片` : '基本信息'}
{isMultiSelect ? `已选择 ${actualSelectedCount} ${selectionHasVideo ? '个文件' : '张图片'}` : '基本信息'}
</h3>
<div className="space-y-2 text-xs">
{isMultiSelect ? (
@@ -1359,7 +1380,7 @@ function RightPanel() {
<>
<div>
<span className="text-gray-500 dark:text-gray-400">数量:</span>
<p className="text-gray-900 dark:text-gray-100 text-xs">{stats.count} 张图片</p>
<p className="text-gray-900 dark:text-gray-100 text-xs">{stats.count} {selectionHasVideo ? '个文件' : '张图片'}</p>
</div>
<div>
<span className="text-gray-500 dark:text-gray-400">评分:</span>
@@ -1492,6 +1513,14 @@ function RightPanel() {
<span className="text-gray-500 dark:text-gray-400">尺寸:</span>
<p className="text-gray-900 dark:text-gray-100 text-xs">{selectedImage.width} × {selectedImage.height}</p>
</div>
{singleIsVideo && selectedImage.duration > 0 && (
<div>
<span className="text-gray-500 dark:text-gray-400">时长:</span>
<p className="text-gray-900 dark:text-gray-100 text-xs font-mono tabular-nums">
{Math.floor(selectedImage.duration / 60)}:{String(Math.floor(selectedImage.duration % 60)).padStart(2, '0')}
</p>
</div>
)}
<div>
<span className="text-gray-500 dark:text-gray-400">文件大小:</span>
<p className="text-gray-900 dark:text-gray-100 text-xs">{formatFileSize(selectedImage.size)}</p>
@@ -1552,7 +1581,7 @@ function RightPanel() {
</div>
{isMultiSelect && (
<p className="text-xs text-gray-400 dark:text-gray-500 mt-1">
已选择 {actualSelectedCount} 张图片的共同父路径
已选择 {actualSelectedCount} {selectionHasVideo ? '个文件' : '张图片'}的共同父路径
</p>
)}
</div>
@@ -1563,16 +1592,23 @@ function RightPanel() {
{/* Actions - 仅桌面端显示 */}
{!isMobile && (
<div className="p-4 border-t border-gray-200 dark:border-gray-700 space-y-2 flex-shrink-0">
{/* 编辑图片(单选时) */}
{/* 编辑图片/视频(单选时) */}
{!isMultiSelect && selectedImage && (
<button
onClick={() => setEditingImage(selectedImage)}
onClick={() => {
if (singleIsVideo) {
// 视频 → 视频编辑弹窗(水印/字幕声音)
setVideoEditFile(selectedImage);
} else {
setEditingImage(selectedImage);
}
}}
className="w-full flex items-center justify-center gap-2 px-4 py-2 rounded-lg bg-blue-600 text-white hover:bg-blue-700 transition-colors"
>
<svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
</svg>
编辑图片
{singleIsVideo ? '编辑视频' : '编辑图片'}
</button>
)}
{/* 复制按钮 */}
@@ -1587,12 +1623,16 @@ function RightPanel() {
{imageCopied ? (
<>
<Check className="w-4 h-4" />
<span>已复制{isMultiSelect ? ` ${actualSelectedCount} 张` : ''}</span>
<span>已复制{isMultiSelect ? ` ${actualSelectedCount} ${selectionHasVideo ? '个' : '张'}` : ''}</span>
</>
) : (
<>
<Copy className="w-4 h-4" />
<span>复制图片{isMultiSelect ? ` (${actualSelectedCount})` : ''}</span>
<span>
{singleIsVideo
? '复制视频'
: `${selectionHasVideo ? '复制文件' : '复制图片'}${isMultiSelect ? ` (${actualSelectedCount})` : ''}`}
</span>
</>
)}
</button>
@@ -1608,7 +1648,7 @@ function RightPanel() {
<span>
{isExporting
? `打包中... ${exportProgress}%`
: `导出图片${isMultiSelect ? ` (${actualSelectedCount})` : ''}`
: `${singleIsVideo ? '导出视频' : selectionHasVideo ? '导出文件' : '导出图片'}${isMultiSelect ? ` (${actualSelectedCount})` : ''}`
}
</span>
</div>
+1 -1
View File
@@ -2,7 +2,7 @@ import { useState, useEffect } from 'react';
import { X, ScanText, Info, Save, FlaskConical, Github, ExternalLink, Wand2 } from 'lucide-react';
import { settingsAPI } from '../api';
const APP_VERSION = 'v1.4.3';
const APP_VERSION = 'v1.4.5';
const REPO_URL = 'https://gitea.88531.cn/jinghui/flypic';
/**
+4
View File
@@ -22,6 +22,10 @@ export const useUIStore = create((set) => ({
editingImage: null,
setEditingImage: (image) => set({ editingImage: image }),
// 视频编辑弹窗(打开的视频记录,null=关闭;右侧面板与瀑布流共用)
videoEditFile: null,
setVideoEditFile: (file) => set({ videoEditFile: file }),
// 合拼种子图(多选后点「合拼」带入编辑器,null=无)
mergeImages: null,
setMergeImages: (images) => set({ mergeImages: images }),