chore:修复react-router

Author: SunLxy

examples/base/package.json

@@ -33,8 +33,8 @@
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
     "react-redux": "~7.2.6",
-    "react-router": "~6.2.1",
-    "react-router-dom": "~6.2.1",
+    "react-router": "~6.4.3",
+    "react-router-dom": "~6.4.3",
     "swr": "^1.3.0",
     "uiw": "^4.21.13"
   },

examples/website/package.json

@@ -37,8 +37,8 @@
     "@uiw/reset.css": "1.0.5",
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
-    "react-router": "~6.2.1",
-    "react-router-dom": "~6.2.1",
+    "react-router": "~6.4.3",
+    "react-router-dom": "~6.4.3",
     "react-test-renderer": "17.0.2",
     "uiw": "^4.21.13",
     "uiw-admin": "5.3.20"

packages/authorized/package.json

@@ -53,7 +53,7 @@
     "@types/react-dom": "~17.0.11",
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
-    "react-router": "~6.2.1",
-    "react-router-dom": "~6.2.1"
+    "react-router": "~6.4.3",
+    "react-router-dom": "~6.4.3"
   }
 }

packages/basic-layouts/package.json

@@ -56,8 +56,8 @@
     "@uiw-admin/router-control": "5.3.20",
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
-    "react-router": "~6.2.1",
-    "react-router-dom": "~6.2.1",
+    "react-router": "~6.4.3",
+    "react-router-dom": "~6.4.3",
     "uiw": "^4.15.0"
   }
 }

packages/components/package.json

@@ -57,8 +57,8 @@
     "@types/react-dom": "~17.0.11",
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
-    "react-router": "~6.2.1",
-    "react-router-dom": "~6.2.1",
+    "react-router": "~6.4.3",
+    "react-router-dom": "~6.4.3",
     "uiw": "^4.15.0"
   }
 }

packages/exceptions/package.json

@@ -51,8 +51,8 @@
     "@types/react-dom": "~17.0.11",
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
-    "react-router": "~6.2.1",
-    "react-router-dom": "~6.2.1",
+    "react-router": "~6.4.3",
+    "react-router-dom": "~6.4.3",
     "uiw": "^4.15.0"
   }
 }

packages/layout-tabs/package.json

@@ -54,8 +54,8 @@
     "@uiw-admin/router-control": "5.3.20",
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
-    "react-router": "~6.2.1",
-    "react-router-dom": "~6.2.1",
+    "react-router": "~6.4.3",
+    "react-router-dom": "~6.4.3",
     "uiw": "^4.15.0"
   }
 }

packages/router-control/package.json

@@ -43,6 +43,9 @@
     "react": ">=17.x",
     "react-dom": ">=17.x"
   },
+  "dependencies": {
+    "history": "5.3.0"
+  },
   "devDependencies": {
     "@babel/runtime": "~7.20.0",
     "@types/react": "~17.0.39",
@@ -53,7 +56,7 @@
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
     "react-redux": "~7.2.6",
-    "react-router": "~6.2.1",
-    "react-router-dom": "~6.2.1"
+    "react-router": "~6.4.3",
+    "react-router-dom": "~6.4.3"
   }
-}
+}

packages/router-control/src/index.tsx

@@ -1,7 +1,6 @@
 // @ts-nocheck
 import React from 'react';
 import {
-  unstable_HistoryRouter,
   useRoutes,
   useNavigate,
   NavigateFunction,
@@ -10,7 +9,6 @@ import {
   BrowserRouter,
 } from 'react-router-dom';
 
-// @ts-ignore
 import RoutePathArr from '@@/routes';
 import { Provider } from 'react-redux';
 import { store } from '@uiw-admin/models';
@@ -24,7 +22,6 @@ export * from 'react-router-dom';
 export * from 'react-router';
 export * from 'react-redux';
 
-export const HistoryRouter = unstable_HistoryRouter;
 export const history = createBrowserHistory();
 export let navigate: NavigateFunction = () => {};
 
@@ -78,18 +75,7 @@ export default function Controller(props: ControllerProps = {}) {
   // @ts-ignore
   let base = BASE_NAME;
   const dom = React.useMemo(() => {
-    if (routeType === 'history') {
-      return (
-        <HistoryRouter history={history} basename={base}>
-          <RouteChild
-            addModels={props.addModels}
-            isAutoAuth={isAutoAuth}
-            notLoginMenus={notLoginMenus}
-            navigateTo={navigateTo}
-          />
-        </HistoryRouter>
-      );
-    } else if (routeType === 'browser') {
+    if (routeType === 'browser') {
       return (
         <BrowserRouter window={window} basename={base}>
           <RouteChild