v4.4.6 (#377)

projects/app/src/pages/chat/components/ToolMenu.tsx

@@ -8,7 +8,6 @@ import { useRouter } from 'next/router';
 const ToolMenu = ({ history }: { history: ChatItemType[] }) => {
   const { onExportChat } = useChatBox();
   const router = useRouter();
-  const { appId, shareId } = router.query;
 
   const menuList = useMemo(
     () => [
@@ -18,8 +17,8 @@ const ToolMenu = ({ history }: { history: ChatItemType[] }) => {
         onClick: () => {
           router.replace({
             query: {
-              appId,
-              shareId
+              ...router.query,
+              chatId: ''
             }
           });
         }
@@ -36,7 +35,7 @@ const ToolMenu = ({ history }: { history: ChatItemType[] }) => {
       },
       { icon: 'pdf', label: 'PDF导出', onClick: () => onExportChat({ type: 'pdf', history }) }
     ],
-    [appId, history, onExportChat, router, shareId]
+    [history, onExportChat, router]
   );
 
   return history.length > 0 ? (

projects/app/src/pages/chat/index.tsx

@@ -358,7 +358,6 @@ const Chat = ({ appId, chatId }: { appId: string; chatId: string }) => {
               <ChatBox
                 ref={ChatBoxRef}
                 showEmptyIntro
-                chatId={chatId}
                 appAvatar={chatData.app.avatar}
                 userAvatar={userInfo?.avatar}
                 userGuideModule={chatData.app?.userGuideModule}

projects/app/src/pages/chat/share.tsx

@@ -24,10 +24,12 @@ import { serviceSideProps } from '@/utils/web/i18n';
 const OutLink = ({
   shareId,
   chatId,
+  showHistory,
   authToken
 }: {
   shareId: string;
   chatId: string;
+  showHistory: '0' | '1';
   authToken?: string;
 }) => {
   const router = useRouter();
@@ -89,9 +91,8 @@ const OutLink = ({
         forbidRefresh.current = true;
         router.replace({
           query: {
-            shareId,
-            chatId: completionChatId,
-            authToken
+            ...router.query,
+            chatId: completionChatId
           }
         });
       }
@@ -174,59 +175,58 @@ const OutLink = ({
         <title>{shareChatData.app.name}</title>
       </Head>
       <Flex h={'100%'} flexDirection={['column', 'row']}>
-        {((children: React.ReactNode) => {
-          return isPc ? (
-            <SideBar>{children}</SideBar>
-          ) : (
-            <Drawer
-              isOpen={isOpenSlider}
-              placement="left"
-              autoFocus={false}
-              size={'xs'}
-              onClose={onCloseSlider}
-            >
-              <DrawerOverlay backgroundColor={'rgba(255,255,255,0.5)'} />
-              <DrawerContent maxWidth={'250px'} boxShadow={'2px 0 10px rgba(0,0,0,0.15)'}>
-                {children}
-              </DrawerContent>
-            </Drawer>
-          );
-        })(
-          <ChatHistorySlider
-            appName={shareChatData.app.name}
-            appAvatar={shareChatData.app.avatar}
-            activeChatId={chatId}
-            history={history.map((item) => ({
-              id: item.chatId,
-              title: item.title
-            }))}
-            onClose={onCloseSlider}
-            onChangeChat={(chatId) => {
-              console.log(chatId);
-
-              router.replace({
-                query: {
-                  chatId: chatId || '',
-                  shareId,
-                  authToken
-                }
-              });
-              if (!isPc) {
-                onCloseSlider();
-              }
-            }}
-            onDelHistory={delOneShareHistoryByChatId}
-            onClearHistory={() => {
-              delManyShareChatHistoryByShareId(shareId);
-              router.replace({
-                query: {
-                  shareId,
-                  authToken
-                }
-              });
-            }}
-          />
-        )}
+        {showHistory === '1'
+          ? ((children: React.ReactNode) => {
+              return isPc ? (
+                <SideBar>{children}</SideBar>
+              ) : (
+                <Drawer
+                  isOpen={isOpenSlider}
+                  placement="left"
+                  autoFocus={false}
+                  size={'xs'}
+                  onClose={onCloseSlider}
+                >
+                  <DrawerOverlay backgroundColor={'rgba(255,255,255,0.5)'} />
+                  <DrawerContent maxWidth={'250px'} boxShadow={'2px 0 10px rgba(0,0,0,0.15)'}>
+                    {children}
+                  </DrawerContent>
+                </Drawer>
+              );
+            })(
+              <ChatHistorySlider
+                appName={shareChatData.app.name}
+                appAvatar={shareChatData.app.avatar}
+                activeChatId={chatId}
+                history={history.map((item) => ({
+                  id: item.chatId,
+                  title: item.title
+                }))}
+                onClose={onCloseSlider}
+                onChangeChat={(chatId) => {
+                  router.replace({
+                    query: {
+                      ...router.query,
+                      chatId: chatId || ''
+                    }
+                  });
+                  if (!isPc) {
+                    onCloseSlider();
+                  }
+                }}
+                onDelHistory={delOneShareHistoryByChatId}
+                onClearHistory={() => {
+                  delManyShareChatHistoryByShareId(shareId);
+                  router.replace({
+                    query: {
+                      ...router.query,
+                      chatId: ''
+                    }
+                  });
+                }}
+              />
+            )
+          : null}
 
         {/* chat container */}
         <Flex
@@ -276,10 +276,11 @@ const OutLink = ({
 export async function getServerSideProps(context: any) {
   const shareId = context?.query?.shareId || '';
   const chatId = context?.query?.chatId || '';
+  const showHistory = context?.query?.showHistory || '1';
   const authToken = context?.query?.authToken || '';
 
   return {
-    props: { shareId, chatId, authToken, ...(await serviceSideProps(context)) }
+    props: { shareId, chatId, showHistory, authToken, ...(await serviceSideProps(context)) }
   };
 }