diff --git a/electron-builder.yml b/electron-builder.yml index 004a5df35..aafd4c19f 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -63,11 +63,6 @@ electronDownload: afterSign: scripts/notarize.js releaseInfo: releaseNotes: | - 话题搜索修改为弹窗模式 - 设置界面样式调整 - 增加APP数据目录显示 - 增加代码折叠功能 - 修复编辑消息后没有保存的问题 - 修复一些视觉模型不能识别问题 - 修复一些特殊的数据会导致APP启动后崩溃问题 - 修复备份文件在某些情况下无法恢复问题 + 修复系统代理默认设置问题 + 恢复设置面板模型参数选项 + 界面样式微调 diff --git a/package.json b/package.json index b4afac616..d6f9da91c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "CherryStudio", - "version": "0.8.15", + "version": "0.8.16", "private": true, "description": "A powerful AI assistant for producer.", "main": "./out/main/index.js", diff --git a/src/main/services/AppUpdater.ts b/src/main/services/AppUpdater.ts index cb3b4aa34..d112e0246 100644 --- a/src/main/services/AppUpdater.ts +++ b/src/main/services/AppUpdater.ts @@ -1,4 +1,4 @@ -import { BrowserWindow, dialog } from 'electron' +import { app, BrowserWindow, dialog } from 'electron' import logger from 'electron-log' import { AppUpdater as _AppUpdater, autoUpdater, UpdateInfo } from 'electron-updater' @@ -47,6 +47,7 @@ export default class AppUpdater { }) .then(({ response }) => { if (response === 1) { + app.isQuitting = true setImmediate(() => autoUpdater.quitAndInstall()) } }) diff --git a/src/renderer/src/assets/styles/index.scss b/src/renderer/src/assets/styles/index.scss index 244f66be5..b507c0b36 100644 --- a/src/renderer/src/assets/styles/index.scss +++ b/src/renderer/src/assets/styles/index.scss @@ -9,7 +9,7 @@ --color-white-soft: rgba(255, 255, 255, 0.8); --color-white-mute: rgba(255, 255, 255, 0.94); - --color-black: #121212; + --color-black: #0f0f0f; --color-black-soft: #191919; --color-black-mute: #242424; diff --git a/src/renderer/src/context/AntdProvider.tsx b/src/renderer/src/context/AntdProvider.tsx index b70908c6f..1d31dcb5b 100644 --- a/src/renderer/src/context/AntdProvider.tsx +++ b/src/renderer/src/context/AntdProvider.tsx @@ -24,21 +24,20 @@ const AntdProvider: FC = ({ children }) => { trackBg: 'transparent', itemSelectedBg: isDarkTheme ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)', boxShadowTertiary: undefined, - borderRadiusLG: 6, - borderRadiusSM: 6, - borderRadiusXS: 6 + borderRadiusLG: 12, + borderRadiusSM: 12, + borderRadiusXS: 12 }, Menu: { activeBarBorderWidth: 0, darkItemBg: 'transparent' }, Modal: { - colorBgMask: isDarkTheme ? 'rgba(0, 0, 0, 0.85)' : 'rgba(255, 255, 255, 0.9)' + colorBgMask: isDarkTheme ? 'rgba(0, 0, 0, 0.85)' : 'rgba(255, 255, 255, 0.8)' } }, token: { - colorPrimary: '#00b96b', - borderRadius: 6 + colorPrimary: '#00b96b' } }}> {children} diff --git a/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx b/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx index 4f1091630..e04543d62 100644 --- a/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx +++ b/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx @@ -187,7 +187,7 @@ const Assistants: FC = ({ suffix={⌘+K} value={search} onChange={(e) => setSearch(e.target.value)} - style={{ borderWidth: 0.5 }} + style={{ borderRadius: 16, borderWidth: 0.5 }} onKeyDown={onSearch} ref={searchRef} onFocus={() => dispatch(setSearching(true))} @@ -251,7 +251,7 @@ const AssistantItem = styled.div` margin: 0 10px; padding-right: 35px; font-family: Ubuntu; - border-radius: 6px; + border-radius: 17px; cursor: pointer; .iconfont { opacity: 0; diff --git a/src/renderer/src/pages/home/Tabs/TopicsTab.tsx b/src/renderer/src/pages/home/Tabs/TopicsTab.tsx index 098297b67..1bc07840c 100644 --- a/src/renderer/src/pages/home/Tabs/TopicsTab.tsx +++ b/src/renderer/src/pages/home/Tabs/TopicsTab.tsx @@ -38,6 +38,8 @@ const Topics: FC = ({ assistant: _assistant, activeTopic, setActiveTopic const generating = useAppSelector((state) => state.runtime.generating) const { showTopicTime, topicPosition } = useSettings() + const borderRadius = showTopicTime ? 12 : 17 + const onDeleteTopic = useCallback( (topic: Topic) => { if (generating) { @@ -190,7 +192,10 @@ const Topics: FC = ({ assistant: _assistant, activeTopic, setActiveTopic const isActive = topic.id === activeTopic?.id return ( - onSwitchTopic(topic)}> + onSwitchTopic(topic)}> {topic.name.replace('`', '')} {showTopicTime && {dayjs(topic.createdAt).format('MM/DD HH:mm')}} {isActive && ( @@ -225,7 +230,7 @@ const Container = styled(Scrollbar)` const TopicListItem = styled.div` padding: 7px 12px; margin: 0 10px; - border-radius: 6px; + border-radius: 17px; font-family: Ubuntu; font-size: 13px; display: flex; diff --git a/src/renderer/src/pages/home/components/SelectModelButton.tsx b/src/renderer/src/pages/home/components/SelectModelButton.tsx index 3a18b6711..e4557855a 100644 --- a/src/renderer/src/pages/home/components/SelectModelButton.tsx +++ b/src/renderer/src/pages/home/components/SelectModelButton.tsx @@ -44,6 +44,7 @@ const DropdownButton = styled(Button)` border-radius: 15px; padding: 12px 8px 12px 3px; -webkit-app-region: none; + box-shadow: none; ` const ModelName = styled.span`