chore:修改router版本

Author: SunLxy

examples/base/package.json

@@ -34,6 +34,7 @@
     "react-dom": "~17.0.2",
     "react-redux": "~7.2.6",
     "react-router-dom": "^6.2.1",
+    "react-router": "^6.2.1",
     "swr": "^1.3.0",
     "uiw": "^4.21.13"
   },

examples/website/package.json

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

packages/authorized/package.json

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

packages/basic-layouts/package.json

@@ -57,6 +57,7 @@
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
     "react-router-dom": "^6.2.1",
+    "react-router": "^6.2.1",
     "uiw": "^4.15.0"
   }
 }

packages/basic-layouts/src/index.tsx

@@ -3,24 +3,12 @@ import Layout from '@uiw/react-layout';
 import Button from '@uiw/react-button';
 import classnames from 'classnames';
 import DocumentTitle from '@uiw-admin/document-title';
-import {
-  RoutersProps,
-  useLocation,
-  useNavigate,
-  Navigate,
-} from '@uiw-admin/router-control';
+import { RoutersProps } from '@uiw-admin/router-control';
 import LogoHeader from './LogoHeader';
-import Menu, { onNavigate } from './Menu';
+import Menu from './Menu';
 import Bread from './Breadcrumb';
 import './index.css';
-import {
-  getMenu,
-  BreadcrumbMap,
-  getSideMenusMap,
-  getMenuList,
-  getCurrentPath,
-  getDiffIndex,
-} from './utils';
+import { getMenu, BreadcrumbMap } from './utils';
 import BodyContent, { WarpBody } from './Content';
 import HeaderRightMenu, { HeaderRightProps } from './HeaderRightMenu';
 import FullScreen from './FullScreen';

packages/components/package.json

@@ -58,6 +58,7 @@
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
     "react-router-dom": "^6.2.1",
+    "react-router": "^6.2.1",
     "uiw": "^4.15.0"
   }
 }

packages/exceptions/package.json

@@ -52,6 +52,7 @@
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
     "react-router-dom": "^6.2.1",
+    "react-router": "^6.2.1",
     "uiw": "^4.15.0"
   }
 }

packages/layout-tabs/package.json

@@ -55,6 +55,7 @@
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
     "react-router-dom": "^6.2.1",
+    "react-router": "^6.2.1",
     "uiw": "^4.15.0"
   }
 }

packages/layout-tabs/src/index.tsx

@@ -1,10 +1,14 @@
 import React from 'react';
 import { Tabs, Icon } from 'uiw';
-import { RoutersProps } from '@uiw-admin/router-control';
+import {
+  RoutersProps,
+  useNavigate,
+  useLocation,
+  Location,
+} from '@uiw-admin/router-control';
 import { getRoutesList, getMatch, getMatchRender } from './utils';
 import { matchPath } from 'react-router';
 import './styles/index.css';
-import { useNavigate, useLocation, Location } from 'react-router-dom';
 
 export interface LayoutTabsProps {
   /** 子集路由 */

packages/router-control/package.json

@@ -53,6 +53,7 @@
     "react": "~17.0.2",
     "react-dom": "~17.0.2",
     "react-redux": "^7.2.6",
-    "react-router-dom": "^6.2.1"
+    "react-router-dom": "^6.2.1",
+    "react-router": "^6.2.1"
   }
 }