From 9cac43772b9bea76d167a101626a3fdc247e238f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=9F=E8=B4=A4?= <qixian.cs@antgroup.com>
Date: Thu, 5 Jan 2023 18:29:51 +0800
Subject: [PATCH] feat(layout): remove unuse deps

---
 packages/layout/package.json                  |   2 +-
 .../src/components/SiderMenu/BaseMenu.tsx     |   4 +-
 .../src/demos/AlwaysDefaultOpenAllMenu.tsx    |   1 +
 packages/layout/src/demos/complexMenu.ts      |   1 +
 packages/layout/src/index.tsx                 |   1 +
 packages/layout/src/utils/getMenuData.ts      |   1 +
 packages/layout/src/utils/utils.ts            |   6 +-
 tests/layout/PageHeader.test.tsx              |   3 +-
 tests/layout/__snapshots__/demo.test.ts.snap  |  32 ++---
 tests/layout/index.test.tsx                   |  19 +--
 yarn.lock                                     | 136 +++++++++++-------
 11 files changed, 122 insertions(+), 84 deletions(-)

diff --git a/packages/layout/package.json b/packages/layout/package.json
index 2bf76e3316c6..3731b9959c70 100644
--- a/packages/layout/package.json
+++ b/packages/layout/package.json
@@ -35,7 +35,7 @@
     "@ant-design/pro-provider": "2.3.1",
     "@ant-design/pro-utils": "2.5.2",
     "@babel/runtime": "^7.18.0",
-    "@umijs/route-utils": "^2.1.0",
+    "@umijs/route-utils": "^4.0.0",
     "@umijs/use-params": "^1.0.9",
     "classnames": "^2.2.6",
     "lodash.merge": "^4.6.2",
diff --git a/packages/layout/src/components/SiderMenu/BaseMenu.tsx b/packages/layout/src/components/SiderMenu/BaseMenu.tsx
index c7ed64dd59a4..e126a40dd90c 100644
--- a/packages/layout/src/components/SiderMenu/BaseMenu.tsx
+++ b/packages/layout/src/components/SiderMenu/BaseMenu.tsx
@@ -474,7 +474,9 @@ const BaseMenu: React.FC<BaseMenuProps & PrivateSiderMenuProps> = (props) => {
       } else if (menu?.ignoreFlatMenu && defaultOpenAll) {
         // 忽略用户手动折叠过的菜单状态，折叠按钮切换之后也可实现默认展开所有菜单
         setOpenKeys(getOpenKeysFromMenuData(menuData));
-      } else setDefaultOpenAll(false);
+      } else {
+        setDefaultOpenAll(false);
+      }
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [matchMenuKeys.join('-')],
diff --git a/packages/layout/src/demos/AlwaysDefaultOpenAllMenu.tsx b/packages/layout/src/demos/AlwaysDefaultOpenAllMenu.tsx
index dd584f85f3d6..b341d1860b14 100644
--- a/packages/layout/src/demos/AlwaysDefaultOpenAllMenu.tsx
+++ b/packages/layout/src/demos/AlwaysDefaultOpenAllMenu.tsx
@@ -42,6 +42,7 @@ export default () => (
                 collapsed: true,
                 menuName: '域买家维度交易',
                 name: '域买家维度交易',
+                path: '/xx',
                 routes: [
                   {
                     id: 2,
diff --git a/packages/layout/src/demos/complexMenu.ts b/packages/layout/src/demos/complexMenu.ts
index 856879e5bd3d..fe972590c997 100644
--- a/packages/layout/src/demos/complexMenu.ts
+++ b/packages/layout/src/demos/complexMenu.ts
@@ -27,6 +27,7 @@ export default [
         collapsed: true,
         menuName: '域买家维度交易',
         name: '域买家维度交易',
+        path: '/xx',
         routes: [
           {
             id: 2,
diff --git a/packages/layout/src/index.tsx b/packages/layout/src/index.tsx
index a21b47f0a7a7..f30d9361c9ee 100644
--- a/packages/layout/src/index.tsx
+++ b/packages/layout/src/index.tsx
@@ -15,6 +15,7 @@ import 'antd/es/spin/style';
 import 'antd/es/switch/style';
 import 'antd/es/tabs/style';
 import 'antd/es/tooltip/style';
+import 'antd/es/breadcrumb/style';
 //----------------------
 
 import { FooterToolbar } from './components/FooterToolbar';
diff --git a/packages/layout/src/utils/getMenuData.ts b/packages/layout/src/utils/getMenuData.ts
index 8675e7e939f0..4a6f17c29706 100644
--- a/packages/layout/src/utils/getMenuData.ts
+++ b/packages/layout/src/utils/getMenuData.ts
@@ -25,6 +25,7 @@ const getMenuData = (
     formatMessage,
     true,
   );
+
   if (!menuDataRender) {
     return {
       breadcrumb: fromEntries(breadcrumb),
diff --git a/packages/layout/src/utils/utils.ts b/packages/layout/src/utils/utils.ts
index c6a19f75d859..8551cc38f6fd 100644
--- a/packages/layout/src/utils/utils.ts
+++ b/packages/layout/src/utils/utils.ts
@@ -5,8 +5,10 @@ export const getOpenKeysFromMenuData = (menuData?: MenuDataItem[]) => {
     if (item.key) {
       pre.push(item.key);
     }
-    if (item.routes) {
-      const newArray: string[] = pre.concat(getOpenKeysFromMenuData(item.routes) || []);
+    if (item.children || item.routes) {
+      const newArray: string[] = pre.concat(
+        getOpenKeysFromMenuData(item.children || item.routes) || [],
+      );
       return newArray;
     }
     return pre;
diff --git a/tests/layout/PageHeader.test.tsx b/tests/layout/PageHeader.test.tsx
index 3cc6b5de67cb..e4bef1d6e5fb 100644
--- a/tests/layout/PageHeader.test.tsx
+++ b/tests/layout/PageHeader.test.tsx
@@ -120,8 +120,7 @@ describe('PageContainer', () => {
   it('change container width', async () => {
     const { container } = render(<PageHeader title="Page Title" extra="extra" />);
     triggerResize(container.firstChild as HTMLDivElement);
-    await waitTime(100);
-
+    await waitTime(1000);
     expect(
       container.querySelector('div.ant-page-header')?.className.includes('ant-page-header-compact'),
     ).toBeTruthy();
diff --git a/tests/layout/__snapshots__/demo.test.ts.snap b/tests/layout/__snapshots__/demo.test.ts.snap
index cdd9364966c6..339937544e9b 100644
--- a/tests/layout/__snapshots__/demo.test.ts.snap
+++ b/tests/layout/__snapshots__/demo.test.ts.snap
@@ -3893,11 +3893,11 @@ exports[`layout demos 📸 renders ./packages/layout/src/demos/AlwaysDefaultOpen
                         role="none"
                       >
                         <div
-                          aria-controls="rc-menu-uuid-test-/cc19e384db0c314c8f5bae7bd08375a1eb8280bc00fba70f3941602421d509c4-popup"
+                          aria-controls="rc-menu-uuid-test-/xx-popup"
                           aria-expanded="true"
                           aria-haspopup="true"
                           class="ant-menu-submenu-title"
-                          data-menu-id="rc-menu-uuid-test-/cc19e384db0c314c8f5bae7bd08375a1eb8280bc00fba70f3941602421d509c4"
+                          data-menu-id="rc-menu-uuid-test-/xx"
                           role="menuitem"
                           style="padding-left: 32px;"
                           tabindex="-1"
@@ -3923,7 +3923,7 @@ exports[`layout demos 📸 renders ./packages/layout/src/demos/AlwaysDefaultOpen
                         <ul
                           class="ant-menu ant-menu-sub ant-menu-inline"
                           data-menu-list="true"
-                          id="rc-menu-uuid-test-/cc19e384db0c314c8f5bae7bd08375a1eb8280bc00fba70f3941602421d509c4-popup"
+                          id="rc-menu-uuid-test-/xx-popup"
                         >
                           <li
                             class="ant-menu-item ant-menu-item-only-child ant-pro-base-menu-menu-item"
@@ -3976,11 +3976,11 @@ exports[`layout demos 📸 renders ./packages/layout/src/demos/AlwaysDefaultOpen
                         role="none"
                       >
                         <div
-                          aria-controls="rc-menu-uuid-test-/028ada2346da00990af63de1191f18cc87c96fc671323ae24df9dd39fc8c0fd2-popup"
+                          aria-controls="rc-menu-uuid-test-/9449c99785ac015b1ec5af4ac62f9e00fe23fa6c23f3f0d36303c9e840f54ffe-popup"
                           aria-expanded="true"
                           aria-haspopup="true"
                           class="ant-menu-submenu-title"
-                          data-menu-id="rc-menu-uuid-test-/028ada2346da00990af63de1191f18cc87c96fc671323ae24df9dd39fc8c0fd2"
+                          data-menu-id="rc-menu-uuid-test-/9449c99785ac015b1ec5af4ac62f9e00fe23fa6c23f3f0d36303c9e840f54ffe"
                           role="menuitem"
                           style="padding-left: 32px;"
                           tabindex="-1"
@@ -4006,7 +4006,7 @@ exports[`layout demos 📸 renders ./packages/layout/src/demos/AlwaysDefaultOpen
                         <ul
                           class="ant-menu ant-menu-sub ant-menu-inline"
                           data-menu-list="true"
-                          id="rc-menu-uuid-test-/028ada2346da00990af63de1191f18cc87c96fc671323ae24df9dd39fc8c0fd2-popup"
+                          id="rc-menu-uuid-test-/9449c99785ac015b1ec5af4ac62f9e00fe23fa6c23f3f0d36303c9e840f54ffe-popup"
                         >
                           <li
                             class="ant-menu-item ant-menu-item-only-child ant-pro-base-menu-menu-item"
@@ -4784,11 +4784,11 @@ exports[`layout demos 📸 renders ./packages/layout/src/demos/DefaultOpenAllMen
                         role="none"
                       >
                         <div
-                          aria-controls="rc-menu-uuid-test-/cc19e384db0c314c8f5bae7bd08375a1eb8280bc00fba70f3941602421d509c4-popup"
+                          aria-controls="rc-menu-uuid-test-/xx-popup"
                           aria-expanded="true"
                           aria-haspopup="true"
                           class="ant-menu-submenu-title"
-                          data-menu-id="rc-menu-uuid-test-/cc19e384db0c314c8f5bae7bd08375a1eb8280bc00fba70f3941602421d509c4"
+                          data-menu-id="rc-menu-uuid-test-/xx"
                           role="menuitem"
                           style="padding-left: 32px;"
                           tabindex="-1"
@@ -4814,7 +4814,7 @@ exports[`layout demos 📸 renders ./packages/layout/src/demos/DefaultOpenAllMen
                         <ul
                           class="ant-menu ant-menu-sub ant-menu-inline"
                           data-menu-list="true"
-                          id="rc-menu-uuid-test-/cc19e384db0c314c8f5bae7bd08375a1eb8280bc00fba70f3941602421d509c4-popup"
+                          id="rc-menu-uuid-test-/xx-popup"
                         >
                           <li
                             class="ant-menu-item ant-menu-item-only-child ant-pro-base-menu-menu-item"
@@ -4867,11 +4867,11 @@ exports[`layout demos 📸 renders ./packages/layout/src/demos/DefaultOpenAllMen
                         role="none"
                       >
                         <div
-                          aria-controls="rc-menu-uuid-test-/028ada2346da00990af63de1191f18cc87c96fc671323ae24df9dd39fc8c0fd2-popup"
+                          aria-controls="rc-menu-uuid-test-/9449c99785ac015b1ec5af4ac62f9e00fe23fa6c23f3f0d36303c9e840f54ffe-popup"
                           aria-expanded="true"
                           aria-haspopup="true"
                           class="ant-menu-submenu-title"
-                          data-menu-id="rc-menu-uuid-test-/028ada2346da00990af63de1191f18cc87c96fc671323ae24df9dd39fc8c0fd2"
+                          data-menu-id="rc-menu-uuid-test-/9449c99785ac015b1ec5af4ac62f9e00fe23fa6c23f3f0d36303c9e840f54ffe"
                           role="menuitem"
                           style="padding-left: 32px;"
                           tabindex="-1"
@@ -4897,7 +4897,7 @@ exports[`layout demos 📸 renders ./packages/layout/src/demos/DefaultOpenAllMen
                         <ul
                           class="ant-menu ant-menu-sub ant-menu-inline"
                           data-menu-list="true"
-                          id="rc-menu-uuid-test-/028ada2346da00990af63de1191f18cc87c96fc671323ae24df9dd39fc8c0fd2-popup"
+                          id="rc-menu-uuid-test-/9449c99785ac015b1ec5af4ac62f9e00fe23fa6c23f3f0d36303c9e840f54ffe-popup"
                         >
                           <li
                             class="ant-menu-item ant-menu-item-only-child ant-pro-base-menu-menu-item"
@@ -5766,11 +5766,11 @@ exports[`layout demos 📸 renders ./packages/layout/src/demos/MenuGroup.tsx cor
                         role="none"
                       >
                         <div
-                          aria-controls="rc-menu-uuid-test-/cc19e384db0c314c8f5bae7bd08375a1eb8280bc00fba70f3941602421d509c4-popup"
+                          aria-controls="rc-menu-uuid-test-/xx-popup"
                           aria-expanded="false"
                           aria-haspopup="true"
                           class="ant-menu-submenu-title"
-                          data-menu-id="rc-menu-uuid-test-/cc19e384db0c314c8f5bae7bd08375a1eb8280bc00fba70f3941602421d509c4"
+                          data-menu-id="rc-menu-uuid-test-/xx"
                           role="menuitem"
                           style="padding-left: 16px;"
                           tabindex="-1"
@@ -5799,11 +5799,11 @@ exports[`layout demos 📸 renders ./packages/layout/src/demos/MenuGroup.tsx cor
                         role="none"
                       >
                         <div
-                          aria-controls="rc-menu-uuid-test-/028ada2346da00990af63de1191f18cc87c96fc671323ae24df9dd39fc8c0fd2-popup"
+                          aria-controls="rc-menu-uuid-test-/9449c99785ac015b1ec5af4ac62f9e00fe23fa6c23f3f0d36303c9e840f54ffe-popup"
                           aria-expanded="false"
                           aria-haspopup="true"
                           class="ant-menu-submenu-title"
-                          data-menu-id="rc-menu-uuid-test-/028ada2346da00990af63de1191f18cc87c96fc671323ae24df9dd39fc8c0fd2"
+                          data-menu-id="rc-menu-uuid-test-/9449c99785ac015b1ec5af4ac62f9e00fe23fa6c23f3f0d36303c9e840f54ffe"
                           role="menuitem"
                           style="padding-left: 16px;"
                           tabindex="-1"
diff --git a/tests/layout/index.test.tsx b/tests/layout/index.test.tsx
index b14f98bb5426..3563d0647bce 100644
--- a/tests/layout/index.test.tsx
+++ b/tests/layout/index.test.tsx
@@ -101,13 +101,13 @@ describe('BasicLayout', () => {
           },
         ]}
         route={{
-          routes: [
+          children: [
             [
               {
                 path: '/home',
                 name: '首页',
                 locale: 'menu.home',
-                routes: [
+                children: [
                   {
                     path: '/home/overview',
                     name: '概述',
@@ -166,13 +166,13 @@ describe('BasicLayout', () => {
           },
         ]}
         route={{
-          routes: [
+          children: [
             [
               {
                 path: '/home',
                 name: '首页',
                 locale: 'menu.home',
-                routes: [
+                children: [
                   {
                     path: '/home/overview',
                     name: '概述',
@@ -382,13 +382,13 @@ describe('BasicLayout', () => {
     const wrapper = render(
       <ProLayout
         route={{
-          routes: [
+          children: [
             [
               {
                 path: '/home',
                 name: '首页',
                 locale: 'menu.home',
-                routes: [
+                children: [
                   {
                     path: '/home/overview',
                     name: '概述',
@@ -1243,7 +1243,7 @@ describe('BasicLayout', () => {
                 {
                   path: '/admin',
                   name: '管理页',
-                  routes: [
+                  children: [
                     {
                       path: '/admin/sub-page1',
                       name: '一级页面',
@@ -1261,7 +1261,7 @@ describe('BasicLayout', () => {
                 {
                   name: '列表页',
                   path: '/list',
-                  routes: [
+                  children: [
                     {
                       path: '/list/sub-page',
                       name: '一级列表页面',
@@ -1422,6 +1422,7 @@ describe('BasicLayout', () => {
                   collapsed: true,
                   menuName: '域买家维度交易',
                   name: '域买家维度交易',
+                  path: '/xx',
                   children: [
                     {
                       id: 2,
@@ -1563,7 +1564,7 @@ describe('BasicLayout', () => {
           locale: true,
         }}
         route={{
-          routes: [
+          children: [
             {
               name: 'home',
               locale: 'menu.home',
diff --git a/yarn.lock b/yarn.lock
index b7d8d05a3383..5cef22cf6d88 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -28,9 +28,9 @@
     "@ctrl/tinycolor" "^3.4.0"
 
 "@ant-design/cssinjs@^1.0.0", "@ant-design/cssinjs@^1.3.0":
-  version "1.3.2"
-  resolved "https://registry.npmmirror.com/@ant-design/cssinjs/-/cssinjs-1.3.2.tgz#f149bb3b970ec2ad166bc920bd40f4ec172c702a"
-  integrity sha512-WQt7hb+PRM62lyL1VmknaH9C1l9zPjQ2kzB24ZrPX5IXJTUlKZueXYLpg8tmcaj3GAr4eLHy8fDWb0Qxsjp5TQ==
+  version "1.4.0"
+  resolved "https://registry.npmmirror.com/@ant-design/cssinjs/-/cssinjs-1.4.0.tgz#c66aa468322d6fdec7f43c8ebd0f3171630d2711"
+  integrity sha512-siFyX5VyiJWKBQAffI8zE0WZ4OWfI35QnqesbtHaVg49QxHFAcFN9VbJ+Qoos24JxABcxfopEwMWe2joZ2QVBQ==
   dependencies:
     "@babel/runtime" "^7.11.1"
     "@emotion/hash" "^0.8.0"
@@ -129,24 +129,24 @@
     semver "^6.3.0"
 
 "@babel/core@^7.1.0", "@babel/core@^7.12.10", "@babel/core@^7.12.16", "@babel/core@^7.12.17", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.17.9", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0":
-  version "7.20.7"
-  resolved "https://registry.npmmirror.com/@babel/core/-/core-7.20.7.tgz#37072f951bd4d28315445f66e0ec9f6ae0c8c35f"
-  integrity sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw==
+  version "7.20.12"
+  resolved "https://registry.npmmirror.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d"
+  integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.18.6"
     "@babel/generator" "^7.20.7"
     "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-module-transforms" "^7.20.7"
+    "@babel/helper-module-transforms" "^7.20.11"
     "@babel/helpers" "^7.20.7"
     "@babel/parser" "^7.20.7"
     "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.7"
+    "@babel/traverse" "^7.20.12"
     "@babel/types" "^7.20.7"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
+    json5 "^2.2.2"
     semver "^6.3.0"
 
 "@babel/eslint-parser@^7.12.1", "@babel/eslint-parser@^7.12.16":
@@ -194,9 +194,9 @@
     semver "^6.3.0"
 
 "@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.5", "@babel/helper-create-class-features-plugin@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.7.tgz#d0e1f8d7e4ed5dac0389364d9c0c191d948ade6f"
-  integrity sha512-LtoWbDXOaidEf50hmdDqn9g8VEzsorMexoWMQdQODbvmqYmaF23pBP5VNPAGIFHsFQCIeKokDiz3CH5Y2jlY6w==
+  version "7.20.12"
+  resolved "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz#4349b928e79be05ed2d1643b20b99bb87c503819"
+  integrity sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-environment-visitor" "^7.18.9"
@@ -204,6 +204,7 @@
     "@babel/helper-member-expression-to-functions" "^7.20.7"
     "@babel/helper-optimise-call-expression" "^7.18.6"
     "@babel/helper-replace-supers" "^7.20.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/helper-split-export-declaration" "^7.18.6"
 
 "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
@@ -267,7 +268,7 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.18.0", "@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.20.7":
+"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.18.0", "@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11":
   version "7.20.11"
   resolved "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0"
   integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==
@@ -1328,10 +1329,10 @@
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.18.2", "@babel/traverse@^7.18.6", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.2":
-  version "7.20.10"
-  resolved "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.20.10.tgz#2bf98239597fcec12f842756f186a9dde6d09230"
-  integrity sha512-oSf1juCgymrSez8NI4A2sr4+uB/mFd9MXplYGPEBnfAuWmmyeVcHa6xLPiaRBcXkcb/28bgxmQLTVwFKE1yfsg==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.18.2", "@babel/traverse@^7.18.6", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.2":
+  version "7.20.12"
+  resolved "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.20.12.tgz#7f0f787b3a67ca4475adef1f56cb94f6abd4a4b5"
+  integrity sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==
   dependencies:
     "@babel/code-frame" "^7.18.6"
     "@babel/generator" "^7.20.7"
@@ -3320,11 +3321,6 @@
   resolved "https://registry.npmmirror.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
   integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
 
-"@qixian.cs/path-to-regexp@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.npmmirror.com/@qixian.cs/path-to-regexp/-/path-to-regexp-6.1.0.tgz#6b84ad01596332aba95fa29d2e70104698cd5c45"
-  integrity sha512-2jIiLiVZB1jnY7IIRQKtoV8Gnr7XIhk4mC88ONGunZE3hYt5IHUG4BE/6+JiTBjjEWQLBeWnZB8hGpppkufiVw==
-
 "@rc-component/mini-decimal@^1.0.1":
   version "1.0.1"
   resolved "https://registry.npmmirror.com/@rc-component/mini-decimal/-/mini-decimal-1.0.1.tgz#e5dbc20a6a5b0e234d279bc71ce730ab865d3910"
@@ -4599,15 +4595,10 @@
     "@umijs/runtime" "3.5.36"
     react-router-config "5.1.1"
 
-"@umijs/route-utils@^2.1.0":
-  version "2.2.2"
-  resolved "https://registry.npmmirror.com/@umijs/route-utils/-/route-utils-2.2.2.tgz#046934d63480c94e1a136bf77f20c65d663ac27a"
-  integrity sha512-cMk6qizy0pfpiwpVCvNQB0BKBUJEH33pDv5q5k2tSleSDw2abkJkTu2Kd5hKzoESLuFK43oGeOfcplZqm2bRxw==
-  dependencies:
-    "@qixian.cs/path-to-regexp" "^6.1.0"
-    fast-deep-equal "^3.1.3"
-    lodash.isequal "^4.5.0"
-    memoize-one "^5.1.1"
+"@umijs/route-utils@^4.0.0":
+  version "4.0.1"
+  resolved "https://registry.npmmirror.com/@umijs/route-utils/-/route-utils-4.0.1.tgz#156df5b3f2328059722d3ee7dd8f65e18c3cde8b"
+  integrity sha512-+1ixf1BTOLuH+ORb4x8vYMPeIt38n9q0fJDwhv9nSxrV46mxbLF0nmELIo9CKQB2gHfuC4+hww6xejJ6VYnBHQ==
 
 "@umijs/runtime@3.5.36", "@umijs/runtime@^3.5.27":
   version "3.5.36"
@@ -5552,9 +5543,9 @@ aws-lambda@^1.0.7:
     watchpack "^2.0.0-beta.10"
 
 aws-sdk@^2.814.0:
-  version "2.1287.0"
-  resolved "https://registry.npmmirror.com/aws-sdk/-/aws-sdk-2.1287.0.tgz#40296aadf34e7550e058f73f3363130d65ffb1c0"
-  integrity sha512-mtfDstUdFNn8FnBaXs2KAaQ0cgDIiwlqwC2UptUKWWrugjZHAoRacfD/6bnah1Kwhu43F9CDEe5QLHnQtymNkw==
+  version "2.1288.0"
+  resolved "https://registry.npmmirror.com/aws-sdk/-/aws-sdk-2.1288.0.tgz#7c5d90f0c3c942406f204aa72eb75fe715b52ebf"
+  integrity sha512-5ALCke6yp+QP5VEnotLw7tF3ipII2+j7+ZjJg7s5OFgqJ9p0XNOBb6V+0teOTpbQarkfefwOLHj5oir3i6OMsA==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
@@ -6407,9 +6398,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000971, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001400:
-  version "1.0.30001441"
-  resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz#987437b266260b640a23cd18fbddb509d7f69f3e"
-  integrity sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==
+  version "1.0.30001442"
+  resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001442.tgz#40337f1cf3be7c637b061e2f78582dc1daec0614"
+  integrity sha512-239m03Pqy0hwxYPYR5JwOIxRJfLTWtle9FV8zosfV5pHg+/51uD4nxcUlM8+mWWGfwKtt8lJNHnD3cWw9VZ6ow==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -8438,26 +8429,31 @@ error-stack-parser@^2.0.6:
     stackframe "^1.3.4"
 
 es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.20.4:
-  version "1.20.5"
-  resolved "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.20.5.tgz#e6dc99177be37cacda5988e692c3fa8b218e95d2"
-  integrity sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ==
+  version "1.21.0"
+  resolved "https://registry.npmmirror.com/es-abstract/-/es-abstract-1.21.0.tgz#dd1b69ea5bfc3c27199c9753efd4de015102c252"
+  integrity sha512-GUGtW7eXQay0c+PRq0sGIKSdaBorfVqsCMhGHo4elP7YVqZu9nCZS4UkK4gv71gOWNMra/PaSKD3ao1oWExO0g==
   dependencies:
     call-bind "^1.0.2"
+    es-set-tostringtag "^2.0.0"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
     function.prototype.name "^1.1.5"
     get-intrinsic "^1.1.3"
     get-symbol-description "^1.0.0"
+    globalthis "^1.0.3"
     gopd "^1.0.1"
     has "^1.0.3"
     has-property-descriptors "^1.0.0"
+    has-proto "^1.0.1"
     has-symbols "^1.0.3"
-    internal-slot "^1.0.3"
+    internal-slot "^1.0.4"
+    is-array-buffer "^3.0.0"
     is-callable "^1.2.7"
     is-negative-zero "^2.0.2"
     is-regex "^1.1.4"
     is-shared-array-buffer "^1.0.2"
     is-string "^1.0.7"
+    is-typed-array "^1.1.10"
     is-weakref "^1.0.2"
     object-inspect "^1.12.2"
     object-keys "^1.1.1"
@@ -8466,7 +8462,9 @@ es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.20.4:
     safe-regex-test "^1.0.0"
     string.prototype.trimend "^1.0.6"
     string.prototype.trimstart "^1.0.6"
+    typed-array-length "^1.0.4"
     unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.9"
 
 es-array-method-boxes-properly@^1.0.0:
   version "1.0.0"
@@ -8497,6 +8495,14 @@ es-module-lexer@^0.9.0:
   resolved "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
   integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
 
+es-set-tostringtag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmmirror.com/es-set-tostringtag/-/es-set-tostringtag-2.0.0.tgz#b33fdef554fb35a264fe022c1f095f1f2022fa85"
+  integrity sha512-vZVAIWss0FcR/+a08s6e2/GjGjjYBCZJXDrOnj6l5kJCKhQvJs4cnVqUxkVepIhqHbKHm3uwOvPb8lRcqA3DSg==
+  dependencies:
+    get-intrinsic "^1.1.3"
+    has-tostringtag "^1.0.0"
+
 es-shim-unscopables@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmmirror.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
@@ -10151,6 +10157,13 @@ globals@^13.6.0, globals@^13.9.0:
   dependencies:
     type-fest "^0.20.2"
 
+globalthis@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
+  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
+  dependencies:
+    define-properties "^1.1.3"
+
 globby@10.0.0:
   version "10.0.0"
   resolved "https://registry.npmmirror.com/globby/-/globby-10.0.0.tgz#abfcd0630037ae174a88590132c2f6804e291072"
@@ -10413,6 +10426,11 @@ has-property-descriptors@^1.0.0:
   dependencies:
     get-intrinsic "^1.1.1"
 
+has-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
+  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
+
 has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
@@ -11206,7 +11224,7 @@ inquirer@^8.0.0:
     through "^2.3.6"
     wrap-ansi "^7.0.0"
 
-internal-slot@^1.0.3:
+internal-slot@^1.0.3, internal-slot@^1.0.4:
   version "1.0.4"
   resolved "https://registry.npmmirror.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3"
   integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==
@@ -11310,6 +11328,14 @@ is-arguments@^1.0.4, is-arguments@^1.1.0, is-arguments@^1.1.1:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-array-buffer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmmirror.com/is-array-buffer/-/is-array-buffer-3.0.0.tgz#d93aaf24dade5e5391e2992e884c378482f078c1"
+  integrity sha512-TI2hnvT6dPUnn/jARFCJBKL1eeabAfLnKZ2lmW5Uh317s1Ii2IMroL1yMciEk/G+OETykVzlsH6x/L4q/avhgw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -11783,7 +11809,7 @@ is-text-path@^1.0.1:
   dependencies:
     text-extensions "^1.0.0"
 
-is-typed-array@^1.1.10, is-typed-array@^1.1.3:
+is-typed-array@^1.1.10, is-typed-array@^1.1.3, is-typed-array@^1.1.9:
   version "1.1.10"
   resolved "https://registry.npmmirror.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
   integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
@@ -13034,7 +13060,7 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.2.0, json5@^2.2.1:
+json5@^2.1.2, json5@^2.2.0, json5@^2.2.1, json5@^2.2.2:
   version "2.2.3"
   resolved "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -14128,11 +14154,6 @@ memoize-one@*:
   resolved "https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045"
   integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==
 
-memoize-one@^5.1.1:
-  version "5.2.1"
-  resolved "https://registry.npmmirror.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
-  integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
-
 memory-fs@^0.5.0:
   version "0.5.0"
   resolved "https://registry.npmmirror.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
@@ -17669,9 +17690,9 @@ rc-tabs@^11.7.1:
     rc-util "^5.5.0"
 
 rc-tabs@~12.5.1:
-  version "12.5.5"
-  resolved "https://registry.npmmirror.com/rc-tabs/-/rc-tabs-12.5.5.tgz#8b34c2ea58f7d9fe141de252f24e69b26df34221"
-  integrity sha512-Y0k+JK4IN2cr0+MstkYK6MryvURhUc8JvHDCXujbUA6zHVTnWeTikOspGgvHPrlfZRl7WS+DPyMdEFE6RwlueQ==
+  version "12.5.6"
+  resolved "https://registry.npmmirror.com/rc-tabs/-/rc-tabs-12.5.6.tgz#611728575d5f3ef010a8e5e75d2c1b67bb71e86a"
+  integrity sha512-aArXHzxK7YICxe+622CZ8FlO5coMi8P7E6tXpseCPKm1gdTjUt0LrQK1/AxcrRXZXG3K4QqhlKmET0+cX5DQaQ==
   dependencies:
     "@babel/runtime" "^7.11.2"
     classnames "2.x"
@@ -20599,6 +20620,15 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+typed-array-length@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmmirror.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
+  integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    is-typed-array "^1.1.9"
+
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
   resolved "https://registry.npmmirror.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -21642,7 +21672,7 @@ which-module@^2.0.0:
   resolved "https://registry.npmmirror.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
 
-which-typed-array@^1.1.2, which-typed-array@^1.1.8:
+which-typed-array@^1.1.2, which-typed-array@^1.1.8, which-typed-array@^1.1.9:
   version "1.1.9"
   resolved "https://registry.npmmirror.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
   integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==