diff --git a/src/main/services/AppUpdater.ts b/src/main/services/AppUpdater.ts index fa7413699d..e60dac31f0 100644 --- a/src/main/services/AppUpdater.ts +++ b/src/main/services/AppUpdater.ts @@ -9,10 +9,10 @@ import { CancellationToken, UpdateInfo } from 'builder-util-runtime' import { app, BrowserWindow, dialog } from 'electron' import { AppUpdater as _AppUpdater, autoUpdater, Logger, NsisUpdater, UpdateCheckResult } from 'electron-updater' import path from 'path' -import { windowService } from './WindowService' import icon from '../../../build/icon.png?asset' import { configManager } from './ConfigManager' +import { windowService } from './WindowService' const logger = loggerService.withContext('AppUpdater') diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json index 3a13cb9251..d1ec6e6b5c 100644 --- a/src/renderer/src/i18n/locales/en-us.json +++ b/src/renderer/src/i18n/locales/en-us.json @@ -2889,7 +2889,7 @@ "tagsPlaceholder": "Enter tags", "timeout": "Timeout", "timeoutTooltip": "Timeout in seconds for requests to this server, default is 60 seconds", - "title": "MCP Settings", + "title": "MCP", "tools": { "autoApprove": { "label": "Auto Approve", @@ -3432,10 +3432,10 @@ "title": "Settings", "tool": { "preprocess": { - "provider": "Pre Process Provider", - "provider_placeholder": "Choose a Pre Process provider", - "title": "Pre Process", - "tooltip": "In Settings -> Tools, set a document preprocessing service provider. Document preprocessing can effectively improve the retrieval performance of complex format documents and scanned documents." + "provider": "Document Processing Provider", + "provider_placeholder": "Choose a document processing provider", + "title": "Document Processing", + "tooltip": "In Settings -> Tools, set a document processing service provider. Document processing can effectively improve the retrieval performance of complex format documents and scanned documents." }, "title": "Other Settings", "websearch": { diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json index fa4f46b90b..94bf9b7faa 100644 --- a/src/renderer/src/i18n/locales/ja-jp.json +++ b/src/renderer/src/i18n/locales/ja-jp.json @@ -2889,7 +2889,7 @@ "tagsPlaceholder": "タグを入力", "timeout": "タイムアウト", "timeoutTooltip": "このサーバーへのリクエストのタイムアウト時間（秒）、デフォルトは60秒です", - "title": "MCP 設定", + "title": "MCP", "tools": { "autoApprove": { "label": "自動承認", diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json index 6395bbc3bf..3da62da559 100644 --- a/src/renderer/src/i18n/locales/ru-ru.json +++ b/src/renderer/src/i18n/locales/ru-ru.json @@ -2889,7 +2889,7 @@ "tagsPlaceholder": "Введите теги", "timeout": "Тайм-аут", "timeoutTooltip": "Тайм-аут в секундах для запросов к этому серверу, по умолчанию 60 секунд", - "title": "Настройки MCP", + "title": "MCP", "tools": { "autoApprove": { "label": "Автоматическое одобрение", @@ -3432,10 +3432,10 @@ "title": "Настройки", "tool": { "preprocess": { - "provider": "Предварительная обработка Поставщик", - "provider_placeholder": "Выберите поставщика услуг предварительной обработки", - "title": "Предварительная обработка", - "tooltip": "В настройках (Настройки -> Инструменты) укажите поставщика услуги предварительной обработки документов. Предварительная обработка документов может значительно повысить эффективность поиска для документов сложных форматов и отсканированных документов." + "provider": "Поставщик обработки документов", + "provider_placeholder": "Выберите поставщика услуг обработки документов", + "title": "Обработка документов", + "tooltip": "В настройках (Настройки -> Инструменты) укажите поставщика услуг обработки документов. Обработка документов может значительно повысить эффективность поиска для документов сложных форматов и отсканированных документов." }, "title": "Другие настройки", "websearch": { diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json index 250aa8ee72..beac18d19e 100644 --- a/src/renderer/src/i18n/locales/zh-cn.json +++ b/src/renderer/src/i18n/locales/zh-cn.json @@ -176,7 +176,7 @@ "enableFirst": "请先在 MCP 设置中启用此服务器", "label": "MCP 服务器", "noServersAvailable": "无可用 MCP 服务器。请在设置中添加服务器", - "title": "MCP 设置" + "title": "MCP 服务器" }, "model": "模型设置", "more": "助手设置", @@ -2889,7 +2889,7 @@ "tagsPlaceholder": "输入标签", "timeout": "超时", "timeoutTooltip": "对该服务器请求的超时时间（秒），默认为 60 秒", - "title": "MCP 设置", + "title": "MCP", "tools": { "autoApprove": { "label": "自动批准", @@ -3432,10 +3432,10 @@ "title": "设置", "tool": { "preprocess": { - "provider": "文档预处理服务商", - "provider_placeholder": "选择一个文档预处理服务商", - "title": "文档预处理", - "tooltip": "在设置 -> 工具中设置文档预处理服务商，文档预处理可以有效提升复杂格式文档与扫描版文档的检索效果" + "provider": "文档处理服务商", + "provider_placeholder": "选择一个文档处理服务商", + "title": "文档处理", + "tooltip": "在设置 -> 工具中设置文档处理服务商，文档处理可以有效提升复杂格式文档与扫描版文档的检索效果" }, "title": "其他设置", "websearch": { diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json index b06f199777..e2f156a9d0 100644 --- a/src/renderer/src/i18n/locales/zh-tw.json +++ b/src/renderer/src/i18n/locales/zh-tw.json @@ -2889,7 +2889,7 @@ "tagsPlaceholder": "輸入標籤", "timeout": "超時", "timeoutTooltip": "對該伺服器請求的超時時間（秒），預設為 60 秒", - "title": "MCP 設定", + "title": "MCP", "tools": { "autoApprove": { "label": "自動批准", @@ -3432,10 +3432,10 @@ "title": "設定", "tool": { "preprocess": { - "provider": "前置處理供應商", - "provider_placeholder": "選擇一個預處理供應商", - "title": "前置處理", - "tooltip": "在「設定」->「工具」中設定文件預處理服務供應商。文件預處理可有效提升複雜格式文件及掃描文件的檢索效能" + "provider": "文件處理供應商", + "provider_placeholder": "選擇一個文件處理供應商", + "title": "文件處理", + "tooltip": "在「設定」->「工具」中設定文件處理服務供應商。文件處理可有效提升複雜格式文件及掃描文件的檢索效能" }, "title": "其他設定", "websearch": { diff --git a/src/renderer/src/pages/settings/ToolSettings/PreprocessSettings/PreprocessSettings.tsx b/src/renderer/src/pages/settings/PreprocessSettings/PreprocessSettings.tsx similarity index 99% rename from src/renderer/src/pages/settings/ToolSettings/PreprocessSettings/PreprocessSettings.tsx rename to src/renderer/src/pages/settings/PreprocessSettings/PreprocessSettings.tsx index c2de952dd7..c1592ac73f 100644 --- a/src/renderer/src/pages/settings/ToolSettings/PreprocessSettings/PreprocessSettings.tsx +++ b/src/renderer/src/pages/settings/PreprocessSettings/PreprocessSettings.tsx @@ -20,7 +20,7 @@ import { SettingRowTitle, SettingSubtitle, SettingTitle -} from '../..' +} from '..' interface Props { provider: PreprocessProvider diff --git a/src/renderer/src/pages/settings/ToolSettings/PreprocessSettings/index.tsx b/src/renderer/src/pages/settings/PreprocessSettings/index.tsx similarity index 97% rename from src/renderer/src/pages/settings/ToolSettings/PreprocessSettings/index.tsx rename to src/renderer/src/pages/settings/PreprocessSettings/index.tsx index 23f8771e63..daa76c042c 100644 --- a/src/renderer/src/pages/settings/ToolSettings/PreprocessSettings/index.tsx +++ b/src/renderer/src/pages/settings/PreprocessSettings/index.tsx @@ -6,7 +6,7 @@ import { Select } from 'antd' import { FC, useState } from 'react' import { useTranslation } from 'react-i18next' -import { SettingContainer, SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '../..' +import { SettingContainer, SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '..' import PreprocessProviderSettings from './PreprocessSettings' const PreprocessSettings: FC = () => { diff --git a/src/renderer/src/pages/settings/ProviderSettings/index.tsx b/src/renderer/src/pages/settings/ProviderSettings/index.tsx index 836a156faa..98d8120557 100644 --- a/src/renderer/src/pages/settings/ProviderSettings/index.tsx +++ b/src/renderer/src/pages/settings/ProviderSettings/index.tsx @@ -535,6 +535,7 @@ const ProviderListContainer = styled.div` flex-direction: column; min-width: calc(var(--settings-width) + 10px); height: calc(100vh - var(--navbar-height)); + padding-bottom: 5px; border-right: 0.5px solid var(--color-border); ` diff --git a/src/renderer/src/pages/settings/ToolSettings/QuickPhraseSettings.tsx b/src/renderer/src/pages/settings/QuickPhraseSettings.tsx similarity index 99% rename from src/renderer/src/pages/settings/ToolSettings/QuickPhraseSettings.tsx rename to src/renderer/src/pages/settings/QuickPhraseSettings.tsx index 8cddc8aa4b..a8b395a2e2 100644 --- a/src/renderer/src/pages/settings/ToolSettings/QuickPhraseSettings.tsx +++ b/src/renderer/src/pages/settings/QuickPhraseSettings.tsx @@ -11,7 +11,7 @@ import { FC, useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' -import { SettingContainer, SettingDivider, SettingGroup, SettingRow, SettingTitle } from '..' +import { SettingContainer, SettingDivider, SettingGroup, SettingRow, SettingTitle } from '.' const { TextArea } = Input diff --git a/src/renderer/src/pages/settings/SettingsPage.tsx b/src/renderer/src/pages/settings/SettingsPage.tsx index 72ff047882..59a505d45b 100644 --- a/src/renderer/src/pages/settings/SettingsPage.tsx +++ b/src/renderer/src/pages/settings/SettingsPage.tsx @@ -1,10 +1,13 @@ +import { GlobalOutlined } from '@ant-design/icons' import { Navbar, NavbarCenter } from '@renderer/components/app/Navbar' +import Scrollbar from '@renderer/components/Scrollbar' import ModelSettings from '@renderer/pages/settings/ModelSettings/ModelSettings' +import { Divider as AntDivider } from 'antd' import { Brain, Cloud, Command, - FolderCog, + FileCode, HardDrive, Info, MonitorCog, @@ -12,7 +15,8 @@ import { PictureInPicture2, Settings2, SquareTerminal, - TextCursorInput + TextCursorInput, + Zap } from 'lucide-react' import { FC } from 'react' import { useTranslation } from 'react-i18next' @@ -25,11 +29,13 @@ import DisplaySettings from './DisplaySettings/DisplaySettings' import GeneralSettings from './GeneralSettings' import MCPSettings from './MCPSettings' import MemorySettings from './MemorySettings' +import PreprocessSettings from './PreprocessSettings' import ProvidersList from './ProviderSettings' import QuickAssistantSettings from './QuickAssistantSettings' +import QuickPhraseSettings from './QuickPhraseSettings' import SelectionAssistantSettings from './SelectionAssistantSettings/SelectionAssistantSettings' import ShortcutSettings from './ShortcutSettings' -import ToolSettings from './ToolSettings' +import WebSearchSettings from './WebSearchSettings' const SettingsPage: FC = () => { const { pathname } = useLocation() @@ -56,6 +62,7 @@ const SettingsPage: FC = () => { {t('settings.model')} + @@ -74,30 +81,44 @@ const SettingsPage: FC = () => { {t('settings.data.title')} + {t('settings.mcp.title')} + + + + {t('settings.tool.websearch.title')} + + {t('memory.title')} + + + + {t('settings.tool.preprocess.title')} + + + + + + {t('settings.quickPhrase.title')} + + {t('settings.shortcuts.title')} - - - - {t('settings.tool.title')} - - + @@ -110,6 +131,7 @@ const SettingsPage: FC = () => { {t('selection.name')} + @@ -121,7 +143,9 @@ const SettingsPage: FC = () => { } /> } /> - } /> + } /> + } /> + } /> } /> } /> } /> @@ -149,21 +173,22 @@ const ContentContainer = styled.div` flex: 1; flex-direction: row; height: calc(100vh - var(--navbar-height)); + padding: 1px 0; ` -const SettingMenus = styled.ul` +const SettingMenus = styled(Scrollbar)` display: flex; flex-direction: column; min-width: var(--settings-width); border-right: 0.5px solid var(--color-border); padding: 10px; user-select: none; + gap: 5px; ` const MenuItemLink = styled(Link)` text-decoration: none; color: var(--color-text-1); - margin-bottom: 5px; ` const MenuItem = styled.li` @@ -182,12 +207,6 @@ const MenuItem = styled.li` font-size: 16px; opacity: 0.8; } - .iconfont { - font-size: 18px; - line-height: 18px; - opacity: 0.7; - margin-left: -1px; - } &:hover { background: var(--color-background-soft); } @@ -203,4 +222,8 @@ const SettingContent = styled.div` flex: 1; ` +const Divider = styled(AntDivider)` + margin: 3px 0; +` + export default SettingsPage diff --git a/src/renderer/src/pages/settings/ToolSettings/index.tsx b/src/renderer/src/pages/settings/ToolSettings/index.tsx deleted file mode 100644 index 1b277846ae..0000000000 --- a/src/renderer/src/pages/settings/ToolSettings/index.tsx +++ /dev/null @@ -1,79 +0,0 @@ -import { GlobalOutlined } from '@ant-design/icons' -import { HStack } from '@renderer/components/Layout' -import ListItem from '@renderer/components/ListItem' -import { FileCode, Zap } from 'lucide-react' -import { FC } from 'react' -import { useTranslation } from 'react-i18next' -import { Link, Route, Routes, useLocation } from 'react-router-dom' -import styled from 'styled-components' - -import PreprocessSettings from './PreprocessSettings' -import QuickPhraseSettings from './QuickPhraseSettings' -import WebSearchSettings from './WebSearchSettings' - -const ToolSettings: FC = () => { - const { t } = useTranslation() - const { pathname } = useLocation() - const menuItems = [ - { key: 'web-search', title: 'settings.tool.websearch.title', icon: }, - { key: 'preprocess', title: 'settings.tool.preprocess.title', icon: }, - { key: 'quick-phrase', title: 'settings.quickPhrase.title', icon: } - ] - - const isActive = (key: string): boolean => { - const basePath = '/settings/tool' - if (key === 'web-search') { - return pathname === basePath || pathname === `${basePath}/` || pathname === `${basePath}/${key}` - } - return pathname === `${basePath}/${key}` - } - - return ( - - - {menuItems.map((item) => ( - - - - ))} - - - - } /> - } /> - } /> - } /> - - - - ) -} - -const Container = styled(HStack)` - flex: 1; -` - -const MenuList = styled.div` - display: flex; - flex-direction: column; - gap: 5px; - width: var(--settings-width); - padding: 12px; - border-right: 0.5px solid var(--color-border); - height: 100%; - .iconfont { - line-height: 16px; - } -` - -const ContentArea = styled.div` - display: flex; - flex: 1; - height: 100%; -` -export default ToolSettings diff --git a/src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/AddSubscribePopup.tsx b/src/renderer/src/pages/settings/WebSearchSettings/AddSubscribePopup.tsx similarity index 100% rename from src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/AddSubscribePopup.tsx rename to src/renderer/src/pages/settings/WebSearchSettings/AddSubscribePopup.tsx diff --git a/src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/BasicSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx similarity index 98% rename from src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/BasicSettings.tsx rename to src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx index 30716994bd..79ac56237c 100644 --- a/src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/BasicSettings.tsx +++ b/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx @@ -7,7 +7,7 @@ import { t } from 'i18next' import { Info } from 'lucide-react' import { FC } from 'react' -import { SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '../..' +import { SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '..' const BasicSettings: FC = () => { const { theme } = useTheme() diff --git a/src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/BlacklistSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/BlacklistSettings.tsx similarity index 99% rename from src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/BlacklistSettings.tsx rename to src/renderer/src/pages/settings/WebSearchSettings/BlacklistSettings.tsx index 28b4cb2184..8aa7783a44 100644 --- a/src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/BlacklistSettings.tsx +++ b/src/renderer/src/pages/settings/WebSearchSettings/BlacklistSettings.tsx @@ -10,7 +10,7 @@ import TextArea from 'antd/es/input/TextArea' import { t } from 'i18next' import { FC, useEffect, useState } from 'react' -import { SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '../..' +import { SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '..' import AddSubscribePopup from './AddSubscribePopup' type TableRowSelection = TableProps['rowSelection'] diff --git a/src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/CompressionSettings/CutoffSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/CutoffSettings.tsx similarity index 100% rename from src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/CompressionSettings/CutoffSettings.tsx rename to src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/CutoffSettings.tsx diff --git a/src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/CompressionSettings/RagSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/RagSettings.tsx similarity index 100% rename from src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/CompressionSettings/RagSettings.tsx rename to src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/RagSettings.tsx diff --git a/src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/CompressionSettings/index.tsx b/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/index.tsx similarity index 100% rename from src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/CompressionSettings/index.tsx rename to src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/index.tsx diff --git a/src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/WebSearchProviderSetting.tsx b/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx similarity index 98% rename from src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/WebSearchProviderSetting.tsx rename to src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx index 01c1d306ab..68bb689bd6 100644 --- a/src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/WebSearchProviderSetting.tsx +++ b/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx @@ -12,14 +12,7 @@ import { FC, useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' -import { - SettingDivider, - SettingHelpLink, - SettingHelpText, - SettingHelpTextRow, - SettingSubtitle, - SettingTitle -} from '../..' +import { SettingDivider, SettingHelpLink, SettingHelpText, SettingHelpTextRow, SettingSubtitle, SettingTitle } from '..' const logger = loggerService.withContext('WebSearchProviderSetting') interface Props { diff --git a/src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/index.tsx b/src/renderer/src/pages/settings/WebSearchSettings/index.tsx similarity index 98% rename from src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/index.tsx rename to src/renderer/src/pages/settings/WebSearchSettings/index.tsx index 7f973eed86..1469008875 100644 --- a/src/renderer/src/pages/settings/ToolSettings/WebSearchSettings/index.tsx +++ b/src/renderer/src/pages/settings/WebSearchSettings/index.tsx @@ -6,7 +6,7 @@ import { hasObjectKey } from '@renderer/utils' import { FC, useState } from 'react' import { useTranslation } from 'react-i18next' -import { SettingContainer, SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '../..' +import { SettingContainer, SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '..' import BasicSettings from './BasicSettings' import BlacklistSettings from './BlacklistSettings' import CompressionSettings from './CompressionSettings' diff --git a/src/renderer/src/pages/settings/index.tsx b/src/renderer/src/pages/settings/index.tsx index 86a660f252..ae9697189b 100644 --- a/src/renderer/src/pages/settings/index.tsx +++ b/src/renderer/src/pages/settings/index.tsx @@ -7,7 +7,7 @@ export const SettingContainer = styled.div<{ theme?: ThemeMode }>` display: flex; flex-direction: column; flex: 1; - padding: 10px; + padding: 15px 18px; overflow-y: scroll; background: ${(props) => (props.theme === 'dark' ? 'transparent' : 'var(--color-background-soft)')};