feat: conversation infite scroll

This commit is contained in:
金伟强 2023-05-25 16:17:10 +08:00
commit 32b49294f5
3 changed files with 52 additions and 19 deletions

View File

@ -83,6 +83,11 @@ const Main: FC<IMainProps> = ({
setNewConversationInfo, setNewConversationInfo,
setExistConversationInfo setExistConversationInfo
} = useConversation() } = useConversation()
const [hasMore, setHasMore] = useState<boolean>(false)
const onMoreLoaded = ({ data: conversations, has_more }: any) => {
setHasMore(has_more)
setConversationList([...conversationList, ...conversations])
}
const [suggestedQuestionsAfterAnswerConfig, setSuggestedQuestionsAfterAnswerConfig] = useState<SuggestedQuestionsAfterAnswerConfig | null>(null) const [suggestedQuestionsAfterAnswerConfig, setSuggestedQuestionsAfterAnswerConfig] = useState<SuggestedQuestionsAfterAnswerConfig | null>(null)
const [conversationIdChangeBecauseOfNew, setConversationIdChangeBecauseOfNew, getConversationIdChangeBecauseOfNew] = useGetState(false) const [conversationIdChangeBecauseOfNew, setConversationIdChangeBecauseOfNew, getConversationIdChangeBecauseOfNew] = useGetState(false)
@ -250,10 +255,10 @@ const Main: FC<IMainProps> = ({
setIsPublicVersion(tempIsPublicVersion) setIsPublicVersion(tempIsPublicVersion)
const prompt_template = '' const prompt_template = ''
// handle current conversation id // handle current conversation id
const { data: conversations } = conversationData as { data: ConversationItem[] } const { data: conversations, has_more } = conversationData as { data: ConversationItem[], has_more: boolean }
const _conversationId = getConversationIdFromStorage(appId) const _conversationId = getConversationIdFromStorage(appId)
const isNotNewConversation = conversations.some(item => item.id === _conversationId) const isNotNewConversation = conversations.some(item => item.id === _conversationId)
setHasMore(has_more)
// fetch new conversation info // fetch new conversation info
const { user_input_form, opening_statement: introduction, suggested_questions_after_answer }: any = appParams const { user_input_form, opening_statement: introduction, suggested_questions_after_answer }: any = appParams
const prompt_variables = userInputsFormToPromptVariables(user_input_form) const prompt_variables = userInputsFormToPromptVariables(user_input_form)
@ -395,7 +400,8 @@ const Main: FC<IMainProps> = ({
} }
let currChatList = conversationList let currChatList = conversationList
if (getConversationIdChangeBecauseOfNew()) { if (getConversationIdChangeBecauseOfNew()) {
const { data: conversations }: any = await fetchConversations(isInstalledApp, installedAppInfo?.id) const { data: conversations, has_more }: any = await fetchConversations(isInstalledApp, installedAppInfo?.id)
setHasMore(has_more)
setConversationList(conversations as ConversationItem[]) setConversationList(conversations as ConversationItem[])
currChatList = conversations currChatList = conversations
} }
@ -440,10 +446,13 @@ const Main: FC<IMainProps> = ({
return ( return (
<Sidebar <Sidebar
list={conversationList} list={conversationList}
onMoreLoaded={onMoreLoaded}
isNoMore={!hasMore}
onCurrentIdChange={handleConversationIdChange} onCurrentIdChange={handleConversationIdChange}
currentId={currConversationId} currentId={currConversationId}
copyRight={siteInfo.copyright || siteInfo.title} copyRight={siteInfo.copyright || siteInfo.title}
isInstalledApp={isInstalledApp} isInstalledApp={isInstalledApp}
installedAppId={installedAppInfo?.id}
siteInfo={siteInfo} siteInfo={siteInfo}
/> />
) )

View File

@ -1,4 +1,4 @@
import React from 'react' import React, { useEffect, useRef } from 'react'
import type { FC } from 'react' import type { FC } from 'react'
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { import {
@ -10,20 +10,23 @@ import Button from '../../../base/button'
import AppInfo from '@/app/components/share/chat/sidebar/app-info' import AppInfo from '@/app/components/share/chat/sidebar/app-info'
// import Card from './card' // import Card from './card'
import type { ConversationItem, SiteInfo } from '@/models/share' import type { ConversationItem, SiteInfo } from '@/models/share'
import { useInfiniteScroll } from 'ahooks'
import { fetchConversations } from '@/service/share'
function classNames(...classes: any[]) { function classNames(...classes: any[]) {
return classes.filter(Boolean).join(' ') return classes.filter(Boolean).join(' ')
} }
const MAX_CONVERSATION_LENTH = 20
export type ISidebarProps = { export type ISidebarProps = {
copyRight: string copyRight: string
currentId: string currentId: string
onCurrentIdChange: (id: string) => void onCurrentIdChange: (id: string) => void
list: ConversationItem[] list: ConversationItem[]
isInstalledApp: boolean isInstalledApp: boolean
installedAppId?: string
siteInfo: SiteInfo siteInfo: SiteInfo
onMoreLoaded: (res: {data: ConversationItem[], has_more: boolean}) => void
isNoMore: boolean
} }
const Sidebar: FC<ISidebarProps> = ({ const Sidebar: FC<ISidebarProps> = ({
@ -32,15 +35,35 @@ const Sidebar: FC<ISidebarProps> = ({
onCurrentIdChange, onCurrentIdChange,
list, list,
isInstalledApp, isInstalledApp,
installedAppId,
siteInfo, siteInfo,
onMoreLoaded,
isNoMore,
}) => { }) => {
const { t } = useTranslation() const { t } = useTranslation()
const listRef = useRef<HTMLDivElement>(null)
useInfiniteScroll(
async () => {
if(!isNoMore) {
const lastId = list[list.length - 1].id
const { data: conversations, has_more }: any = await fetchConversations(isInstalledApp, installedAppId, lastId)
onMoreLoaded({ data: conversations, has_more })
}
return {list: []}
},
{
target: listRef,
isNoMore: () => isNoMore,
},
)
return ( return (
<div <div
className={ className={
classNames( classNames(
isInstalledApp ? 'tablet:h-[calc(100vh_-_74px)]' : 'tablet:h-[calc(100vh_-_3rem)]', isInstalledApp ? 'tablet:h-[calc(100vh_-_74px)]' : 'tablet:h-[calc(100vh_-_3rem)]',
"shrink-0 flex flex-col overflow-y-auto bg-white pc:w-[244px] tablet:w-[192px] mobile:w-[240px] border-r border-gray-200 mobile:h-screen" "shrink-0 flex flex-col bg-white pc:w-[244px] tablet:w-[192px] mobile:w-[240px] border-r border-gray-200 mobile:h-screen"
) )
} }
> >
@ -52,17 +75,18 @@ const Sidebar: FC<ISidebarProps> = ({
icon_background={siteInfo.icon_background} icon_background={siteInfo.icon_background}
/> />
)} )}
{list.length < MAX_CONVERSATION_LENTH && ( <div className="flex flex-shrink-0 p-4 !pb-0">
<div className="flex flex-shrink-0 p-4 !pb-0"> <Button
<Button onClick={() => { onCurrentIdChange('-1') }}
onClick={() => { onCurrentIdChange('-1') }} className="group block w-full flex-shrink-0 !justify-start !h-9 text-primary-600 items-center text-sm">
className="group block w-full flex-shrink-0 !justify-start !h-9 text-primary-600 items-center text-sm"> <PencilSquareIcon className="mr-2 h-4 w-4" /> {t('share.chat.newChat')}
<PencilSquareIcon className="mr-2 h-4 w-4" /> {t('share.chat.newChat')} </Button>
</Button> </div>
</div>
)}
<nav className="mt-4 flex-1 space-y-1 bg-white p-4 !pt-0"> <nav
ref={listRef}
className="mt-4 flex-1 space-y-1 bg-white p-4 !pt-0 overflow-y-auto"
>
{list.map((item) => { {list.map((item) => {
const isCurrent = item.id === currentId const isCurrent = item.id === currentId
const ItemIcon const ItemIcon

View File

@ -51,8 +51,8 @@ export const fetchAppInfo = async () => {
return get('/site') return get('/site')
} }
export const fetchConversations = async (isInstalledApp: boolean, installedAppId='') => { export const fetchConversations = async (isInstalledApp: boolean, installedAppId='', last_id?: string) => {
return getAction('get', isInstalledApp)(getUrl('conversations', isInstalledApp, installedAppId), { params: { limit: 20, first_id: '' } }) return getAction('get', isInstalledApp)(getUrl('conversations', isInstalledApp, installedAppId), { params: {...{ limit: 20 }, ...(last_id ? { last_id } : {}) } })
} }
export const fetchChatList = async (conversationId: string, isInstalledApp: boolean, installedAppId='') => { export const fetchChatList = async (conversationId: string, isInstalledApp: boolean, installedAppId='') => {