perf: error show

2023-05-15 22:27:54 +08:00 · 2023-05-15 22:27:54 +08:00 · 371e0e36c6
commit 371e0e36c6
parent e7d3a8e2e1
10 changed files with 60 additions and 39 deletions
--- a/src/components/Layout/index.tsx
+++ b/src/components/Layout/index.tsx
@ -78,6 +78,6 @@ export default Layout;

 Layout.getInitialProps = ({ req }: any) => {
  return {
-    isPcDevice: !/Mobile/.test(req ? req.headers['user-agent'] : navigator.userAgent)
+    isPcDevice: !/Mobile/.test(req?.headers?.['user-agent'])
  };
 };
--- a/src/pages/_error.tsx
+++ b/src/pages/_error.tsx
@ -4,7 +4,9 @@ function Error({ errStr }: { errStr: string }) {

 Error.getInitialProps = ({ res, err }: { res: any; err: any }) => {
  console.log(err);
-  return { errStr: JSON.stringify(err) };
+  return {
+    errStr: `部分系统不兼容，导致页面崩溃。如果可以，请联系作者，反馈下具体操作和页面。大部分是 苹果 的 safari 浏览器导致，可以尝试更换 chrome 浏览器。`
+  };
 };

 export default Error;
--- a/src/pages/api/model/data/pushModelDataCsv.ts
+++ b/src/pages/api/model/data/pushModelDataCsv.ts
@ -89,3 +89,11 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
    });
  }
 }
+
+export const config = {
+  api: {
+    bodyParser: {
+      sizeLimit: '100mb'
+    }
+  }
+};
--- a/src/pages/chat/components/Empty.tsx
+++ b/src/pages/chat/components/Empty.tsx
@ -5,8 +5,10 @@ import Markdown from '@/components/Markdown';
 import { LOGO_ICON } from '@/constants/chat';

 const Empty = ({
+  showChatProblem,
  model: { name, intro, avatar }
 }: {
+  showChatProblem: boolean;
  model: {
    name: string;
    intro: string;
@ -43,6 +45,9 @@ const Empty = ({
          <Box whiteSpace={'pre-line'}>{intro}</Box>
        </Card>
      )}
+
+      {showChatProblem && (
+        <>
          {/* version intro */}
          <Card p={4} mb={10}>
            <Markdown source={versionIntro} />
@ -50,6 +55,8 @@ const Empty = ({
          <Card p={4}>
            <Markdown source={chatProblem} />
          </Card>
+        </>
+      )}
    </Box>
  );
 };
--- a/src/pages/chat/index.tsx
+++ b/src/pages/chat/index.tsx
@ -36,12 +36,11 @@ import { useToast } from '@/hooks/useToast';
 import { useScreen } from '@/hooks/useScreen';
 import { useQuery } from '@tanstack/react-query';
 import dynamic from 'next/dynamic';
-import { useCopyData, voiceBroadcast, formatLinkTextToHtml } from '@/utils/tools';
+import { useCopyData, voiceBroadcast, hasVoiceApi } from '@/utils/tools';
 import { streamFetch } from '@/api/fetch';
 import MyIcon from '@/components/Icon';
 import { throttle } from 'lodash';
 import { Types } from 'mongoose';
-import Markdown from '@/components/Markdown';
 import { LOGO_ICON } from '@/constants/chat';
 import { ChatModelMap } from '@/constants/model';
 import { useChatStore } from '@/store/chat';
@ -50,19 +49,16 @@ import { fileDownload } from '@/utils/file';
 import { htmlTemplate } from '@/constants/common';
 import { useUserStore } from '@/store/user';
 import Loading from '@/components/Loading';
+import Markdown from '@/components/Markdown';
+import Empty from './components/Empty';

 const PhoneSliderBar = dynamic(() => import('./components/PhoneSliderBar'), {
-  loading: () => <Loading fixed={false} />,
  ssr: false
 });
 const History = dynamic(() => import('./components/History'), {
  loading: () => <Loading fixed={false} />,
  ssr: false
 });
-const Empty = dynamic(() => import('./components/Empty'), {
-  loading: () => <Loading fixed={false} />,
-  ssr: false
-});

 import styles from './index.module.scss';

@ -77,7 +73,6 @@ const Chat = ({
  chatId: string;
  isPcDevice: boolean;
 }) => {
-  const hasVoiceApi = typeof window === 'undefined' ? false : !!window.speechSynthesis;
  const router = useRouter();
  const theme = useTheme();

@ -627,7 +622,6 @@ const Chat = ({
      chatData.model.canUse,
      chatData.modelId,
      delChatRecord,
-      hasVoiceApi,
      onclickCopy,
      router,
      theme.borders.base
@ -790,7 +784,10 @@ const Chat = ({
                            order: 1,
                            mr: ['6px', 2],
                            cursor: 'pointer',
-                            onClick: () => isPc && router.push(`/model?modelId=${chatData.modelId}`)
+                            onClick: () =>
+                              isPc &&
+                              chatData.model.canUse &&
+                              router.push(`/model?modelId=${chatData.modelId}`)
                          }
                        : {
                            order: 3,
@ -856,17 +853,16 @@ const Chat = ({
                          bg={'myBlue.300'}
                          onContextMenu={(e) => onclickContextMenu(e, item)}
                        >
-                          <Box
-                            as={'p'}
-                            dangerouslySetInnerHTML={{ __html: formatLinkTextToHtml(item.value) }}
-                          />
+                          <Box as={'p'}>{item.value}</Box>
                        </Card>
                      </Box>
                    )}
                  </Flex>
                </Flex>
              ))}
-              {chatData.history.length === 0 && <Empty model={chatData.model} />}
+              {chatData.history.length === 0 && (
+                <Empty model={chatData.model} showChatProblem={true} />
+              )}
            </Box>
          </Box>
          {/* 发送区 */}
@ -1012,7 +1008,7 @@ Chat.getInitialProps = ({ query, req }: any) => {
  return {
    modelId: query?.modelId || '',
    chatId: query?.chatId || '',
-    isPcDevice: !/Mobile/.test(req ? req.headers['user-agent'] : navigator.userAgent)
+    isPcDevice: !/Mobile/.test(req?.headers?.['user-agent'])
  };
 };

--- a/src/pages/chat/share.tsx
+++ b/src/pages/chat/share.tsx
@ -34,12 +34,11 @@ import { useToast } from '@/hooks/useToast';
 import { useScreen } from '@/hooks/useScreen';
 import { useQuery } from '@tanstack/react-query';
 import dynamic from 'next/dynamic';
-import { useCopyData, voiceBroadcast } from '@/utils/tools';
+import { useCopyData, voiceBroadcast, hasVoiceApi } from '@/utils/tools';
 import { streamFetch } from '@/api/fetch';
 import MyIcon from '@/components/Icon';
 import { throttle } from 'lodash';
 import { Types } from 'mongoose';
-import Markdown from '@/components/Markdown';
 import { LOGO_ICON } from '@/constants/chat';
 import { useChatStore } from '@/store/chat';
 import { useLoading } from '@/hooks/useLoading';
@ -47,15 +46,13 @@ import { fileDownload } from '@/utils/file';
 import { htmlTemplate } from '@/constants/common';
 import { useUserStore } from '@/store/user';
 import Loading from '@/components/Loading';
+import Markdown from '@/components/Markdown';
+import Empty from './components/Empty';

 const ShareHistory = dynamic(() => import('./components/ShareHistory'), {
  loading: () => <Loading fixed={false} />,
  ssr: false
 });
-const Empty = dynamic(() => import('./components/Empty'), {
-  loading: () => <Loading fixed={false} />,
-  ssr: false
-});

 import styles from './index.module.scss';

@ -70,7 +67,6 @@ const Chat = ({
  historyId: string;
  isPcDevice: boolean;
 }) => {
-  const hasVoiceApi = typeof window === 'undefined' ? false : !!window.speechSynthesis;
  const router = useRouter();
  const theme = useTheme();

@ -536,7 +532,7 @@ const Chat = ({
        <MenuItem onClick={() => delShareChatHistoryItemById(historyId, index)}>删除</MenuItem>
      </MenuList>
    ),
-    [delShareChatHistoryItemById, hasVoiceApi, historyId, onclickCopy, theme.borders.base]
+    [delShareChatHistoryItemById, historyId, onclickCopy, theme.borders.base]
  );

  return (
@ -754,7 +750,9 @@ const Chat = ({
                </Flex>
              </Flex>
            ))}
-            {shareChatData.history.length === 0 && <Empty model={shareChatData.model} />}
+            {shareChatData.history.length === 0 && (
+              <Empty model={shareChatData.model} showChatProblem={false} />
+            )}
          </Box>
        </Box>
        {/* 发送区 */}
@ -926,7 +924,7 @@ Chat.getInitialProps = ({ query, req }: any) => {
  return {
    shareId: query?.shareId || '',
    historyId: query?.historyId || '',
-    isPcDevice: !/Mobile/.test(req ? req.headers['user-agent'] : navigator.userAgent)
+    isPcDevice: !/Mobile/.test(req?.headers?.['user-agent'])
  };
 };

--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@ -117,6 +117,6 @@ export default Login;

 Login.getInitialProps = ({ query, req }: any) => {
  return {
-    isPcDevice: !/Mobile/.test(req ? req.headers['user-agent'] : navigator.userAgent)
+    isPcDevice: !/Mobile/.test(req?.headers?.['user-agent'])
  };
 };
--- a/src/pages/model/components/detail/index.tsx
+++ b/src/pages/model/components/detail/index.tsx
@ -45,6 +45,11 @@ const ModelDetail = ({ modelId, isPc }: { modelId: string; isPc: boolean }) => {
    [modelDetail.userId, userInfo?._id]
  );

+  const canRead = useMemo(
+    () => isOwner || isLoading || modelDetail.share.isShareDetail,
+    [isLoading, isOwner, modelDetail.share.isShareDetail]
+  );
+
  /* 点击删除 */
  const handleDelModel = useCallback(async () => {
    if (!modelDetail) return;
@ -129,7 +134,7 @@ const ModelDetail = ({ modelId, isPc }: { modelId: string; isPc: boolean }) => {
    };
  }, [router]);

-  return (
+  return canRead ? (
    <Box h={'100%'} p={5} overflow={'overlay'} position={'relative'}>
      {/* 头部 */}
      <Card px={6} py={3}>
@ -196,6 +201,10 @@ const ModelDetail = ({ modelId, isPc }: { modelId: string; isPc: boolean }) => {
      </Grid>
      <Loading loading={isLoading} fixed={false} />
    </Box>
+  ) : (
+    <Box h={'100%'} p={5}>
+      无权查看模型配置
+    </Box>
  );
 };

--- a/src/pages/model/index.tsx
+++ b/src/pages/model/index.tsx
@ -46,6 +46,6 @@ export default Model;
 Model.getInitialProps = ({ query, req }: any) => {
  return {
    modelId: query?.modelId || '',
-    isPcDevice: !/Mobile/.test(req ? req.headers['user-agent'] : navigator.userAgent)
+    isPcDevice: !/Mobile/.test(req?.headers?.['user-agent'])
  };
 };
--- a/src/utils/tools.ts
+++ b/src/utils/tools.ts
@ -89,6 +89,7 @@ export const formatTimeToChatTime = (time: Date) => {
  return target.format('YYYY/M/D');
 };

+export const hasVoiceApi = typeof window !== 'undefined' && 'speechSynthesis' in window;
 /**
 * voice broadcast
 */