fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-08 06:59:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: extend collection cache bug (#5031)

Browse Source
This commit is contained in:
jack zhang 2024-08-09 17:40:52 +08:00 committed by GitHub
parent 4404f5fa13
commit 00d3ffaf99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/core/client/src/data-source/collection/CollectionManagerProvider.tsx
View File

@ -7,7 +7,7 @@
* For more information, please refer to: https://www.nocobase.com/agreement. * For more information, please refer to: https://www.nocobase.com/agreement.
*/ */
import React, { FC, ReactNode, createContext, useContext, useMemo } from 'react'; import React, { FC, ReactNode, createContext, useContext, useEffect, useMemo } from 'react';
import type { CollectionManager } from './CollectionManager'; import type { CollectionManager } from './CollectionManager';
import type { Collection } from './Collection'; import type { Collection } from './Collection';
import { DataSourceProvider, useDataSource } from '../data-source/DataSourceProvider'; import { DataSourceProvider, useDataSource } from '../data-source/DataSourceProvider';
@ -25,14 +25,23 @@ export interface CollectionManagerProviderProps {
const CollectionManagerProviderInner: FC<CollectionManagerProviderProps> = ({ instance, children }) => { const CollectionManagerProviderInner: FC<CollectionManagerProviderProps> = ({ instance, children }) => {
const dataSource = useDataSource(); const dataSource = useDataSource();
const extendCollections = useExtendCollections(); const extendCollections = useExtendCollections();
const collectionManager = useMemo(() => instance || dataSource?.collectionManager, [instance, dataSource]);
const [random, setRandom] = React.useState(Math.random());
useEffect(() => {
collectionManager.dataSource.addReloadCallback(() => {
setRandom(Math.random());
});
}, [collectionManager]);
const cm = useMemo(() => { const cm = useMemo(() => {
const res = instance || dataSource?.collectionManager; const res = collectionManager;
if (extendCollections?.length) { if (extendCollections?.length) {
return res.clone(extendCollections); return res.clone(extendCollections);
} }
return res; return res;
}, [instance, extendCollections, dataSource]); // Random is used to force re-render when collectionManager is changed
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [collectionManager, extendCollections, random]);
return <CollectionManagerContext.Provider value={cm}>{children}</CollectionManagerContext.Provider>; return <CollectionManagerContext.Provider value={cm}>{children}</CollectionManagerContext.Provider>;
}; };