Merge branch 'main' into next

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

View File

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

View File

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