diff --git a/electron-builder.yml b/electron-builder.yml index 1f726d148..3b02d217f 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -109,9 +109,10 @@ afterSign: scripts/notarize.js artifactBuildCompleted: scripts/artifact-build-completed.js releaseInfo: releaseNotes: | - - 新功能：可选数据保存目录 - - 快捷助手：支持单独选择助手，支持暂停、上下文、思考过程、流式 - - 划词助手：系统托盘菜单开关 - - 翻译：新增 Markdown 预览选项 - - 新供应商：新增 Vertex AI 服务商 - - 错误修复和界面优化 + 界面优化：优化多处界面样式，气泡样式改版，自动调整代码预览边栏宽度 + 知识库：修复知识库引用不显示问题，修复部分嵌入模型适配问题 + 备份与恢复：修复超过 2GB 大文件无法恢复问题 + 文件处理：添加 .doc 文件支持 + 划词助手：支持自定义 CSS 样式 + MCP：基于 Pyodide 实现 Python MCP 服务 + 其他错误修复和优化 diff --git a/package.json b/package.json index 6c613920f..277e7cb15 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,6 @@ "@testing-library/jest-dom": "^6.6.3", "@testing-library/react": "^16.3.0", "@tryfabric/martian": "^1.2.4", - "@types/balanced-match": "^3", "@types/diff": "^7", "@types/fs-extra": "^11", "@types/lodash": "^4.17.5", @@ -142,7 +141,6 @@ "archiver": "^7.0.1", "async-mutex": "^0.5.0", "axios": "^1.7.3", - "balanced-match": "^3.0.1", "browser-image-compression": "^2.0.2", "color": "^5.0.0", "dayjs": "^1.11.11", @@ -218,7 +216,7 @@ "styled-components": "^6.1.11", "tar": "^7.4.3", "tiny-pinyin": "^1.3.2", - "tokenx": "^0.4.1", + "tokenx": "^1.1.0", "typescript": "^5.6.2", "uuid": "^10.0.0", "vite": "6.2.6", diff --git a/packages/shared/IpcChannel.ts b/packages/shared/IpcChannel.ts index 760f1070e..847010947 100644 --- a/packages/shared/IpcChannel.ts +++ b/packages/shared/IpcChannel.ts @@ -3,6 +3,8 @@ export enum IpcChannel { App_ClearCache = 'app:clear-cache', App_SetLaunchOnBoot = 'app:set-launch-on-boot', App_SetLanguage = 'app:set-language', + App_SetEnableSpellCheck = 'app:set-enable-spell-check', + App_SetSpellCheckLanguages = 'app:set-spell-check-languages', App_ShowUpdateDialog = 'app:show-update-dialog', App_CheckForUpdate = 'app:check-for-update', App_Reload = 'app:reload', @@ -13,7 +15,8 @@ export enum IpcChannel { App_SetTrayOnClose = 'app:set-tray-on-close', App_SetTheme = 'app:set-theme', App_SetAutoUpdate = 'app:set-auto-update', - App_SetFeedUrl = 'app:set-feed-url', + App_SetTestPlan = 'app:set-test-plan', + App_SetTestChannel = 'app:set-test-channel', App_HandleZoomFactor = 'app:handle-zoom-factor', App_Select = 'app:select', App_HasWritePermission = 'app:has-write-permission', @@ -35,6 +38,7 @@ export enum IpcChannel { Notification_OnClick = 'notification:on-click', Webview_SetOpenLinkExternal = 'webview:set-open-link-external', + Webview_SetSpellCheckEnabled = 'webview:set-spell-check-enabled', // Open Open_Path = 'open:path', @@ -67,6 +71,9 @@ export enum IpcChannel { Mcp_ServersUpdated = 'mcp:servers-updated', Mcp_CheckConnectivity = 'mcp:check-connectivity', + // Python + Python_Execute = 'python:execute', + //copilot Copilot_GetAuthMessage = 'copilot:get-auth-message', Copilot_GetCopilotToken = 'copilot:get-copilot-token', diff --git a/packages/shared/config/constant.ts b/packages/shared/config/constant.ts index 719600650..e4545d44c 100644 --- a/packages/shared/config/constant.ts +++ b/packages/shared/config/constant.ts @@ -406,6 +406,16 @@ export const defaultLanguage = 'en-US' export enum FeedUrl { PRODUCTION = 'https://releases.cherry-ai.com', - EARLY_ACCESS = 'https://github.com/CherryHQ/cherry-studio/releases/latest/download' + GITHUB_LATEST = 'https://github.com/CherryHQ/cherry-studio/releases/latest/download', + PRERELEASE_LOWEST = 'https://github.com/CherryHQ/cherry-studio/releases/download/v1.4.0' } + +export enum UpgradeChannel { + LATEST = 'latest', // 最新稳定版本 + RC = 'rc', // 公测版本 + BETA = 'beta' // 预览版本 +} + export const defaultTimeout = 5 * 1000 * 60 + +export const occupiedDirs = ['logs', 'Network', 'Partitions/webview/Network'] diff --git a/src/main/bootstrap.ts b/src/main/bootstrap.ts index f682c06fc..15648f6ff 100644 --- a/src/main/bootstrap.ts +++ b/src/main/bootstrap.ts @@ -1,5 +1,33 @@ +import { occupiedDirs } from '@shared/config/constant' import { app } from 'electron' +import fs from 'fs' +import path from 'path' import { initAppDataDir } from './utils/file' app.isPackaged && initAppDataDir() + +// 在主进程中复制 appData 中某些一直被占用的文件 +// 在renderer进程还没有启动时，主进程可以复制这些文件到新的appData中 +function copyOccupiedDirsInMainProcess() { + const newAppDataPath = process.argv + .slice(1) + .find((arg) => arg.startsWith('--new-data-path=')) + ?.split('--new-data-path=')[1] + if (!newAppDataPath) { + return + } + + if (process.platform === 'win32') { + const appDataPath = app.getPath('userData') + occupiedDirs.forEach((dir) => { + const dirPath = path.join(appDataPath, dir) + const newDirPath = path.join(newAppDataPath, dir) + if (fs.existsSync(dirPath)) { + fs.cpSync(dirPath, newDirPath, { recursive: true }) + } + }) + } +} + +copyOccupiedDirsInMainProcess() diff --git a/src/main/ipc.ts b/src/main/ipc.ts index e88117174..e9a7ea04a 100644 --- a/src/main/ipc.ts +++ b/src/main/ipc.ts @@ -5,10 +5,10 @@ import path from 'node:path' import { isMac, isWin } from '@main/constant' import { getBinaryPath, isBinaryExists, runInstallScript } from '@main/utils/process' import { handleZoomFactor } from '@main/utils/zoom' -import { FeedUrl } from '@shared/config/constant' +import { UpgradeChannel } from '@shared/config/constant' import { IpcChannel } from '@shared/IpcChannel' import { FileMetadata, Provider, Shortcut, ThemeMode } from '@types' -import { BrowserWindow, dialog, ipcMain, session, shell } from 'electron' +import { BrowserWindow, dialog, ipcMain, session, shell, webContents } from 'electron' import log from 'electron-log' import { Notification } from 'src/renderer/src/types/notification' @@ -26,6 +26,7 @@ import NotificationService from './services/NotificationService' import * as NutstoreService from './services/NutstoreService' import ObsidianVaultService from './services/ObsidianVaultService' import { ProxyConfig, proxyManager } from './services/ProxyManager' +import { pythonService } from './services/PythonService' import { FileServiceManager } from './services/remotefile/FileServiceManager' import { searchService } from './services/SearchService' import { SelectionService } from './services/SelectionService' @@ -51,6 +52,9 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { const appUpdater = new AppUpdater(mainWindow) const notificationService = new NotificationService(mainWindow) + // Initialize Python service with main window + pythonService.setMainWindow(mainWindow) + ipcMain.handle(IpcChannel.App_Info, () => ({ version: app.getVersion(), isPackaged: app.isPackaged, @@ -90,6 +94,27 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { configManager.setLanguage(language) }) + // spell check + ipcMain.handle(IpcChannel.App_SetEnableSpellCheck, (_, isEnable: boolean) => { + // disable spell check for all webviews + const webviews = webContents.getAllWebContents() + webviews.forEach((webview) => { + webview.session.setSpellCheckerEnabled(isEnable) + }) + }) + + // spell check languages + ipcMain.handle(IpcChannel.App_SetSpellCheckLanguages, (_, languages: string[]) => { + if (languages.length === 0) { + return + } + const windows = BrowserWindow.getAllWindows() + windows.forEach((window) => { + window.webContents.session.setSpellCheckerLanguages(languages) + }) + configManager.set('spellCheckLanguages', languages) + }) + // launch on boot ipcMain.handle(IpcChannel.App_SetLaunchOnBoot, (_, openAtLogin: boolean) => { // Set login item settings for windows and mac @@ -120,8 +145,20 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { configManager.setAutoUpdate(isActive) }) - ipcMain.handle(IpcChannel.App_SetFeedUrl, (_, feedUrl: FeedUrl) => { - appUpdater.setFeedUrl(feedUrl) + ipcMain.handle(IpcChannel.App_SetTestPlan, async (_, isActive: boolean) => { + log.info('set test plan', isActive) + if (isActive !== configManager.getTestPlan()) { + appUpdater.cancelDownload() + configManager.setTestPlan(isActive) + } + }) + + ipcMain.handle(IpcChannel.App_SetTestChannel, async (_, channel: UpgradeChannel) => { + log.info('set test channel', channel) + if (channel !== configManager.getTestChannel()) { + appUpdater.cancelDownload() + configManager.setTestChannel(channel) + } }) ipcMain.handle(IpcChannel.Config_Set, (_, key: string, value: any, isNotify: boolean = false) => { @@ -252,9 +289,17 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { }) // Copy user data to new location - ipcMain.handle(IpcChannel.App_Copy, async (_, oldPath: string, newPath: string) => { + ipcMain.handle(IpcChannel.App_Copy, async (_, oldPath: string, newPath: string, occupiedDirs: string[] = []) => { try { - await fs.promises.cp(oldPath, newPath, { recursive: true }) + await fs.promises.cp(oldPath, newPath, { + recursive: true, + filter: (src) => { + if (occupiedDirs.some((dir) => src.startsWith(path.resolve(dir)))) { + return false + } + return true + } + }) return { success: true } } catch (error: any) { log.error('Failed to copy user data:', error) @@ -458,6 +503,14 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { ipcMain.handle(IpcChannel.Mcp_GetInstallInfo, mcpService.getInstallInfo) ipcMain.handle(IpcChannel.Mcp_CheckConnectivity, mcpService.checkMcpConnectivity) + // Register Python execution handler + ipcMain.handle( + IpcChannel.Python_Execute, + async (_, script: string, context?: Record
-
- {tokenLines.map((lineTokens, lineIndex) => (
-
+ return (
+
+
+ {tokenLines.map((lineTokens, lineIndex) => (
+
+ {showLineNumbers && {lineIndex + 1}}
+
{lineTokens.map((token, tokenIndex) => (
{token.content}
))}
- ))}
-
-
- )
- }
-)
+
+ ))}
+
+
+ )
+})
const ContentContainer = styled.div<{
- $lineNumbers: boolean
$wrap: boolean
$fadeIn: boolean
}>`
position: relative;
overflow: auto;
- border: 0.5px solid transparent;
- border-radius: 5px;
+ border-radius: inherit;
margin-top: 0;
+ /* gutter 宽度默认值 */
+ --gutter-width: 0.6rem;
+
.shiki {
padding: 1em;
+ border-radius: inherit;
code {
display: flex;
flex-direction: column;
.line {
- display: block;
+ display: flex;
+ align-items: flex-start;
min-height: 1.3rem;
- padding-left: ${(props) => (props.$lineNumbers ? '2rem' : '0')};
- * {
- overflow-wrap: ${(props) => (props.$wrap ? 'break-word' : 'normal')};
- white-space: ${(props) => (props.$wrap ? 'pre-wrap' : 'pre')};
+ .line-number {
+ width: var(--gutter-width);
+ text-align: right;
+ opacity: 0.35;
+ margin-right: 1rem;
+ user-select: none;
+ flex-shrink: 0;
+ overflow: hidden;
+ line-height: inherit;
+ font-family: inherit;
+ font-variant-numeric: tabular-nums;
+ }
+
+ .line-content {
+ flex: 1;
+
+ * {
+ overflow-wrap: ${(props) => (props.$wrap ? 'break-word' : 'normal')};
+ white-space: ${(props) => (props.$wrap ? 'pre-wrap' : 'pre')};
+ }
}
}
}
}
- ${(props) =>
- props.$lineNumbers &&
- `
- code {
- counter-reset: step;
- counter-increment: step 0;
- position: relative;
- }
-
- code .line::before {
- content: counter(step);
- counter-increment: step;
- width: 1rem;
- position: absolute;
- left: 0;
- text-align: right;
- opacity: 0.35;
- }
- `}
-
@keyframes contentFadeIn {
from {
opacity: 0;
@@ -291,7 +294,7 @@ const ContentContainer = styled.div<{
}
}
- animation: ${(props) => (props.$fadeIn ? 'contentFadeIn 0.3s ease-in-out forwards' : 'none')};
+ animation: ${(props) => (props.$fadeIn ? 'contentFadeIn 0.1s ease-in forwards' : 'none')};
`
const CodePlaceholder = styled.div`
diff --git a/src/renderer/src/components/CodeBlockView/index.tsx b/src/renderer/src/components/CodeBlockView/index.tsx
index 811b8665c..c25ab3079 100644
--- a/src/renderer/src/components/CodeBlockView/index.tsx
+++ b/src/renderer/src/components/CodeBlockView/index.tsx
@@ -273,6 +273,7 @@ const CodeHeader = styled.div<{ $isInSpecialView: boolean }>`
align-items: center;
color: var(--color-text);
font-size: 14px;
+ line-height: 1;
font-weight: bold;
padding: 0 10px;
border-top-left-radius: 8px;
@@ -288,6 +289,10 @@ const SplitViewWrapper = styled.div`
flex: 1 1 auto;
width: 100%;
}
+
+ &:not(:has(+ [class*='Container'])) {
+ border-radius: 0 0 8px 8px;
+ }
`
export default memo(CodeBlockView)
diff --git a/src/renderer/src/components/CodeEditor/index.tsx b/src/renderer/src/components/CodeEditor/index.tsx
index d92fd91e8..db699fa03 100644
--- a/src/renderer/src/components/CodeEditor/index.tsx
+++ b/src/renderer/src/components/CodeEditor/index.tsx
@@ -227,10 +227,10 @@ const CodeEditor = ({
...customBasicSetup // override basicSetup
}}
style={{
- ...style,
fontSize: `${fontSize - 1}px`,
- border: '0.5px solid transparent',
- marginTop: 0
+ marginTop: 0,
+ borderRadius: 'inherit',
+ ...style
}}
/>
)
diff --git a/src/renderer/src/components/ContextMenu/index.tsx b/src/renderer/src/components/ContextMenu/index.tsx
index 195fcb2a3..610afa695 100644
--- a/src/renderer/src/components/ContextMenu/index.tsx
+++ b/src/renderer/src/components/ContextMenu/index.tsx
@@ -1,87 +1,59 @@
import { Dropdown } from 'antd'
-import { useCallback, useEffect, useState } from 'react'
+import { useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
-import styled from 'styled-components'
interface ContextMenuProps {
children: React.ReactNode
- onContextMenu?: (e: React.MouseEvent) => void
- style?: React.CSSProperties
}
-const ContextMenu: React.FC