Commit Graph

3152 Commits

Author SHA1 Message Date
Teo
c7843ca288 fix: 修复合并main分之后样式问题 2025-06-15 13:00:08 +08:00
kangfenmao
facf29e02b Merge branch 'main' into feat/sidebar-ui
# Conflicts:
#	src/renderer/src/assets/styles/index.scss
#	src/renderer/src/hooks/useTopic.ts
#	src/renderer/src/pages/home/Messages/Blocks/ImageBlock.tsx
#	src/renderer/src/pages/home/Messages/Blocks/index.tsx
#	src/renderer/src/pages/mcp-servers/providers/lanyun.ts
#	src/renderer/src/pages/settings/ModelSettings/TopicNamingModalPopup.tsx
2025-06-15 11:39:21 +08:00
kangfenmao
66d280136c style: enhance MainSidebar and PageContainer styles for improved UI
- Added 3D transform styles to PageContainer for better visual effects.
- Updated MainSidebar to use optional chaining for safer property access.
- Removed background color from MainSidebar to support transparency.
2025-06-15 11:36:33 +08:00
Aichaellee
9001a96fff feat:add lanyun mcp server 2025-06-15 11:17:02 +08:00
Wang Jiyuan
9ea4d1f99f
fix: send message shortcut doesn't work when editing existing message (#6934)
* fix: send message shortcut doesn't work when editing existing message

* fix: resend shortcut only apply on user msg
2025-06-14 23:11:52 +08:00
Chen Tao
fc62a5bdc2
fix: 7127 (#7196) 2025-06-14 23:01:45 +08:00
one
06b543039f
chore(ci): remove --fix from lint (#7159)
* chore(ci): remove --fix from lint

* fix: lint errors
2025-06-14 22:58:49 +08:00
Doekin
1c354ffa0a
fix(ImageGenerationMiddleware): correctly process image URLs (#7198) 2025-06-14 22:39:32 +08:00
Teo
91892ea619 feat(FilesPage): 添加批量删除功能 2025-06-14 21:52:25 +08:00
one
163e28d9ba
fix(model): qwen3 model detection (#7201) 2025-06-14 21:24:34 +08:00
beyondkmp
fd9ff4a432
fix: update app-builder-lib patch and adjust minimumSystemVersion handling (#7197)
- Updated the resolution and checksum for the app-builder-lib patch in yarn.lock.
- Modified macPackager.js and updateInfoBuilder.js to correctly reference LSMinimumSystemVersion.
- Enhanced ArchiveTarget.js and NsisTarget.js to include minimumSystemVersion in updateInfo if specified.
2025-06-14 19:39:28 +08:00
Teo
7d70425c75 revert: remove backgroundMaterial for win 2025-06-14 18:44:35 +08:00
beyondkmp
cab975f88b
fix: update app-builder-lib patch and add excludeReBuildModules option (#7193) 2025-06-14 15:57:39 +08:00
Teo
20b3db0c01 Revert "refactor(FileItem, FileList, FilesPage, i18n): enhance file management UI and localization"
This reverts commit edeb9f84f9.
2025-06-14 15:48:47 +08:00
Teo
f1804bc3a0 Revert "refactor(FileItem, FileList, FilesPage): enhance file selection UI and improve checkbox handling"
This reverts commit 58f3edb352.
2025-06-14 15:46:55 +08:00
Teo
2ec0c29087 style: change hover color 2025-06-14 15:03:58 +08:00
Wang Jiyuan
c644e4afa8
feat: add prompt variables docs on topic naming modal popup (#7175) 2025-06-14 14:59:29 +08:00
Wang Jiyuan
0a498460d6
fix: remove margin-bottom for loading animation (#7191)
* fix: remove margin-bottom for loading animation

* fix: just need to remove the margin-bottom of the last block
2025-06-14 14:57:31 +08:00
Teo
20a572aa46 feat(styles, useAppInit, DisplaySettings): 更新导航栏背景色和列表项样式,优化透明窗口设置
- 在 color.scss 中添加 Windows 版本的导航栏背景色。
- 修改 useAppInit 钩子以支持 Windows 和 Mac 的背景色设置。
- 更新 MainSidebar 的悬停样式以使用新的背景色。
- 在 DisplaySettings 中简化透明窗口设置的显示逻辑。
2025-06-14 14:49:30 +08:00
Wang Jiyuan
bd4333ab9a
fix: transparent background on translate dropdown (#7189) 2025-06-14 14:18:25 +08:00
Wang Jiyuan
9138aecdf0
fix: missing topic prompt on resend/regenerate and duplicate prevention (#7173)
* fix: completion doesn't include topic prompt

* fix: Multiple additions of topic prompts

* fix: improve logic

* fix: improve logic
2025-06-14 13:37:48 +08:00
Wang Jiyuan
e4e4dcbd1e
fix: model_name prompt var always use default model (#7178)
* fix: model_name prompt var always use default mode

* fix: incorrect model name
2025-06-14 13:35:32 +08:00
kangfenmao
2a0484ede2 chore(release): update fetch depth in GitHub Actions workflow
- Changed the fetch depth to 0 in the release workflow to ensure all history is available for tagging. This adjustment improves the accuracy of the release process.
2025-06-14 13:18:59 +08:00
Wang Jiyuan
c9f12c2e49
feat: add prompt variable "username" (#7174) 2025-06-14 13:08:32 +08:00
fullex
27354d82e2
fix(SelectionAssistant): make add custom action button bigger (#7185)
fix: make add custom action button bigger
2025-06-14 11:43:13 +08:00
kangfenmao
142b624001 feat(ThemeProvider, color.scss, useAppInit): integrate transparent window settings and update styles 2025-06-14 10:36:45 +08:00
beyondkmp
f5e1885ffa
chore(electron.vite.config): update Rollup configuration for single file packaging (#7183)
- Modified the Rollup options to disable code splitting and enable inline dynamic imports, ensuring a single file output for the build process. This change optimizes the packaging of the Electron application.
2025-06-14 10:01:47 +08:00
kangfenmao
3775562956 feat(DisplaySettings, MainSidebar, useSettings): implement transparent window feature and update styles
- Added functionality to manage transparent window settings in DisplaySettings and MainSidebar components.
- Updated useSettings hook to include transparent window state management.
- Modified MainSidebar and its styles to support transparency based on user settings.
- Removed obsolete opaque window translations from localization files across multiple languages for consistency.
2025-06-14 08:32:40 +08:00
beyondkmp
afc4731b9d
feat: clean up Windows license files (#7133)
* feat: enable minification in build configurations and clean up Windows license files

- Added minification option to the build configurations in electron.vite.config.ts to optimize output size.
- Updated after-pack.js to remove unnecessary license files on Windows, improving the packaging process.

* refactor: remove minification from build configurations in electron.vite.config.ts

- Eliminated the minification option from the build settings in electron.vite.config.ts to streamline the build process.
- This change may improve build times and simplify configuration management.

---------

Co-authored-by: beyondkmp <beyondkmkp@gmail.com>
2025-06-14 08:01:36 +08:00
Teo
3544c40d9a feat(TranslatePage, ant.scss): add ChevronDown icon to select components and update dropdown styles
- Introduced ChevronDown icon to various Select components in TranslatePage for improved visual consistency.
- Updated ant.scss to add a border style to the select dropdown for enhanced UI clarity.
2025-06-14 00:41:02 +08:00
Teo
36fa3af9e9 feat(CustomCollapse, ThinkingBlock, KnowledgeSearchPopup): add expand icons and adjust styles for improved UI
- Introduced ChevronRight expand icons in CustomCollapse and ThinkingBlock components for better visual feedback.
- Adjusted height and styling in KnowledgeSearchPopup for enhanced usability and consistency.
- Updated various styled components to improve layout and user interaction.
2025-06-14 00:28:33 +08:00
Teo
eb832cc25a refactor(AddKnowledgePopup, KnowledgeSettingsPopup, ModelSettings): enhance select components with consistent icons
- Updated Select components in AddKnowledgePopup and KnowledgeSettingsPopup to include a ChevronDown icon for improved visual consistency.
- Refactored ModelSettings to add ChevronDown icon to Select components, enhancing the overall UI experience.
- Simplified Slider component usage by removing unnecessary styling for a cleaner layout.
2025-06-13 23:27:46 +08:00
Teo
0378f9ceb1 refactor(styles, AntdProvider, DisplaySettings, DefaultAssistantSettings): enhance UI elements and improve styling consistency
- Updated ant.scss to refine modal styles for better visual distinction.
- Adjusted AntdProvider theme settings for Segmented and Switch components to improve color consistency.
- Modified DisplaySettings to change button sizes and styles for a more cohesive appearance.
- Tweaked DefaultAssistantSettings button dimensions for improved layout and usability.
2025-06-13 23:04:17 +08:00
suyao
99b23e1d5d
fix(migrate): correct filter condition for assistants' template status
- Updated the filter condition in migrateConfig to check for undefined isTemplate, ensuring proper assignment of template status for assistants.
2025-06-13 22:24:50 +08:00
kangfenmao
8d23c810fe refactor(App, MainSidebar, OpenedMinapps): streamline component code and enhance layout
- Simplified the handleClick function in App component by removing unnecessary line breaks.
- Adjusted MainMenu component in MainSidebar to remove inline margin styling for cleaner layout.
- Updated OpenedMinapps to apply margin styling directly to TabsContainer for improved spacing.
- Removed the PinnedApps component to declutter the sidebar and enhance performance.
2025-06-13 20:44:08 +08:00
kangfenmao
cdfa2ac13a refactor(ChatProvider, useChat): implement context for chat state management and enhance event handling
- Introduced ChatProvider to manage active assistant and topic state using React context.
- Updated useChat hook to utilize context for accessing chat state and actions.
- Refactored message navigation to emit events for setting active assistant and topic.
- Improved topic selection logic to ensure active topic is valid when topics change.
- Integrated ChatProvider into HomePage and HistoryPage for consistent chat state management.
2025-06-13 19:31:21 +08:00
suyao
58f3edb352
refactor(FileItem, FileList, FilesPage): enhance file selection UI and improve checkbox handling
- Added isSelected prop to FileItem for visual indication of selection.
- Updated FileList to manage selected file IDs and pass selection state to FileItem.
- Enhanced FilesPage checkbox handling with improved visibility on hover and selection state.
- Introduced CheckboxContainer for consistent styling of checkboxes across components.
2025-06-13 19:20:16 +08:00
suyao
edeb9f84f9
refactor(FileItem, FileList, FilesPage, i18n): enhance file management UI and localization
- Updated FileItem component to display file count and additional metadata.
- Refactored FileList to support checkbox selection and improved layout.
- Enhanced FilesPage with batch delete functionality and improved file selection handling.
- Updated localization strings across multiple languages for consistency in delete confirmation messages.
2025-06-13 19:11:10 +08:00
MyPrototypeWhat
9411866727
refactor(ImageBlock): enhance loading state presentation and improve … (#7160)
* refactor(ImageBlock): enhance loading state presentation and improve layout responsiveness

- Wrapped the loading spinner in a new SpinnerWrapper for better alignment and presentation during streaming and processing states.
- Updated the ImageBlockGroup to use `repeat(auto-fit, minmax(...))` for more flexible grid layout, improving responsiveness across different screen sizes.

These changes enhance the user experience by providing a clearer loading indication and a more adaptable layout for image blocks.

* style(ImageBlockGroup): comment out child styling for future adjustments

- Commented out the child styling rules in ImageBlockGroup to allow for potential layout modifications without removing the code entirely.
- This change prepares the component for further enhancements while maintaining existing functionality.

* refactor(ImageBlock): replace loading spinner with Ant Design Skeleton component

- Updated the loading state presentation in ImageBlock by replacing the custom spinner with Ant Design's Skeleton component for a more consistent UI experience.
- Removed the SpinnerWrapper and simplified the return statement for better readability.
- This change enhances the visual feedback during image loading while maintaining the component's functionality.

---------

Co-authored-by: lizhixuan <zhixuan.li@banosuperapp.com>
2025-06-13 17:55:40 +08:00
one
c7fd1ac373
fix(TopicRenaming): captured activeTopic.id is outdated and causes accidental topic changing after renaming (#7157)
* fix(TopicRenaming): captured activeTopic.id is outdated and causes accidental topic changing after renaming

* fix: prevent topic changing on auto renaming

* fix: filter out main text on summarizing
2025-06-13 17:24:24 +08:00
Teo
2757fcf6b9 refactor(Selector, HomePage, MessageGroupSettings, NutstoreSettings, WebDavSettings): replace Select components with Selector for improved consistency
- Updated Selector component to handle value checks more robustly.
- Removed unused ContentContainer styles in HomePage for cleaner code.
- Replaced Select components with Selector in MessageGroupSettings, NutstoreSettings, and WebDavSettings for a unified UI experience.
- Enhanced option handling in Selector for better integration with existing settings.
2025-06-13 14:03:30 +08:00
one
faf14ff10b
fix(MermaidPreview): re-render mermaid on display change (#7058)
* fix(MermaidPreview): re-render mermaid on display change

* test: add tests for MermaidPreview
2025-06-13 13:52:50 +08:00
kangfenmao
5339f4a9a3 refactor(MainSidebar, AssistantItem): enhance sidebar functionality and improve event handling
- Updated event handling in MainSidebar to conditionally show topics based on assistant selection.
- Integrated new settings option for showing topics when clicking on assistants.
- Removed unused code related to tab navigation for a cleaner implementation.
- Improved dependency management in useEffect hooks for better performance.
2025-06-13 13:49:15 +08:00
kangfenmao
e786feb165 refactor(i18n, settings): update localization and UI elements for improved consistency
- Removed redundant settings entries in multiple language files.
- Updated various settings titles for clarity, including "Code Settings" to "Code Block Settings".
- Added new localization keys for assistant and topic settings.
- Enhanced the layout of the ChatNavbar and MainSidebar components for better user experience.
- Adjusted the MessageMenubar to reflect updated settings terminology.
2025-06-13 13:11:06 +08:00
suyao
5794c36d0d
Merge branch 'feat/sidebar-ui' of https://github.com/CherryHQ/cherry-studio into feat/sidebar-ui 2025-06-13 12:24:37 +08:00
Teo
7d8b88c56e refactor(styles, HistoryPage, MessageGroup): improve UI consistency and layout
- Removed padding from dropdown menu items for a cleaner look.
- Updated suffix rendering in HistoryPage to conditionally show icon based on search length.
- Added padding to MessageGroup for better spacing in grid layout.
2025-06-13 11:46:20 +08:00
one
3b3b3c961e
refactor(CodeEditor): remove the right border of gutters (#7137)
Some checks failed
Nightly Build / cleanup-artifacts (push) Failing after 0s
Nightly Build / check-repository (push) Failing after 0s
Nightly Build / nightly-build (macos-latest) (push) Has been skipped
Nightly Build / nightly-build (ubuntu-latest) (push) Has been skipped
Nightly Build / nightly-build (windows-latest) (push) Has been skipped
Nightly Build / Build-Summary (push) Failing after 0s
refactor: remove the right border of gutters
2025-06-13 11:02:22 +08:00
Teo
d0daeddf14 Merge branch 'feat/sidebar-ui' of github.com:CherryHQ/cherry-studio into feat/sidebar-ui 2025-06-13 10:58:35 +08:00
Teo
2fe2ae797b refactor(styles): update CitationTooltip and CitationsList components for improved UI consistency and layout 2025-06-13 10:58:20 +08:00
beyondkmp
06d495c7e1
feat: Enhance AppUpdater for Windows installation directory support (#7135)
- Added support for setting the installation directory for the autoUpdater on Windows using NsisUpdater.
- Imported the 'path' module to dynamically determine the installation path based on the executable location.
- This change improves the updater's functionality and ensures a smoother installation experience for Windows users.

Co-authored-by: beyondkmp <beyondkmkp@gmail.com>
2025-06-13 10:52:25 +08:00