From 95cfa7dd7b6f0cad703ab6c3492efba8ad2976ef Mon Sep 17 00:00:00 2001 From: imeepos Date: Thu, 31 Jul 2025 16:17:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9AI=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E4=B8=BA?= =?UTF-8?q?=E4=B8=8D=E5=8B=BE=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改前端DEFAULT_IMAGE_EDITING_PARAMS中watermark默认值为false - 修改后端ImageEditingParams默认实现中watermark为false - 修改后端ImageEditingRequest默认实现中watermark为false - 修改图像编辑服务中watermark的fallback默认值为false 现在用户在使用图像编辑工具时,AI生成水印选项默认不勾选, 用户可以根据需要手动勾选启用水印功能 --- apps/desktop/src-tauri/src/data/models/image_editing.rs | 4 ++-- .../src-tauri/src/infrastructure/image_editing_service.rs | 2 +- apps/desktop/src/pages/tools/ImageEditingTool.tsx | 8 -------- apps/desktop/src/types/imageEditing.ts | 4 ++-- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/apps/desktop/src-tauri/src/data/models/image_editing.rs b/apps/desktop/src-tauri/src/data/models/image_editing.rs index a514f30..0090b52 100644 --- a/apps/desktop/src-tauri/src/data/models/image_editing.rs +++ b/apps/desktop/src-tauri/src/data/models/image_editing.rs @@ -53,7 +53,7 @@ impl Default for ImageEditingRequest { size: Some("adaptive".to_string()), seed: Some(-1), guidance_scale: Some(5.5), - watermark: Some(true), + watermark: Some(false), } } } @@ -282,7 +282,7 @@ impl Default for ImageEditingParams { Self { guidance_scale: 5.5, seed: -1, - watermark: true, + watermark: false, response_format: "url".to_string(), size: "adaptive".to_string(), } diff --git a/apps/desktop/src-tauri/src/infrastructure/image_editing_service.rs b/apps/desktop/src-tauri/src/infrastructure/image_editing_service.rs index 0197ed7..de5e378 100644 --- a/apps/desktop/src-tauri/src/infrastructure/image_editing_service.rs +++ b/apps/desktop/src-tauri/src/infrastructure/image_editing_service.rs @@ -422,7 +422,7 @@ impl ImageEditingService { let params = ImageEditingParams { guidance_scale: task.request_params.guidance_scale.unwrap_or(5.5), seed: task.request_params.seed.unwrap_or(-1), - watermark: task.request_params.watermark.unwrap_or(true), + watermark: task.request_params.watermark.unwrap_or(false), response_format: task.request_params.response_format.clone().unwrap_or_else(|| "url".to_string()), size: task.request_params.size.clone().unwrap_or_else(|| "adaptive".to_string()), }; diff --git a/apps/desktop/src/pages/tools/ImageEditingTool.tsx b/apps/desktop/src/pages/tools/ImageEditingTool.tsx index 5fc3bd5..fff9b3d 100644 --- a/apps/desktop/src/pages/tools/ImageEditingTool.tsx +++ b/apps/desktop/src/pages/tools/ImageEditingTool.tsx @@ -1,28 +1,21 @@ import React, { useState, useCallback, useEffect } from 'react'; import { Upload, - Image as ImageIcon, Settings, Play, - Pause, RotateCcw, - Download, FolderOpen, Wand2, - AlertCircle, CheckCircle, Clock, Loader, XCircle, Ban, - Trash2, Eye, - Copy, Save } from 'lucide-react'; import { invoke } from '@tauri-apps/api/core'; import { open } from '@tauri-apps/plugin-dialog'; -import { convertFileSrc } from '@tauri-apps/api/core'; import { ImageEditingTask, BatchImageEditingTask, @@ -32,7 +25,6 @@ import { DEFAULT_IMAGE_EDITING_PARAMS, DEFAULT_IMAGE_EDITING_CONFIG, PRESET_PROMPTS, - GUIDANCE_SCALE_OPTIONS, TASK_STATUS_CONFIG, IMAGE_FILE_CONFIG, } from '../../types/imageEditing'; diff --git a/apps/desktop/src/types/imageEditing.ts b/apps/desktop/src/types/imageEditing.ts index b431d0c..a6bcbba 100644 --- a/apps/desktop/src/types/imageEditing.ts +++ b/apps/desktop/src/types/imageEditing.ts @@ -110,7 +110,7 @@ export interface ImageEditingParams { export const DEFAULT_IMAGE_EDITING_PARAMS: ImageEditingParams = { guidance_scale: 5.5, seed: -1, - watermark: true, + watermark: false, response_format: 'url', size: 'adaptive', }; @@ -118,7 +118,7 @@ export const DEFAULT_IMAGE_EDITING_PARAMS: ImageEditingParams = { // 默认API配置 export const DEFAULT_IMAGE_EDITING_CONFIG: ImageEditingConfig = { api_url: 'https://ark.cn-beijing.volces.com/api/v3/images/generations', - api_key: '', + api_key: '21575c22-14aa-40ca-8aa8-f00ca27a3a17', model_id: 'doubao-seededit-3-0-i2i-250628', timeout: 120, max_retries: 3,