Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions src/renderer/src/components/ChatView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,9 @@ const isGenerating = computed(() => {
return chatStore.generatingThreadIds.has(chatStore.getActiveThreadId()!)
})
const handleSend = async (msg: UserMessageContent) => {
if (messageList.value) {
// 在发送消息前将aboveThreshold设置为false,确保消息发送过程中总是滚动到底部
messageList.value.aboveThreshold = false
}
scrollToBottom()
await chatStore.sendMessage(msg)
// 只有当用户在底部时才自动滚动
if (!messageList.value?.aboveThreshold) {
scrollToBottom()
}
scrollToBottom()
}

const handleFileUpload = () => {
Expand Down
43 changes: 32 additions & 11 deletions src/renderer/src/components/message/MessageList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<div
ref="messagesContainer"
class="message-list-container relative flex-1 overflow-y-auto scroll-smooth w-full h-full"
@scroll="handleScroll"
>
<div
ref="messageList"
Expand Down Expand Up @@ -83,11 +82,11 @@
</template>

<script setup lang="ts">
import { ref, onMounted, nextTick, watch, computed, reactive } from 'vue'
import { ref, onMounted, onUnmounted, nextTick, watch, computed, reactive } from 'vue'
import MessageItemAssistant from './MessageItemAssistant.vue'
import MessageItemUser from './MessageItemUser.vue'
import { AssistantMessage, UserMessage } from '@shared/chat'
import { useElementBounding, useDebounceFn } from '@vueuse/core'
import { useElementBounding } from '@vueuse/core'
import { Button } from '@/components/ui/button'
import { Icon } from '@iconify/vue'
import { useChatStore } from '@/stores/chat'
Expand Down Expand Up @@ -286,6 +285,7 @@ onMounted(() => {
scrollToBottom()
nextTick(() => {
visible.value = true
setupScrollObserver()
})
}, 100)

Expand All @@ -301,16 +301,37 @@ onMounted(() => {
)
})

onUnmounted(() => {
if (intersectionObserver) {
intersectionObserver.disconnect()
intersectionObserver = null
}
})

const aboveThreshold = ref(false)
const SCROLL_THRESHOLD = 20
const handleScroll = useDebounceFn((event) => {
const rect = messageList.value?.getBoundingClientRect()
const container = event.target
if (rect?.height) {
const scrollBottom = container.scrollHeight - (container.scrollTop + container.clientHeight)
aboveThreshold.value = scrollBottom > SCROLL_THRESHOLD
let intersectionObserver: IntersectionObserver | null = null

const setupScrollObserver = () => {
if (intersectionObserver) {
intersectionObserver.disconnect()
}

intersectionObserver = new IntersectionObserver(
(entries) => {
const entry = entries[0]
aboveThreshold.value = !entry.isIntersecting
},
{
root: messagesContainer.value,
rootMargin: '0px 0px 20px 0px', // 20px 的缓冲区
threshold: 0
}
)

if (scrollAnchor.value) {
intersectionObserver.observe(scrollAnchor.value)
}
}, 100)
}

const showCancelButton = computed(() => {
return chatStore.generatingThreadIds.has(chatStore.getActiveThreadId() ?? '')
Expand Down
2 changes: 2 additions & 0 deletions src/types/i18n.d.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { DefineLocaleMessage } from 'vue-i18n'

declare module 'vue-i18n' {
interface DefineLocaleMessage {
title: string
Expand Down