From e6c9ca540a489a6635f63d10b95a856755eb90ff Mon Sep 17 00:00:00 2001
From: Archer <545436317@qq.com>
Date: Fri, 17 Mar 2023 22:06:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=81=8A=E5=A4=A9=E4=BE=A7=E8=BE=B9?=
 =?UTF-8?q?=E6=A0=8F=E6=9C=AA=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Layout/navbar.tsx       |   8 +-
 src/components/Layout/navbarPhone.tsx  |   1 +
 src/pages/chat/components/SlideBar.tsx | 155 +++++++++++--------------
 3 files changed, 76 insertions(+), 88 deletions(-)

diff --git a/src/components/Layout/navbar.tsx b/src/components/Layout/navbar.tsx
index dd9dc8517..9001c7174 100644
--- a/src/components/Layout/navbar.tsx
+++ b/src/components/Layout/navbar.tsx
@@ -45,12 +45,12 @@ const Navbar = ({
             flexDirection={'column'}
             alignItems={'center'}
             justifyContent={'center'}
-            onClick={() =>
-              !item.activeLink.includes(router.pathname) &&
+            onClick={() => {
+              if (item.link === router.pathname) return;
               router.push(item.link, undefined, {
                 shallow: true
-              })
-            }
+              });
+            }}
             cursor={'pointer'}
             fontSize={'sm'}
             w={'60px'}
diff --git a/src/components/Layout/navbarPhone.tsx b/src/components/Layout/navbarPhone.tsx
index 251a0a791..4b22ce3be 100644
--- a/src/components/Layout/navbarPhone.tsx
+++ b/src/components/Layout/navbarPhone.tsx
@@ -57,6 +57,7 @@ const NavbarPhone = ({
                 alignItems={'center'}
                 justifyContent={'center'}
                 onClick={() => {
+                  if (item.link === router.pathname) return;
                   router.push(item.link);
                   onClose();
                 }}
diff --git a/src/pages/chat/components/SlideBar.tsx b/src/pages/chat/components/SlideBar.tsx
index 776a0b129..c2c068a39 100644
--- a/src/pages/chat/components/SlideBar.tsx
+++ b/src/pages/chat/components/SlideBar.tsx
@@ -80,29 +80,7 @@ const SlideBar = ({
           <Box flex={'1 0 0'} w={0} className="textEllipsis">
             {item.title}
           </Box>
-          {/* <Input
-            flex={'1 0 0'}
-            w={0}
-            value={item.title}
-            variant={'unstyled'}
-            disabled={editHistoryId !== item.windowId}
-            opacity={'1 !important'}
-            cursor={`${editHistoryId !== item.windowId ? 'pointer' : 'text'} !important`}
-            onChange={(e) => {
-              updateChatHistory(item.windowId, e.target.value);
-            }}
-          /> */}
           <Box>
-            {/* <IconButton
-              icon={<EditIcon />}
-              variant={'unstyled'}
-              aria-label={'edit'}
-              size={'xs'}
-              onClick={(e) => {
-                console.log(e);
-                setEditHistoryId(item.windowId);
-              }}
-            /> */}
             <IconButton
               icon={<DeleteIcon />}
               variant={'unstyled'}
@@ -120,7 +98,14 @@ const SlideBar = ({
   );
 
   return (
-    <Box w={'100%'} h={'100%'} p={3} backgroundColor={'blackAlpha.800'} color={'white'}>
+    <Flex
+      flexDirection={'column'}
+      w={'100%'}
+      h={'100%'}
+      p={3}
+      backgroundColor={'blackAlpha.800'}
+      color={'white'}
+    >
       {/* 新对话 */}
       <Button
         w={'100%'}
@@ -133,67 +118,69 @@ const SlideBar = ({
         新对话
       </Button>
       {/* 我的模型 & 历史记录 折叠框*/}
-      {isSuccess ? (
-        <Accordion defaultIndex={[0]} allowToggle>
-          <AccordionItem borderTop={0} borderBottom={0}>
-            <AccordionButton borderRadius={'md'} pl={1}>
-              <Box as="span" flex="1" textAlign="left">
-                历史记录
-              </Box>
-              <AccordionIcon />
-            </AccordionButton>
-            <AccordionPanel pb={0} px={0}>
-              {hasReady && <RenderHistory />}
-            </AccordionPanel>
-          </AccordionItem>
-          <AccordionItem borderTop={0} borderBottom={0}>
-            <AccordionButton borderRadius={'md'} pl={1}>
-              <Box as="span" flex="1" textAlign="left">
-                其他模型
-              </Box>
-              <AccordionIcon />
-            </AccordionButton>
-            <AccordionPanel pb={4} px={0}>
-              {myModels.map((item) => (
-                <Flex
-                  key={item._id}
-                  alignItems={'center'}
-                  p={3}
-                  borderRadius={'md'}
-                  mb={2}
-                  cursor={'pointer'}
-                  _hover={{
-                    backgroundColor: 'rgba(255,255,255,0.1)'
-                  }}
-                  fontSize={'xs'}
-                  border={'1px solid transparent'}
-                  {...(item.name === name
-                    ? {
-                        borderColor: 'rgba(255,255,255,0.5)',
-                        backgroundColor: 'rgba(255,255,255,0.1)'
-                      }
-                    : {})}
-                  onClick={async () => {
-                    if (item.name === name) return;
-                    router.push(
-                      `/chat?chatId=${await generateChatWindow(item._id)}&timeStamp=${Date.now()}`
-                    );
-                    onClose();
-                  }}
-                >
-                  <ChatIcon mr={2} />
-                  <Box className={'textEllipsis'} flex={'1 0 0'} w={0}>
-                    {item.name}
-                  </Box>
-                </Flex>
-              ))}
-            </AccordionPanel>
-          </AccordionItem>
-        </Accordion>
-      ) : (
-        <RenderHistory />
-      )}
-    </Box>
+      <Box flex={'1 0 0'} h={0} overflowY={'auto'}>
+        {isSuccess ? (
+          <Accordion defaultIndex={[0]} allowToggle>
+            <AccordionItem borderTop={0} borderBottom={0}>
+              <AccordionButton borderRadius={'md'} pl={1}>
+                <Box as="span" flex="1" textAlign="left">
+                  历史记录
+                </Box>
+                <AccordionIcon />
+              </AccordionButton>
+              <AccordionPanel pb={0} px={0}>
+                {hasReady && <RenderHistory />}
+              </AccordionPanel>
+            </AccordionItem>
+            <AccordionItem borderTop={0} borderBottom={0}>
+              <AccordionButton borderRadius={'md'} pl={1}>
+                <Box as="span" flex="1" textAlign="left">
+                  其他模型
+                </Box>
+                <AccordionIcon />
+              </AccordionButton>
+              <AccordionPanel pb={4} px={0}>
+                {myModels.map((item) => (
+                  <Flex
+                    key={item._id}
+                    alignItems={'center'}
+                    p={3}
+                    borderRadius={'md'}
+                    mb={2}
+                    cursor={'pointer'}
+                    _hover={{
+                      backgroundColor: 'rgba(255,255,255,0.1)'
+                    }}
+                    fontSize={'xs'}
+                    border={'1px solid transparent'}
+                    {...(item.name === name
+                      ? {
+                          borderColor: 'rgba(255,255,255,0.5)',
+                          backgroundColor: 'rgba(255,255,255,0.1)'
+                        }
+                      : {})}
+                    onClick={async () => {
+                      if (item.name === name) return;
+                      router.push(
+                        `/chat?chatId=${await generateChatWindow(item._id)}&timeStamp=${Date.now()}`
+                      );
+                      onClose();
+                    }}
+                  >
+                    <ChatIcon mr={2} />
+                    <Box className={'textEllipsis'} flex={'1 0 0'} w={0}>
+                      {item.name}
+                    </Box>
+                  </Flex>
+                ))}
+              </AccordionPanel>
+            </AccordionItem>
+          </Accordion>
+        ) : (
+          <RenderHistory />
+        )}
+      </Box>
+    </Flex>
   );
 };