Merge branch 'main' into beian

src/components/Layout/auth.tsx

@@ -39,7 +39,7 @@ const Auth = ({ children }: { children: JSX.Element }) => {
         }
       },
       onError(error) {
-        console.error(error);
+        console.log('error->', error);
         router.push('/login');
         toast();
       },

src/components/Markdown/codeLight.ts

@@ -2,9 +2,7 @@ import React from 'react';
 export const codeLight: { [key: string]: React.CSSProperties } = {
   'code[class*=language-]': {
     color: '#d4d4d4',
-    fontSize: '13px',
     textShadow: 'none',
-    fontFamily: 'Menlo,Monaco,Consolas,"Andale Mono","Ubuntu Mono","Courier New",monospace',
     direction: 'ltr',
     textAlign: 'left',
     whiteSpace: 'pre',
@@ -21,9 +19,7 @@ export const codeLight: { [key: string]: React.CSSProperties } = {
   },
   'pre[class*=language-]': {
     color: '#d4d4d4',
-    fontSize: '13px',
     textShadow: 'none',
-    fontFamily: 'Menlo,Monaco,Consolas,"Andale Mono","Ubuntu Mono","Courier New",monospace',
     direction: 'ltr',
     textAlign: 'left',
     whiteSpace: 'pre',

src/components/Markdown/index.module.scss

@@ -341,7 +341,7 @@
   background-color: #f0f0f0;
   border: 1px solid #cccccc;
   border-radius: 3px 3px 3px 3px;
-  font-size: 13px;
+  font-size: max(0.9em, 14px);
   line-height: 19px;
   overflow: auto;
   padding: 6px 10px;
@@ -352,11 +352,12 @@
   border: medium none;
 }
 .markdown {
-  font-size: 14px;
-  line-height: 1.6;
-  letter-spacing: 0.5px;
   text-align: justify;
   word-break: break-all;
+  overflow-y: hidden;
+  tab-size: 4;
+  word-spacing: normal;
+
   pre {
     display: block;
     width: 100%;
@@ -372,7 +373,6 @@
     background-color: #222 !important;
     color: #fff;
     width: 100%;
-    font-family: 'Söhne,ui-sans-serif,system-ui,-apple-system,Segoe UI,Roboto,Ubuntu,Cantarell,Noto Sans,sans-serif,Helvetica Neue,Arial,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji';
   }
 
   a {

src/components/Markdown/index.tsx

@@ -1,8 +1,6 @@
 import React, { memo, useMemo } from 'react';
 import ReactMarkdown from 'react-markdown';
-import styles from './index.module.scss';
 import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
-import { codeLight } from './codeLight';
 import { Box, Flex } from '@chakra-ui/react';
 import { useCopyData } from '@/utils/tools';
 import Icon from '@/components/Icon';
@@ -10,8 +8,12 @@ import remarkGfm from 'remark-gfm';
 import remarkMath from 'remark-math';
 import rehypeKatex from 'rehype-katex';
 
+import 'katex/dist/katex.min.css';
+import styles from './index.module.scss';
+import { codeLight } from './codeLight';
+
 const Markdown = ({ source, isChatting }: { source: string; isChatting: boolean }) => {
-  const formatSource = useMemo(() => source.replace(/\n/g, '  \n'), [source]);
+  const formatSource = useMemo(() => source, [source]);
   const { copyData } = useCopyData();
 
   return (
@@ -25,7 +27,8 @@ const Markdown = ({ source, isChatting }: { source: string; isChatting: boolean
         pre: 'div',
         code({ node, inline, className, children, ...props }) {
           const match = /language-(\w+)/.exec(className || '');
-          const code = String(children).replace(/\n$/, '');
+          const code = String(children);
+
           return !inline || match ? (
             <Box my={3} borderRadius={'md'} overflow={'hidden'} backgroundColor={'#222'}>
               <Flex
@@ -53,7 +56,7 @@ const Markdown = ({ source, isChatting }: { source: string; isChatting: boolean
             </Box>
           ) : (
             <code className={className} {...props}>
-              {children}
+              {code}
             </code>
           );
         }