mirror of
https://github.com/labring/FastGPT.git
synced 2025-10-20 02:34:52 +00:00
V4.12.4 features (#5626)
* fix: push again, user select option button and form input radio content overflow (#5601) * fix: push again, user select option button and form input radio content overflow * fix: use useCallback instead of useMemo, fix unnecessary delete * fix: Move the variable inside the component * fix: do not pass valueLabel to MySelect * ui * del collection api adapt * refactor: inherit permission (#5529) * refactor: permission update conflict check function * refactor(permission): app collaborator update api * refactor(permission): support app update collaborator * feat: support fe permission conflict check * refactor(permission): app permission * refactor(permission): dataset permission * refactor(permission): team permission * chore: fe adjust * fix: type error * fix: audit pagiation * fix: tc * chore: initv4130 * fix: app/dataset auth logic * chore: move code * refactor(permission): remove selfPermission * fix: mock * fix: test * fix: app & dataset auth * fix: inherit * test(inheritPermission): test syncChildrenPermission * prompt editor add list plugin (#5620) * perf: search result (#5608) * fix: table size (#5598) * temp: list value * backspace * optimize code --------- Co-authored-by: Archer <545436317@qq.com> Co-authored-by: 伍闲犬 <whoeverimf5@gmail.com> * fix: fe & member list (#5619) * chore: initv4130 * fix: MemberItemCard * fix: MemberItemCard * chore: fe adjust & init script * perf: test code * doc * fix debug variables (#5617) * perf: search result (#5608) * fix: table size (#5598) * fix debug variables * fix --------- Co-authored-by: Archer <545436317@qq.com> Co-authored-by: 伍闲犬 <whoeverimf5@gmail.com> * perf: member ui * fix: inherit bug (#5624) * refactor(permission): remove getClbsWithInfo, which is useless * fix: app list privateApp * fix: get infos * perf(fe): remove delete icon when it is disable in MemberItemCard * fix: dataset private dataset * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Archer <545436317@qq.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * perf: auto coupon * chore: upgrade script & get infos avatar (#5625) * fix: get infos * chore: initv4130 * feat: support WecomRobot publish, and fix AesKey can not save bug (#5526) * feat: resolve conflicts * fix: add param 'show_publish_wecom' * feat: abstract out WecomCrypto type * doc: wecom robot document * fix: solve instability in AI output * doc: update some pictures * feat: remove functions from request.ts to chat.ts and toolCall.ts * doc: wecom robot doc update * fix * delete unused code * doc: update version and prompt * feat: remove wecom crypto, delete wecom code in workflow * feat: delete unused codes --------- Co-authored-by: heheer <zhiyu44@qq.com> * remove test * rename init shell * feat: collection page store * reload sandbox * pysandbox * remove log * chore: remove useless code (#5629) * chore: remove useless code * fix: checkConflict * perf: support hidden type for RoleList * fix: copy node * update doc * fix(permission): some bug (#5632) * fix: app/dataset list * fix: inherit bug * perf: del app;i18n;save chat * fix: test * i18n * fix: sumper overflow return OwnerRoleVal (#5633) * remove invalid code * fix: scroll * fix: objectId * update next * update package * object id * mock redis * feat: add redis append to resolve wecom stream response (#5643) * feat: resolve conflicts * fix: add param 'show_publish_wecom' * feat: abstract out WecomCrypto type * doc: wecom robot document * fix: solve instability in AI output * doc: update some pictures * feat: remove functions from request.ts to chat.ts and toolCall.ts * doc: wecom robot doc update * fix * delete unused code * doc: update version and prompt * feat: remove wecom crypto, delete wecom code in workflow * feat: delete unused codes * feat: add redis append method --------- Co-authored-by: heheer <zhiyu44@qq.com> * cache per * fix(test): init team sub when creating mocked user (#5646) * fix: button is not vertically centered (#5647) * doc * fix: gridFs objectId (#5649) --------- Co-authored-by: Zeng Qingwen <143274079+fishwww-ww@users.noreply.github.com> Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com> Co-authored-by: heheer <heheer@sealos.io> Co-authored-by: 伍闲犬 <whoeverimf5@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: heheer <zhiyu44@qq.com>
This commit is contained in:
Archer
@@ -26,6 +26,7 @@ import {
|
||||
import { type PaginationProps, type PaginationResponse } from '../common/fetch/type';
|
||||
import MyMenu from '../components/common/MyMenu';
|
||||
import { useSystem } from './useSystem';
|
||||
import { useRouter } from 'next/router';
|
||||
|
||||
const thresholdVal = 200;
|
||||
|
||||
@@ -35,19 +36,18 @@ export function usePagination<DataT, ResT = {}>(
|
||||
defaultPageSize = 10,
|
||||
pageSizeOptions: defaultPageSizeOptions,
|
||||
params,
|
||||
defaultRequest = true,
|
||||
type = 'button',
|
||||
onChange,
|
||||
refreshDeps,
|
||||
scrollLoadType = 'bottom',
|
||||
EmptyTip,
|
||||
pollingInterval,
|
||||
pollingWhenHidden = false
|
||||
pollingWhenHidden = false,
|
||||
storeToQuery = false
|
||||
}: {
|
||||
defaultPageSize?: number;
|
||||
pageSizeOptions?: number[];
|
||||
params?: DataT;
|
||||
defaultRequest?: boolean;
|
||||
type?: 'button' | 'scroll';
|
||||
onChange?: (pageNum: number) => void;
|
||||
refreshDeps?: any[];
|
||||
@@ -56,15 +56,20 @@ export function usePagination<DataT, ResT = {}>(
|
||||
EmptyTip?: React.JSX.Element;
|
||||
pollingInterval?: number;
|
||||
pollingWhenHidden?: boolean;
|
||||
storeToQuery?: boolean;
|
||||
}
|
||||
) {
|
||||
const router = useRouter();
|
||||
let { page = '1' } = router.query as { page: string };
|
||||
const numPage = Number(page);
|
||||
|
||||
const { toast } = useToast();
|
||||
const { isPc } = useSystem();
|
||||
const { t } = useTranslation();
|
||||
|
||||
const [isLoading, { setTrue, setFalse }] = useBoolean(false);
|
||||
|
||||
const [pageNum, setPageNum] = useState(1);
|
||||
const [pageNum, setPageNum] = useState(numPage);
|
||||
const [pageSize, setPageSize] = useState(defaultPageSize);
|
||||
const pageSizeOptions = useCreation(
|
||||
() => defaultPageSizeOptions || [10, 20, 50, 100],
|
||||
@@ -76,7 +81,7 @@ export function usePagination<DataT, ResT = {}>(
|
||||
const totalDataLength = useMemo(() => Math.max(total, data.length), [total, data.length]);
|
||||
|
||||
const isEmpty = total === 0 && !isLoading;
|
||||
const noMore = data.length >= totalDataLength;
|
||||
const noMore = data.length > 0 && data.length >= totalDataLength;
|
||||
|
||||
const fetchData = useMemoizedFn(
|
||||
async (num: number = pageNum, ScrollContainerRef?: RefObject<HTMLDivElement>) => {
|
||||
@@ -92,6 +97,16 @@ export function usePagination<DataT, ResT = {}>(
|
||||
});
|
||||
|
||||
setPageNum(num);
|
||||
if (storeToQuery && num !== pageNum) {
|
||||
router.replace({
|
||||
pathname: router.pathname,
|
||||
query: {
|
||||
...router.query,
|
||||
page: num
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
res.total !== undefined && setTotal(res.total);
|
||||
|
||||
if (type === 'scroll') {
|
||||
@@ -268,7 +283,8 @@ export function usePagination<DataT, ResT = {}>(
|
||||
// Watch scroll position
|
||||
useThrottleEffect(
|
||||
() => {
|
||||
if (!ref?.current || type !== 'scroll' || noMore || isLoading) return;
|
||||
if (!ref?.current || type !== 'scroll' || noMore || isLoading || data.length === 0)
|
||||
return;
|
||||
const { scrollTop, scrollHeight, clientHeight } = ref.current;
|
||||
|
||||
if (
|
||||
@@ -313,9 +329,16 @@ export function usePagination<DataT, ResT = {}>(
|
||||
);
|
||||
|
||||
// Reload data
|
||||
const isFirstLoad = useRef(true);
|
||||
const { runAsync: refresh } = useRequest(
|
||||
async () => {
|
||||
defaultRequest && fetchData(1);
|
||||
if (isFirstLoad.current) {
|
||||
isFirstLoad.current = false;
|
||||
fetchData(numPage);
|
||||
return;
|
||||
}
|
||||
|
||||
fetchData(1);
|
||||
},
|
||||
{
|
||||
manual: false,
|
||||
@@ -323,6 +346,7 @@ export function usePagination<DataT, ResT = {}>(
|
||||
throttleWait: 100
|
||||
}
|
||||
);
|
||||
// Page size refresh
|
||||
useEffect(() => {
|
||||
data.length > 0 && fetchData();
|
||||
}, [pageSize]);
|
||||
|
||||
Reference in New Issue
Block a user