模版引入的文件

This commit is contained in:
Wang Kejun 2022-08-31 15:12:31 +08:00
parent df892bb2e0
commit e914ac09d1
4 changed files with 34 additions and 12 deletions

View File

@ -465,9 +465,13 @@ function oakConfigContentWithWeChatMp() {
exports.oakConfigContentWithWeChatMp = oakConfigContentWithWeChatMp; exports.oakConfigContentWithWeChatMp = oakConfigContentWithWeChatMp;
function appJsonContentWithWeb(isDev) { function appJsonContentWithWeb(isDev) {
const pages = [ const pages = [
'@project/pages/store/list/index',
'@project/pages/store/upsert/index',
'@project/pages/store/detail/index',
'@project/pages/book/list/index', '@project/pages/book/list/index',
'@project/pages/book/upsert/index', '@project/pages/book/upsert/index',
'@project/pages/book/detail/index', '@project/pages/book/detail/index',
'@oak-general-business/pages/login/index',
]; ];
return `{ return `{
"pages": ${JSON.stringify(pages, null, 4)} "pages": ${JSON.stringify(pages, null, 4)}

View File

@ -476,9 +476,13 @@ export function oakConfigContentWithWeChatMp() {
export function appJsonContentWithWeb(isDev: boolean) { export function appJsonContentWithWeb(isDev: boolean) {
const pages = [ const pages = [
'@project/pages/store/list/index',
'@project/pages/store/upsert/index',
'@project/pages/store/detail/index',
'@project/pages/book/list/index', '@project/pages/book/list/index',
'@project/pages/book/upsert/index', '@project/pages/book/upsert/index',
'@project/pages/book/detail/index', '@project/pages/book/detail/index',
'@oak-general-business/pages/login/index',
]; ];
return `{ return `{
"pages": ${JSON.stringify(pages, null, 4)} "pages": ${JSON.stringify(pages, null, 4)}

View File

@ -2,12 +2,11 @@ import React from 'react';
import { Routes, Route } from 'react-router-dom'; import { Routes, Route } from 'react-router-dom';
import './App.less'; import './App.less';
import Loading from './components/Loading'; import AppContainer from './AppContainer';
const Console = React.lazy(() => import('./components/console')); const Console = React.lazy(() => import('./components/console'));
const Frontend = React.lazy(() => import('./components/frontend')); const Frontend = React.lazy(() => import('./components/frontend'));
const NotFound = React.lazy(() => import('./components/notFound')); const NotFound = React.lazy(() => import('./components/notFound'));
const Message = React.lazy(() => import('@oak-general-business/components/message'));
const DebugPanel = React.lazy(() => import('@oak-general-business/components/func/debugPanel'));
type Router = { type Router = {
path: string; path: string;
@ -22,11 +21,7 @@ function getRoutes(routers2: Router[], namespace?: string) {
<Route <Route
key={`route_${namespace ? `${namespace}_` : ''}${index}`} key={`route_${namespace ? `${namespace}_` : ''}${index}`}
path={path} path={path}
element={ element={<Component namespace={namespace} />}
<React.Suspense fallback={<Loading />}>
<Component namespace={namespace} />
</React.Suspense>
}
></Route> ></Route>
); );
}); });
@ -36,8 +31,7 @@ let routers: Router[] = [];
function App() { function App() {
return ( return (
<React.Suspense> <AppContainer>
<Message />
<Routes> <Routes>
<Route path="/console" element={<Console />}> <Route path="/console" element={<Console />}>
{getRoutes(routers, 'console')} {getRoutes(routers, 'console')}
@ -47,8 +41,7 @@ function App() {
</Route> </Route>
<Route path="*" element={<NotFound />} /> <Route path="*" element={<NotFound />} />
</Routes> </Routes>
{process.env.NODE_ENV === 'development' && <DebugPanel />} </AppContainer>
</React.Suspense>
); );
} }

View File

@ -0,0 +1,21 @@
import React, { lazy } from 'react';
import Loading from './components/Loading';
const Message = lazy(() => import('@oak-general-business/components/message'));
const DebugPanel = lazy(() => import('@oak-general-business/components/func/debugPanel'));
type AppContainerProps = {
children?: React.ReactNode
};
const AppContainer = (props: AppContainerProps) => {
const { children } = props;
return (
<React.Suspense fallback={<Loading />}>
<Message />
{children}
{process.env.NODE_ENV === 'development' && <DebugPanel />}
</React.Suspense>
);
};
export default AppContainer;