From fd7132cd3a30671fa14feafbe30cfdf448d225d9 Mon Sep 17 00:00:00 2001 From: kangfenmao Date: Sun, 19 Jan 2025 15:35:17 +0800 Subject: [PATCH] fix: store minapp url use base64 data image --- src/renderer/src/store/index.ts | 2 +- src/renderer/src/store/migrate.ts | 37 ++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/src/renderer/src/store/index.ts b/src/renderer/src/store/index.ts index 1fff2b83..404af47d 100644 --- a/src/renderer/src/store/index.ts +++ b/src/renderer/src/store/index.ts @@ -30,7 +30,7 @@ const persistedReducer = persistReducer( { key: 'cherry-studio', storage, - version: 57, + version: 58, blacklist: ['runtime'], migrate }, diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts index a0b03884..35735f40 100644 --- a/src/renderer/src/store/migrate.ts +++ b/src/renderer/src/store/migrate.ts @@ -1,4 +1,5 @@ import { isMac } from '@renderer/config/constant' +import { DEFAULT_MIN_APPS } from '@renderer/config/minapps' import { SYSTEM_MODELS } from '@renderer/config/models' import { TRANSLATE_PROMPT } from '@renderer/config/prompts' import db from '@renderer/databases' @@ -814,13 +815,37 @@ const migrateConfig = { return state }, '57': (state: RootState) => { - state.shortcuts.shortcuts.push({ - key: 'mini_window', - shortcut: [isMac ? 'Command' : 'Ctrl', 'E'], - editable: true, - enabled: false, - system: true + if (state.shortcuts) { + state.shortcuts.shortcuts.push({ + key: 'mini_window', + shortcut: [isMac ? 'Command' : 'Ctrl', 'E'], + editable: true, + enabled: false, + system: true + }) + } + + 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.llm.providers.forEach((provider) => { + if (provider.id === 'qwenlm') { + provider.type = 'qwenlm' + } }) + return state } }