@lobehub/chat 1.103.2 → 1.104.1

package/locales/zh-CN/setting.json

@@ -45,14 +45,25 @@
   },
   "hotkey": {
     "conflicts": "与现有快捷键冲突",
+    "errors": {
+      "CONFLICT": "快捷键冲突：该快捷键已被其他功能占用",
+      "INVALID_FORMAT": "快捷键格式无效：请使用正确的格式（如 CommandOrControl+E）",
+      "INVALID_ID": "无效的快捷键ID",
+      "NO_MODIFIER": "快捷键必须包含修饰键（Ctrl、Alt、Shift等）",
+      "SYSTEM_OCCUPIED": "快捷键已被系统或其他应用程序占用",
+      "UNKNOWN": "更新失败：未知错误"
+    },
     "group": {
       "conversation": "会话",
+      "desktop": "桌面端",
       "essential": "基础"
     },
     "invalidCombination": "快捷键需要至少包含一个修饰键 (Ctrl, Alt, Shift) 和一个常规键",
     "record": "按下按键以录制快捷键",
     "reset": "重置为默认快捷键",
-    "title": "快捷键"
+    "title": "快捷键",
+    "updateError": "快捷键更新失败：网络或系统错误",
+    "updateSuccess": "快捷键更新成功"
   },
   "llm": {
     "aesGcm": "您的秘钥与代理地址等将使用 <1>AES-GCM</1> 加密算法进行加密",

package/locales/zh-TW/hotkey.json

@@ -7,6 +7,16 @@
     "desc": "清空當前會話的消息和上傳的檔案",
     "title": "清空會話消息"
   },
+  "desktop": {
+    "openSettings": {
+      "desc": "打開應用設定頁面",
+      "title": "應用設定"
+    },
+    "showApp": {
+      "desc": "全域快速鍵顯示或隱藏主視窗",
+      "title": "顯示/隱藏主視窗"
+    }
+  },
   "editMessage": {
     "desc": "通過按住 Alt 並雙擊消息進入編輯模式",
     "title": "編輯消息"
@@ -19,10 +29,6 @@
     "desc": "查看所有快捷鍵的使用說明",
     "title": "打開快捷鍵幫助"
   },
-  "openSettings": {
-    "desc": "打開應用設定頁面",
-    "title": "應用設定"
-  },
   "regenerateMessage": {
     "desc": "重新生成最後一條消息",
     "title": "重新生成消息"

package/locales/zh-TW/setting.json

@@ -45,14 +45,25 @@
   },
   "hotkey": {
     "conflicts": "與現有快捷鍵衝突",
+    "errors": {
+      "CONFLICT": "快速鍵衝突：該快速鍵已被其他功能佔用",
+      "INVALID_FORMAT": "快速鍵格式無效：請使用正確的格式（如 CommandOrControl+E）",
+      "INVALID_ID": "無效的快速鍵ID",
+      "NO_MODIFIER": "快速鍵必須包含修飾鍵（Ctrl、Alt、Shift等）",
+      "SYSTEM_OCCUPIED": "快速鍵已被系統或其他應用程式佔用",
+      "UNKNOWN": "更新失敗：未知錯誤"
+    },
     "group": {
       "conversation": "對話",
+      "desktop": "桌面端",
       "essential": "基本"
     },
     "invalidCombination": "快捷鍵需要至少包含一個修飾鍵 (Ctrl, Alt, Shift) 和一個常規鍵",
     "record": "按下按鍵以錄製快捷鍵",
     "reset": "重置為預設快捷鍵",
-    "title": "快速鍵"
+    "title": "快速鍵",
+    "updateError": "快速鍵更新失敗：網路或系統錯誤",
+    "updateSuccess": "快速鍵更新成功"
   },
   "llm": {
     "aesGcm": "您的金鑰與代理地址等將使用 <1>AES-GCM</1> 加密演算法進行加密",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.103.2",
+  "version": "1.104.1",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/packages/electron-client-ipc/src/events/shortcut.ts

@@ -1,4 +1,6 @@
+import { ShortcutUpdateResult } from '../types';
+
 export interface ShortcutDispatchEvents {
   getShortcutsConfig: () => Record<string, string>;
-  updateShortcutConfig: (id: string, accelerator: string) => boolean;
+  updateShortcutConfig: (params: { accelerator: string; id: string }) => ShortcutUpdateResult;
 }

package/packages/electron-client-ipc/src/types/shortcut.ts

@@ -9,3 +9,14 @@ export interface ShortcutConfig {
   id: string;
 }
 export type ShortcutActionType = Record<string, any>;
+
+export interface ShortcutUpdateResult {
+  errorType?:
+    | 'INVALID_ID'
+    | 'INVALID_FORMAT'
+    | 'NO_MODIFIER'
+    | 'CONFLICT'
+    | 'SYSTEM_OCCUPIED'
+    | 'UNKNOWN';
+  success: boolean;
+}

package/src/app/[variants]/(main)/image/features/GenerationFeed/BatchItem.tsx

@@ -20,6 +20,7 @@ import { AsyncTaskErrorType } from '@/types/asyncTask';
 import { GenerationBatch } from '@/types/generation';
 
 import { GenerationItem } from './GenerationItem';
+import { DEFAULT_MAX_ITEM_WIDTH } from './GenerationItem/utils';
 import { ReferenceImages } from './ReferenceImages';
 
 const useStyles = createStyles(({ cx, css, token }) => ({
@@ -182,7 +183,11 @@ export const GenerationBatchItem = memo<GenerationBatchItemProps>(({ batch }) =>
           {promptAndMetadata}
         </>
       )}
-      <Grid maxItemWidth={200} ref={imageGridRef} rows={batch.generations.length || 4}>
+      <Grid
+        maxItemWidth={DEFAULT_MAX_ITEM_WIDTH}
+        ref={imageGridRef}
+        rows={batch.generations.length}
+      >
         {batch.generations.map((generation) => (
           <GenerationItem
             generation={generation}

package/src/app/[variants]/(main)/image/features/GenerationFeed/GenerationItem/ErrorState.tsx

@@ -9,10 +9,11 @@ import { Center } from 'react-layout-kit';
 import { ActionButtons } from './ActionButtons';
 import { useStyles } from './styles';
 import { ErrorStateProps } from './types';
+import { getThumbnailMaxWidth } from './utils';
 
 // 错误状态组件
 export const ErrorState = memo<ErrorStateProps>(
-  ({ generation, aspectRatio, onDelete, onCopyError }) => {
+  ({ generation, generationBatch, aspectRatio, onDelete, onCopyError }) => {
     const { styles, theme } = useStyles();
     const { t } = useTranslation('image');
 
@@ -32,7 +33,7 @@ export const ErrorState = memo<ErrorStateProps>(
         style={{
           aspectRatio,
           cursor: 'pointer',
-          maxWidth: generation.asset?.width ? generation.asset.width / 2 : 'unset',
+          maxWidth: getThumbnailMaxWidth(generation, generationBatch),
         }}
         variant={'filled'}
       >

package/src/app/[variants]/(main)/image/features/GenerationFeed/GenerationItem/LoadingState.tsx

@@ -12,33 +12,36 @@ import { ActionButtons } from './ActionButtons';
 import { ElapsedTime } from './ElapsedTime';
 import { useStyles } from './styles';
 import { LoadingStateProps } from './types';
+import { getThumbnailMaxWidth } from './utils';
 
 // 加载状态组件
-export const LoadingState = memo<LoadingStateProps>(({ generation, aspectRatio, onDelete }) => {
-  const { styles } = useStyles();
+export const LoadingState = memo<LoadingStateProps>(
+  ({ generation, generationBatch, aspectRatio, onDelete }) => {
+    const { styles } = useStyles();
 
-  const isGenerating =
-    generation.task.status === AsyncTaskStatus.Processing ||
-    generation.task.status === AsyncTaskStatus.Pending;
+    const isGenerating =
+      generation.task.status === AsyncTaskStatus.Processing ||
+      generation.task.status === AsyncTaskStatus.Pending;
 
-  return (
-    <Block
-      align={'center'}
-      className={styles.placeholderContainer}
-      justify={'center'}
-      style={{
-        aspectRatio,
-        maxWidth: generation.asset?.width ? generation.asset.width / 2 : 'unset',
-      }}
-      variant={'filled'}
-    >
-      <Center gap={8}>
-        <Spin indicator={<LoadingOutlined spin />} />
-        <ElapsedTime generationId={generation.id} isActive={isGenerating} />
-      </Center>
-      <ActionButtons onDelete={onDelete} />
-    </Block>
-  );
-});
+    return (
+      <Block
+        align={'center'}
+        className={styles.placeholderContainer}
+        justify={'center'}
+        style={{
+          aspectRatio,
+          maxWidth: getThumbnailMaxWidth(generation, generationBatch),
+        }}
+        variant={'filled'}
+      >
+        <Center gap={8}>
+          <Spin indicator={<LoadingOutlined spin />} />
+          <ElapsedTime generationId={generation.id} isActive={isGenerating} />
+        </Center>
+        <ActionButtons onDelete={onDelete} />
+      </Block>
+    );
+  },
+);
 
 LoadingState.displayName = 'LoadingState';

package/src/app/[variants]/(main)/image/features/GenerationFeed/GenerationItem/SuccessState.tsx

@@ -8,10 +8,20 @@ import ImageItem from '@/components/ImageItem';
 import { ActionButtons } from './ActionButtons';
 import { useStyles } from './styles';
 import { SuccessStateProps } from './types';
+import { getThumbnailMaxWidth } from './utils';
 
 // 成功状态组件
 export const SuccessState = memo<SuccessStateProps>(
-  ({ generation, prompt, aspectRatio, onDelete, onDownload, onCopySeed, seedTooltip }) => {
+  ({
+    generation,
+    generationBatch,
+    prompt,
+    aspectRatio,
+    onDelete,
+    onDownload,
+    onCopySeed,
+    seedTooltip,
+  }) => {
     const { styles } = useStyles();
 
     return (
@@ -21,7 +31,7 @@ export const SuccessState = memo<SuccessStateProps>(
         justify={'center'}
         style={{
           aspectRatio,
-          maxWidth: generation.asset?.width ? generation.asset.width / 2 : 'unset',
+          maxWidth: getThumbnailMaxWidth(generation, generationBatch),
         }}
         variant={'filled'}
       >
@@ -31,7 +41,8 @@ export const SuccessState = memo<SuccessStateProps>(
             src: generation.asset!.url,
           }}
           style={{ height: '100%', width: '100%' }}
-          url={generation.asset!.thumbnailUrl}
+          // Thumbnail quality is too bad
+          url={generation.asset!.url}
         />
         <ActionButtons
           onCopySeed={onCopySeed}

package/src/app/[variants]/(main)/image/features/GenerationFeed/GenerationItem/index.tsx

@@ -37,13 +37,7 @@ export const GenerationItem = memo<GenerationItemProps>(
     const shouldPoll = !isFinalized;
     useCheckGenerationStatus(generation.id, generation.task.id, activeTopicId!, shouldPoll);
 
-    const aspectRatio = getAspectRatio(
-      generation.asset ?? {
-        height: generationBatch.config?.height,
-        type: 'image',
-        width: generationBatch.config?.width,
-      },
-    );
+    const aspectRatio = getAspectRatio(generation, generationBatch);
 
     // 事件处理函数
     const handleDeleteGeneration = async () => {
@@ -120,6 +114,7 @@ export const GenerationItem = memo<GenerationItemProps>(
         <SuccessState
           aspectRatio={aspectRatio}
           generation={generation}
+          generationBatch={generationBatch}
           onCopySeed={handleCopySeed}
           onDelete={handleDeleteGeneration}
           onDownload={handleDownloadImage}
@@ -134,6 +129,7 @@ export const GenerationItem = memo<GenerationItemProps>(
         <ErrorState
           aspectRatio={aspectRatio}
           generation={generation}
+          generationBatch={generationBatch}
           onCopyError={handleCopyError}
           onDelete={handleDeleteGeneration}
         />
@@ -145,6 +141,7 @@ export const GenerationItem = memo<GenerationItemProps>(
       <LoadingState
         aspectRatio={aspectRatio}
         generation={generation}
+        generationBatch={generationBatch}
         onDelete={handleDeleteGeneration}
       />
     );

package/src/app/[variants]/(main)/image/features/GenerationFeed/GenerationItem/types.ts

@@ -18,6 +18,7 @@ export interface ActionButtonsProps {
 export interface SuccessStateProps {
   aspectRatio: string;
   generation: Generation;
+  generationBatch: GenerationBatch;
   onCopySeed?: () => void;
   onDelete: () => void;
   onDownload: () => void;
@@ -28,6 +29,7 @@ export interface SuccessStateProps {
 export interface ErrorStateProps {
   aspectRatio: string;
   generation: Generation;
+  generationBatch: GenerationBatch;
   onCopyError: () => void;
   onDelete: () => void;
 }
@@ -35,5 +37,6 @@ export interface ErrorStateProps {
 export interface LoadingStateProps {
   aspectRatio: string;
   generation: Generation;
+  generationBatch: GenerationBatch;
   onDelete: () => void;
 }