From 5b9daba0d44fe1a0ef3904870cc97ff3209ccc47 Mon Sep 17 00:00:00 2001
From: Kerwin <me@zhanghuanglong.com>
Date: Wed, 26 Apr 2023 21:35:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A0=E6=B3=95=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E5=80=92=E5=BA=95=E9=83=A8=20(Close=20#74)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/chat/index.vue             | 26 ++++++++++++++++----------
 src/views/chat/layout/sider/List.vue |  9 ---------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/views/chat/index.vue b/src/views/chat/index.vue
index 9d384382..e6af7dee 100644
--- a/src/views/chat/index.vue
+++ b/src/views/chat/index.vue
@@ -1,6 +1,6 @@
 <script setup lang='ts'>
 import type { Ref } from 'vue'
-import { computed, defineAsyncComponent, nextTick, onMounted, onUnmounted, ref } from 'vue'
+import { computed, defineAsyncComponent, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useRoute } from 'vue-router'
 import { storeToRefs } from 'pinia'
 import type { MessageReactive } from 'naive-ui'
@@ -471,6 +471,16 @@ async function loadMoreMessage(event: any) {
 }
 
 const handleLoadMoreMessage = debounce(loadMoreMessage, 300)
+const handleSyncChat
+  = debounce(() => {
+    // 直接刷 极小概率不请求
+    chatStore.syncChat({ uuid: Number(uuid) } as Chat.History, undefined, () => {
+      firstLoading.value = false
+      scrollToBottom()
+      if (inputRef.value && !isMobile.value)
+        inputRef.value?.focus()
+    })
+  }, 200)
 
 async function handleScroll(event: any) {
   const scrollTop = event.target.scrollTop
@@ -524,15 +534,11 @@ const footerClass = computed(() => {
 
 onMounted(() => {
   firstLoading.value = true
-  debounce(() => {
-    // 直接刷 极小概率不请求
-    chatStore.syncChat({ uuid: Number(uuid) } as Chat.History, undefined, () => {
-      firstLoading.value = false
-      scrollToBottom()
-      if (inputRef.value && !isMobile.value)
-        inputRef.value?.focus()
-    })
-  }, 200)()
+  handleSyncChat()
+})
+
+watch(() => chatStore.active, (newVal, oldVal) => {
+  handleSyncChat()
 })
 
 onUnmounted(() => {
diff --git a/src/views/chat/layout/sider/List.vue b/src/views/chat/layout/sider/List.vue
index c4524d6f..3dc9cfbf 100644
--- a/src/views/chat/layout/sider/List.vue
+++ b/src/views/chat/layout/sider/List.vue
@@ -1,15 +1,12 @@
 <script setup lang='ts'>
 import { computed, onMounted, ref } from 'vue'
 import { NInput, NPopconfirm, NScrollbar, NSpin } from 'naive-ui'
-import { useScroll } from '../../hooks/useScroll'
 import { SvgIcon } from '@/components/common'
 import { useAppStore, useChatStore } from '@/store'
 import { useBasicLayout } from '@/hooks/useBasicLayout'
 import { useAuthStoreWithout } from '@/store/modules/auth'
 import { debounce } from '@/utils/functions/debounce'
 
-const { scrollToBottom } = useScroll()
-
 const { isMobile } = useBasicLayout()
 
 const appStore = useAppStore()
@@ -26,15 +23,9 @@ onMounted(async () => {
 })
 
 async function handleSyncChatRoom() {
-  // if (chatStore.history.length == 1 && chatStore.history[0].title == 'New Chat'
-  //   && chatStore.chat[0].data.length <= 0)
   loadingRoom.value = true
   chatStore.syncHistory(() => {
     loadingRoom.value = false
-    if (chatStore.active) {
-      const uuid = chatStore.active
-      chatStore.syncChat({ uuid } as Chat.History, undefined, scrollToBottom)
-    }
   })
 }