feat: 错误处理 & 配置优化 #58
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| 'use client'; | ||
|
|
||
| import dynamic from 'next/dynamic'; | ||
|
|
||
| export default dynamic(() => import('@/components/Error')); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,22 @@ | ||||||
| 'use client'; | ||||||
|
|
||||||
| import Error from 'next/error'; | ||||||
|
There was a problem hiding this comment. Rename the imported - import Error from 'next/error';
+ import NextError from 'next/error';Committable suggestion
Suggested change
|
||||||
| import { useEffect } from 'react'; | ||||||
|
|
||||||
| export default function GlobalError({ | ||||||
| error, | ||||||
| }: { | ||||||
| error: Error & { digest?: string }; | ||||||
| reset: () => void; | ||||||
| }) { | ||||||
| useEffect(() => { | ||||||
| console.log('error', error); | ||||||
| }, [error]); | ||||||
| return ( | ||||||
| <html> | ||||||
|
There was a problem hiding this comment. Add a - <html>
+ <html lang="en">Committable suggestion
Suggested change
|
||||||
| <body> | ||||||
| <Error statusCode={undefined as any} /> | ||||||
|
There was a problem hiding this comment. Avoid using - <Error statusCode={undefined as any} />
+ <NextError statusCode={500} /> // Example: Use a specific status code
|
||||||
| </body> | ||||||
| </html> | ||||||
| ); | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ export const useStyles = createStyles(({ css }) => ({ | |
| preview: css` | ||
| overflow: auto; | ||
| width: 80rem; | ||
| margin: 0 auto; | ||
| `, | ||
| edit: css` | ||
| padding: 0 24px; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,43 @@ | ||||||
| import { createStyles } from 'antd-style'; | ||||||
| import NextImage from 'next/image'; | ||||||
|
|
||||||
| import { AVATAR_IMAGE_SIZE, DEFAULT_USER_AVATAR_URL } from '@/constants/common'; | ||||||
|
|
||||||
| const useStyle = createStyles( | ||||||
| ({ css, token }) => css` | ||||||
| cursor: pointer; | ||||||
| overflow: hidden; | ||||||
| border-radius: 50%; | ||||||
| transition: | ||||||
| scale 400ms ${token.motionEaseOut}, | ||||||
| box-shadow 100ms ${token.motionEaseOut}; | ||||||
|
|
||||||
| &:hover { | ||||||
| box-shadow: 0 0 0 3px ${token.colorText}; | ||||||
| } | ||||||
|
|
||||||
| &:active { | ||||||
| scale: 0.8; | ||||||
| } | ||||||
| `, | ||||||
| ); | ||||||
|
|
||||||
| interface Props { | ||||||
| avatar?: string; | ||||||
| size?: number; | ||||||
| } | ||||||
|
|
||||||
| export default (props: Props) => { | ||||||
| const { size = AVATAR_IMAGE_SIZE, avatar } = props; | ||||||
| const { styles } = useStyle(); | ||||||
| return ( | ||||||
| <NextImage | ||||||
| className={styles} | ||||||
| alt={avatar ? 'userAvatar' : 'LobeVidol'} | ||||||
| height={size} | ||||||
| src={!!avatar ? avatar : DEFAULT_USER_AVATAR_URL} | ||||||
|
There was a problem hiding this comment. Simplify the conditional expression for clarity. - src={!!avatar ? avatar : DEFAULT_USER_AVATAR_URL}
+ src={avatar ? avatar : DEFAULT_USER_AVATAR_URL}Committable suggestion
Suggested change
|
||||||
| unoptimized | ||||||
| width={size} | ||||||
| /> | ||||||
| ); | ||||||
| }; | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| 'use client'; | ||
|
|
||
| import { FluentEmoji } from '@lobehub/ui'; | ||
| import { Button } from 'antd'; | ||
| import Link from 'next/link'; | ||
| import { memo, useEffect } from 'react'; | ||
| import { Flexbox } from 'react-layout-kit'; | ||
|
|
||
| import { MAX_WIDTH } from '@/constants/common'; | ||
| import ResetConfig from '@/features/Actions/ClearSession'; | ||
| import ClearChat from '@/features/Actions/ResetConfig'; | ||
|
|
||
| interface ErrorCaptureProps { | ||
| error: Error & { digest?: string }; | ||
| reset: () => void; | ||
| } | ||
|
|
||
| const ErrorCapture = memo<ErrorCaptureProps>(({ reset, error }) => { | ||
| useEffect(() => { | ||
| // Log the error to an error reporting service | ||
| console.error(error); | ||
| }, [error]); | ||
|
|
||
| return ( | ||
| <Flexbox align={'center'} justify={'center'} style={{ minHeight: '100%', width: '100%' }}> | ||
| <h1 | ||
| style={{ | ||
| filter: 'blur(8px)', | ||
| fontSize: `min(${MAX_WIDTH / 6}px, 25vw)`, | ||
| fontWeight: 900, | ||
| margin: 0, | ||
| opacity: 0.12, | ||
| position: 'absolute', | ||
| zIndex: 0, | ||
| }} | ||
| > | ||
| ERROR | ||
| </h1> | ||
| <FluentEmoji emoji={'🤧'} size={64} /> | ||
| <h2 style={{ fontWeight: 'bold', marginTop: '1em', textAlign: 'center' }}> | ||
| 页面遇到一点问题... | ||
| </h2> | ||
| <p style={{ marginBottom: '2em' }}> | ||
| 项目当前正在施工中，不保证数据稳定性，如果遇到问题可以尝试 | ||
| <ClearChat text="清除会话消息" type={'link'} /> | ||
| 或 <ResetConfig text="重置系统设置" type={'link'} /> | ||
| ，造成地不便敬请谅解 | ||
| </p> | ||
| <Flexbox gap={12} horizontal style={{ marginBottom: '1em' }}> | ||
| <Button onClick={() => reset()}>重新加载</Button> | ||
| <Link href="/"> | ||
| <Button type={'primary'}>返回首页</Button> | ||
| </Link> | ||
| </Flexbox> | ||
| </Flexbox> | ||
| ); | ||
| }); | ||
|
|
||
| ErrorCapture.displayName = 'ErrorCapture'; | ||
|
|
||
| export default ErrorCapture; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,97 @@ | ||||||||
| import { Menu as AntdMenu, MenuProps as AntdMenuProps, ConfigProvider } from 'antd'; | ||||||||
|
There was a problem hiding this comment. Consider using these imports only for type annotations to clean up the import statements. - import { Menu as AntdMenu, MenuProps as AntdMenuProps, ConfigProvider } from 'antd';
+ import type { MenuProps as AntdMenuProps } from 'antd';
+ import { Menu as AntdMenu, ConfigProvider } from 'antd';Committable suggestion
Suggested change
|
||||||||
| import { createStyles } from 'antd-style'; | ||||||||
| import { memo } from 'react'; | ||||||||
|
|
||||||||
| const useStyles = createStyles(({ css, token, prefixCls }) => ({ | ||||||||
| compact: css` | ||||||||
| display: flex; | ||||||||
| flex-direction: column; | ||||||||
| gap: 0.125rem; | ||||||||
| `, | ||||||||
| menu: css` | ||||||||
| flex: 1; | ||||||||
| background: transparent; | ||||||||
| border: none !important; | ||||||||
|
|
||||||||
| .${prefixCls}-menu-item-divider { | ||||||||
| margin-block: 0.125rem; | ||||||||
| border-color: ${token.colorFillTertiary}; | ||||||||
|
|
||||||||
| &:first-child { | ||||||||
| margin-top: 0; | ||||||||
| } | ||||||||
|
|
||||||||
| &:last-child { | ||||||||
| margin-bottom: 0; | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| .${prefixCls}-menu-item, .${prefixCls}-menu-submenu-title { | ||||||||
| display: flex; | ||||||||
| gap: 0.75rem; | ||||||||
| align-items: center; | ||||||||
|
|
||||||||
| height: unset; | ||||||||
| min-height: 2rem; | ||||||||
| padding: 0.375rem 0.75rem; | ||||||||
|
|
||||||||
| line-height: 2; | ||||||||
|
|
||||||||
| .anticon + .${prefixCls}-menu-title-content { | ||||||||
| margin-inline-start: 0; | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| .${prefixCls}-menu-item-selected { | ||||||||
| .${prefixCls}-menu-item-icon svg { | ||||||||
| color: ${token.colorText}; | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| .${prefixCls}-menu-item-icon svg { | ||||||||
| color: ${token.colorTextSecondary}; | ||||||||
| } | ||||||||
|
|
||||||||
| .${prefixCls}-menu-title-content { | ||||||||
| flex: 1; | ||||||||
| } | ||||||||
| `, | ||||||||
| })); | ||||||||
|
|
||||||||
| export interface MenuProps extends AntdMenuProps { | ||||||||
| variant?: 'default' | 'compact'; | ||||||||
| } | ||||||||
|
|
||||||||
| const Menu = memo<MenuProps>(({ className, selectable = false, variant, ...rest }) => { | ||||||||
| const isCompact = variant === 'compact'; | ||||||||
| const { cx, styles, theme } = useStyles(); | ||||||||
| return ( | ||||||||
| <ConfigProvider | ||||||||
| theme={{ | ||||||||
| components: { | ||||||||
| Menu: { | ||||||||
| controlHeightLG: 36, | ||||||||
| iconMarginInlineEnd: 8, | ||||||||
| iconSize: 16, | ||||||||
| itemBorderRadius: theme.borderRadius, | ||||||||
| itemColor: selectable ? theme.colorTextSecondary : theme.colorText, | ||||||||
| itemHoverBg: theme.colorFillTertiary, | ||||||||
| itemMarginBlock: isCompact ? 0 : 4, | ||||||||
| itemMarginInline: isCompact ? 0 : 4, | ||||||||
| itemSelectedBg: theme.colorFillSecondary, | ||||||||
| paddingXS: -8, | ||||||||
| }, | ||||||||
| }, | ||||||||
| }} | ||||||||
| > | ||||||||
| <AntdMenu | ||||||||
| className={cx(styles.menu, isCompact && styles.compact, className)} | ||||||||
| mode="vertical" | ||||||||
| selectable={selectable} | ||||||||
| {...rest} | ||||||||
| /> | ||||||||
| </ConfigProvider> | ||||||||
| ); | ||||||||
| }); | ||||||||
|
|
||||||||
| export default Menu; | ||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,12 +5,13 @@ import { Center, Flexbox } from 'react-layout-kit'; | |
|
|
||
| interface PageLoadingProps { | ||
| className?: string; | ||
| description?: string; | ||
| style?: React.CSSProperties; | ||
| title: string; | ||
| } | ||
|
|
||
| const PageLoading = (props: PageLoadingProps) => { | ||
| const { title, className, style, description } = props; | ||
| return ( | ||
| <Flexbox height={'100%'} width={'100%'} className={className} style={style}> | ||
| <Center flex={1} gap={12} width={'100%'}> | ||
|
|
@@ -19,6 +20,7 @@ const PageLoading = (props: PageLoadingProps) => { | |
| <Icon icon={Loader2} spin /> | ||
| {title} | ||
| </Center> | ||
| {description && <Center>{description}</Center>} | ||
| </Center> | ||
| </Flexbox> | ||
| ); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,8 @@ export const LOADING_FLAG = '...'; | |
| export const DEFAULT_USER_AVATAR = '😀'; | ||
|
|
||
| export const MAX_NAME_LENGTH = 20; | ||
|
|
||
| export const MAX_WIDTH = 1024; | ||
| export const MAX_DESCRIPTION_LENGTH = 100; | ||
| export const MAX_GREETING_LENGTH = 200; | ||
| export const MAX_README_LENGTH = 800; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,41 @@ | ||||||||||
| import { App, Button } from 'antd'; | ||||||||||
| import { ButtonType } from 'antd/es/button'; | ||||||||||
|
Comment on lines
+1
to
+2
There was a problem hiding this comment. Optimize imports by using - import { App, Button } from 'antd';
- import { ButtonType } from 'antd/es/button';
+ import type { App, Button } from 'antd';
+ import type { ButtonType } from 'antd/es/button';Committable suggestion
Suggested change
|
||||||||||
| import React from 'react'; | ||||||||||
|
|
||||||||||
| import { useAgentStore } from '@/store/agent'; | ||||||||||
| import { useSessionStore } from '@/store/session'; | ||||||||||
|
|
||||||||||
| interface Props { | ||||||||||
| text?: string; | ||||||||||
| type?: ButtonType; | ||||||||||
| } | ||||||||||
| export default (props: Props) => { | ||||||||||
| const { text = '立即清除', type = 'primary' } = props; | ||||||||||
| const clearAgentStorage = useAgentStore((s) => s.clearAgentStorage); | ||||||||||
| const clearSessions = useSessionStore((s) => s.clearSessions); | ||||||||||
| const { message, modal } = App.useApp(); | ||||||||||
|
|
||||||||||
| const handleClear = () => { | ||||||||||
| modal.confirm({ | ||||||||||
| cancelText: '取消', | ||||||||||
| centered: true, | ||||||||||
| content: '操作无法撤销，清除后数据将无法恢复，请慎重操作', | ||||||||||
| okButtonProps: { | ||||||||||
| danger: true, | ||||||||||
| }, | ||||||||||
| okText: '确定', | ||||||||||
| onOk: () => { | ||||||||||
| clearSessions(); | ||||||||||
| clearAgentStorage(); | ||||||||||
| message.success('清除成功'); | ||||||||||
| }, | ||||||||||
| title: '确认清除所有会话消息?', | ||||||||||
| }); | ||||||||||
| }; | ||||||||||
|
|
||||||||||
| return ( | ||||||||||
| <Button danger onClick={handleClear} type={type}> | ||||||||||
| {text} | ||||||||||
| </Button> | ||||||||||
| ); | ||||||||||
| }; | ||||||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add a space after the comma for consistent formatting.
Committable suggestion