perf scroll components (#2676)

* perf: add scroll list && virtualist (#2665)

* perf: chatHistorySlider add virtualList

* perf: dataCard add scroll

* fix: ts

* perf: scroll list components

* perf: hook refresh

---------

Co-authored-by: papapatrick <109422393+Patrickill@users.noreply.github.com>
This commit is contained in:
Archer
2024-09-11 19:53:49 +08:00
committed by GitHub
parent 5101c7a6dc
commit 6331f4b845
17 changed files with 413 additions and 335 deletions

View File

@@ -1,13 +1,17 @@
import { useRef, useState, useCallback, useMemo, useEffect } from 'react';
import { IconButton, Flex, Box, Input } from '@chakra-ui/react';
import { useRef, useState, useCallback, useMemo } from 'react';
import { IconButton, Flex, Box, Input, BoxProps } from '@chakra-ui/react';
import { ArrowBackIcon, ArrowForwardIcon } from '@chakra-ui/icons';
import { useMutation } from '@tanstack/react-query';
import { useTranslation } from 'next-i18next';
import { throttle } from 'lodash';
import { useToast } from './useToast';
import { getErrText } from '@fastgpt/global/common/error/utils';
const thresholdVal = 100;
import {
useBoolean,
useLockFn,
useMemoizedFn,
useRequest,
useScroll,
useThrottleEffect
} from 'ahooks';
type PagingData<T> = {
pageNum: number;
@@ -23,7 +27,7 @@ export function usePagination<ResT = any>({
defaultRequest = true,
type = 'button',
onChange,
elementRef
refreshDeps
}: {
api: (data: any) => Promise<PagingData<ResT>>;
pageSize?: number;
@@ -31,46 +35,59 @@ export function usePagination<ResT = any>({
defaultRequest?: boolean;
type?: 'button' | 'scroll';
onChange?: (pageNum: number) => void;
elementRef?: React.RefObject<HTMLDivElement>;
refreshDeps?: any[];
}) {
const { toast } = useToast();
const { t } = useTranslation();
const [pageNum, setPageNum] = useState(1);
const pageNumRef = useRef(pageNum);
pageNumRef.current = pageNum;
const ScrollContainerRef = useRef<HTMLDivElement>(null);
const noMore = useRef(false);
const [isLoading, { setTrue, setFalse }] = useBoolean(false);
const [total, setTotal] = useState(0);
const totalRef = useRef(total);
totalRef.current = total;
const [data, setData] = useState<ResT[]>([]);
const dataLengthRef = useRef(data.length);
dataLengthRef.current = data.length;
const maxPage = useMemo(() => Math.ceil(total / pageSize) || 1, [pageSize, total]);
const { mutate, isLoading } = useMutation({
mutationFn: async (num: number = pageNum) => {
try {
const res: PagingData<ResT> = await api({
pageNum: num,
pageSize,
...params
});
setPageNum(num);
res.total !== undefined && setTotal(res.total);
if (type === 'scroll') {
setData((prevData) => [...prevData, ...res.data]);
} else {
setData(res.data);
}
onChange && onChange(num);
} catch (error: any) {
toast({
title: getErrText(error, t('common:core.chat.error.data_error')),
status: 'error'
});
console.log(error);
const fetchData = useLockFn(async (num: number = pageNum) => {
if (noMore.current && num !== 1) return;
setTrue();
try {
const res: PagingData<ResT> = await api({
pageNum: num,
pageSize,
...params
});
// Check total and set
res.total !== undefined && setTotal(res.total);
if (res.total !== undefined && res.total <= data.length + res.data.length) {
noMore.current = true;
}
return null;
setPageNum(num);
if (type === 'scroll') {
setData((prevData) => (num === 1 ? res.data : [...prevData, ...res.data]));
} else {
setData(res.data);
}
onChange?.(num);
} catch (error: any) {
toast({
title: getErrText(error, t('common:core.chat.error.data_error')),
status: 'error'
});
console.log(error);
}
setFalse();
});
const Pagination = useCallback(() => {
@@ -82,7 +99,7 @@ export function usePagination<ResT = any>({
aria-label={'left'}
size={'smSquare'}
isLoading={isLoading}
onClick={() => mutate(pageNum - 1)}
onClick={() => fetchData(pageNum - 1)}
/>
<Flex mx={2} alignItems={'center'}>
<Input
@@ -97,11 +114,11 @@ export function usePagination<ResT = any>({
const val = +e.target.value;
if (val === pageNum) return;
if (val >= maxPage) {
mutate(maxPage);
fetchData(maxPage);
} else if (val < 1) {
mutate(1);
fetchData(1);
} else {
mutate(+e.target.value);
fetchData(+e.target.value);
}
}}
onKeyDown={(e) => {
@@ -110,11 +127,11 @@ export function usePagination<ResT = any>({
if (val && e.key === 'Enter') {
if (val === pageNum) return;
if (val >= maxPage) {
mutate(maxPage);
fetchData(maxPage);
} else if (val < 1) {
mutate(1);
fetchData(1);
} else {
mutate(val);
fetchData(val);
}
}
}}
@@ -130,22 +147,35 @@ export function usePagination<ResT = any>({
isLoading={isLoading}
w={'28px'}
h={'28px'}
onClick={() => mutate(pageNum + 1)}
onClick={() => fetchData(pageNum + 1)}
/>
</Flex>
);
}, [isLoading, maxPage, mutate, pageNum]);
}, [isLoading, maxPage, fetchData, pageNum]);
const ScrollData = useCallback(
({ children, ...props }: { children: React.ReactNode }) => {
const loadText = useMemo(() => {
// Reload data
const { runAsync: refresh } = useRequest(
async () => {
setData([]);
defaultRequest && fetchData(1);
},
{
manual: false,
refreshDeps,
throttleWait: 100
}
);
const ScrollData = useMemoizedFn(
({ children, ...props }: { children: React.ReactNode } & BoxProps) => {
const loadText = (() => {
if (isLoading) return t('common:common.is_requesting');
if (total <= data.length) return t('common:common.request_end');
return t('common:common.request_more');
}, []);
})();
return (
<Box {...props} ref={elementRef} overflow={'overlay'}>
<Box {...props} ref={ScrollContainerRef} overflow={'overlay'}>
{children}
<Box
mt={2}
@@ -155,51 +185,29 @@ export function usePagination<ResT = any>({
cursor={loadText === t('common:common.request_more') ? 'pointer' : 'default'}
onClick={() => {
if (loadText !== t('common:common.request_more')) return;
mutate(pageNum + 1);
fetchData(pageNum + 1);
}}
>
{loadText}
</Box>
</Box>
);
},
[data.length, isLoading, mutate, pageNum, total]
}
);
useEffect(() => {
if (!elementRef?.current || type !== 'scroll') return;
const scrolling = throttle((e: Event) => {
const element = e.target as HTMLDivElement;
if (!element) return;
// 当前滚动位置
const scrollTop = element.scrollTop;
// 可视高度
const clientHeight = element.clientHeight;
// 内容总高度
const scrollHeight = element.scrollHeight;
// 判断是否滚动到底部
if (
scrollTop + clientHeight + thresholdVal >= scrollHeight &&
dataLengthRef.current < totalRef.current
) {
mutate(pageNumRef.current + 1);
// Scroll check
const scroll = useScroll(ScrollContainerRef);
useThrottleEffect(
() => {
if (!ScrollContainerRef?.current || type !== 'scroll' || total === 0) return;
const { scrollTop, scrollHeight, clientHeight } = ScrollContainerRef.current;
if (scrollTop + clientHeight >= scrollHeight - 100) {
fetchData(pageNum + 1);
}
}, 100);
const handleScroll = (e: Event) => {
scrolling(e);
};
elementRef.current.addEventListener('scroll', handleScroll);
return () => {
elementRef.current?.removeEventListener('scroll', handleScroll);
};
}, [elementRef, mutate, pageNum, type, total, data.length]);
useEffect(() => {
defaultRequest && mutate(1);
}, []);
},
[scroll],
{ wait: 50 }
);
return {
pageNum,
@@ -210,6 +218,7 @@ export function usePagination<ResT = any>({
isLoading,
Pagination,
ScrollData,
getData: mutate
getData: fetchData,
refresh
};
}

View File

@@ -1,4 +1,4 @@
import React, { useRef, useState, useEffect } from 'react';
import React, { useRef, useState } from 'react';
import { Box, BoxProps } from '@chakra-ui/react';
import { useToast } from './useToast';
import { getErrText } from '@fastgpt/global/common/error/utils';
@@ -9,11 +9,14 @@ import {
useMemoizedFn,
useScroll,
useVirtualList,
useRequest
useRequest,
useThrottleEffect
} from 'ahooks';
import MyBox from '../components/common/MyBox';
import { useTranslation } from 'next-i18next';
type ItemHeight<T> = (index: number, data: T) => number;
export type ScrollListType = ({
children,
EmptyChildren,
@@ -31,8 +34,6 @@ export function useScrollPagination<
>(
api: (data: TParams) => Promise<TData>,
{
debounceWait,
throttleWait,
refreshDeps,
itemHeight = 50,
overscan = 10,
@@ -40,11 +41,9 @@ export function useScrollPagination<
pageSize = 10,
defaultParams = {}
}: {
debounceWait?: number;
throttleWait?: number;
refreshDeps?: any[];
itemHeight: number;
itemHeight: number | ItemHeight<TData['list'][0]>;
overscan?: number;
pageSize?: number;
@@ -123,43 +122,56 @@ export function useScrollPagination<
isLoading?: boolean;
} & BoxProps) => {
return (
<>
<MyBox isLoading={isLoading} ref={containerRef} overflow={'overlay'} {...props}>
<Box ref={wrapperRef}>{children}</Box>
<MyBox isLoading={isLoading} ref={containerRef} overflow={'overlay'} {...props}>
<Box ref={wrapperRef}>
{children}
{noMore.current && list.length > 0 && (
<Box py={4} textAlign={'center'} color={'myGray.600'} fontSize={'xs'}>
{t('common:common.No more data')}
</Box>
)}
{list.length === 0 && !isLoading && EmptyChildren && <>{EmptyChildren}</>}
</MyBox>
</>
</Box>
{list.length === 0 && !isLoading && EmptyChildren && <>{EmptyChildren}</>}
</MyBox>
);
}
);
useRequest(() => loadData(1), {
refreshDeps,
debounceWait: data.length === 0 ? 0 : debounceWait,
throttleWait
});
const scroll = useScroll(containerRef);
useEffect(() => {
if (!containerRef.current || list.length === 0) return;
const { scrollTop, scrollHeight, clientHeight } = containerRef.current;
if (scrollTop + clientHeight >= scrollHeight - 100) {
loadData(current + 1);
// Reload data
useRequest(
async () => {
console.log('reload', 11111);
loadData(1);
},
{
manual: false,
refreshDeps
}
}, [scroll]);
);
// Check if scroll to bottom
const scroll = useScroll(containerRef);
useThrottleEffect(
() => {
if (!containerRef.current || list.length === 0) return;
const { scrollTop, scrollHeight, clientHeight } = containerRef.current;
console.log('=======', 111111);
if (scrollTop + clientHeight >= scrollHeight - 100) {
loadData(current + 1);
}
},
[scroll],
{
wait: 50
}
);
return {
containerRef,
list,
scrollDataList: list,
total,
data,
totalData: data,
setData,
isLoading,
ScrollList,

View File

@@ -198,7 +198,7 @@ const LexiconConfigModal = ({ appId, onClose }: { appId: string; onClose: () =>
});
const {
list,
scrollDataList,
setData,
ScrollList,
isLoading: isRequesting,
@@ -206,7 +206,7 @@ const LexiconConfigModal = ({ appId, onClose }: { appId: string; onClose: () =>
scroll2Top
} = useScrollPagination(getChatInputGuideList, {
refreshDeps: [searchKey],
debounceWait: 300,
// debounceWait: 300,
itemHeight: 48,
overscan: 20,
@@ -389,7 +389,7 @@ const LexiconConfigModal = ({ appId, onClose }: { appId: string; onClose: () =>
</Flex>
{/* new data input */}
{newData !== undefined && (
<Box mt={5} ml={list.length > 0 ? 7 : 0}>
<Box mt={5} ml={scrollDataList.length > 0 ? 7 : 0}>
<MyInput
autoFocus
rightIcon={<MyIcon name={'save'} w={'14px'} cursor={'pointer'} />}
@@ -412,7 +412,7 @@ const LexiconConfigModal = ({ appId, onClose }: { appId: string; onClose: () =>
fontSize={'sm'}
EmptyChildren={<EmptyTip text={chatT('chat_input_guide_lexicon_is_empty')} />}
>
{list.map((data, index) => {
{scrollDataList.map((data, index) => {
const item = data.data;
const selected = selectedRows.includes(item._id);

View File

@@ -1,18 +1,27 @@
import type { NextApiRequest, NextApiResponse } from 'next';
import { jsonRes } from '@fastgpt/service/common/response';
import { connectToDatabase } from '@/service/mongo';
import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
import type { ChatHistoryItemType } from '@fastgpt/global/core/chat/type.d';
import { ChatSourceEnum } from '@fastgpt/global/core/chat/constants';
import { GetHistoriesProps } from '@/global/core/chat/api';
import { authOutLink } from '@/service/support/permission/auth/outLink';
import { authCert } from '@fastgpt/service/support/permission/auth/common';
import { authTeamSpaceToken } from '@/service/support/permission/auth/team';
import { NextAPI } from '@/service/middleware/entry';
import { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
import { PaginationProps, PaginationResponse } from '@fastgpt/web/common/fetch/type';
import { GetHistoriesProps } from '@/global/core/chat/api';
export type getHistoriesQuery = {};
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
export type getHistoriesBody = PaginationProps<GetHistoriesProps>;
export type getHistoriesResponse = {};
async function handler(
req: ApiRequestProps<getHistoriesBody, getHistoriesQuery>,
res: ApiResponseType<any>
): Promise<PaginationResponse<getHistoriesResponse>> {
try {
await connectToDatabase();
const { appId, shareId, outLinkUid, teamId, teamToken } = req.body as GetHistoriesProps;
const { appId, shareId, outLinkUid, teamId, teamToken, current, pageSize } =
req.body as getHistoriesBody;
const limit = shareId && outLinkUid ? 20 : 30;
@@ -50,24 +59,28 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
return Promise.reject('Params are error');
})();
const data = await MongoChat.find(match, 'chatId title top customTitle appId updateTime')
.sort({ top: -1, updateTime: -1 })
.limit(limit);
const [data, total] = await Promise.all([
await MongoChat.find(match, 'chatId title top customTitle appId updateTime')
.sort({ top: -1, updateTime: -1 })
.skip((current - 1) * pageSize)
.limit(pageSize),
MongoChat.countDocuments(match)
]);
jsonRes<ChatHistoryItemType[]>(res, {
data: data.map((item) => ({
return {
list: data.map((item) => ({
chatId: item.chatId,
updateTime: item.updateTime,
appId: item.appId,
customTitle: item.customTitle,
title: item.title,
top: item.top
}))
});
})),
total
};
} catch (err) {
jsonRes(res, {
code: 500,
error: err
});
return Promise.reject(err);
}
}
export default NextAPI(handler);

View File

@@ -41,11 +41,11 @@ const PublishHistoriesSlider = ({
const [selectedHistoryId, setSelectedHistoryId] = useState<string>();
const { list, ScrollList, isLoading } = useScrollPagination(getPublishList, {
const { scrollDataList, ScrollList, isLoading } = useScrollPagination(getPublishList, {
itemHeight: 49,
overscan: 20,
pageSize: 30,
pageSize: 20,
defaultParams: {
appId
}
@@ -132,7 +132,7 @@ const PublishHistoriesSlider = ({
{appT('current_settings')}
</Button>
<ScrollList isLoading={showLoading} flex={'1 0 0'} px={5}>
{list.map((data, index) => {
{scrollDataList.map((data, index) => {
const item = data.data;
return (
@@ -159,7 +159,7 @@ const PublishHistoriesSlider = ({
borderColor={'primary.600'}
borderRadius={'50%'}
position={'relative'}
{...(index !== list.length - 1 && {
{...(index !== scrollDataList.length - 1 && {
_after: {
content: '""',
height: '40px',

View File

@@ -180,15 +180,18 @@ const TeamCloud = () => {
const { loadAndGetTeamMembers } = useUserStore();
const { feConfigs } = useSystemStore();
const { list, ScrollList, isLoading, fetchData } = useScrollPagination(getWorkflowVersionList, {
itemHeight: 40,
overscan: 20,
const { scrollDataList, ScrollList, isLoading, fetchData } = useScrollPagination(
getWorkflowVersionList,
{
itemHeight: 40,
overscan: 20,
pageSize: 30,
defaultParams: {
appId: appDetail._id
pageSize: 30,
defaultParams: {
appId: appDetail._id
}
}
});
);
const { data: members = [] } = useRequest2(loadAndGetTeamMembers, {
manual: !feConfigs.isPlus
});
@@ -228,9 +231,9 @@ const TeamCloud = () => {
return (
<ScrollList isLoading={isLoading || isLoadingVersion} flex={'1 0 0'} px={5}>
{list.map((data, index) => {
{scrollDataList.map((data, index) => {
const item = data.data;
const firstPublishedIndex = list.findIndex((data) => data.data.isPublish);
const firstPublishedIndex = scrollDataList.findIndex((data) => data.data.isPublish);
const tmb = members.find((member) => member.tmbId === item.tmbId);
return (

View File

@@ -9,8 +9,6 @@ import MyIcon from '@fastgpt/web/components/common/Icon';
import { useTranslation } from 'next-i18next';
import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
import { useUserStore } from '@/web/support/user/useUserStore';
import { AppListItemType } from '@fastgpt/global/core/app/type';
import { useI18n } from '@/web/context/I18n';
import MyMenu from '@fastgpt/web/components/common/MyMenu';
import { useContextSelector } from 'use-context-selector';
import { ChatContext } from '@/web/core/chat/context/chatContext';
@@ -52,19 +50,19 @@ const ChatHistorySlider = ({
const { userInfo } = useUserStore();
const {
histories,
onChangeChatId,
chatId: activeChatId,
isLoading
isLoading,
ScrollList,
historyList,
histories
} = useContextSelector(ChatContext, (v) => v);
const concatHistory = useMemo(() => {
const formatHistories: HistoryItemType[] = histories.map((item) => ({
id: item.chatId,
title: item.title,
customTitle: item.customTitle,
top: item.top
}));
const formatHistories: HistoryItemType[] = historyList.map((data) => {
const item = data.data;
return { id: item.chatId, title: item.title, customTitle: item.customTitle, top: item.top };
});
const newChat: HistoryItemType = {
id: activeChatId,
title: t('common:core.chat.New Chat')
@@ -72,7 +70,7 @@ const ChatHistorySlider = ({
const activeChat = histories.find((item) => item.chatId === activeChatId);
return !activeChat ? [newChat].concat(formatHistories) : formatHistories;
}, [activeChatId, histories, t]);
}, [activeChatId, histories, historyList, t]);
// custom title edit
const { onOpenModal, EditModal: EditTitleModal } = useEditTitle({
@@ -175,20 +173,19 @@ const ChatHistorySlider = ({
)}
</Flex>
<Box flex={'1 0 0'} h={0} px={[2, 5]} overflow={'overlay'}>
<ScrollList flex={'1 0 0'} h={0} px={[2, 5]} overflow={'overlay'}>
{/* chat history */}
<>
{concatHistory.map((item, i) => (
<Flex
position={'relative'}
key={item.id || `${i}`}
key={item.id}
alignItems={'center'}
py={2.5}
px={4}
h={'44px'}
cursor={'pointer'}
userSelect={'none'}
borderRadius={'md'}
mb={2}
fontSize={'sm'}
_hover={{
bg: 'myGray.50',
@@ -207,6 +204,9 @@ const ChatHistorySlider = ({
onChangeChatId(item.id);
}
})}
{...(i !== concatHistory.length - 1 && {
mb: '8px'
})}
>
<MyIcon
name={item.id === activeChatId ? 'core/chat/chatFill' : 'core/chat/chatLight'}
@@ -283,7 +283,7 @@ const ChatHistorySlider = ({
</Flex>
))}
</>
</Box>
</ScrollList>
{/* exec */}
{!isPc && isUserChatPage && (

View File

@@ -1,4 +1,4 @@
import React, { useCallback, useState } from 'react';
import React, { useCallback, useMemo, useState } from 'react';
import NextHead from '@/components/common/NextHead';
import { useRouter } from 'next/router';
import { delChatRecordById, getChatHistories, getInitChatInfo } from '@/web/core/chat/api';
@@ -53,14 +53,17 @@ const Chat = ({
const { setLastChatAppId } = useChatStore();
const {
loadHistories,
setHistories: setRecordHistories,
loadHistories: loadRecordHistories,
histories: recordHistories,
onUpdateHistory,
onClearHistories,
onDelHistory,
isOpenSlider,
onCloseSlider,
forbidLoadChat,
onChangeChatId
onChangeChatId,
onUpdateHistoryTitle
} = useContextSelector(ChatContext, (v) => v);
const {
ChatBoxRef,
@@ -148,8 +151,7 @@ const Chat = ({
if (completionChatId !== chatId && controller.signal.reason !== 'leave') {
onChangeChatId(completionChatId, true);
}
loadHistories();
onUpdateHistoryTitle({ chatId: completionChatId, newTitle });
// update chat window
setChatData((state) => ({
...state,
@@ -158,7 +160,7 @@ const Chat = ({
return { responseText, responseData, isNewChat: forbidLoadChat.current };
},
[appId, chatId, forbidLoadChat, loadHistories, onChangeChatId]
[chatId, appId, onUpdateHistoryTitle, forbidLoadChat, onChangeChatId]
);
return (
@@ -283,14 +285,6 @@ const Render = (props: Props) => {
}
);
const { data: histories = [], runAsync: loadHistories } = useRequest2(
() => (appId ? getChatHistories({ appId }) : Promise.resolve([])),
{
manual: false,
refreshDeps: [appId]
}
);
// 初始化聊天框
useMount(async () => {
// pc: redirect to latest model chat
@@ -324,8 +318,9 @@ const Render = (props: Props) => {
}
});
const providerParams = useMemo(() => ({ appId }), [appId]);
return (
<ChatContextProvider histories={histories} loadHistories={loadHistories}>
<ChatContextProvider params={providerParams}>
<Chat {...props} myApps={myApps} />
</ChatContextProvider>
);

View File

@@ -1,4 +1,4 @@
import React, { useCallback, useRef, useState } from 'react';
import React, { useCallback, useMemo, useRef, useState } from 'react';
import { useRouter } from 'next/router';
import { Box, Flex, Drawer, DrawerOverlay, DrawerContent } from '@chakra-ui/react';
import { streamFetch } from '@/web/common/api/fetch';
@@ -75,6 +75,7 @@ const OutLink = ({ appName, appIntro, appAvatar }: Props) => {
const outLinkUid: string = authToken || localUId;
const {
onUpdateHistoryTitle,
loadHistories,
onUpdateHistory,
onClearHistories,
@@ -140,7 +141,7 @@ const OutLink = ({ appName, appIntro, appAvatar }: Props) => {
if (completionChatId !== chatId) {
onChangeChatId(completionChatId, true);
}
loadHistories();
onUpdateHistoryTitle({ chatId: completionChatId, newTitle });
// update chat window
setChatData((state) => ({
@@ -168,9 +169,9 @@ const OutLink = ({ appName, appIntro, appAvatar }: Props) => {
shareId,
chatData.app.type,
outLinkUid,
onUpdateHistoryTitle,
forbidLoadChat,
onChangeChatId,
loadHistories
onChangeChatId
]
);
@@ -354,16 +355,12 @@ const Render = (props: Props) => {
const { localUId } = useShareChatStore();
const outLinkUid: string = authToken || localUId;
const { data: histories = [], runAsync: loadHistories } = useRequest2(
() => (shareId && outLinkUid ? getChatHistories({ shareId, outLinkUid }) : Promise.resolve([])),
{
manual: false,
refreshDeps: [shareId, outLinkUid]
}
);
const contextParams = useMemo(() => {
return { shareId, outLinkUid };
}, [shareId, outLinkUid]);
return (
<ChatContextProvider histories={histories} loadHistories={loadHistories}>
<ChatContextProvider params={contextParams}>
<OutLink {...props} />;
</ChatContextProvider>
);

View File

@@ -1,4 +1,4 @@
import React, { useCallback, useEffect, useState } from 'react';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import NextHead from '@/components/common/NextHead';
import { delChatRecordById, getChatHistories, getTeamChatInfo } from '@/web/core/chat/api';
import { useRouter } from 'next/router';
@@ -58,6 +58,7 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
const [chatData, setChatData] = useState<InitChatResponse>(defaultChatData);
const {
onUpdateHistoryTitle,
loadHistories,
onUpdateHistory,
onClearHistories,
@@ -114,7 +115,7 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
if (completionChatId !== chatId) {
onChangeChatId(completionChatId, true);
}
loadHistories();
onUpdateHistoryTitle({ chatId: completionChatId, newTitle });
// update chat window
setChatData((state) => ({
@@ -125,15 +126,15 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
return { responseText, responseData, isNewChat: forbidLoadChat.current };
},
[
chatData.app.type,
chatId,
customVariables,
appId,
teamId,
teamToken,
chatData.app.type,
onUpdateHistoryTitle,
forbidLoadChat,
onChangeChatId,
loadHistories
onChangeChatId
]
);
@@ -302,19 +303,6 @@ const Render = (props: Props) => {
}
);
const { data: histories = [], runAsync: loadHistories } = useRequest2(
async () => {
if (teamId && appId && teamToken) {
return getChatHistories({ teamId, appId, teamToken: teamToken });
}
return [];
},
{
manual: false,
refreshDeps: [appId, teamId, teamToken]
}
);
// 初始化聊天框
useEffect(() => {
(async () => {
@@ -330,8 +318,12 @@ const Render = (props: Props) => {
})();
}, [appId, loadMyApps, myApps, router, t, toast]);
const contextParams = useMemo(() => {
return { teamId, appId, teamToken };
}, [teamId, appId, teamToken]);
return (
<ChatContextProvider histories={histories} loadHistories={loadHistories}>
<ChatContextProvider params={contextParams}>
<Chat {...props} myApps={myApps} />
</ChatContextProvider>
);

View File

@@ -120,11 +120,9 @@ const CollectionPageContextProvider = ({ children }: { children: ReactNode }) =>
searchText,
filterTags
},
defaultRequest: false
// defaultRequest: false,
refreshDeps: [parentId, searchText, filterTags]
});
useEffect(() => {
getData(1);
}, [parentId]);
const contextValue: CollectionPageContextType = {
openWebSyncConfirm: openWebSyncConfirm(onUpdateDatasetWebsiteConfig),

View File

@@ -60,15 +60,6 @@ const Header = ({}: {}) => {
const { searchText, setSearchText, total, getData, pageNum, onOpenWebsiteModal } =
useContextSelector(CollectionPageContext, (v) => v);
// change search
const debounceRefetch = useCallback(
debounce(() => {
getData(1);
lastSearch.current = searchText;
}, 300),
[]
);
const { data: paths = [] } = useQuery(['getDatasetCollectionPathById', parentId], () =>
getDatasetCollectionPathById(parentId)
);
@@ -189,17 +180,6 @@ const Header = ({}: {}) => {
}
onChange={(e) => {
setSearchText(e.target.value);
debounceRefetch();
}}
onBlur={() => {
if (searchText === lastSearch.current) return;
getData(1);
}}
onKeyDown={(e) => {
if (searchText === lastSearch.current) return;
if (e.key === 'Enter') {
getData(1);
}
}}
/>
)}

View File

@@ -5,15 +5,13 @@ import MyBox from '@fastgpt/web/components/common/MyBox';
import { useContextSelector } from 'use-context-selector';
import { DatasetPageContext } from '@/web/core/dataset/context/datasetPageContext';
import { useTranslation } from 'next-i18next';
import { useCallback, useState } from 'react';
import { CollectionPageContext } from './Context';
import { debounce, isEqual } from 'lodash';
import { isEqual } from 'lodash';
import TagManageModal from './TagManageModal';
import { DatasetTagType } from '@fastgpt/global/core/dataset/type';
const HeaderTagPopOver = () => {
const { t } = useTranslation();
const [checkedTags, setCheckedTags] = useState<string[]>([]);
const {
searchDatasetTagsResult,
@@ -29,12 +27,8 @@ const HeaderTagPopOver = () => {
CollectionPageContext,
(v) => v
);
const debounceRefetch = useCallback(
debounce(() => {
getData(1);
}, 300),
[]
);
const checkedTags = filterTags;
const {
isOpen: isTagManageModalOpen,
@@ -46,16 +40,13 @@ const HeaderTagPopOver = () => {
let currentCheckedTags = [];
if (checkedTags.includes(tag._id)) {
currentCheckedTags = checkedTags.filter((t) => t !== tag._id);
setCheckedTags(currentCheckedTags);
setCheckedDatasetTag(checkedDatasetTag.filter((t) => t._id !== tag._id));
} else {
currentCheckedTags = [...checkedTags, tag._id];
setCheckedTags([...checkedTags, tag._id]);
setCheckedDatasetTag([...checkedDatasetTag, tag]);
}
if (isEqual(currentCheckedTags, filterTags)) return;
setFilterTags(currentCheckedTags);
debounceRefetch();
};
return (
@@ -181,9 +172,7 @@ const HeaderTagPopOver = () => {
variant={'unstyled'}
onClick={() => {
setSearchTagKey('');
setCheckedTags([]);
setFilterTags([]);
debounceRefetch();
onClose();
}}
>
@@ -211,7 +200,7 @@ const HeaderTagPopOver = () => {
<TagManageModal
onClose={() => {
onCloseTagManageModal();
debounceRefetch();
getData(1);
}}
/>
)}

View File

@@ -121,14 +121,15 @@ const TagManageModal = ({ onClose }: { onClose: () => void }) => {
// Tags list
const {
list,
scrollDataList: renderTags,
totalData: collectionTags,
ScrollList,
isLoading: isRequesting,
fetchData,
total: tagsTotal
} = useScrollPagination(getDatasetCollectionTags, {
refreshDeps: [''],
debounceWait: 300,
// debounceWait: 300,
itemHeight: 56,
overscan: 10,
@@ -142,12 +143,12 @@ const TagManageModal = ({ onClose }: { onClose: () => void }) => {
// Collections list
const {
list: collectionsList,
scrollDataList: collectionsList,
ScrollList: ScrollListCollections,
isLoading: collectionsListLoading
} = useScrollPagination(getScrollCollectionList, {
refreshDeps: [searchText],
debounceWait: 300,
// debounceWait: 300,
itemHeight: 37,
overscan: 10,
@@ -221,7 +222,7 @@ const TagManageModal = ({ onClose }: { onClose: () => void }) => {
ref={tagInputRef}
w={'200px'}
onBlur={() => {
if (newTag && !list.map((item) => item.data.tag).includes(newTag)) {
if (newTag && !collectionTags.map((item) => item.tag).includes(newTag)) {
onCreateCollectionTag(newTag);
}
setNewTag(undefined);
@@ -236,7 +237,7 @@ const TagManageModal = ({ onClose }: { onClose: () => void }) => {
fontSize={'sm'}
EmptyChildren={<EmptyTip text={t('dataset:dataset.no_tags')} />}
>
{list.map((listItem) => {
{renderTags.map((listItem) => {
const item = listItem.data;
const tagUsage = tagUsages?.find((tagUsage) => tagUsage.tagId === item._id);
const collections = tagUsage?.collections || [];
@@ -292,7 +293,9 @@ const TagManageModal = ({ onClose }: { onClose: () => void }) => {
onBlur={() => {
if (
currentEditTagContent &&
!list.map((item) => item.data.tag).includes(currentEditTagContent)
!collectionTags
.map((item) => item.tag)
.includes(currentEditTagContent)
) {
onUpdateCollectionTag({
tag: currentEditTagContent,

View File

@@ -29,11 +29,10 @@ import TagsPopOver from './CollectionCard/TagsPopOver';
import { useSystemStore } from '@/web/common/system/useSystemStore';
import MyDivider from '@fastgpt/web/components/common/MyDivider';
import Markdown from '@/components/Markdown';
import { DatasetDataListItemType } from '@/global/core/dataset/type';
const DataCard = () => {
const BoxRef = useRef<HTMLDivElement>(null);
const theme = useTheme();
const lastSearch = useRef('');
const router = useRouter();
const { isPc } = useSystem();
const { collectionId = '', datasetId } = router.query as {
@@ -51,44 +50,30 @@ const DataCard = () => {
type: 'delete'
});
const {
data: datasetDataList,
Pagination,
total,
getData,
pageNum,
pageSize,
isLoading: isRequesting
} = usePagination({
api: getDatasetDataList,
pageSize: 24,
defaultRequest: false,
params: {
const scrollParams = useMemo(
() => ({
collectionId,
searchText
},
onChange() {
if (BoxRef.current) {
BoxRef.current.scrollTop = 0;
}
}
}),
[collectionId, searchText]
);
const {
data: datasetDataList,
ScrollData,
total,
isLoading,
refresh,
setData: setDatasetDataList
} = usePagination<DatasetDataListItemType>({
api: getDatasetDataList,
pageSize: 10,
type: 'scroll',
params: scrollParams,
refreshDeps: [searchText, collectionId]
});
const [editDataId, setEditDataId] = useState<string>();
// get first page data
useRequest2(
async () => {
getData(1);
lastSearch.current = searchText;
},
{
manual: false,
debounceWait: 300,
refreshDeps: [searchText]
}
);
// get file info
const { data: collection } = useQuery(
['getDatasetCollectionById', collectionId],
@@ -106,17 +91,9 @@ const DataCard = () => {
const canWrite = useMemo(() => datasetDetail.permission.hasWritePer, [datasetDetail]);
const { loading } = useRequest2(putDatasetDataById, {
onSuccess() {
getData(pageNum);
}
});
const isLoading = isRequesting || loading;
return (
<MyBox isLoading={isLoading} position={'relative'} py={[1, 0]} h={'100%'}>
<Flex ref={BoxRef} flexDirection={'column'} h={'100%'}>
<MyBox position={'relative'} py={[1, 0]} h={'100%'}>
<Flex flexDirection={'column'} h={'100%'}>
{/* Header */}
<Flex alignItems={'center'} px={6}>
<Flex className="textEllipsis" flex={'1 0 0'} mr={[3, 5]} alignItems={'center'}>
@@ -185,7 +162,7 @@ const DataCard = () => {
/>
</Flex>
{/* data */}
<Box flex={'1 0 0'} overflow={'auto'} px={5} pb={5}>
<ScrollData flex={'1 0 0'} px={5} pb={5}>
<Flex flexDir={'column'} gap={2}>
{datasetDataList.map((item, index) => (
<Card
@@ -203,7 +180,6 @@ const DataCard = () => {
boxShadow: 'lg',
'& .header': { visibility: 'visible' },
'& .footer': { visibility: 'visible' },
'& .forbid-switch': { display: 'flex' },
bg: index % 2 === 1 ? 'myGray.200' : 'blue.100'
}}
onClick={(e) => {
@@ -298,13 +274,18 @@ const DataCard = () => {
icon={<MyIcon name={'common/trash'} w={'14px'} color={'myGray.600'} />}
variant={'whiteDanger'}
size={'xsSquare'}
aria-label={'delete'}
onClick={(e) => {
e.stopPropagation();
openConfirm(async () => {
try {
await delOneDatasetDataById(item._id);
getData(pageNum);
setDatasetDataList((prev) => {
return prev.filter((data) => data._id !== item._id);
});
toast({
title: t('common:common.Delete Success'),
status: 'success'
});
} catch (error) {
toast({
title: getErrText(error),
@@ -313,19 +294,17 @@ const DataCard = () => {
}
})();
}}
aria-label={''}
/>
)}
</Flex>
</Card>
))}
</Flex>
{total > pageSize && (
<Flex mt={2} justifyContent={'center'}>
<Pagination />
</Flex>
)}
{total === 0 && <EmptyTip text={t('common:core.dataset.data.Empty Tip')}></EmptyTip>}
</Box>
</ScrollData>
{total === 0 && !isLoading && (
<EmptyTip text={t('common:core.dataset.data.Empty Tip')}></EmptyTip>
)}
</Flex>
{editDataId !== undefined && collection && (
@@ -333,7 +312,23 @@ const DataCard = () => {
collectionId={collection._id}
dataId={editDataId}
onClose={() => setEditDataId(undefined)}
onSuccess={() => getData(pageNum)}
onSuccess={(data) => {
if (editDataId === '') {
refresh();
return;
}
setDatasetDataList((prev) => {
return prev.map((item) => {
if (item._id === editDataId) {
return {
...item,
...data
};
}
return item;
});
});
}}
/>
)}
<ConfirmModal />

View File

@@ -20,6 +20,7 @@ import type {
import { UpdateChatFeedbackProps } from '@fastgpt/global/core/chat/api';
import { AuthTeamTagTokenProps } from '@fastgpt/global/support/user/team/tag';
import { AppListItemType } from '@fastgpt/global/core/app/type';
import { PaginationProps, PaginationResponse } from '@fastgpt/web/common/fetch/type';
/**
* 获取初始化聊天内容
@@ -33,8 +34,8 @@ export const getTeamChatInfo = (data: InitTeamChatProps) =>
/**
* get current window history(appid or shareId)
*/
export const getChatHistories = (data: GetHistoriesProps) =>
POST<ChatHistoryItemType[]>('/core/chat/getHistories', data);
export const getChatHistories = (data: PaginationProps<GetHistoriesProps>) =>
POST<PaginationResponse<ChatHistoryItemType>>('/core/chat/getHistories', data);
/**
* get detail responseData by dataId appId chatId
*/

View File

@@ -2,18 +2,23 @@ import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
import { useRouter } from 'next/router';
import React, { ReactNode, useCallback, useEffect, useRef } from 'react';
import { createContext } from 'use-context-selector';
import { delClearChatHistories, delChatHistoryById, putChatHistory } from '../api';
import {
delClearChatHistories,
delChatHistoryById,
putChatHistory,
getChatHistories
} from '../api';
import { ChatHistoryItemType } from '@fastgpt/global/core/chat/type';
import { ClearHistoriesProps, DelHistoryProps, UpdateHistoryProps } from '@/global/core/chat/api';
import { useDisclosure } from '@chakra-ui/react';
import { BoxProps, useDisclosure } from '@chakra-ui/react';
import { useChatStore } from './storeChat';
import { getNanoid } from '@fastgpt/global/common/string/tools';
import { useScrollPagination } from '@fastgpt/web/hooks/useScrollPagination';
type ChatContextValueType = {
histories: ChatHistoryItemType[];
loadHistories: () => Promise<ChatHistoryItemType[]>;
params: Record<string, string | number>;
};
type ChatContextType = ChatContextValueType & {
type ChatContextType = {
chatId: string;
onUpdateHistory: (data: UpdateHistoryProps) => void;
onDelHistory: (data: DelHistoryProps) => Promise<undefined>;
@@ -21,17 +26,45 @@ type ChatContextType = ChatContextValueType & {
isOpenSlider: boolean;
onCloseSlider: () => void;
onOpenSlider: () => void;
setHistories: React.Dispatch<React.SetStateAction<ChatHistoryItemType[]>>;
forbidLoadChat: React.MutableRefObject<boolean>;
onChangeChatId: (chatId?: string, forbid?: boolean) => void;
loadHistories: () => void;
ScrollList: ({
children,
EmptyChildren,
isLoading,
...props
}: {
children: React.ReactNode;
EmptyChildren?: React.ReactNode;
isLoading?: boolean;
} & BoxProps) => ReactNode;
onChangeAppId: (appId: string) => void;
isLoading: boolean;
historyList: {
index: number;
data: ChatHistoryItemType;
}[];
histories: ChatHistoryItemType[];
onUpdateHistoryTitle: ({ chatId, newTitle }: { chatId: string; newTitle: string }) => void;
};
export const ChatContext = createContext<ChatContextType>({
chatId: '',
// forbidLoadChat: undefined,
historyList: [],
histories: [],
loadHistories: function (): Promise<ChatHistoryItemType[]> {
onUpdateHistoryTitle: function (): void {
throw new Error('Function not implemented.');
},
ScrollList: function (): ReactNode {
throw new Error('Function not implemented.');
},
loadHistories: function (): void {
throw new Error('Function not implemented.');
},
setHistories: function (): void {
throw new Error('Function not implemented.');
},
onUpdateHistory: function (data: UpdateHistoryProps): void {
@@ -62,8 +95,7 @@ export const ChatContext = createContext<ChatContextType>({
const ChatContextProvider = ({
children,
histories,
loadHistories
params
}: ChatContextValueType & { children: ReactNode }) => {
const router = useRouter();
const { chatId = '' } = router.query as { chatId: string };
@@ -72,6 +104,21 @@ const ChatContextProvider = ({
const { isOpen: isOpenSlider, onClose: onCloseSlider, onOpen: onOpenSlider } = useDisclosure();
const {
scrollDataList: historyList,
ScrollList,
isLoading: isPaginationLoading,
setData: setHistories,
fetchData: loadHistories,
totalData: histories
} = useScrollPagination(getChatHistories, {
overscan: 30,
pageSize: 30,
itemHeight: 52,
defaultParams: params,
refreshDeps: [params]
});
const { setLastChatId } = useChatStore();
const onChangeChatId = useCallback(
(changeChatId = getNanoid(), forbid = false) => {
@@ -85,10 +132,13 @@ const ChatContextProvider = ({
}
});
}
onCloseSlider();
},
[chatId, onCloseSlider, router, setLastChatId]
);
// Refresh lastChatId
useEffect(() => {
setLastChatId(chatId);
}, [chatId, setLastChatId]);
@@ -108,33 +158,68 @@ const ChatContextProvider = ({
);
const { runAsync: onUpdateHistory, loading: isUpdatingHistory } = useRequest2(putChatHistory, {
onSuccess() {
loadHistories();
onSuccess(data, params) {
const { chatId, top, customTitle } = params[0];
setHistories((histories) => {
const updatedHistories = histories.map((history) => {
if (history.chatId === chatId) {
return {
...history,
customTitle: customTitle || history.customTitle,
top: top !== undefined ? top : history.top
};
}
return history;
});
return top !== undefined
? updatedHistories.sort((a, b) => (b.top ? 1 : 0) - (a.top ? 1 : 0))
: updatedHistories;
});
},
errorToast: undefined
});
const { runAsync: onDelHistory, loading: isDeletingHistory } = useRequest2(delChatHistoryById, {
onSuccess() {
loadHistories();
onSuccess(data, params) {
const { chatId } = params[0];
setHistories((old) => old.filter((i) => i.chatId !== chatId));
}
});
const { runAsync: onClearHistories, loading: isClearingHistory } = useRequest2(
delClearChatHistories,
{
onSuccess() {
loadHistories();
setHistories([]);
},
onFinally() {
onChangeChatId('');
}
}
);
const isLoading = isUpdatingHistory || isDeletingHistory || isClearingHistory;
const onUpdateHistoryTitle = useCallback(
({ chatId, newTitle }: { chatId: string; newTitle: string }) => {
// Chat history exists
if (histories.find((item) => item.chatId === chatId)) {
setHistories((state) =>
state.map((item) => (item.chatId === chatId ? { ...item, title: newTitle } : item))
);
} else {
// Chat history not exists
loadHistories();
}
},
[histories, loadHistories, setHistories]
);
const isLoading =
isUpdatingHistory || isDeletingHistory || isClearingHistory || isPaginationLoading;
const contextValue = {
chatId,
histories,
loadHistories,
onUpdateHistory,
onDelHistory,
onClearHistories,
@@ -144,7 +229,13 @@ const ChatContextProvider = ({
forbidLoadChat,
onChangeChatId,
onChangeAppId,
isLoading
isLoading,
historyList,
setHistories,
ScrollList,
loadHistories,
histories,
onUpdateHistoryTitle
};
return <ChatContext.Provider value={contextValue}>{children}</ChatContext.Provider>;
};