Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7d0023949b | ||
|
|
9c7c72e3e7 | ||
|
|
e17b78cd19 | ||
|
|
f07cf7a266 | ||
|
|
0bbf14f194 | ||
|
|
87cc9c00a5 | ||
|
|
1775ababf6 | ||
|
|
03fb69f892 | ||
|
|
a365c4ce42 |
No files matched your search
@@ -1,5 +1,40 @@
|
||||
# 更新日志
|
||||
|
||||
## 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`)。
|
||||
|
||||
**修复:视频编辑/AI 生成视频点「开始处理」报 `[object Object]`、功能完全不可用**——根因是两处裸 `fetch` 调用没带登录态:`VideoEditModal.jsx`(`/api/video/edit`)与 `AIVideoModal.jsx`(`/api/video/aigenerate`、`/api/video/task/:id`)均未附 `Authorization` 头,而后端 `/api` 全组走认证中间件,一律 401 拒绝;前端又把 `{code, message}` 错误对象直接 `new Error()`,对象转字符串就成了 `[object Object]`。修复:三处请求补 `Authorization: `Bearer ${getToken()}`(与图片编辑器等既有调用一致),错误信息统一经 `errText()` 解析(对象取 `message`,再兜底状态码),不再出现 `[object Object]`。另修复 `MergeCollage.jsx` 拼图找相似接口同样的缺 token 问题(历史遗留)。
|
||||
|
||||
## 2026-11-18 → v1.4.2
|
||||
|
||||
**修复:添加素材库报 `Path does not exist`(视频目录)**——根因是该目录未挂载进容器(容器里看不到宿主机目录)。`docker-compose.yml` 已补挂载 `/vol2/1000/HD2/发布到平台的图片和视频`,README 使用注意新增排查方法(volumes 加一行同路径挂载后 `docker compose up -d`)。后端报错同步中文化:`素材库路径不存在: <路径>(如为宿主机目录,需先在 docker-compose.yml 的 volumes 里挂载进容器再重试)`(创建与更新两处)。
|
||||
|
||||
## 2026-11-18 → v1.4.1
|
||||
|
||||
**品牌更名**:应用正式更名为「牛仔库」(原名:牛图 / FlyPic 飞图)——页面标题(定为「牛仔库 - 素材库管理」)、登录页、顶栏、设置-关于、导出文件名、后端提示与启动日志全部同步;仓库地址、镜像名、数据目录 `.flypic` 保持不变,README 标题附更名说明。
|
||||
|
||||
**修复**:平铺库(无子文件夹)无法浏览图片——误显「素材库似乎是空的」且无法进入瀑布视图。新增 `foldersLoaded` 标记区分「文件夹加载中」与「确认无子文件夹」,无子文件夹的库直接加载全部图片;扫描完成不再清空已显示图片;Dashboard 空文案按 `totalImageCount` 分流(有图时不再误报空库)。
|
||||
|
||||
## 2026-11-17 → v1.4.0
|
||||
|
||||
视频能力大版本:素材库兼容视频目录、点击弹窗播放、四项常用视频编辑(加/去水印、加/去字幕声音),以及多选图片填标题 + 模型 KEY 后 AI 一键生成带字幕和朗读的成片。
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
# FlyPic 飞图(Docker 独立部署版)
|
||||
# 牛仔库(FlyPic 飞图,Docker 独立部署版)
|
||||
|
||||
> **2026-11-18 起正式更名为「牛仔库」**(原名:牛图 / FlyPic 飞图)。仓库地址、镜像名、数据目录 `.flypic` 保持不变。
|
||||
|
||||
本仓库是 [ZangXincz/FlyPic](https://github.com/ZangXincz/FlyPic) 的 Docker 化分支(上游已归档停更)。**本文档只介绍本分支修改过的功能与部署方式**,上游原有功能不再重复。
|
||||
|
||||
@@ -100,6 +102,7 @@ services:
|
||||
# 素材库目录(容器内路径与宿主机一致,中文路径直接填,按需增减)
|
||||
- /vol2/1000/HD2/壁纸:/vol2/1000/HD2/壁纸
|
||||
- /vol2/1000/HD2/我的文档:/vol2/1000/HD2/我的文档
|
||||
- /vol2/1000/HD2/发布到平台的图片和视频:/vol2/1000/HD2/发布到平台的图片和视频
|
||||
# 持久化配置(素材库列表、管理员密码,不用改)
|
||||
- /vol3/1000/HD3/docker/flypic/config:/root/.flypic
|
||||
environment:
|
||||
@@ -140,6 +143,8 @@ docker run -d --name flypic --restart unless-stopped \
|
||||
-e NODE_ENV=production \
|
||||
-v /vol3/1000/HD3/docker/flypic/config:/root/.flypic \
|
||||
-v /vol2/1000/HD2/壁纸:/vol2/1000/HD2/壁纸 \
|
||||
-v "/vol2/1000/HD2/我的文档:/vol2/1000/HD2/我的文档" \
|
||||
-v "/vol2/1000/HD2/发布到平台的图片和视频:/vol2/1000/HD2/发布到平台的图片和视频" \
|
||||
jpccr.ccs.tencentyun.com/jinghui/flypic:latest
|
||||
```
|
||||
|
||||
@@ -150,6 +155,7 @@ docker run -d --name flypic --restart unless-stopped \
|
||||
## 📝 使用注意
|
||||
|
||||
- **添加/更新素材库后需重新扫描**,图片内 OCR 文字才可被搜索到(旧索引无文字数据)——点击右上角**「重新扫描」图标**即可,扫描时会自动补齐历史图片的 OCR 文字索引
|
||||
- **添加素材库提示 `Path does not exist`** = 该目录没有挂载进容器(容器里看不到宿主机目录)——在 `docker-compose.yml` 的 `volumes` 下加一行 `- /宿主机路径:/宿主机路径`(两边写一样的路径),再 `docker compose up -d`,然后重新添加即可
|
||||
- 素材库全量 OCR 扫描逐张识别、耗时较长,建议在不用的时候执行
|
||||
- 数据存储:素材目录下 `.flypic/`(缩略图 + SQLite 索引,含 `ocr_text` 列);应用配置在 `config/`(已 gitignore)
|
||||
- 删除素材目录下的 `.flypic` 即可清除该库索引,重新扫描重建
|
||||
|
||||
+1
-1
@@ -113,7 +113,7 @@ cleanupManager.startRoutineCleanup();
|
||||
|
||||
// 启动服务器
|
||||
server.listen(PORT, () => {
|
||||
console.log('\n🚀 FlyPic 服务器已启动');
|
||||
console.log('\n🚀 牛仔库服务器已启动');
|
||||
console.log(`📡 端口: ${PORT}`);
|
||||
console.log(`🔌 Socket.IO 就绪`);
|
||||
if (FRONTEND_DIST) console.log(`📁 前端: ${FRONTEND_DIST}`);
|
||||
|
||||
@@ -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]);
|
||||
}
|
||||
|
||||
/**
|
||||
* 插入文件夹
|
||||
*/
|
||||
|
||||
@@ -46,7 +46,7 @@ class LibraryService {
|
||||
|
||||
if (!fs.existsSync(normalizedPath)) {
|
||||
logger.warn(`路径不存在: ${normalizedPath}`);
|
||||
throw new ValidationError('Path does not exist', 'path');
|
||||
throw new ValidationError(`素材库路径不存在: ${normalizedPath}(如为宿主机目录,需先在 docker-compose.yml 的 volumes 里挂载进容器再重试)`, 'path');
|
||||
}
|
||||
|
||||
// 检查文件夹访问权限
|
||||
@@ -57,7 +57,7 @@ class LibraryService {
|
||||
if (readError.code === 'EACCES' || readError.code === 'EPERM') {
|
||||
logger.warn(`无访问权限: ${normalizedPath}`);
|
||||
throw new ValidationError(
|
||||
'无法访问该文件夹。请在飞牛 fnOS 的"数据共享"中将此文件夹添加到 FlyPic 应用的访问权限。',
|
||||
'无法访问该文件夹。请在飞牛 fnOS 的"数据共享"中将此文件夹添加到 牛仔库 应用的访问权限。',
|
||||
'permission'
|
||||
);
|
||||
}
|
||||
@@ -105,7 +105,7 @@ class LibraryService {
|
||||
|
||||
// 验证更新的路径是否存在
|
||||
if (updates.path && !fs.existsSync(updates.path)) {
|
||||
throw new ValidationError('Path does not exist', 'path');
|
||||
throw new ValidationError(`素材库路径不存在: ${updates.path}(如为宿主机目录,需先在 docker-compose.yml 的 volumes 里挂载进容器再重试)`, 'path');
|
||||
}
|
||||
|
||||
const success = this.configManager.updateLibrary(id, updates);
|
||||
|
||||
@@ -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.2.0';
|
||||
const SITE_VERSION = process.env.SITE_VERSION || '1.4.5';
|
||||
const TIMEOUT_MS = 8000;
|
||||
|
||||
const state = {
|
||||
|
||||
@@ -13,6 +13,7 @@ services:
|
||||
# 素材库目录(容器内路径与飞牛一致,直接填实际路径即可)
|
||||
- /vol2/1000/HD2/壁纸:/vol2/1000/HD2/壁纸
|
||||
- /vol2/1000/HD2/我的文档:/vol2/1000/HD2/我的文档
|
||||
- /vol2/1000/HD2/发布到平台的图片和视频:/vol2/1000/HD2/发布到平台的图片和视频
|
||||
# 持久化配置(config.json 存储素材库路径、密码等,不用改)
|
||||
- /vol3/1000/HD3/docker/flypic/config:/root/.flypic
|
||||
environment:
|
||||
@@ -26,6 +27,8 @@ services:
|
||||
- HUB_PROJECT_ID=15
|
||||
- HUB_API_KEY=${HUB_API_KEY:-}
|
||||
- NEWAPI_KEY=${NEWAPI_KEY:-}
|
||||
# 当前站点版本(与 frontend/package.json、CHANGELOG 保持一致,界面版本徽标来源)
|
||||
- SITE_VERSION=1.4.5
|
||||
# 让容器经 host.docker.internal 访问宿主机的 AI 侧车
|
||||
extra_hosts:
|
||||
- "host.docker.internal:host-gateway"
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/png" href="/favicon.png" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>牛图 - 图片素材库管理</title>
|
||||
<title>牛仔库 - 素材库管理</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
|
||||
+29
-7
@@ -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();
|
||||
@@ -137,12 +139,14 @@ function App() {
|
||||
// 如果没有选中文件夹且没有搜索条件,不加载图片(保持在 Dashboard)
|
||||
(imageState.selectedFolder || imageState.searchKeywords || imageState.filters.formats.length > 0 || imageState.favoritesView)
|
||||
? imageAPI.search(libraryId, params)
|
||||
: Promise.resolve({ images: [] }),
|
||||
: Promise.resolve({ images: null }), // null = 本次不刷新图片(平铺库由 MainContent 直接加载,避免清空已显示的图片)
|
||||
// 扫描完成后重新获取统计信息(包含 totalSize)
|
||||
imageAPI.getStats(libraryId)
|
||||
]).then(([foldersRes, imagesRes, statsRes]) => {
|
||||
useImageStore.getState().setFolders(foldersRes.folders);
|
||||
useImageStore.getState().setImages(imagesRes.images);
|
||||
if (imagesRes.images) {
|
||||
useImageStore.getState().setImages(imagesRes.images);
|
||||
}
|
||||
useImageStore.getState().setTotalImageCount(statsRes.total || 0);
|
||||
useImageStore.getState().setTotalSize(statsRes.totalSize || 0);
|
||||
}).catch(err => {
|
||||
@@ -513,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'
|
||||
@@ -588,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">
|
||||
|
||||
@@ -6,6 +6,14 @@
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { X, Loader2, Film, CheckCircle2, AlertCircle, KeyRound } from 'lucide-react';
|
||||
import { imageAPI } from '../api';
|
||||
import { getToken } from '../api/client';
|
||||
|
||||
// 后端错误可能为字符串或 {code,message} 对象,统一取可读文本
|
||||
const errText = (e, fallback) => {
|
||||
if (!e) return fallback;
|
||||
if (typeof e === 'string') return e;
|
||||
return e.message || JSON.stringify(e);
|
||||
};
|
||||
|
||||
const VOICES = [
|
||||
{ key: 'zh-CN-XiaoxiaoNeural', label: '晓晓(女声·自然)' },
|
||||
@@ -51,7 +59,9 @@ function AIVideoModal({ libraryId, images, onClose, onDone }) {
|
||||
if (!taskId) return;
|
||||
timerRef.current = setInterval(async () => {
|
||||
try {
|
||||
const res = await fetch(`/api/video/task/${taskId}`);
|
||||
const res = await fetch(`/api/video/task/${taskId}`, {
|
||||
headers: { Authorization: `Bearer ${getToken()}` }
|
||||
});
|
||||
if (!res.ok) return;
|
||||
const data = await res.json();
|
||||
setTask(data);
|
||||
@@ -74,7 +84,10 @@ function AIVideoModal({ libraryId, images, onClose, onDone }) {
|
||||
try {
|
||||
const res = await fetch('/api/video/aigenerate', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: `Bearer ${getToken()}`
|
||||
},
|
||||
body: JSON.stringify({
|
||||
libraryId,
|
||||
images: list.map((img) => ({ path: img.path })),
|
||||
@@ -86,7 +99,7 @@ function AIVideoModal({ libraryId, images, onClose, onDone }) {
|
||||
})
|
||||
});
|
||||
const data = await res.json().catch(() => ({}));
|
||||
if (!res.ok || data.error) throw new Error(data.error || `启动失败 (${res.status})`);
|
||||
if (!res.ok || data.error) throw new Error(errText(data.error, `启动失败 (${res.status})`));
|
||||
setTaskId(data.taskId);
|
||||
} catch (e) {
|
||||
setError(e.message || '启动失败');
|
||||
|
||||
@@ -99,7 +99,9 @@ function Dashboard() {
|
||||
<Folder className="w-12 h-12 text-secondary mx-auto mb-4" />
|
||||
<h3 className="text-lg font-medium text-primary mb-2">暂无文件夹</h3>
|
||||
<p className="text-tertiary max-w-sm mx-auto">
|
||||
您的素材库似乎是空的。请将图片添加到素材库目录中,系统会自动扫描。
|
||||
{totalImageCount > 0
|
||||
? `此素材库的 ${totalImageCount} 张图片没有子文件夹,已在下方瀑布视图中直接显示。`
|
||||
: '您的素材库似乎是空的。请将图片添加到素材库目录中,系统会自动扫描。'}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -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.3.0';
|
||||
const appVersion = hub.version ? `v${String(hub.version).replace(/^v/, '')}` : 'v1.4.5';
|
||||
|
||||
// 从全局 store 获取筛选状态
|
||||
const selectedFormats = filters.formats || [];
|
||||
@@ -444,7 +444,7 @@ function Header() {
|
||||
<header className="border-b border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800">
|
||||
{/* 顶部栏 */}
|
||||
<div className="h-14 flex items-center justify-between px-4">
|
||||
<h1 className="text-lg font-bold text-gray-900 dark:text-white">牛图</h1>
|
||||
<h1 className="text-lg font-bold text-gray-900 dark:text-white">牛仔库</h1>
|
||||
|
||||
<div className="flex items-center gap-2">
|
||||
<button
|
||||
@@ -670,7 +670,7 @@ function Header() {
|
||||
<header className="border-b border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800">
|
||||
<div className="h-14 flex items-center justify-between px-6">
|
||||
<div className="flex-shrink-0">
|
||||
<h1 className="text-xl font-bold text-gray-900 dark:text-white">牛图</h1>
|
||||
<h1 className="text-xl font-bold text-gray-900 dark:text-white">牛仔库</h1>
|
||||
<p className="text-xs text-gray-500 dark:text-gray-400">轻量快速的图片素材库管理</p>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -82,7 +82,7 @@ export default function Login() {
|
||||
<div className="inline-flex items-center justify-center mb-4">
|
||||
<img
|
||||
src="/ICON_256.PNG"
|
||||
alt="牛图 Logo"
|
||||
alt="牛仔库 Logo"
|
||||
className="w-20 h-20 object-contain"
|
||||
onError={(e) => {
|
||||
// 如果 ICON_256.PNG 加载失败,尝试 favicon.png
|
||||
@@ -91,7 +91,7 @@ export default function Login() {
|
||||
/>
|
||||
</div>
|
||||
<h1 className="text-3xl font-bold text-gray-900 dark:text-white mb-2">
|
||||
牛图
|
||||
牛仔库
|
||||
</h1>
|
||||
<p className="text-gray-600 dark:text-gray-400">
|
||||
{hasPassword ? '请输入密码访问' : '首次使用,请设置访问密码'}
|
||||
|
||||
@@ -15,7 +15,7 @@ const logger = createLogger('MainContent');
|
||||
|
||||
function MainContent() {
|
||||
const { currentLibraryId } = useLibraryStore();
|
||||
const { searchKeywords, filters, selectedFolder, favoritesView, setImages, setOriginalImages, imageLoadingState, images, refreshTick } = useImageStore();
|
||||
const { searchKeywords, filters, selectedFolder, favoritesView, setImages, setOriginalImages, imageLoadingState, images, refreshTick, folders, foldersLoaded } = useImageStore();
|
||||
const { scanProgress } = useScanStore();
|
||||
|
||||
// 使用 ref 跟踪最新的请求上下文
|
||||
@@ -47,8 +47,8 @@ function MainContent() {
|
||||
const loadImages = useCallback(async (isInitialLoad = true) => {
|
||||
if (!currentLibraryId) return;
|
||||
|
||||
// 如果没有选中文件夹且没有搜索条件,显示 Dashboard(「我的收藏」视图除外)
|
||||
if (!selectedFolder && !searchKeywords && filters.formats.length === 0 && !favoritesView) {
|
||||
// 如果没有选中文件夹且没有搜索条件,显示 Dashboard(「我的收藏」视图除外;无子文件夹的平铺库直接进瀑布)
|
||||
if (!selectedFolder && !searchKeywords && filters.formats.length === 0 && !favoritesView && (!foldersLoaded || folders.length > 0)) {
|
||||
setImages([]);
|
||||
useImageStore.getState().setImageLoadingState({
|
||||
isLoading: false,
|
||||
@@ -162,7 +162,7 @@ function MainContent() {
|
||||
clearTimeout(debounceTimerRef.current);
|
||||
}
|
||||
};
|
||||
}, [currentLibraryId, searchKeywords, selectedFolder, favoritesView, refreshTick, loadImages, cancelCurrentRequest]);
|
||||
}, [currentLibraryId, searchKeywords, selectedFolder, favoritesView, refreshTick, folders, foldersLoaded, loadImages, cancelCurrentRequest]);
|
||||
|
||||
// 恢复撤销前的文件夹状态
|
||||
useEffect(() => {
|
||||
@@ -233,7 +233,7 @@ function MainContent() {
|
||||
|
||||
{/* Content */}
|
||||
<div className="flex-1 overflow-hidden">
|
||||
{(!selectedFolder && !searchKeywords && filters.formats.length === 0 && !favoritesView) ? (
|
||||
{(!selectedFolder && !searchKeywords && filters.formats.length === 0 && !favoritesView && (!foldersLoaded || folders.length > 0)) ? (
|
||||
<Dashboard />
|
||||
) : (
|
||||
<ImageWaterfall />
|
||||
|
||||
@@ -221,7 +221,7 @@ export default function MergeCollage({ image, libraryId, onMerge, setStatus, set
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: `*** ${getToken()}`
|
||||
Authorization: `Bearer ${getToken()}`
|
||||
},
|
||||
body: JSON.stringify({
|
||||
libraryId,
|
||||
|
||||
@@ -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 {
|
||||
@@ -920,7 +932,7 @@ function RightPanel() {
|
||||
setExportProgress(100);
|
||||
const link = document.createElement('a');
|
||||
link.href = URL.createObjectURL(zipBlob);
|
||||
link.download = `牛图_导出_${imagesToExport.length}张_${Date.now()}.zip`;
|
||||
link.download = `牛仔库_导出_${imagesToExport.length}张_${Date.now()}.zip`;
|
||||
document.body.appendChild(link);
|
||||
link.click();
|
||||
document.body.removeChild(link);
|
||||
@@ -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>
|
||||
|
||||
@@ -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.3.0';
|
||||
const APP_VERSION = 'v1.4.5';
|
||||
const REPO_URL = 'https://gitea.88531.cn/jinghui/flypic';
|
||||
|
||||
/**
|
||||
@@ -403,7 +403,7 @@ export default function SettingsModal({ open, onClose, versionLabel, initialTab
|
||||
</div>
|
||||
<div className="flex items-center justify-between py-2 border-b border-gray-100 dark:border-gray-700">
|
||||
<span className="text-gray-500 dark:text-gray-400">项目名称</span>
|
||||
<span className="font-medium text-gray-900 dark:text-white">牛图 素材库</span>
|
||||
<span className="font-medium text-gray-900 dark:text-white">牛仔库</span>
|
||||
</div>
|
||||
<div className="flex items-center justify-between py-2">
|
||||
<span className="text-gray-500 dark:text-gray-400">开源地址</span>
|
||||
@@ -419,7 +419,7 @@ export default function SettingsModal({ open, onClose, versionLabel, initialTab
|
||||
</a>
|
||||
</div>
|
||||
<p className="text-xs text-gray-400 dark:text-gray-500 pt-2">
|
||||
牛图(FlyPic)基于 ZangXincz/FlyPic 二次开发,修复多项问题并新增 OCR 图内文字搜索、线上 OCR、授权系统接入等能力。
|
||||
牛仔库(FlyPic)基于 ZangXincz/FlyPic 二次开发,修复多项问题并新增 OCR 图内文字搜索、线上 OCR、授权系统接入等能力。
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -994,9 +994,9 @@ function Sidebar() {
|
||||
'⚠️ 文件夹权限不足\n\n' +
|
||||
errorMessage + '\n\n' +
|
||||
'操作步骤:\n' +
|
||||
'1. 应用中心找到 牛图 应用\n' +
|
||||
'1. 应用中心找到 牛仔库 应用\n' +
|
||||
'2. 点击 应用设置\n' +
|
||||
'3. 将该文件夹添加到 牛图 应用的读写权限'
|
||||
'3. 将该文件夹添加到 牛仔库 应用的读写权限'
|
||||
);
|
||||
} else {
|
||||
alert('添加素材库失败: ' + errorMessage);
|
||||
@@ -1718,7 +1718,7 @@ function Sidebar() {
|
||||
<div className="w-5 mr-1" />
|
||||
<Folder className="w-4 h-4 mr-2 text-blue-500 flex-shrink-0" />
|
||||
<span className="text-sm text-gray-700 dark:text-gray-200 font-medium flex-1">
|
||||
全部图片
|
||||
全部
|
||||
</span>
|
||||
<span className="text-xs text-gray-500 dark:text-gray-300 ml-2">
|
||||
{totalImageCount}
|
||||
|
||||
@@ -6,6 +6,14 @@
|
||||
import { useState } from 'react';
|
||||
import { X, Droplets, Eraser, Type, Scissors, Loader2 } from 'lucide-react';
|
||||
import { imageAPI } from '../api';
|
||||
import { getToken } from '../api/client';
|
||||
|
||||
// 后端错误可能为字符串或 {code,message} 对象,统一取可读文本
|
||||
const errText = (e, fallback) => {
|
||||
if (!e) return fallback;
|
||||
if (typeof e === 'string') return e;
|
||||
return e.message || JSON.stringify(e);
|
||||
};
|
||||
|
||||
const ACTIONS = [
|
||||
{ key: 'watermark-add', label: '加水印', icon: Droplets },
|
||||
@@ -109,11 +117,14 @@ function VideoEditModal({ file, libraryId, onClose, onDone }) {
|
||||
try {
|
||||
const res = await fetch('/api/video/edit', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
Authorization: `Bearer ${getToken()}`
|
||||
},
|
||||
body: JSON.stringify({ libraryId, path: file.path, action, options, output: outputMode })
|
||||
});
|
||||
const data = await res.json().catch(() => ({}));
|
||||
if (!res.ok || data.error) throw new Error(data.error || `处理失败 (${res.status})`);
|
||||
if (!res.ok || data.error) throw new Error(errText(data.error, `处理失败 (${res.status})`));
|
||||
onDone && onDone(data.path);
|
||||
onClose();
|
||||
} catch (e) {
|
||||
|
||||
@@ -15,6 +15,7 @@ export const useImageStore = create((set, get) => ({
|
||||
|
||||
// 文件夹
|
||||
folders: [],
|
||||
foldersLoaded: false, // folders 是否已完成首次加载(区分「加载中」与「确认无文件夹」)
|
||||
selectedFolder: null, // 当前浏览的文件夹路径
|
||||
selectedFolderItem: null, // 选中的文件夹对象(用于显示详情、操作等)
|
||||
|
||||
@@ -82,7 +83,7 @@ export const useImageStore = create((set, get) => ({
|
||||
clearSelection: () => set({ selectedImages: [], selectedImage: null, selectedFolderItem: null }),
|
||||
|
||||
// 文件夹操作
|
||||
setFolders: (folders) => set({ folders }),
|
||||
setFolders: (folders) => set({ folders, foldersLoaded: true }),
|
||||
|
||||
setSelectedFolder: (folder) => set((state) => ({
|
||||
selectedFolder: folder,
|
||||
|
||||
@@ -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 }),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/**
|
||||
* 牛图(FlyPic)前端日志系统
|
||||
* 牛仔库(FlyPic)前端日志系统
|
||||
* 专注于用户操作和UI交互日志
|
||||
*
|
||||
* 日志分类:
|
||||
|
||||
Reference in new issue
Block a user