mirror of
https://github.com/labring/FastGPT.git
synced 2025-07-23 05:12:39 +00:00
V4.9.1 feature (#4206)
* fix: remove DefaultTeam (#4037) * fix ：Get application bound knowledge base information logical rewrite (#4057) * fix ：Get application bound knowledge base information logical rewrite * fix ：Get application bound knowledge base information logical rewrite * fix ：Get application bound knowledge base information logical rewrite * fix ：Get application bound knowledge base information logical rewrite * update package * fix: import dataset step error;perf: ai proxy avatar (#4074) * perf: pg config params * perf: ai proxy avatar * fix: import dataset step error * feat: data input ux * perf: app dataset rewite * fix: 文本提取不支持arrayString,arrayNumber等jsonSchema (#4079) * update doc ;perf: model test (#4098) * perf: extract array * update doc * perf: model test * perf: model test * perf: think tag parse (#4102) * chat quote reader (#3912) * init chat quote full text reader * linked structure * dataset data linked * optimize code * fix ts build * test finish * delete log * fix * fix ts * fix ts * remove nextId * initial scroll * fix * fix * perf: chunk read (#4109) * package * perf: chunk read * feat: api dataset support pdf parse;fix: chunk reader auth (#4117) * feat: api dataset support pdf parse * fix: chunk reader auth * feat: invitation link (#3979) * feat: invitation link schema and apis * feat: add invitation link * feat: member status: active, leave, forbidden * fix: expires show hours and minutes * feat: invalid invitation link hint * fix: typo * chore: fix typo & i18n * fix * pref: fe * feat: add ttl index for 30-day-clean-up * perf: invite member code (#4118) * perf: invite member code * fix: ts * fix: model test channel id;fix: quote reader (#4123) * fix: model test channel id * fix: quote reader * fix chat quote reader (#4125) * perf: model test;perf: sidebar trigger (#4127) * fix: import dataset step error;perf: ai proxy avatar (#4074) * perf: pg config params * perf: ai proxy avatar * fix: import dataset step error * feat: data input ux * perf: app dataset rewite * perf: model test * perf: sidebar trigger * lock * update nanoid version * fix: select component ux * fix: ts * fix: vitest * remove test * fix: prompt toolcall ui (#4139) * load log error adapt * fix: prompt toolcall ui * perf: commercial function tip * update package * pref: copy link (#4147) * fix(i18n): namespace (#4143) * hiden dataset source (#4152) * hiden dataset source * perf: reader * chore: move all tests into a single folder (#4160) * fix modal close scroll (#4162) * fix modal close scroll * update refresh * feat: rerank modal select and weight (#4164) * fix loadInitData refresh (#4169) * fix * fix * form input number default & api dataset max token * feat: mix search weight (#4170) * feat: mix search weight * feat: svg render * fix: avatar error remove (#4173) * fix: avatar error remove * fix: index * fix: guide * fix: auth * update package;fix: input data model ui (#4181) * update package * fix: ts * update config * update jieba package * add type sign * fix: input data ui * fix: page title refresh (#4186) * fix: ts * update jieba package * fix: page title refresh * fix: remove member length check when opening invite create modal (#4193) * add env to check internal ip (#4187) * fix: ts * update jieba package * add env to check internal ip * package * fix: jieba * reset package * update config * fix: jieba package * init shell * init version * change team reload * update jieba package (#4200) * update jieba package * package * update package * remove invalid code * action * package (#4201) * package * update package * remove invalid code * package * remove i18n tip (#4202) * doc (#4205) * fix: i18n (#4208) * fix: next config (#4207) * reset package * i18n * update config * i18n * remove log --------- Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com> Co-authored-by: gggaaallleee <91131304+gggaaallleee@users.noreply.github.com> Co-authored-by: shilin <39396378+shilin66@users.noreply.github.com> Co-authored-by: heheer <heheer@sealos.io>
This commit is contained in:
Archer
@@ -44,7 +44,7 @@ export const useI18nLng = () => {
|
||||
|
||||
await i18n?.changeLanguage?.(lang);
|
||||
|
||||
if (!i18n.hasResourceBundle(lang, 'common') && prevLang !== lang) {
|
||||
if (!i18n?.hasResourceBundle?.(lang, 'common') && prevLang !== lang) {
|
||||
window?.location?.reload?.();
|
||||
}
|
||||
};
|
||||
|
||||
239
packages/web/hooks/useLinkedScroll.tsx
Normal file
239
packages/web/hooks/useLinkedScroll.tsx
Normal file
@@ -0,0 +1,239 @@
|
||||
import { useEffect, useRef, useState, ReactNode } from 'react';
|
||||
import { LinkedListResponse, LinkedPaginationProps } from '../common/fetch/type';
|
||||
import { Box, BoxProps } from '@chakra-ui/react';
|
||||
import { useTranslation } from 'next-i18next';
|
||||
import { useScroll, useMemoizedFn, useDebounceEffect } from 'ahooks';
|
||||
import MyBox from '../components/common/MyBox';
|
||||
import { useRequest2 } from './useRequest';
|
||||
import { delay } from '../../global/common/system/utils';
|
||||
|
||||
const threshold = 100;
|
||||
|
||||
export function useLinkedScroll<
|
||||
TParams extends LinkedPaginationProps & { isInitialLoad?: boolean },
|
||||
TData extends LinkedListResponse
|
||||
>(
|
||||
api: (data: TParams) => Promise<TData>,
|
||||
{
|
||||
pageSize = 15,
|
||||
params = {},
|
||||
currentData
|
||||
}: {
|
||||
pageSize?: number;
|
||||
params?: Record<string, any>;
|
||||
currentData?: { id: string; index: number };
|
||||
}
|
||||
) {
|
||||
const { t } = useTranslation();
|
||||
const [dataList, setDataList] = useState<TData['list']>([]);
|
||||
const [hasMorePrev, setHasMorePrev] = useState(true);
|
||||
const [hasMoreNext, setHasMoreNext] = useState(true);
|
||||
|
||||
const anchorRef = useRef({
|
||||
top: null as { _id: string; index: number } | null,
|
||||
bottom: null as { _id: string; index: number } | null
|
||||
});
|
||||
const containerRef = useRef<HTMLDivElement>(null);
|
||||
const itemRefs = useRef<Map<string, HTMLElement | null>>(new Map());
|
||||
|
||||
const scrollToItem = async (id: string, retry = 3) => {
|
||||
const itemIndex = dataList.findIndex((item) => item._id === id);
|
||||
if (itemIndex === -1) return;
|
||||
|
||||
const element = itemRefs.current.get(id);
|
||||
|
||||
if (!element || !containerRef.current) {
|
||||
if (retry > 0) {
|
||||
await delay(500);
|
||||
return scrollToItem(id, retry - 1);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
const elementRect = element.getBoundingClientRect();
|
||||
const containerRect = containerRef.current.getBoundingClientRect();
|
||||
|
||||
const scrollTop = containerRef.current.scrollTop + elementRect.top - containerRect.top;
|
||||
|
||||
containerRef.current.scrollTo({
|
||||
top: scrollTop
|
||||
});
|
||||
};
|
||||
|
||||
const { runAsync: callApi, loading: isLoading } = useRequest2(api);
|
||||
|
||||
let scroolSign = useRef(false);
|
||||
const { runAsync: loadInitData } = useRequest2(
|
||||
async ({ scrollWhenFinish, refresh } = { scrollWhenFinish: true, refresh: false }) => {
|
||||
console.log('loadInitData', params);
|
||||
if (!currentData || isLoading) return;
|
||||
|
||||
const item = dataList.find((item) => item._id === currentData.id);
|
||||
if (item && !refresh) {
|
||||
scrollToItem(item._id);
|
||||
return;
|
||||
}
|
||||
|
||||
const response = await callApi({
|
||||
initialId: currentData.id,
|
||||
initialIndex: currentData.index,
|
||||
pageSize,
|
||||
...params
|
||||
} as TParams);
|
||||
|
||||
setHasMorePrev(response.hasMorePrev);
|
||||
setHasMoreNext(response.hasMoreNext);
|
||||
|
||||
scroolSign.current = scrollWhenFinish;
|
||||
setDataList(response.list);
|
||||
|
||||
if (response.list.length > 0) {
|
||||
anchorRef.current.top = response.list[0];
|
||||
anchorRef.current.bottom = response.list[response.list.length - 1];
|
||||
}
|
||||
},
|
||||
{
|
||||
refreshDeps: [currentData],
|
||||
manual: false
|
||||
}
|
||||
);
|
||||
useEffect(() => {
|
||||
if (scroolSign.current && currentData) {
|
||||
scroolSign.current = false;
|
||||
scrollToItem(currentData.id);
|
||||
}
|
||||
}, [dataList]);
|
||||
|
||||
const { runAsync: loadPrevData, loading: prevLoading } = useRequest2(
|
||||
async (scrollRef = containerRef) => {
|
||||
if (!anchorRef.current.top || !hasMorePrev || isLoading) return;
|
||||
|
||||
const prevScrollTop = scrollRef?.current?.scrollTop || 0;
|
||||
const prevScrollHeight = scrollRef?.current?.scrollHeight || 0;
|
||||
|
||||
const response = await callApi({
|
||||
prevId: anchorRef.current.top._id,
|
||||
prevIndex: anchorRef.current.top.index,
|
||||
pageSize,
|
||||
...params
|
||||
} as TParams);
|
||||
|
||||
if (!response) return;
|
||||
|
||||
setHasMorePrev(response.hasMorePrev);
|
||||
|
||||
if (response.list.length > 0) {
|
||||
setDataList((prev) => [...response.list, ...prev]);
|
||||
anchorRef.current.top = response.list[0];
|
||||
|
||||
setTimeout(() => {
|
||||
if (scrollRef?.current) {
|
||||
const newHeight = scrollRef.current.scrollHeight;
|
||||
const heightDiff = newHeight - prevScrollHeight;
|
||||
scrollRef.current.scrollTop = prevScrollTop + heightDiff;
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
|
||||
return response;
|
||||
},
|
||||
{
|
||||
refreshDeps: [hasMorePrev, isLoading, params, pageSize]
|
||||
}
|
||||
);
|
||||
|
||||
const { runAsync: loadNextData, loading: nextLoading } = useRequest2(
|
||||
async (scrollRef = containerRef) => {
|
||||
if (!anchorRef.current.bottom || !hasMoreNext || isLoading) return;
|
||||
|
||||
const prevScrollTop = scrollRef?.current?.scrollTop || 0;
|
||||
|
||||
const response = await callApi({
|
||||
nextId: anchorRef.current.bottom._id,
|
||||
nextIndex: anchorRef.current.bottom.index,
|
||||
pageSize,
|
||||
...params
|
||||
} as TParams);
|
||||
|
||||
if (!response) return;
|
||||
|
||||
setHasMoreNext(response.hasMoreNext);
|
||||
|
||||
if (response.list.length > 0) {
|
||||
setDataList((prev) => [...prev, ...response.list]);
|
||||
anchorRef.current.bottom = response.list[response.list.length - 1];
|
||||
|
||||
setTimeout(() => {
|
||||
if (scrollRef?.current) {
|
||||
scrollRef.current.scrollTop = prevScrollTop;
|
||||
}
|
||||
}, 0);
|
||||
}
|
||||
|
||||
return response;
|
||||
},
|
||||
{
|
||||
refreshDeps: [hasMoreNext, isLoading, params, pageSize]
|
||||
}
|
||||
);
|
||||
|
||||
const ScrollData = useMemoizedFn(
|
||||
({
|
||||
children,
|
||||
ScrollContainerRef,
|
||||
...props
|
||||
}: {
|
||||
children: ReactNode;
|
||||
ScrollContainerRef?: React.RefObject<HTMLDivElement>;
|
||||
} & BoxProps) => {
|
||||
const ref = ScrollContainerRef || containerRef;
|
||||
const scroll = useScroll(ref);
|
||||
|
||||
useDebounceEffect(
|
||||
() => {
|
||||
if (!ref?.current || isLoading) return;
|
||||
|
||||
const { scrollTop, scrollHeight, clientHeight } = ref.current;
|
||||
|
||||
// 滚动到底部附近，加载更多下方数据
|
||||
if (scrollTop + clientHeight >= scrollHeight - threshold) {
|
||||
loadNextData(ref);
|
||||
}
|
||||
|
||||
// 滚动到顶部附近，加载更多上方数据
|
||||
if (scrollTop <= threshold) {
|
||||
loadPrevData(ref);
|
||||
}
|
||||
},
|
||||
[scroll],
|
||||
{ wait: 200 }
|
||||
);
|
||||
|
||||
return (
|
||||
<MyBox ref={ref} h={'100%'} overflow={'auto'} isLoading={isLoading} {...props}>
|
||||
{hasMorePrev && prevLoading && (
|
||||
<Box mt={2} fontSize={'xs'} color={'blackAlpha.500'} textAlign={'center'}>
|
||||
{t('common:common.is_requesting')}
|
||||
</Box>
|
||||
)}
|
||||
{children}
|
||||
{hasMoreNext && nextLoading && (
|
||||
<Box mt={2} fontSize={'xs'} color={'blackAlpha.500'} textAlign={'center'}>
|
||||
{t('common:common.is_requesting')}
|
||||
</Box>
|
||||
)}
|
||||
</MyBox>
|
||||
);
|
||||
}
|
||||
);
|
||||
|
||||
return {
|
||||
dataList,
|
||||
setDataList,
|
||||
isLoading,
|
||||
loadInitData,
|
||||
ScrollData,
|
||||
itemRefs,
|
||||
scrollToItem
|
||||
};
|
||||
}
|
||||
@@ -200,7 +200,7 @@ export function usePagination<DataT, ResT = {}>(
|
||||
// Watch scroll position
|
||||
useThrottleEffect(
|
||||
() => {
|
||||
if (!ref?.current || type !== 'scroll' || noMore) return;
|
||||
if (!ref?.current || type !== 'scroll' || noMore || isLoading) return;
|
||||
const { scrollTop, scrollHeight, clientHeight } = ref.current;
|
||||
|
||||
if (
|
||||
@@ -211,7 +211,7 @@ export function usePagination<DataT, ResT = {}>(
|
||||
fetchData(pageNum + 1, ref);
|
||||
}
|
||||
},
|
||||
[scroll],
|
||||
[scroll, isLoading],
|
||||
{ wait: 50 }
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user