diff --git a/electron-builder.yml b/electron-builder.yml index db8fecdb..39fd9242 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -83,6 +83,7 @@ releaseInfo: 新增快捷助手弹窗 翻译默认使用流输出 小程序弹窗顶部增加固定按钮 @ousugo + 新增清除消息、清除上下文快捷键 @cljnnn Gemini 安全设置更新 @magicdmer 智能体页面性能优化 @magicdmer 修复 WebDAV 不能自动备份问题 diff --git a/package.json b/package.json index 3c85792c..a0d57ab3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "CherryStudio", - "version": "0.9.11", + "version": "0.9.12", "private": true, "description": "A powerful AI assistant for producer.", "main": "./out/main/index.js", diff --git a/src/renderer/src/hooks/useMinapps.ts b/src/renderer/src/hooks/useMinapps.ts index 06a48da5..4a8fe5a4 100644 --- a/src/renderer/src/hooks/useMinapps.ts +++ b/src/renderer/src/hooks/useMinapps.ts @@ -1,3 +1,4 @@ +import { DEFAULT_MIN_APPS } from '@renderer/config/minapps' import { RootState, useAppDispatch, useAppSelector } from '@renderer/store' import { setDisabledMinApps, setMinApps, setPinnedMinApps } from '@renderer/store/minapps' import { MinAppType } from '@renderer/types' @@ -7,9 +8,9 @@ export const useMinapps = () => { const dispatch = useAppDispatch() return { - minapps: enabled, - disabled, - pinned, + minapps: enabled.map((app) => DEFAULT_MIN_APPS.find((item) => item.id === app.id) || app), + disabled: disabled.map((app) => DEFAULT_MIN_APPS.find((item) => item.id === app.id) || app), + pinned: pinned.map((app) => DEFAULT_MIN_APPS.find((item) => item.id === app.id) || app), updateMinapps: (minapps: MinAppType[]) => { dispatch(setMinApps(minapps)) }, diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts index 88625f6b..0557f66d 100644 --- a/src/renderer/src/store/migrate.ts +++ b/src/renderer/src/store/migrate.ts @@ -12,20 +12,12 @@ import { createMigrate } from 'redux-persist' import { RootState } from '.' import { DEFAULT_SIDEBAR_ICONS } from './settings' +// remove logo base64 data to reduce the size of the state function removeMiniAppIconsFromState(state: RootState) { if (state.minapps) { - state.minapps.enabled = state.minapps.enabled.map((app) => { - const _app = DEFAULT_MIN_APPS.find((m) => m.id === app.id) - return _app || app - }) - state.minapps.disabled = state.minapps.disabled.map((app) => { - const _app = DEFAULT_MIN_APPS.find((m) => m.id === app.id) - return _app || app - }) - state.minapps.pinned = state.minapps.pinned.map((app) => { - const _app = DEFAULT_MIN_APPS.find((m) => m.id === app.id) - return _app || app - }) + state.minapps.enabled = state.minapps.enabled.map((app) => ({ ...app, logo: undefined })) + state.minapps.disabled = state.minapps.disabled.map((app) => ({ ...app, logo: undefined })) + state.minapps.pinned = state.minapps.pinned.map((app) => ({ ...app, logo: undefined })) } } diff --git a/src/renderer/src/store/minapps.ts b/src/renderer/src/store/minapps.ts index c6b4ae8a..cf2f194e 100644 --- a/src/renderer/src/store/minapps.ts +++ b/src/renderer/src/store/minapps.ts @@ -29,16 +29,16 @@ const minAppsSlice = createSlice({ initialState, reducers: { setMinApps: (state, action: PayloadAction) => { - state.enabled = action.payload + state.enabled = action.payload.map((app) => ({ ...app, logo: undefined })) }, addMinApp: (state, action: PayloadAction) => { state.enabled.push(action.payload) }, setDisabledMinApps: (state, action: PayloadAction) => { - state.disabled = action.payload + state.disabled = action.payload.map((app) => ({ ...app, logo: undefined })) }, setPinnedMinApps: (state, action: PayloadAction) => { - state.pinned = action.payload + state.pinned = action.payload.map((app) => ({ ...app, logo: undefined })) } } }) diff --git a/src/renderer/src/store/shortcuts.ts b/src/renderer/src/store/shortcuts.ts index ab03ef97..982ed6e9 100644 --- a/src/renderer/src/store/shortcuts.ts +++ b/src/renderer/src/store/shortcuts.ts @@ -68,7 +68,7 @@ const initialState: ShortcutsState = { }, { key: 'toggle_new_context', - shortcut: [isMac ? 'Command' : 'Ctrl', 'R'], + shortcut: [isMac ? 'Command' : 'Ctrl', 'K'], editable: true, enabled: true, system: false diff --git a/src/renderer/src/types/index.ts b/src/renderer/src/types/index.ts index 4b5618f1..0512452c 100644 --- a/src/renderer/src/types/index.ts +++ b/src/renderer/src/types/index.ts @@ -137,7 +137,7 @@ export interface Painting { export type MinAppType = { id?: string | number name: string - logo: string + logo?: string url: string bodered?: boolean background?: string