= ({ base: _base, resolve })
window.modal.confirm({
title: t('knowledge.migrate.confirm.title'),
content: (
-
+
{t('knowledge.migrate.confirm.content')}
{t('knowledge.embedding_model')}:
{`${t('knowledge.migrate.source_model')}: ${base.model.name}`}
@@ -80,7 +80,7 @@ const PopupContainer: React.FC = ({ base: _base, resolve })
style={{
paddingLeft: '1em'
}}>{`${t('knowledge.migrate.target_dimensions')}: ${newBase.dimensions}`}
-
+
),
okText: t('knowledge.migrate.confirm.ok'),
centered: true,
diff --git a/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx b/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx
index a48b9b8225..81e7986a94 100644
--- a/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx
+++ b/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx
@@ -1,5 +1,5 @@
+import { RowFlex } from '@cherrystudio/ui'
import { loggerService } from '@logger'
-import { HStack } from '@renderer/components/Layout'
import { TopView } from '@renderer/components/TopView'
import { searchKnowledgeBase } from '@renderer/services/KnowledgeService'
import type { FileMetadata, KnowledgeBase, KnowledgeSearchResult } from '@renderer/types'
@@ -96,7 +96,7 @@ const PopupContainer: React.FC
= ({ base, resolve }) => {
padding: 0
}
}}>
-
+
= ({ base, resolve }) => {
onChange={(e) => setSearchKeyword(e.target.value)}
onPressEnter={() => handleSearch(searchKeyword)}
/>
-
+
diff --git a/src/renderer/src/pages/knowledge/components/KnowledgeSettings/KnowledgeBaseFormModal.tsx b/src/renderer/src/pages/knowledge/components/KnowledgeSettings/KnowledgeBaseFormModal.tsx
index 6ea885da76..6643eef90a 100644
--- a/src/renderer/src/pages/knowledge/components/KnowledgeSettings/KnowledgeBaseFormModal.tsx
+++ b/src/renderer/src/pages/knowledge/components/KnowledgeSettings/KnowledgeBaseFormModal.tsx
@@ -1,4 +1,4 @@
-import { HStack } from '@renderer/components/Layout'
+import { RowFlex } from '@cherrystudio/ui'
import type { ModalProps } from 'antd'
import { Menu, Modal } from 'antd'
import React, { useState } from 'react'
@@ -42,7 +42,7 @@ const KnowledgeBaseFormModal: React.FC = ({ panels,
}
}}
{...rest}>
-
+
= ({ panels,
/>
{activePanel}
-
+
)
}
diff --git a/src/renderer/src/pages/memory/settings-modal.tsx b/src/renderer/src/pages/memory/settings-modal.tsx
index 996baebd1d..b07051cf65 100644
--- a/src/renderer/src/pages/memory/settings-modal.tsx
+++ b/src/renderer/src/pages/memory/settings-modal.tsx
@@ -1,3 +1,4 @@
+import { Flex } from '@cherrystudio/ui'
import { loggerService } from '@logger'
import AiProvider from '@renderer/aiCore'
import InputEmbeddingDimension from '@renderer/components/InputEmbeddingDimension'
@@ -9,7 +10,7 @@ import { useProviders } from '@renderer/hooks/useProvider'
import { getModelUniqId } from '@renderer/services/ModelService'
import { selectMemoryConfig, updateMemoryConfig } from '@renderer/store/memory'
import type { Model } from '@renderer/types'
-import { Flex, Form, Modal } from 'antd'
+import { Form, Modal } from 'antd'
import { t } from 'i18next'
import type { FC } from 'react'
import { useCallback, useEffect, useMemo, useState } from 'react'
@@ -167,7 +168,7 @@ const MemoriesSettingsModal: FC = ({ visible, onSubm
return (
+
{t('memory.embedding_dimensions')}
diff --git a/src/renderer/src/pages/notes/HeaderNavbar.tsx b/src/renderer/src/pages/notes/HeaderNavbar.tsx
index 0798d7ded9..242ca0cb27 100644
--- a/src/renderer/src/pages/notes/HeaderNavbar.tsx
+++ b/src/renderer/src/pages/notes/HeaderNavbar.tsx
@@ -1,7 +1,7 @@
+import { RowFlex } from '@cherrystudio/ui'
import { BreadcrumbItem, Breadcrumbs } from '@heroui/react'
import { loggerService } from '@logger'
import { NavbarCenter, NavbarHeader, NavbarRight } from '@renderer/components/app/Navbar'
-import { HStack } from '@renderer/components/Layout'
import { useActiveNode } from '@renderer/hooks/useNotesQuery'
import { useNotesSettings } from '@renderer/hooks/useNotesSettings'
import { useShowWorkspace } from '@renderer/hooks/useShowWorkspace'
@@ -161,7 +161,7 @@ const HeaderNavbar = ({ notesTree, getCurrentNoteContent, onToggleStar }) => {
-
+
{showWorkspace && (
@@ -176,7 +176,7 @@ const HeaderNavbar = ({ notesTree, getCurrentNoteContent, onToggleStar }) => {
)}
-
+
diff --git a/src/renderer/src/pages/notes/NotesEditor.tsx b/src/renderer/src/pages/notes/NotesEditor.tsx
index 60e098ada7..1cf4647894 100644
--- a/src/renderer/src/pages/notes/NotesEditor.tsx
+++ b/src/renderer/src/pages/notes/NotesEditor.tsx
@@ -1,5 +1,5 @@
-import { CodeEditor } from '@cherrystudio/ui'
-import { HSpaceBetweenStack } from '@renderer/components/Layout'
+import { SpaceBetweenRowFlex } from '@cherrystudio/ui'
+import CodeEditor from '@renderer/components/CodeEditor'
import RichEditor from '@renderer/components/RichEditor'
import type { RichEditorRef } from '@renderer/components/RichEditor/types'
import Selector from '@renderer/components/Selector'
@@ -69,7 +69,7 @@ const NotesEditor: FC = memo(
value={currentContent}
language="markdown"
onChange={onMarkdownChange}
- height="100%"
+ className="h-full"
expanded={false}
style={{
height: '100%'
@@ -88,14 +88,14 @@ const NotesEditor: FC = memo(
showTableOfContents={settings.showTableOfContents}
enableContentSearch
className="notes-rich-editor"
- isFullWidth={settings.isFullWidth}
+ isFullWidth
fontFamily={settings.fontFamily}
fontSize={settings.fontSize}
/>
)}
-
+
{t('notes.characters')}: {tokenCount}
@@ -117,7 +117,7 @@ const NotesEditor: FC = memo(
]}
/>
-
+
)
diff --git a/src/renderer/src/pages/paintings/AihubmixPage.tsx b/src/renderer/src/pages/paintings/AihubmixPage.tsx
index 60a49664c9..e5f06b8e52 100644
--- a/src/renderer/src/pages/paintings/AihubmixPage.tsx
+++ b/src/renderer/src/pages/paintings/AihubmixPage.tsx
@@ -1,11 +1,11 @@
import { PlusOutlined, RedoOutlined } from '@ant-design/icons'
+import { RowFlex } from '@cherrystudio/ui'
import { useCache } from '@data/hooks/useCache'
import { usePreference } from '@data/hooks/usePreference'
import { loggerService } from '@logger'
import AiProvider from '@renderer/aiCore'
import IcImageUp from '@renderer/assets/images/paintings/ic_ImageUp.svg'
import { Navbar, NavbarCenter, NavbarRight } from '@renderer/components/app/Navbar'
-import { HStack } from '@renderer/components/Layout'
import Scrollbar from '@renderer/components/Scrollbar'
import TranslateButton from '@renderer/components/TranslateButton'
import { isMac } from '@renderer/config/constant'
@@ -745,12 +745,12 @@ const AihubmixPage: FC<{ Options: string[] }> = ({ Options }) => {
)
case 'switch':
return (
-
+
updatePaintingState({ [item.key!]: checked })}
/>
-
+
)
case 'image': {
return (
diff --git a/src/renderer/src/pages/paintings/DmxapiPage.tsx b/src/renderer/src/pages/paintings/DmxapiPage.tsx
index 115da30f96..df2c833d56 100644
--- a/src/renderer/src/pages/paintings/DmxapiPage.tsx
+++ b/src/renderer/src/pages/paintings/DmxapiPage.tsx
@@ -1,8 +1,8 @@
import { PlusOutlined, RedoOutlined } from '@ant-design/icons'
+import { RowFlex } from '@cherrystudio/ui'
import { useCache } from '@data/hooks/useCache'
import DMXAPIToImg from '@renderer/assets/images/providers/DMXAPI-to-img.webp'
import { Navbar, NavbarCenter, NavbarRight } from '@renderer/components/app/Navbar'
-import { HStack } from '@renderer/components/Layout'
import Scrollbar from '@renderer/components/Scrollbar'
import { isMac } from '@renderer/config/constant'
import { getProviderLogo } from '@renderer/config/providers'
@@ -872,9 +872,9 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
return modelImageSizes.map((size) => {
return (
-
+
{size.label}
-
+
)
})
@@ -882,9 +882,9 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
{/* 检查当前模型是否支持自定义尺寸 */}
{allModels.find((m) => m.id === painting.model)?.is_custom_size && (
-
+
{t('paintings.custom_size')}
-
+
)}
@@ -892,7 +892,7 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
{/* 自定义尺寸输入框 */}
{isCustomSize && allModels.find((m) => m.id === painting.model)?.is_custom_size && (
-
+
= ({ Options }) => {
style={{ width: 80, flex: 1 }}
/>
px
-
+
)}
@@ -959,9 +959,9 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
-
+
onChangeAutoCreate(checked)} />
-
+
diff --git a/src/renderer/src/pages/paintings/SiliconPage.tsx b/src/renderer/src/pages/paintings/SiliconPage.tsx
index 9271a51cb7..173c8ab5b6 100644
--- a/src/renderer/src/pages/paintings/SiliconPage.tsx
+++ b/src/renderer/src/pages/paintings/SiliconPage.tsx
@@ -1,4 +1,5 @@
import { PlusOutlined, RedoOutlined } from '@ant-design/icons'
+import { ColFlex, RowFlex } from '@cherrystudio/ui'
import { useCache } from '@data/hooks/useCache'
import { usePreference } from '@data/hooks/usePreference'
import { loggerService } from '@logger'
@@ -10,7 +11,6 @@ import ImageSize3_4 from '@renderer/assets/images/paintings/image-size-3-4.svg'
import ImageSize9_16 from '@renderer/assets/images/paintings/image-size-9-16.svg'
import ImageSize16_9 from '@renderer/assets/images/paintings/image-size-16-9.svg'
import { Navbar, NavbarCenter, NavbarRight } from '@renderer/components/app/Navbar'
-import { HStack, VStack } from '@renderer/components/Layout'
import Scrollbar from '@renderer/components/Scrollbar'
import TranslateButton from '@renderer/components/TranslateButton'
import { isMac } from '@renderer/config/constant'
@@ -389,10 +389,10 @@ const SiliconPage: FC<{ Options: string[] }> = ({ Options }) => {
style={{ display: 'flex' }}>
{IMAGE_SIZES.map((size) => (
-
+
{size.label}
-
+
))}
@@ -483,12 +483,12 @@ const SiliconPage: FC<{ Options: string[] }> = ({ Options }) => {
-
+
updatePaintingState({ promptEnhancement: checked })}
/>
-
+
= ({ Options }) => {
{/* 自定义尺寸输入框 */}
{isCustomSize && (
-
+
= ({ Options }) => {
style={{ width: 80, flex: 1 }}
/>
px
-
+
长宽均需满足512px-2048px之间, 需被16整除, 并保证最大像素数不超过2^21px
diff --git a/src/renderer/src/pages/settings/AboutSettings.tsx b/src/renderer/src/pages/settings/AboutSettings.tsx
index c90fc66feb..1751c5d949 100644
--- a/src/renderer/src/pages/settings/AboutSettings.tsx
+++ b/src/renderer/src/pages/settings/AboutSettings.tsx
@@ -1,7 +1,7 @@
import { GithubOutlined } from '@ant-design/icons'
+import { RowFlex } from '@cherrystudio/ui'
import { usePreference } from '@data/hooks/usePreference'
import IndicatorLight from '@renderer/components/IndicatorLight'
-import { HStack } from '@renderer/components/Layout'
import { APP_NAME, AppLogo } from '@renderer/config/env'
import { useTheme } from '@renderer/context/ThemeProvider'
import { useAppUpdateState } from '@renderer/hooks/useAppUpdate'
@@ -186,11 +186,11 @@ const AboutSettings: FC = () => {
{t('settings.about.title')}
-
+
-
+
diff --git a/src/renderer/src/pages/settings/AssistantSettings/AssistantKnowledgeBaseSettings.tsx b/src/renderer/src/pages/settings/AssistantSettings/AssistantKnowledgeBaseSettings.tsx
index 0013050d05..ff086e7722 100644
--- a/src/renderer/src/pages/settings/AssistantSettings/AssistantKnowledgeBaseSettings.tsx
+++ b/src/renderer/src/pages/settings/AssistantSettings/AssistantKnowledgeBaseSettings.tsx
@@ -1,5 +1,5 @@
import { CheckOutlined } from '@ant-design/icons'
-import { Box } from '@renderer/components/Layout'
+import { Box } from '@cherrystudio/ui'
import { useAppSelector } from '@renderer/store'
import type { Assistant, AssistantSettings } from '@renderer/types'
import type { SelectProps } from 'antd'
@@ -31,9 +31,7 @@ const AssistantKnowledgeBaseSettings: React.FC = ({ assistant, updateAssi
return (
-
- {t('common.knowledge_base')}
-
+ {t('common.knowledge_base')}
)
diff --git a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
index 7ced28884b..253675a1e1 100644
--- a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
@@ -5,10 +5,10 @@ import {
LoadingOutlined,
YuqueOutlined
} from '@ant-design/icons'
+import { RowFlex } from '@cherrystudio/ui'
import { usePreference } from '@data/hooks/usePreference'
import DividerWithText from '@renderer/components/DividerWithText'
import { NutstoreIcon } from '@renderer/components/Icons/NutstoreIcons'
-import { HStack } from '@renderer/components/Layout'
import ListItem from '@renderer/components/ListItem'
import BackupPopup from '@renderer/components/Popups/BackupPopup'
import RestorePopup from '@renderer/components/Popups/RestorePopup'
@@ -600,14 +600,14 @@ const DataSettings: FC = () => {
{t('settings.general.backup.title')}
-
+
}>
{t('settings.general.backup.button')}
}>
{t('settings.general.restore.button')}
-
+
@@ -630,9 +630,9 @@ const DataSettings: FC = () => {
{appInfo?.appDataPath}
handleOpenPath(appInfo?.appDataPath)} style={{ flexShrink: 0 }} />
-
+
-
+
@@ -643,19 +643,19 @@ const DataSettings: FC = () => {
{appInfo?.logsPath}
handleOpenPath(appInfo?.logsPath)} style={{ flexShrink: 0 }} />
-
+
-
+
{t('settings.data.app_knowledge.label')}
-
+
-
+
@@ -663,18 +663,18 @@ const DataSettings: FC = () => {
{t('settings.data.clear_cache.title')}
{cacheSize && ({cacheSize}MB)}
-
+
-
+
{t('settings.general.reset.title')}
-
+
-
+
@@ -696,7 +696,7 @@ const DataSettings: FC = () => {
)
}
-const Container = styled(HStack)`
+const Container = styled(RowFlex)`
flex: 1;
`
@@ -751,7 +751,7 @@ const PathText = styled(Typography.Text)`
cursor: pointer;
`
-const PathRow = styled(HStack)`
+const PathRow = styled(RowFlex)`
min-width: 0;
flex: 1;
width: 0;
diff --git a/src/renderer/src/pages/settings/DataSettings/JoplinSettings.tsx b/src/renderer/src/pages/settings/DataSettings/JoplinSettings.tsx
index 807bcedd6a..2aaf86e249 100644
--- a/src/renderer/src/pages/settings/DataSettings/JoplinSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/JoplinSettings.tsx
@@ -1,6 +1,6 @@
import { InfoCircleOutlined } from '@ant-design/icons'
+import { RowFlex } from '@cherrystudio/ui'
import { usePreference } from '@data/hooks/usePreference'
-import { HStack } from '@renderer/components/Layout'
import { useTheme } from '@renderer/context/ThemeProvider'
import { useMinappPopup } from '@renderer/hooks/useMinappPopup'
import { Button, Space, Switch, Tooltip } from 'antd'
@@ -80,16 +80,16 @@ const JoplinSettings: FC = () => {
{t('settings.data.joplin.url')}
-
+
-
+
@@ -102,7 +102,7 @@ const JoplinSettings: FC = () => {
/>
-
+
{
/>
-
+
diff --git a/src/renderer/src/pages/settings/DataSettings/LocalBackupSettings.tsx b/src/renderer/src/pages/settings/DataSettings/LocalBackupSettings.tsx
index a8e2dc163e..1b369e2dc2 100644
--- a/src/renderer/src/pages/settings/DataSettings/LocalBackupSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/LocalBackupSettings.tsx
@@ -1,7 +1,7 @@
import { DeleteOutlined, FolderOpenOutlined, SaveOutlined, SyncOutlined, WarningOutlined } from '@ant-design/icons'
+import { RowFlex } from '@cherrystudio/ui'
import { usePreference } from '@data/hooks/usePreference'
import { loggerService } from '@logger'
-import { HStack } from '@renderer/components/Layout'
import { LocalBackupManager } from '@renderer/components/LocalBackupManager'
import { LocalBackupModal, useLocalBackupModal } from '@renderer/components/LocalBackupModals'
import Selector from '@renderer/components/Selector'
@@ -151,7 +151,7 @@ const LocalBackupSettings: React.FC = () => {
}
return (
-
+
{localBackupSync.syncing && }
{!localBackupSync.syncing && localBackupSync.lastSyncError && (
@@ -163,7 +163,7 @@ const LocalBackupSettings: React.FC = () => {
{t('settings.data.local.lastSync')}: {dayjs(localBackupSync.lastSyncTime).format('HH:mm:ss')}
)}
-
+
)
}
@@ -184,7 +184,7 @@ const LocalBackupSettings: React.FC = () => {
{t('settings.data.local.directory.label')}
-
+
setLocalBackupDir(e.target.value)}
@@ -198,19 +198,19 @@ const LocalBackupSettings: React.FC = () => {
} onClick={handleClearDirectory} disabled={!localBackupDir} danger>
{t('common.clear')}
-
+
{t('settings.general.backup.title')}
-
+
} loading={backuping} disabled={!localBackupDir}>
{t('settings.data.local.backup.button')}
} disabled={!localBackupDir}>
{t('settings.data.local.restore.button')}
-
+
diff --git a/src/renderer/src/pages/settings/DataSettings/MarkdownExportSettings.tsx b/src/renderer/src/pages/settings/DataSettings/MarkdownExportSettings.tsx
index cc88a4a258..ed1dff4f1b 100644
--- a/src/renderer/src/pages/settings/DataSettings/MarkdownExportSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/MarkdownExportSettings.tsx
@@ -1,6 +1,6 @@
import { DeleteOutlined, FolderOpenOutlined } from '@ant-design/icons'
+import { RowFlex } from '@cherrystudio/ui'
import { usePreference } from '@data/hooks/usePreference'
-import { HStack } from '@renderer/components/Layout'
import { useTheme } from '@renderer/context/ThemeProvider'
import { Button, Switch } from 'antd'
import Input from 'antd/es/input/Input'
@@ -72,7 +72,7 @@ const MarkdownExportSettings: FC = () => {
{t('settings.data.markdown_export.path')}
-
+
{
}>
{t('settings.data.markdown_export.select')}
-
+
{t('settings.data.markdown_export.help')}
diff --git a/src/renderer/src/pages/settings/DataSettings/NotionSettings.tsx b/src/renderer/src/pages/settings/DataSettings/NotionSettings.tsx
index cf044fe939..6139372eb1 100644
--- a/src/renderer/src/pages/settings/DataSettings/NotionSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/NotionSettings.tsx
@@ -1,7 +1,7 @@
import { InfoCircleOutlined } from '@ant-design/icons'
+import { RowFlex } from '@cherrystudio/ui'
import { usePreference } from '@data/hooks/usePreference'
import { Client } from '@notionhq/client'
-import { HStack } from '@renderer/components/Layout'
import { useTheme } from '@renderer/context/ThemeProvider'
import { useMinappPopup } from '@renderer/hooks/useMinappPopup'
import { Button, Space, Switch, Tooltip } from 'antd'
@@ -84,35 +84,33 @@ const NotionSettings: FC = () => {
{t('settings.data.notion.database_id')}
-
+
-
+
{t('settings.data.notion.page_name_key')}
-
+
-
+
{t('settings.data.notion.api_key')}
-
+
{
/>
-
+
diff --git a/src/renderer/src/pages/settings/DataSettings/NutstoreSettings.tsx b/src/renderer/src/pages/settings/DataSettings/NutstoreSettings.tsx
index 86440bff97..99891f728f 100644
--- a/src/renderer/src/pages/settings/DataSettings/NutstoreSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/NutstoreSettings.tsx
@@ -1,6 +1,6 @@
import { CheckOutlined, FolderOutlined, LoadingOutlined, SyncOutlined, WarningOutlined } from '@ant-design/icons'
+import { RowFlex } from '@cherrystudio/ui'
import { usePreference } from '@data/hooks/usePreference'
-import { HStack } from '@renderer/components/Layout'
import NutstorePathPopup from '@renderer/components/Popups/NutsorePathPopup'
import Selector from '@renderer/components/Selector'
import { WebdavBackupManager } from '@renderer/components/WebdavBackupManager'
@@ -173,7 +173,7 @@ const NutstoreSettings: FC = () => {
}
return (
-
+
{nutstoreSyncState.syncing && }
{!nutstoreSyncState.syncing && nutstoreSyncState.lastSyncError && (
@@ -185,7 +185,7 @@ const NutstoreSettings: FC = () => {
{t('settings.data.webdav.lastSync')}: {dayjs(nutstoreSyncState.lastSyncTime).format('HH:mm:ss')}
)}
-
+
)
}
@@ -208,7 +208,7 @@ const NutstoreSettings: FC = () => {
{isLogin ? t('settings.data.nutstore.isLogin') : t('settings.data.nutstore.notLogin')}
{isLogin ? (
-
+
+
) : (
)}
@@ -241,7 +241,7 @@ const NutstoreSettings: FC = () => {
{t('settings.data.nutstore.path.label')}
-
+
{
-
+
{t('settings.general.backup.title')}
-
+
-
+
diff --git a/src/renderer/src/pages/settings/DataSettings/ObsidianSettings.tsx b/src/renderer/src/pages/settings/DataSettings/ObsidianSettings.tsx
index 3910b7d4a1..fbf41f54d0 100644
--- a/src/renderer/src/pages/settings/DataSettings/ObsidianSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/ObsidianSettings.tsx
@@ -1,6 +1,6 @@
+import { RowFlex } from '@cherrystudio/ui'
import { usePreference } from '@data/hooks/usePreference'
import { loggerService } from '@logger'
-import { HStack } from '@renderer/components/Layout'
import { Empty, Select, Spin } from 'antd'
import type { FC } from 'react'
import { useEffect, useState } from 'react'
@@ -62,7 +62,7 @@ const ObsidianSettings: FC = () => {
{t('settings.data.obsidian.default_vault')}
-
+
{vaults.length > 0 ? (
-
+
)
diff --git a/src/renderer/src/pages/settings/DataSettings/S3Settings.tsx b/src/renderer/src/pages/settings/DataSettings/S3Settings.tsx
index f697ea3e7d..ba314751c1 100644
--- a/src/renderer/src/pages/settings/DataSettings/S3Settings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/S3Settings.tsx
@@ -1,6 +1,6 @@
import { FolderOpenOutlined, InfoCircleOutlined, SaveOutlined, SyncOutlined, WarningOutlined } from '@ant-design/icons'
+import { RowFlex } from '@cherrystudio/ui'
import { usePreference } from '@data/hooks/usePreference'
-import { HStack } from '@renderer/components/Layout'
import { S3BackupManager } from '@renderer/components/S3BackupManager'
import { S3BackupModal, useS3BackupModal } from '@renderer/components/S3Modals'
import Selector from '@renderer/components/Selector'
@@ -71,7 +71,7 @@ const S3Settings: FC = () => {
}
return (
-
+
{s3Sync?.syncing && }
{!s3Sync?.syncing && s3Sync?.lastSyncError && (
@@ -83,7 +83,7 @@ const S3Settings: FC = () => {
{t('settings.data.s3.syncStatus.lastSync', { time: dayjs(s3Sync.lastSyncTime).format('HH:mm:ss') })}
)}
-
+
)
}
@@ -177,7 +177,7 @@ const S3Settings: FC = () => {
{t('settings.data.s3.backup.operation')}
-
+
}
@@ -191,7 +191,7 @@ const S3Settings: FC = () => {
disabled={!s3Endpoint || !s3Region || !s3Bucket || !s3AccessKeyId || !s3SecretAccessKey}>
{t('settings.data.s3.backup.manager.button')}
-
+
diff --git a/src/renderer/src/pages/settings/DataSettings/SiyuanSettings.tsx b/src/renderer/src/pages/settings/DataSettings/SiyuanSettings.tsx
index 6ab5647a3f..aeecff0d6e 100644
--- a/src/renderer/src/pages/settings/DataSettings/SiyuanSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/SiyuanSettings.tsx
@@ -1,7 +1,7 @@
import { InfoCircleOutlined } from '@ant-design/icons'
+import { RowFlex } from '@cherrystudio/ui'
import { usePreference } from '@data/hooks/usePreference'
import { loggerService } from '@logger'
-import { HStack } from '@renderer/components/Layout'
import { useTheme } from '@renderer/context/ThemeProvider'
import { useMinappPopup } from '@renderer/hooks/useMinappPopup'
import { Button, Space, Tooltip } from 'antd'
@@ -86,15 +86,14 @@ const SiyuanSettings: FC = () => {
{t('settings.data.siyuan.api_url')}
-
+
-
+
@@ -107,7 +106,7 @@ const SiyuanSettings: FC = () => {
/>
-
+
{
/>
-
+
{t('settings.data.siyuan.box_id')}
-
+
-
+
{t('settings.data.siyuan.root_path')}
-
+
-
+
)
diff --git a/src/renderer/src/pages/settings/DataSettings/WebDavSettings.tsx b/src/renderer/src/pages/settings/DataSettings/WebDavSettings.tsx
index 695b083d12..c9db62dac6 100644
--- a/src/renderer/src/pages/settings/DataSettings/WebDavSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/WebDavSettings.tsx
@@ -1,6 +1,6 @@
import { FolderOpenOutlined, SaveOutlined, SyncOutlined, WarningOutlined } from '@ant-design/icons'
+import { RowFlex } from '@cherrystudio/ui'
import { usePreference } from '@data/hooks/usePreference'
-import { HStack } from '@renderer/components/Layout'
import Selector from '@renderer/components/Selector'
import { WebdavBackupManager } from '@renderer/components/WebdavBackupManager'
import { useWebdavBackupModal, WebdavBackupModal } from '@renderer/components/WebdavModals'
@@ -67,7 +67,7 @@ const WebDavSettings: FC = () => {
}
return (
-
+
{webdavSync.syncing && }
{!webdavSync.syncing && webdavSync.lastSyncError && (
@@ -79,7 +79,7 @@ const WebDavSettings: FC = () => {
{t('settings.data.webdav.lastSync')}: {dayjs(webdavSync.lastSyncTime).format('HH:mm:ss')}
)}
-
+
)
}
@@ -145,14 +145,14 @@ const WebDavSettings: FC = () => {
{t('settings.general.backup.title')}
-
+
} loading={backuping}>
{t('settings.data.webdav.backup.button')}
} disabled={!webdavHost}>
{t('settings.data.webdav.restore.button')}
-
+
diff --git a/src/renderer/src/pages/settings/DataSettings/YuqueSettings.tsx b/src/renderer/src/pages/settings/DataSettings/YuqueSettings.tsx
index aef5bc3d6e..0de4c592a2 100644
--- a/src/renderer/src/pages/settings/DataSettings/YuqueSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/YuqueSettings.tsx
@@ -1,6 +1,6 @@
import { InfoCircleOutlined } from '@ant-design/icons'
+import { RowFlex } from '@cherrystudio/ui'
import { usePreference } from '@data/hooks/usePreference'
-import { HStack } from '@renderer/components/Layout'
import { useTheme } from '@renderer/context/ThemeProvider'
import { useMinappPopup } from '@renderer/hooks/useMinappPopup'
import { Button, Space, Tooltip } from 'antd'
@@ -76,15 +76,14 @@ const YuqueSettings: FC = () => {
{t('settings.data.yuque.repo_url')}
-
+
-
+
@@ -97,7 +96,7 @@ const YuqueSettings: FC = () => {
/>
-
+
{
/>
-
+
)
diff --git a/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx b/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
index 3bc8fdbafe..24abdcc8a2 100644
--- a/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
+++ b/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
@@ -1,7 +1,7 @@
+import { RowFlex } from '@cherrystudio/ui'
import { CodeEditor } from '@cherrystudio/ui'
import { usePreference } from '@data/hooks/usePreference'
import { ResetIcon } from '@renderer/components/Icons'
-import { HStack } from '@renderer/components/Layout'
import TextBadge from '@renderer/components/TextBadge'
import { isMac, THEME_COLOR_PRESETS } from '@renderer/config/constant'
import { useCodeStyle } from '@renderer/context/CodeStyleProvider'
@@ -196,8 +196,8 @@ const DisplaySettings: FC = () => {
{t('settings.theme.color_primary')}
-
-
+
+
{THEME_COLOR_PRESETS.map((color) => (
{
/>
))}
-
+
{
}
]}
/>
-
+
{isMac && (
<>
diff --git a/src/renderer/src/pages/settings/DocProcessSettings/OcrProviderSettings.tsx b/src/renderer/src/pages/settings/DocProcessSettings/OcrProviderSettings.tsx
index 2b72658f7e..0fa53e8d6d 100644
--- a/src/renderer/src/pages/settings/DocProcessSettings/OcrProviderSettings.tsx
+++ b/src/renderer/src/pages/settings/DocProcessSettings/OcrProviderSettings.tsx
@@ -1,11 +1,12 @@
// import { loggerService } from '@logger'
+import { Flex } from '@cherrystudio/ui'
import { ErrorBoundary } from '@renderer/components/ErrorBoundary'
import { isMac, isWin } from '@renderer/config/constant'
import { useTheme } from '@renderer/context/ThemeProvider'
import { useOcrProviders } from '@renderer/hooks/useOcrProvider'
import type { OcrProvider } from '@renderer/types'
import { isBuiltinOcrProvider, isOcrSystemProvider } from '@renderer/types'
-import { Divider, Flex } from 'antd'
+import { Divider } from 'antd'
import styled from 'styled-components'
import { SettingGroup, SettingTitle } from '..'
@@ -47,7 +48,7 @@ const OcrProviderSettings = ({ provider }: Props) => {
return (
-
+
{getOcrProviderName(provider)}
diff --git a/src/renderer/src/pages/settings/DocProcessSettings/OcrSystemSettings.tsx b/src/renderer/src/pages/settings/DocProcessSettings/OcrSystemSettings.tsx
index bd24326e2f..e066f49dea 100644
--- a/src/renderer/src/pages/settings/DocProcessSettings/OcrSystemSettings.tsx
+++ b/src/renderer/src/pages/settings/DocProcessSettings/OcrSystemSettings.tsx
@@ -1,4 +1,5 @@
// import { loggerService } from '@logger'
+import { Flex } from '@cherrystudio/ui'
import { SuccessTag } from '@renderer/components/Tags/SuccessTag'
import { InfoTooltip } from '@renderer/components/TooltipIcons'
import { isMac, isWin } from '@renderer/config/constant'
@@ -6,7 +7,7 @@ import { useOcrProvider } from '@renderer/hooks/useOcrProvider'
import useTranslate from '@renderer/hooks/useTranslate'
import type { TranslateLanguageCode } from '@renderer/types'
import { BuiltinOcrProviderIds, isOcrSystemProvider } from '@renderer/types'
-import { Flex, Select } from 'antd'
+import { Select } from 'antd'
import { startTransition, useCallback, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -54,7 +55,7 @@ export const OcrSystemSettings = () => {
<>
-
+
{t('settings.tool.ocr.common.langs')}
{isWin && }
diff --git a/src/renderer/src/pages/settings/DocProcessSettings/OcrTesseractSettings.tsx b/src/renderer/src/pages/settings/DocProcessSettings/OcrTesseractSettings.tsx
index 3c284656ab..bbdde27594 100644
--- a/src/renderer/src/pages/settings/DocProcessSettings/OcrTesseractSettings.tsx
+++ b/src/renderer/src/pages/settings/DocProcessSettings/OcrTesseractSettings.tsx
@@ -1,4 +1,5 @@
// import { loggerService } from '@logger'
+import { Flex } from '@cherrystudio/ui'
import CustomTag from '@renderer/components/Tags/CustomTag'
import { InfoTooltip } from '@renderer/components/TooltipIcons'
import { TESSERACT_LANG_MAP } from '@renderer/config/ocr'
@@ -6,7 +7,7 @@ import { useOcrProvider } from '@renderer/hooks/useOcrProvider'
import useTranslate from '@renderer/hooks/useTranslate'
import type { TesseractLangCode } from '@renderer/types'
import { BuiltinOcrProviderIds, isOcrTesseractProvider } from '@renderer/types'
-import { Flex, Select } from 'antd'
+import { Select } from 'antd'
import { useCallback, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -63,7 +64,7 @@ export const OcrTesseractSettings = () => {
<>
-
+
{t('settings.tool.ocr.common.langs')}
diff --git a/src/renderer/src/pages/settings/DocProcessSettings/PreprocessProviderSettings.tsx b/src/renderer/src/pages/settings/DocProcessSettings/PreprocessProviderSettings.tsx
index 0e44b36f42..75cab3f202 100644
--- a/src/renderer/src/pages/settings/DocProcessSettings/PreprocessProviderSettings.tsx
+++ b/src/renderer/src/pages/settings/DocProcessSettings/PreprocessProviderSettings.tsx
@@ -1,10 +1,11 @@
import { ExportOutlined } from '@ant-design/icons'
+import { Flex } from '@cherrystudio/ui'
import { ApiKeyListPopup } from '@renderer/components/Popups/ApiKeyListPopup'
import { getPreprocessProviderLogo, PREPROCESS_PROVIDER_CONFIG } from '@renderer/config/preprocessProviders'
import { usePreprocessProvider } from '@renderer/hooks/usePreprocess'
import type { PreprocessProvider } from '@renderer/types'
import { formatApiKeys, hasObjectKey } from '@renderer/utils'
-import { Avatar, Button, Divider, Flex, Input, Tooltip } from 'antd'
+import { Avatar, Button, Divider, Input, Tooltip } from 'antd'
import Link from 'antd/es/typography/Link'
import { List } from 'lucide-react'
import type { FC } from 'react'
@@ -70,7 +71,7 @@ const PreprocessProviderSettings: FC = ({ provider: _provider }) => {
return (
<>
-
+
{preprocessProvider.name}
@@ -97,7 +98,7 @@ const PreprocessProviderSettings: FC = ({ provider: _provider }) => {
} />
-
+
{
onChange={onSelectLanguage}
options={languagesOptions.map((lang) => ({
label: (
-
+
{lang.flag}
@@ -236,7 +237,7 @@ const GeneralSettings: FC = () => {
)}
-
+
{t('settings.general.spell_check.label')}
{enableSpellCheck && (
@@ -248,7 +249,7 @@ const GeneralSettings: FC = () => {
options={spellCheckLanguageOptions.map((lang) => ({
value: lang.value,
label: (
-
+
{lang.flag}
@@ -258,7 +259,7 @@ const GeneralSettings: FC = () => {
}))}
/>
)}
-
+
@@ -334,7 +335,7 @@ const GeneralSettings: FC = () => {
{t('settings.developer.title')}
-
+
{t('settings.developer.enable_developer_mode')}
diff --git a/src/renderer/src/pages/settings/MCPSettings/InstallNpxUv.tsx b/src/renderer/src/pages/settings/MCPSettings/InstallNpxUv.tsx
index b30ba5e7d7..96bef8baec 100644
--- a/src/renderer/src/pages/settings/MCPSettings/InstallNpxUv.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/InstallNpxUv.tsx
@@ -1,5 +1,5 @@
import { CheckCircleOutlined, QuestionCircleOutlined, WarningOutlined } from '@ant-design/icons'
-import { Center, VStack } from '@renderer/components/Layout'
+import { Center, ColFlex } from '@cherrystudio/ui'
import { useAppDispatch, useAppSelector } from '@renderer/store'
import { setIsBunInstalled, setIsUvInstalled } from '@renderer/store/mcp'
import { Alert, Button } from 'antd'
@@ -112,7 +112,7 @@ const InstallNpxUv: FC = ({ mini = false }) => {
banner
style={{ borderRadius: 'var(--list-item-border-radius)' }}
description={
-
+
{isUvInstalled ? 'UV Installed' : `UV ${t('settings.mcp.missingDependencies')}`}
@@ -135,7 +135,7 @@ const InstallNpxUv: FC = ({ mini = false }) => {
{uvPath}
-
+
}
/>
= ({ mini = false }) => {
banner
style={{ borderRadius: 'var(--list-item-border-radius)' }}
description={
-
+
{isBunInstalled ? 'Bun Installed' : `Bun ${t('settings.mcp.missingDependencies')}`}
@@ -166,7 +166,7 @@ const InstallNpxUv: FC = ({ mini = false }) => {
{bunPath}
-
+
}
/>
diff --git a/src/renderer/src/pages/settings/MCPSettings/McpPrompt.tsx b/src/renderer/src/pages/settings/MCPSettings/McpPrompt.tsx
index 0d5e6e2865..710eec525c 100644
--- a/src/renderer/src/pages/settings/MCPSettings/McpPrompt.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/McpPrompt.tsx
@@ -1,5 +1,6 @@
+import { ColFlex, Flex } from '@cherrystudio/ui'
import type { MCPPrompt } from '@renderer/types'
-import { Collapse, Descriptions, Empty, Flex, Tooltip, Typography } from 'antd'
+import { Collapse, Descriptions, Empty, Tooltip, Typography } from 'antd'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
@@ -22,7 +23,7 @@ const MCPPromptsSection = ({ prompts }: MCPPromptsSectionProps) => {
+
{arg.name}
{arg.required && (
@@ -31,13 +32,13 @@ const MCPPromptsSection = ({ prompts }: MCPPromptsSectionProps) => {
)}
}>
-
+
{arg.description && (
{arg.description}
)}
-
+
))}
@@ -54,8 +55,8 @@ const MCPPromptsSection = ({ prompts }: MCPPromptsSectionProps) => {
-
+
+
{prompt.name}
{prompt.description && (
@@ -63,7 +64,7 @@ const MCPPromptsSection = ({ prompts }: MCPPromptsSectionProps) => {
{prompt.description}
)}
-
+
}>
{renderPromptArguments(prompt)}
diff --git a/src/renderer/src/pages/settings/MCPSettings/McpResource.tsx b/src/renderer/src/pages/settings/MCPSettings/McpResource.tsx
index d97bffacbc..42566da37d 100644
--- a/src/renderer/src/pages/settings/MCPSettings/McpResource.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/McpResource.tsx
@@ -1,5 +1,6 @@
+import { ColFlex, Flex } from '@cherrystudio/ui'
import type { MCPResource } from '@renderer/types'
-import { Collapse, Descriptions, Empty, Flex, Tag, Typography } from 'antd'
+import { Collapse, Descriptions, Empty, Tag, Typography } from 'antd'
import { useTranslation } from 'react-i18next'
import styled from 'styled-components'
@@ -61,8 +62,8 @@ const MCPResourcesSection = ({ resources }: MCPResourcesSectionProps) => {
-
+
+
{`${resource.name} (${resource.uri})`}
{resource.description && (
@@ -72,7 +73,7 @@ const MCPResourcesSection = ({ resources }: MCPResourcesSectionProps) => {
: resource.description}
)}
-
+
}>
{renderResourceProperties(resource)}
diff --git a/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx b/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx
index 9d0edb0948..050f9b2425 100644
--- a/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx
@@ -1,3 +1,4 @@
+import { Flex } from '@cherrystudio/ui'
import { loggerService } from '@logger'
import type { McpError } from '@modelcontextprotocol/sdk/types.js'
import { DeleteIcon } from '@renderer/components/Icons'
@@ -7,7 +8,7 @@ import MCPDescription from '@renderer/pages/settings/MCPSettings/McpDescription'
import type { MCPPrompt, MCPResource, MCPServer, MCPTool } from '@renderer/types'
import { formatMcpError } from '@renderer/utils/error'
import type { TabsProps } from 'antd'
-import { Badge, Button, Flex, Form, Input, Radio, Select, Switch, Tabs } from 'antd'
+import { Badge, Button, Form, Input, Radio, Select, Switch, Tabs } from 'antd'
import TextArea from 'antd/es/input/TextArea'
import { ChevronDown, SaveIcon } from 'lucide-react'
import React, { useCallback, useEffect, useState } from 'react'
@@ -731,8 +732,8 @@ const McpSettings: React.FC = () => {
-
-
+
+
{server?.name}
{serverVersion && }
@@ -743,7 +744,7 @@ const McpSettings: React.FC = () => {
onClick={() => onDeleteMcpServer(server)}
/>
-
+
{
return (
-
+
-
+
)
}
diff --git a/src/renderer/src/pages/settings/MCPSettings/McpTool.tsx b/src/renderer/src/pages/settings/MCPSettings/McpTool.tsx
index bfd9992dc4..190b324502 100644
--- a/src/renderer/src/pages/settings/MCPSettings/McpTool.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/McpTool.tsx
@@ -1,6 +1,7 @@
+import { ColFlex, Flex } from '@cherrystudio/ui'
import type { MCPServer, MCPTool } from '@renderer/types'
import { isToolAutoApproved } from '@renderer/utils/mcp-tools'
-import { Badge, Descriptions, Empty, Flex, Switch, Table, Tag, Tooltip, Typography } from 'antd'
+import { Badge, Descriptions, Empty, Switch, Table, Tag, Tooltip, Typography } from 'antd'
import type { ColumnsType } from 'antd/es/table'
import { Hammer, Info, Zap } from 'lucide-react'
import { useTranslation } from 'react-i18next'
@@ -58,7 +59,7 @@ const MCPToolsSection = ({ tools, server, onToggleTool, onToggleAutoApprove }: M
+
{key}
{tool.inputSchema.required?.includes(key) && (
@@ -67,8 +68,8 @@ const MCPToolsSection = ({ tools, server, onToggleTool, onToggleAutoApprove }: M
)}
}>
-
-
+
+
{prop.type && (
// {prop.type}
@@ -116,7 +117,7 @@ const NpxSearch: FC = () => {
styles={{ input: { borderRadius: 100 } }}
/>
-
+
{npmScopes.map((scope) => (
{
{scope}
))}
-
+
{searchLoading && (
diff --git a/src/renderer/src/pages/settings/MemorySettings/MemorySettings.tsx b/src/renderer/src/pages/settings/MemorySettings/MemorySettings.tsx
index ecf8d74b68..8784e5cec8 100644
--- a/src/renderer/src/pages/settings/MemorySettings/MemorySettings.tsx
+++ b/src/renderer/src/pages/settings/MemorySettings/MemorySettings.tsx
@@ -1,7 +1,8 @@
import { ExclamationCircleOutlined } from '@ant-design/icons'
+import { RowFlex } from '@cherrystudio/ui'
+import { Flex } from '@cherrystudio/ui'
import { loggerService } from '@logger'
import { DeleteIcon, EditIcon, LoadingIcon, RefreshIcon } from '@renderer/components/Icons'
-import { HStack } from '@renderer/components/Layout'
import TextBadge from '@renderer/components/TextBadge'
import { useTheme } from '@renderer/context/ThemeProvider'
import { useModel } from '@renderer/hooks/useModel'
@@ -15,7 +16,7 @@ import {
setGlobalMemoryEnabled
} from '@renderer/store/memory'
import type { MemoryItem } from '@types'
-import { Badge, Button, Dropdown, Empty, Flex, Form, Input, Modal, Pagination, Space, Spin, Switch } from 'antd'
+import { Badge, Button, Dropdown, Empty, Form, Input, Modal, Pagination, Space, Spin, Switch } from 'antd'
import dayjs from 'dayjs'
import relativeTime from 'dayjs/plugin/relativeTime'
import { Brain, Calendar, MenuIcon, PlusIcon, Settings2, UserRound, UserRoundMinus, UserRoundPlus } from 'lucide-react'
@@ -88,7 +89,7 @@ const AddMemoryModal: React.FC = ({ visible, onCancel, onAd
onOk={() => form.submit()}
okButtonProps={{ loading: loading }}
title={
-
+
{t('memory.add_memory')}
@@ -146,7 +147,7 @@ const EditMemoryModal: React.FC = ({ visible, memory, onCa
return (
+
{t('memory.edit_memory')}
@@ -244,7 +245,7 @@ const AddUserModal: React.FC = ({ visible, onCancel, onAdd, e
}
}}
title={
-
+
{t('memory.add_user')}
@@ -581,16 +582,16 @@ const MemorySettings = () => {
{/* Memory Settings */}
-
-
+
+
{t('memory.global_memory')}
-
-
+
+
} onClick={() => setSettingsModalVisible(true)} />
-
-
+
+
{/* User Management */}
diff --git a/src/renderer/src/pages/settings/MemorySettings/UserSelector.tsx b/src/renderer/src/pages/settings/MemorySettings/UserSelector.tsx
index d11318c25f..e41a16e865 100644
--- a/src/renderer/src/pages/settings/MemorySettings/UserSelector.tsx
+++ b/src/renderer/src/pages/settings/MemorySettings/UserSelector.tsx
@@ -1,4 +1,4 @@
-import { HStack } from '@renderer/components/Layout'
+import { RowFlex } from '@cherrystudio/ui'
import { Avatar, Button, Select, Space, Tooltip } from 'antd'
import { UserRoundPlus } from 'lucide-react'
import { useCallback, useMemo } from 'react'
@@ -23,12 +23,12 @@ const UserSelector: React.FC = ({ currentUser, uniqueUsers, o
const renderLabel = useCallback(
(userId: string, userName: string) => {
return (
-
+
{getUserAvatar(userId)}
{userName}
-
+
)
},
[getUserAvatar]
diff --git a/src/renderer/src/pages/settings/ModelSettings/DefaultAssistantSettings.tsx b/src/renderer/src/pages/settings/ModelSettings/DefaultAssistantSettings.tsx
index 903d7708eb..004b78ce48 100644
--- a/src/renderer/src/pages/settings/ModelSettings/DefaultAssistantSettings.tsx
+++ b/src/renderer/src/pages/settings/ModelSettings/DefaultAssistantSettings.tsx
@@ -1,14 +1,15 @@
import { CloseCircleFilled, QuestionCircleOutlined } from '@ant-design/icons'
+import { RowFlex } from '@cherrystudio/ui'
+import { Flex } from '@cherrystudio/ui'
import EmojiPicker from '@renderer/components/EmojiPicker'
import { ResetIcon } from '@renderer/components/Icons'
-import { HStack } from '@renderer/components/Layout'
import { TopView } from '@renderer/components/TopView'
import { DEFAULT_CONTEXTCOUNT, DEFAULT_MAX_TOKENS, DEFAULT_TEMPERATURE } from '@renderer/config/constant'
import { useTheme } from '@renderer/context/ThemeProvider'
import { useDefaultAssistant } from '@renderer/hooks/useAssistant'
import type { AssistantSettings as AssistantSettingsType } from '@renderer/types'
import { getLeadingEmoji, modalConfirm } from '@renderer/utils'
-import { Button, Col, Flex, Input, InputNumber, Modal, Popover, Row, Slider, Switch, Tooltip } from 'antd'
+import { Button, Col, Input, InputNumber, Modal, Popover, Row, Slider, Switch, Tooltip } from 'antd'
import TextArea from 'antd/es/input/TextArea'
import type { Dispatch, FC, SetStateAction } from 'react'
import { useState } from 'react'
@@ -110,7 +111,7 @@ const AssistantSettings: FC = () => {
style={{ height: 'auto', background: 'transparent', padding: `0 0 12px 0`, gap: 12 }}
theme={theme}>
{t('common.name')}
-
+
} arrow trigger="click">
@@ -140,7 +141,7 @@ const AssistantSettings: FC = () => {
onChange={handleNameChange}
style={{ flex: 1 }}
/>
-
+
{t('common.prompt')}