From 7b60a3b7c4206b0dbc49221c5db9ca4192a1233b Mon Sep 17 00:00:00 2001
From: wkj <278599135@qq.com>
Date: Tue, 2 Aug 2022 14:58:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/web/src/App.tsx                      | 100 ++++++++----------
 .../web/src/{utils => template}/Loading.tsx   |   0
 template/web/src/template/console/index.tsx   |  15 ---
 template/web/src/utils/lazyLoad.tsx           |  13 ---
 4 files changed, 47 insertions(+), 81 deletions(-)
 rename template/web/src/{utils => template}/Loading.tsx (100%)
 delete mode 100644 template/web/src/utils/lazyLoad.tsx

diff --git a/template/web/src/App.tsx b/template/web/src/App.tsx
index 690bb0f..794890e 100644
--- a/template/web/src/App.tsx
+++ b/template/web/src/App.tsx
@@ -1,30 +1,32 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { Routes, Route } from 'react-router-dom';
-import { Button, Drawer } from 'tdesign-react';
-import { ChevronUpIcon } from 'tdesign-icons-react'
 
 import './App.less';
-import LazyLoad from './utils/lazyLoad';
-const Console = LazyLoad(() => import('./template/console'));
-const Frontend = LazyLoad(() => import('./template/frontend'));
-const NotFound = LazyLoad(() => import('./template/notFound'));
-const Message = LazyLoad(() => import('@oak-general-business/components/message'));
-const DebugPanel = LazyLoad(() => import('@oak-general-business/components/Func/debugPanel'));
+import Loading from './template/Loading';
+const Console = React.lazy(() => import('./template/console'));
+const Frontend = React.lazy(() => import('./template/frontend'));
+const NotFound = React.lazy(() => import('./template/notFound'));
+const Message = React.lazy(() => import('@oak-general-business/components/message'));
+const DebugPanel = React.lazy(() => import('@oak-general-business/components/func/debugPanel'));
 
 type Router = {
     path: string;
-    element: ReturnType<typeof LazyLoad>;
+    element: React.LazyExoticComponent<React.ComponentType<any>>;
     title: string;
-}
+};
 
 function getRoutes(routers2: Router[], namespace?: string) {
     return routers2.map((router, index) => {
-        const { path, element } = router;
+        const { path, element: Component } = router;
         return (
             <Route
                 key={`route_${namespace ? `${namespace}_` : ''}${index}`}
                 path={path}
-                element={element}
+                element={
+                    <React.Suspense fallback={<Loading />}>
+                        <Component />
+                    </React.Suspense>
+                }
             ></Route>
         );
     });
@@ -33,54 +35,46 @@ function getRoutes(routers2: Router[], namespace?: string) {
 let routers: Router[] = [];
 
 function App() {
-    const [visible, setVisible] = useState(false);
-
-    const handleClick = () => {
-        setVisible(true);
-    };
-    const handleClose = () => {
-        setVisible(false);
-    };
     return (
         <React.Fragment>
-            {Message}
+            <React.Suspense>
+                <Message />
+            </React.Suspense>
             <Routes>
-                <Route path="/console" element={Console}>
+                <Route
+                    path="/console"
+                    element={
+                        <React.Suspense fallback={<Loading />}>
+                            <Console />
+                        </React.Suspense>
+                    }
+                >
                     {getRoutes(routers, 'console')}
                 </Route>
-                <Route path="/" element={Frontend}>
+                <Route
+                    path="/"
+                    element={
+                        <React.Suspense fallback={<Loading />}>
+                            <Frontend />
+                        </React.Suspense>
+                    }
+                >
                     {getRoutes(routers)}
                 </Route>
-                <Route path="*" element={NotFound} />
+                <Route
+                    path="*"
+                    element={
+                        <React.Suspense fallback={<Loading />}>
+                            <NotFound />
+                        </React.Suspense>
+                    }
+                />
             </Routes>
-            {
-                process.env.NODE_ENV === "development" && (
-                    <React.Fragment>
-                        <Button
-                            variant="text"
-                            shape="circle"
-                            theme="primary"
-                            icon={<ChevronUpIcon />}
-                            style={{
-                                position: 'absolute',
-                                bottom: 0,
-                                right: '45vw',
-                            }}
-                            onClick={handleClick}
-                        />
-
-                        <Drawer
-                            placement="bottom"
-                            visible={visible}
-                            onClose={handleClose}
-                            header={<text>debug控制台</text>}
-                            footer={<div/>}
-                        >
-                            {DebugPanel}
-                        </Drawer>
-                    </React.Fragment>
-                )
-            }
+            {process.env.NODE_ENV === 'development' && (
+                <React.Suspense>
+                    <DebugPanel />
+                </React.Suspense>
+            )}
         </React.Fragment>
     );
 }
diff --git a/template/web/src/utils/Loading.tsx b/template/web/src/template/Loading.tsx
similarity index 100%
rename from template/web/src/utils/Loading.tsx
rename to template/web/src/template/Loading.tsx
diff --git a/template/web/src/template/console/index.tsx b/template/web/src/template/console/index.tsx
index 2d77cd3..ff45739 100644
--- a/template/web/src/template/console/index.tsx
+++ b/template/web/src/template/console/index.tsx
@@ -4,21 +4,6 @@ import { useNavigate, useParams, useSearchParams, useLocation } from 'react-rout
 import { Routes, Route, Outlet } from 'react-router-dom';
 
 
-// function Console() {
-//     const n = useNavigate();
-//     const d = useParams();
-//     const [search, setSearch] = useSearchParams();
-//     const id = search.get('id');
-//     const l = useLocation();
-//     console.log(d, id, l);
-//     return <div onClick={() => {
-//         n('', { state: { name: '212' } })
-//     }}>console</div>;
-// }
-
-// export default Console;
-
-
 function Console() {
     return (
         <Outlet />
diff --git a/template/web/src/utils/lazyLoad.tsx b/template/web/src/utils/lazyLoad.tsx
deleted file mode 100644
index 4069fda..0000000
--- a/template/web/src/utils/lazyLoad.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from "react";
-import Loading from './Loading';
-
-const LazyLoad = (factory: () => Promise<{ default: any }>) => {
-    const Component = React.lazy(factory);
-    return (
-        <React.Suspense fallback={<Loading />}>
-            <Component />
-        </React.Suspense>
-    );
-};
-
-export default LazyLoad;
\ No newline at end of file