feat(upload): remove image format conversion options #6

- Remove image format conversion and quality settings from the upload dialog
- Update backend to use default format and quality settings
- Add system configuration options for default image format and quality
This commit is contained in:
ShiYu
2025-05-24 11:41:06 +08:00
parent bec2c26b38
commit c2a9d07772
7 changed files with 116 additions and 114 deletions

View File

@@ -119,8 +119,6 @@ export async function uploadPicture(
data: {
permission?: number;
albumId?: number;
convertToFormat?: string;
quality?: number;
onProgress?: (percent: number) => void
} = {}
): Promise<BaseResult<PictureResponse>> {
@@ -135,14 +133,6 @@ export async function uploadPicture(
formData.append('albumId', data.albumId.toString());
}
if (data.convertToFormat !== undefined) {
formData.append('convertToFormat', data.convertToFormat.toString());
}
if (data.quality !== undefined) {
formData.append('quality', data.quality.toString());
}
try {
const token = localStorage.getItem('token');
const headers: Record<string, string> = {};

View File

@@ -1,9 +1,9 @@
import React, { useState, useEffect } from 'react';
import { Modal, Upload, Button, Progress, message, Form, Select, Radio, Slider, Divider, Alert } from 'antd';
import { Modal, Upload, Button, Progress, message, Form, Select, Radio, Slider } from 'antd';
import { InboxOutlined } from '@ant-design/icons';
import { v4 as uuidv4 } from 'uuid';
import type { UploadFile, AlbumResponse } from '../../api';
import { uploadPicture, getAlbums, ImageFormat } from '../../api';
import { uploadPicture, getAlbums } from '../../api';
const { Dragger } = Upload;
const { Option } = Select;
@@ -20,8 +20,6 @@ const ImageUploadDialog: React.FC<UploadDialogProps> = ({ visible, onClose, onUp
const [form] = Form.useForm();
const [albums, setAlbums] = useState<AlbumResponse[]>([]);
const [concurrentUploads, setConcurrentUploads] = useState<number>(3);
const [convertFormat, setConvertFormat] = useState<ImageFormat>(ImageFormat.Original);
const [quality, setQuality] = useState<number>(95);
useEffect(() => {
if (visible) {
@@ -77,11 +75,9 @@ const ImageUploadDialog: React.FC<UploadDialogProps> = ({ visible, onClose, onUp
setUploading(true);
const values = await form.validateFields();
const params: { // 修改此处的类型定义
const params: {
permission?: number;
albumId?: number;
convertToFormat?: string; // 允许 string 类型
quality?: number;
} = {};
if (values.permission !== undefined) {
@@ -90,10 +86,6 @@ const ImageUploadDialog: React.FC<UploadDialogProps> = ({ visible, onClose, onUp
if (values.albumId) {
params.albumId = values.albumId;
}
if (convertFormat !== ImageFormat.Original) {
params.convertToFormat = convertFormat.toString(); // 现在类型匹配
params.quality = quality;
}
let successCount = 0;
let failCount = 0;
@@ -110,7 +102,7 @@ const ImageUploadDialog: React.FC<UploadDialogProps> = ({ visible, onClose, onUp
try {
// 上传文件
const result = await uploadPicture(item.file, { // 此处 params 类型现在匹配
const result = await uploadPicture(item.file, {
...params,
onProgress: (percent) => {
setUploadQueue((prev) =>
@@ -217,17 +209,6 @@ const ImageUploadDialog: React.FC<UploadDialogProps> = ({ visible, onClose, onUp
}
};
// 获取格式名称
const getFormatName = (format: ImageFormat) => {
switch (format) {
case ImageFormat.Original: return '保持原格式';
case ImageFormat.Jpeg: return 'JPEG';
case ImageFormat.Png: return 'PNG';
case ImageFormat.WebP: return 'WebP';
default: return '未知格式';
}
};
// 自定义上传列表项
const renderUploadItem = (item: UploadFile) => {
let statusIcon;
@@ -361,51 +342,6 @@ const ImageUploadDialog: React.FC<UploadDialogProps> = ({ visible, onClose, onUp
<Radio value={2}></Radio>
</Radio.Group>
</Form.Item>
<Divider orientation="left"></Divider>
<Form.Item label="输出格式">
<Radio.Group
value={convertFormat}
onChange={(e) => setConvertFormat(e.target.value)}
optionType="button"
buttonStyle="solid"
style={{ display: 'flex', flexWrap: 'wrap', gap: '8px' }}
>
<Radio.Button value={ImageFormat.Original}></Radio.Button>
<Radio.Button value={ImageFormat.Jpeg}>JPEG (.jpg)</Radio.Button>
<Radio.Button value={ImageFormat.Png}>PNG (.png)</Radio.Button>
<Radio.Button value={ImageFormat.WebP}>WebP (.webp)</Radio.Button>
</Radio.Group>
</Form.Item>
{convertFormat !== ImageFormat.Original && (
<>
{convertFormat === ImageFormat.Png ? (
<Alert
message="提示"
description={`${getFormatName(convertFormat)} 格式为无损压缩,不支持质量调节。`}
type="info"
showIcon
style={{ marginBottom: '16px' }}
/>
) : (
<Form.Item label={`图片质量 (${quality}%)`}>
<Slider
min={50}
max={100}
value={quality}
onChange={setQuality}
marks={{ 50: '50%', 75: '75%', 90: '90%', 95: '95%', 100: '100%' }}
tooltip={{ formatter: (value) => `${value}%` }}
/>
<div style={{ fontSize: '12px', color: '#666', marginTop: '4px' }}>
使 85-95%
</div>
</Form.Item>
)}
</>
)}
<Form.Item
name="concurrentUploads"
@@ -434,14 +370,10 @@ const ImageUploadDialog: React.FC<UploadDialogProps> = ({ visible, onClose, onUp
<p className="ant-upload-text"></p>
<p className="ant-upload-hint">
10MB
{convertFormat !== ImageFormat.Original && (
<>
<br />
<span style={{ color: '#1890ff' }}>
{getFormatName(convertFormat)}
</span>
</>
)}
<br />
<span style={{ color: '#888' }}>
</span>
</p>
</Dragger>

View File

@@ -391,6 +391,90 @@ const SystemConfig: React.FC = () => {
</div>
</Card>
{/* 上传设置卡片 - 新增 */}
<Card
size="small"
title="上传设置配置"
style={{ marginBottom: isMobile ? 16 : 24 }}
bodyStyle={{ padding: isMobile ? '12px' : '16px' }}
>
<div style={{
display: 'grid',
gridTemplateColumns: isMobile ? '1fr' : 'repeat(auto-fit, minmax(300px, 1fr))',
gap: isMobile ? 12 : 16,
marginBottom: 0
}}>
{/* 图片默认格式 */}
<div>
<div style={{
marginBottom: 8,
fontSize: 14,
fontWeight: 500,
color: '#666'
}}>
</div>
<Select
value={configs.Upload?.DefaultImageFormat || 'Original'}
onChange={(value) => {
handleSaveConfig('Upload', 'DefaultImageFormat', value);
}}
style={{ width: '100%' }}
size="large"
placeholder="选择上传图片的默认处理格式"
>
<Option value="Original"></Option>
<Option value="Jpeg">JPEG</Option>
<Option value="Png">PNG</Option>
<Option value="Webp">WebP</Option>
</Select>
<div style={{
fontSize: 12,
color: '#999',
marginTop: 4
}}>
</div>
</div>
{/* 图片压缩质量 */}
<div>
<div style={{
marginBottom: 8,
fontSize: 14,
fontWeight: 500,
color: '#666'
}}>
</div>
<Select
value={configs.Upload?.DefaultImageQuality || '95'}
onChange={(value) => {
handleSaveConfig('Upload', 'DefaultImageQuality', value);
}}
style={{ width: '100%' }}
size="large"
placeholder="选择图片压缩质量"
>
<Option value="100">100% - </Option>
<Option value="95">95% - </Option>
<Option value="90">90% - </Option>
<Option value="85">85% - </Option>
<Option value="80">80% - </Option>
<Option value="75">75% - </Option>
<Option value="70">70% - </Option>
</Select>
<div style={{
fontSize: 12,
color: '#999',
marginTop: 4
}}>
JPEG和WebP格式的图片质量设置
</div>
</div>
</div>
</Card>
{/* 存储服务配置卡片 */}
<Card
size="small"