diff --git a/client/public/locales/zh/common.json b/client/public/locales/zh/common.json index 95febf156..203f801bf 100644 --- a/client/public/locales/zh/common.json +++ b/client/public/locales/zh/common.json @@ -37,7 +37,7 @@ "chat": { "Admin Mark Content": "纠正后的回复", "Complete Response": "完整响应", - "Confirm to clear history": "确认清空该应用的聊天记录？", + "Confirm to clear history": "确认清空该应用的在线聊天记录？分享和 API 调用的记录不会被清空。", "Exit Chat": "退出聊天", "Feedback Close": "关闭反馈", "Feedback Failed": "提交反馈异常", diff --git a/client/src/components/ChatBox/index.tsx b/client/src/components/ChatBox/index.tsx index 1545085a8..3dd1ff5a5 100644 --- a/client/src/components/ChatBox/index.tsx +++ b/client/src/components/ChatBox/index.tsx @@ -439,13 +439,20 @@ const ChatBox = ( border: theme.borders.base, mr: 3 }; - const controlContainerStyle = { - className: 'control', - color: 'myGray.400', - display: feedbackType === FeedbackTypeEnum.admin ? 'flex' : ['flex', 'none'], - pl: 1, - mt: 2 - }; + const controlContainerStyle = useCallback((status: ChatSiteItemType['status']) => { + return { + className: 'control', + color: 'myGray.400', + display: + status === 'finish' + ? feedbackType === FeedbackTypeEnum.admin + ? 'flex' + : ['flex', 'none'] + : 'none', + pl: 1, + mt: 2 + }; + }, []); const MessageCardStyle: BoxProps = { px: 4, py: 3, @@ -604,7 +611,11 @@ const ChatBox = ( {item.obj === 'Human' && ( <> - + - + diff --git a/client/src/pages/_app.tsx b/client/src/pages/_app.tsx index 4b65dff98..219ae1425 100644 --- a/client/src/pages/_app.tsx +++ b/client/src/pages/_app.tsx @@ -42,6 +42,7 @@ function App({ Component, pageProps }: AppProps) { const [googleClientVerKey, setGoogleVerKey] = useState(); useEffect(() => { + // get init data (async () => { const { feConfigs: { scripts, googleClientVerKey } @@ -49,6 +50,21 @@ function App({ Component, pageProps }: AppProps) { setScripts(scripts || []); setGoogleVerKey(googleClientVerKey); })(); + // add window error track + window.onerror = function (msg, url) { + window.umami?.track('windowError', { + device: { + userAgent: navigator.userAgent, + platform: navigator.platform, + appName: navigator.appName + }, + msg, + url + }); + }; + return () => { + window.onerror = null; + }; }, []); useEffect(() => { diff --git a/client/src/pages/_error.tsx b/client/src/pages/_error.tsx index de75ac7cc..339112e90 100644 --- a/client/src/pages/_error.tsx +++ b/client/src/pages/_error.tsx @@ -1,10 +1,19 @@ import { useEffect } from 'react'; import { useRouter } from 'next/router'; +import { serviceSideProps } from '@/utils/i18n'; function Error() { const router = useRouter(); useEffect(() => { setTimeout(() => { - router.replace('/app/list'); + window.umami?.track('pageError', { + userAgent: navigator.userAgent, + platform: navigator.platform, + appName: navigator.appName + }); + }, 1000); + + setTimeout(() => { + router.back(); }, 2000); }, []); @@ -16,4 +25,12 @@ function Error() { ); } +export async function getServerSideProps(context: any) { + console.log(context); + + return { + props: { ...(await serviceSideProps(context)) } + }; +} + export default Error; diff --git a/client/src/pages/api/chat/removeHistory.ts b/client/src/pages/api/chat/removeHistory.ts index 87fe57f1b..254d9981a 100644 --- a/client/src/pages/api/chat/removeHistory.ts +++ b/client/src/pages/api/chat/removeHistory.ts @@ -2,6 +2,7 @@ import type { NextApiRequest, NextApiResponse } from 'next'; import { jsonRes } from '@/service/response'; import { connectToDatabase, Chat, ChatItem } from '@/service/mongo'; import { authUser } from '@/service/utils/auth'; +import { ChatSourceEnum } from '@/constants/chat'; type Props = { chatId?: string; @@ -29,14 +30,19 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) ]); } if (appId) { + const chats = await Chat.find({ + appId, + userId, + source: ChatSourceEnum.online + }).select('_id'); + const chatIds = chats.map((chat) => chat._id); + await Promise.all([ Chat.deleteMany({ - appId, - userId + _id: { $in: chatIds } }), ChatItem.deleteMany({ - userId, - appId + chatId: { $in: chatIds } }) ]); } diff --git a/client/src/pages/chat/components/SliderApps.tsx b/client/src/pages/chat/components/SliderApps.tsx index 10a25da7a..47c9ac1c3 100644 --- a/client/src/pages/chat/components/SliderApps.tsx +++ b/client/src/pages/chat/components/SliderApps.tsx @@ -15,29 +15,31 @@ const SliderApps = ({ appId }: { appId: string }) => { useQuery(['loadModels'], () => loadMyApps(false)); return ( - <> - router.push('/app/list')} - > - } - bg={'white'} - boxShadow={'1px 1px 9px rgba(0,0,0,0.15)'} - h={'28px'} - size={'sm'} - borderRadius={'50%'} - aria-label={''} - /> - {t('chat.Exit Chat')} - - + + + router.push('/app/list')} + > + } + bg={'white'} + boxShadow={'1px 1px 9px rgba(0,0,0,0.15)'} + h={'28px'} + size={'sm'} + borderRadius={'50%'} + aria-label={''} + /> + {t('chat.Exit Chat')} + + + {myApps.map((item) => ( { ))} - + ); }; diff --git a/client/src/pages/chat/index.tsx b/client/src/pages/chat/index.tsx index 5a9d06e8a..14b25a973 100644 --- a/client/src/pages/chat/index.tsx +++ b/client/src/pages/chat/index.tsx @@ -252,7 +252,7 @@ const Chat = ({ appId, chatId }: { appId: string; chatId: string }) => { {/* pc show myself apps */} {isPc && ( - + )} diff --git a/client/src/types/index.d.ts b/client/src/types/index.d.ts index 6b0d84637..045228e0e 100644 --- a/client/src/types/index.d.ts +++ b/client/src/types/index.d.ts @@ -4,6 +4,7 @@ import type { Pool } from 'pg'; import type { Tiktoken } from '@dqbd/tiktoken'; import type { Logger } from 'winston'; import { ChatModelItemType, QAModelItemType, VectorModelItemType } from './model'; +import { TrackEventName } from '@/constants/common'; export type PagingData = { pageNum: number; @@ -60,5 +61,8 @@ declare global { particlesJS: any; grecaptcha: any; QRCode: any; + umami?: { + track: (event: `${TrackEventName}`, data: any) => void; + }; } }