fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-01 18:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
Zeke Zhang 2025-01-03 12:32:20 +08:00
commit 0377762b2c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/client/src/application/RouterManager.tsx
View File

@ -19,6 +19,7 @@ import {
RouteObject,
useRoutes,
} from 'react-router-dom';
import VariablesProvider from '../variables/VariablesProvider';
import { Application } from './Application';
import { CustomRouterContextProvider } from './CustomRouterContextProvider';
import { BlankComponent, RouterContextCleaner } from './components';
@ -146,8 +147,10 @@ export class RouterManager {
<ReactRouter {...opts}>
<CustomRouterContextProvider>
<BaseLayout>
<RenderRoutes />
{children}
<VariablesProvider>
<RenderRoutes />
{children}
</VariablesProvider>
</BaseLayout>
</CustomRouterContextProvider>
</ReactRouter>

5
packages/core/client/src/route-switch/antd/admin-layout/index.tsx
View File

@ -57,7 +57,6 @@ import {
import { Plugin } from '../../../application/Plugin';
import { useMenuTranslation } from '../../../schema-component/antd/menu/locale';
import { Help } from '../../../user/Help';
import { VariablesProvider } from '../../../variables';
import { KeepAlive } from './KeepAlive';
export { KeepAlive };
@ -528,9 +527,7 @@ export const AdminProvider = (props) => {
<MenuSchemaRequestProvider>
<RemoteCollectionManagerProvider>
<CurrentAppInfoProvider>
<RemoteSchemaTemplateManagerProvider>
<VariablesProvider>{props.children}</VariablesProvider>
</RemoteSchemaTemplateManagerProvider>
<RemoteSchemaTemplateManagerProvider>{props.children}</RemoteSchemaTemplateManagerProvider>
</CurrentAppInfoProvider>
</RemoteCollectionManagerProvider>
</MenuSchemaRequestProvider>