From ddedca2179f2740affbbd1414bd67fb290784d9a Mon Sep 17 00:00:00 2001
From: bqy_fe <1743369777@qq.com>
Date: Sun, 2 Jan 2022 18:27:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=86=97=E4=BD=99=E7=9A=84=E6=97=A7=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |  10 +-
 README.md                                     |   2 +-
 package.json                                  |  18 ++-
 .../dynamic-table/dynamic-table.vue           |   2 -
 src/components/lockscreen/index.vue           |   5 +-
 src/components/lockscreen/lockscreen.vue      |   3 +-
 src/layout/header/index.vue                   |   5 +-
 src/layout/menu/menu.vue                      |   3 +-
 src/layout/tabs/components.ts                 |  24 ---
 src/layout/tabs/tabs-view.vue                 |  88 ++++-------
 src/router/constant.ts                        |  10 +-
 src/router/generator-router.tsx               |  20 +--
 src/router/index.ts                           |  11 +-
 src/router/outsideLayout.ts                   |  16 ++
 src/router/router-guards.ts                   |  11 +-
 src/router/staticModules/besidesLayout.ts     |  75 +++++----
 src/router/staticModules/error.ts             |  11 +-
 src/store/modules/tabsView.ts                 |  42 ++++-
 src/utils/request.ts                          |   8 +-
 src/views/shared/redirect/index.vue           |  22 ---
 tsconfig.json                                 |   3 +-
 types/shims/shims-vue.d.ts                    |   8 +-
 types/vue-router.d.ts                         |   4 +
 vue.config.js                                 |  16 +-
 yarn.lock                                     | 147 +++++-------------
 25 files changed, 254 insertions(+), 310 deletions(-)
 delete mode 100644 src/layout/tabs/components.ts
 create mode 100644 src/router/outsideLayout.ts
 delete mode 100644 src/views/shared/redirect/index.vue

diff --git a/.env.production b/.env.production
index ed85a0735..f529d6fd4 100644
--- a/.env.production
+++ b/.env.production
@@ -1,14 +1,14 @@
 # 只在生产模式中被载入
 ENV = 'production'
 
-# base api
-VUE_APP_BASE_API = 'http://buqiyuan.site:7001/admin/'
-VUE_APP_BASE_SOCKET_PATH = '/ws-api'
-VUE_APP_BASE_SOCKET_NSP = 'ws://buqiyuan.site:7002/admin'
-
 # 网站前缀
 BASE_URL = /vue3-antd-admin/
 
+# base api
+VUE_APP_BASE_API = 'https://nest-api.buqiyuan.site/api/admin/'
+VUE_APP_BASE_SOCKET_PATH = '/ws-api'
+VUE_APP_BASE_SOCKET_NSP = 'wss://nest-api.buqiyuan.site/admin'
+
 # mock api
 VUE_APP_MOCK_API = '/mock-api/'
 
diff --git a/README.md b/README.md
index f514c732a..9ad8d7ff1 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 - 账号：rootadmin，密码：123456
 - [在线预览](http://buqiyuan.gitee.io/vue3-antd-admin/)
-- [swagger 文档](http://buqiyuan.site:7001/swagger-api/static/index.html#/)
+- [swagger 文档](https://nest-api.buqiyuan.site/swagger-api/static/index.html)
 - [后台地址](https://github.com/buqiyuan/nest-admin)
 - [react 版 coding](https://github.com/buqiyuan/react-antd-admin)
 - [vite 版](https://github.com/buqiyuan/vite-vue3-admin)
diff --git a/package.json b/package.json
index a7600b572..cfebc7320 100644
--- a/package.json
+++ b/package.json
@@ -6,21 +6,24 @@
     "dev": "npm run serve",
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
+    "build:test": "vue-cli-service build --mode test",
+    "build:preview": "npm run build && npx serve -s dist",
+    "build:prod": "vue-cli-service build --mode production",
     "lint": "vue-cli-service lint",
-    "deploy": "gh-pages -d dist",
+    "deploy": "npm run build && npx gh-pages -d dist",
     "lint:eslint": "eslint --cache --max-warnings 0 \"{src,mock}/**/*.{vue,ts,tsx}\" --fix",
     "lint:lint-staged": "lint-staged",
     "lint:prettier": "prettier --write  \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"",
     "lint:stylelint": "stylelint --cache --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
     "prepare": "husky install",
-    "test prod cors": "http-server dist --cors --gzip -P http://29135jo738.zicp.vip",
-    "test prod gzip": "http-server dist --cors --gzip -c-1"
+    "test prod cors": "npx http-server dist --cors --gzip -P http://29135jo738.zicp.vip",
+    "test prod gzip": "npx http-server dist --cors --gzip -c-1"
   },
   "dependencies": {
-    "@vueuse/core": "^7.4.3",
+    "@vueuse/core": "^7.5.1",
     "ant-design-vue": "3.0.0-beta.4",
     "axios": "^0.24.0",
-    "core-js": "^3.20.1",
+    "core-js": "^3.20.2",
     "dayjs": "^1.10.7",
     "lodash": "^4.17.21",
     "mitt": "^3.0.0",
@@ -37,7 +40,7 @@
     "@commitlint/cli": "^16.0.1",
     "@commitlint/config-conventional": "^16.0.0",
     "@types/lodash": "^4.14.178",
-    "@types/node": "^17.0.5",
+    "@types/node": "^17.0.6",
     "@types/webpack-env": "^1.16.3",
     "@typescript-eslint/eslint-plugin": "^5.8.1",
     "@typescript-eslint/parser": "^5.8.1",
@@ -53,11 +56,10 @@
     "babel-plugin-lodash": "^3.3.4",
     "commitizen": "^4.2.4",
     "compression-webpack-plugin": "^9.2.0",
-    "eslint": "^8.5.0",
+    "eslint": "^8.6.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-vue": "^8.2.0",
-    "gh-pages": "^3.2.3",
     "husky": "^7.0.4",
     "less": "^4.1.2",
     "less-loader": "10.2.0",
diff --git a/src/components/dynamic-table/dynamic-table.vue b/src/components/dynamic-table/dynamic-table.vue
index 7bb1403a6..c3ca236b0 100644
--- a/src/components/dynamic-table/dynamic-table.vue
+++ b/src/components/dynamic-table/dynamic-table.vue
@@ -96,8 +96,6 @@
 
       const innerPropsRef = ref<Partial<TableProps>>();
 
-      console.log('slots', slots);
-
       const getProps = computed(() => {
         return { ...props, ...unref(innerPropsRef) };
       });
diff --git a/src/components/lockscreen/index.vue b/src/components/lockscreen/index.vue
index 39b6a0021..90d071903 100644
--- a/src/components/lockscreen/index.vue
+++ b/src/components/lockscreen/index.vue
@@ -1,6 +1,6 @@
 <template>
   <transition name="slide-up">
-    <LockScreen v-if="isLock && isMouted && $route.name != 'login'" />
+    <LockScreen v-if="isLock && isMouted && $route.name != LOGIN_NAME" />
   </transition>
 </template>
 
@@ -9,6 +9,7 @@
   import { computed, ref, onMounted, onUnmounted } from 'vue';
   import { useRoute } from 'vue-router';
   import { useLockscreenStore } from '@/store/modules/lockscreen';
+  import { LOGIN_NAME } from '@/router/constant';
 
   const lockscreenStore = useLockscreenStore();
   const route = useRoute();
@@ -20,7 +21,7 @@
 
   const timekeeping = () => {
     clearInterval(timer);
-    if (route.name == 'login' || isLock.value) return;
+    if (route.name === LOGIN_NAME || isLock.value) return;
     // 设置不锁屏
     lockscreenStore.setLock(false);
     // 重置锁屏时间
diff --git a/src/components/lockscreen/lockscreen.vue b/src/components/lockscreen/lockscreen.vue
index ac947115e..eb5702c69 100644
--- a/src/components/lockscreen/lockscreen.vue
+++ b/src/components/lockscreen/lockscreen.vue
@@ -85,6 +85,7 @@
   import { useBattery } from '@/hooks/useBattery';
   import { useLockscreenStore } from '@/store/modules/lockscreen';
   import { useUserStore } from '@/store/modules/user';
+  import { LOGIN_NAME } from '@/router/constant';
 
   const lockscreenStore = useLockscreenStore();
   const userStore = useUserStore();
@@ -137,7 +138,7 @@
     unLockLogin(false);
     lockscreenStore.setLock(false);
     router.replace({
-      path: '/login',
+      name: LOGIN_NAME,
       query: {
         redirect: route.fullPath,
       },
diff --git a/src/layout/header/index.vue b/src/layout/header/index.vue
index 9aa84f18d..dbe088e0e 100644
--- a/src/layout/header/index.vue
+++ b/src/layout/header/index.vue
@@ -12,7 +12,7 @@
               <Menu :selectedKeys="[menus[rotueIndex + 1]?.name]">
                 <template v-for="childItem in routeItem?.children" :key="childItem.name">
                   <Menu.Item
-                    v-if="!childItem.meta?.hideInMenu"
+                    v-if="!childItem.meta?.hideInMenu && !childItem.meta?.hideInBreadcrumb"
                     :key="childItem.name"
                     @click="clickMenuItem(childItem)"
                   >
@@ -83,6 +83,7 @@
   import { SearchModal } from './components';
   import { useUserStore } from '@/store/modules/user';
   import { useLockscreenStore } from '@/store/modules/lockscreen';
+  import { LOGIN_NAME } from '@/router/constant';
 
   defineProps({
     collapsed: {
@@ -172,7 +173,7 @@
         // 移除标签页
         localStorage.clear();
         router.replace({
-          name: 'login',
+          name: LOGIN_NAME,
           query: {
             redirect: route.fullPath,
           },
diff --git a/src/layout/menu/menu.vue b/src/layout/menu/menu.vue
index e29596387..6737eaa80 100644
--- a/src/layout/menu/menu.vue
+++ b/src/layout/menu/menu.vue
@@ -21,6 +21,7 @@
   import MenuItem from './menu-item.vue';
   import { useUserStore } from '@/store/modules/user';
   import { useRoute, useRouter } from 'vue-router';
+  import { LOGIN_NAME } from '@/router/constant';
 
   const props = defineProps({
     collapsed: {
@@ -68,7 +69,7 @@
   watch(
     () => currentRoute.fullPath,
     () => {
-      if (currentRoute.name == 'login' || props.collapsed) return;
+      if (currentRoute.name === LOGIN_NAME || props.collapsed) return;
       state.openKeys = getOpenKeys();
       const meta = currentRoute.meta;
       if (meta?.activeMenu) {
diff --git a/src/layout/tabs/components.ts b/src/layout/tabs/components.ts
deleted file mode 100644
index 345c96375..000000000
--- a/src/layout/tabs/components.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import {
-  DownOutlined,
-  ReloadOutlined,
-  CloseOutlined,
-  VerticalRightOutlined,
-  VerticalLeftOutlined,
-  ColumnWidthOutlined,
-  MinusOutlined,
-} from '@ant-design/icons-vue';
-import { Dropdown, Tabs, Card } from 'ant-design-vue';
-
-export default {
-  [Tabs.name]: Tabs,
-  [Tabs.TabPane.name]: Tabs.TabPane,
-  [Dropdown.name]: Dropdown,
-  [Card.name]: Card,
-  MinusOutlined,
-  DownOutlined,
-  ReloadOutlined,
-  CloseOutlined,
-  VerticalRightOutlined,
-  VerticalLeftOutlined,
-  ColumnWidthOutlined,
-};
diff --git a/src/layout/tabs/tabs-view.vue b/src/layout/tabs/tabs-view.vue
index de0fbce6c..4b73571de 100644
--- a/src/layout/tabs/tabs-view.vue
+++ b/src/layout/tabs/tabs-view.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="tabs-view">
     <Tabs
-      v-model:activeKey="state.activeKey"
+      :active-key="activeKey"
       hide-add
       type="editable-card"
       class="tabs"
@@ -16,11 +16,7 @@
             </div>
             <template #overlay>
               <Menu style="user-select: none">
-                <Menu.Item
-                  key="1"
-                  :disabled="state.activeKey !== pageItem.fullPath"
-                  @click="reloadPage"
-                >
+                <Menu.Item key="1" :disabled="activeKey !== pageItem.fullPath" @click="reloadPage">
                   <reload-outlined />
                   刷新
                 </Menu.Item>
@@ -59,7 +55,7 @@
           </a>
           <template #overlay>
             <Menu style="user-select: none">
-              <Menu.Item key="1" :disabled="state.activeKey !== route.fullPath" @click="reloadPage">
+              <Menu.Item key="1" :disabled="activeKey !== route.fullPath" @click="reloadPage">
                 <reload-outlined />
                 刷新
               </Menu.Item>
@@ -86,12 +82,7 @@
         <template v-if="Component">
           <transition name="fade-transform" mode="out-in" appear>
             <keep-alive :include="keepAliveComponents">
-              <suspense>
-                <component :is="Component" :key="route.fullPath" />
-                <template #fallback>
-                  <div> Loading... </div>
-                </template>
-              </suspense>
+              <component :is="Component" :key="route.fullPath" />
             </keep-alive>
           </transition>
         </template>
@@ -101,11 +92,11 @@
 </template>
 
 <script setup lang="ts">
-  import { reactive, computed, unref, provide, watch } from 'vue';
+  import { computed, unref, watch } from 'vue';
   import { useRoute, useRouter, RouteLocation } from 'vue-router';
   import { Storage } from '@/utils/Storage';
   import { TABS_ROUTES } from '@/enums/cacheEnum';
-  import { useTabsViewStore } from '@/store/modules/tabsView';
+  import { useTabsViewStore, blackList } from '@/store/modules/tabsView';
   import { useKeepAliveStore } from '@/store/modules/keepAlive';
   import {
     DownOutlined,
@@ -117,6 +108,7 @@
     MinusOutlined,
   } from '@ant-design/icons-vue';
   import { Dropdown, Tabs, message, Menu } from 'ant-design-vue';
+  import { REDIRECT_NAME } from '@/router/constant';
 
   type RouteItem = Omit<RouteLocation, 'matched' | 'redirectedFrom'>;
 
@@ -125,14 +117,10 @@
   const tabsViewStore = useTabsViewStore();
   const keepAliveStore = useKeepAliveStore();
 
-  const whiteList = ['Redirect', 'login'];
-
-  const state = reactive({
-    activeKey: route.fullPath,
-  });
+  const activeKey = computed(() => route.fullPath);
 
   // 标签页列表
-  const tabsList = computed(() => tabsViewStore.tabsList.filter((n) => router.hasRoute(n.name!)));
+  const tabsList = computed(() => tabsViewStore.getTabsList);
 
   // 缓存的路由组件列表
   const keepAliveComponents = computed(() => keepAliveStore.list);
@@ -154,10 +142,11 @@
 
   // 初始化标签页
   tabsViewStore.initTabs(routes);
+
   // tabsViewMutations.initTabs(routes)
 
-  // 移除缓存组件名称
-  const delKeepAliveCompName = () => {
+  // 将当前组件从keep-alive缓存中移除
+  const delCurrCompFromKeepAlive = () => {
     if (route.meta.keepAlive) {
       const name = router.currentRoute.value.matched.find((item) => item.name == route.name)
         ?.components?.default.name;
@@ -170,27 +159,7 @@
   watch(
     () => route.fullPath,
     () => {
-      // 不存在的路由
-      const notFondRoutes: string[] = [];
-      tabsList.value.forEach((item) => {
-        if (item.name && !router.hasRoute(item.name)) {
-          notFondRoutes.push(item.name as string);
-        }
-      });
-      // 过滤不存在的路由
-      if (notFondRoutes.length) {
-        tabsViewStore.initTabs(
-          tabsList.value.filter((item) => !notFondRoutes.includes(item.name as string)),
-        );
-      }
-    },
-  );
-
-  watch(
-    () => route.fullPath,
-    (to) => {
-      if (whiteList.includes(route.name as string)) return;
-      state.activeKey = to;
+      if (blackList.some((n) => n === route.name)) return;
       // tabsViewMutations.addTabs(getSimpleRoute(route))
       tabsViewStore.addTabs(getSimpleRoute(route));
     },
@@ -202,18 +171,22 @@
     Storage.set(TABS_ROUTES, JSON.stringify(tabsList.value));
   });
 
+  // 目标路由是否等于当前路由
+  const isCurrentRoute = (route) => {
+    return router.currentRoute.value.matched.some((item) => item.name === route.name);
+  };
+
   // 关闭当前页面
   const removeTab = (route) => {
     if (tabsList.value.length === 1) {
       return message.warning('这已经是最后一页，不能再关闭了！');
     }
-    delKeepAliveCompName();
+    delCurrCompFromKeepAlive();
     // tabsViewMutations.closeCurrentTabs(route)
     tabsViewStore.closeCurrentTab(route);
     // 如果关闭的是当前页
-    if (state.activeKey === route.fullPath) {
+    if (activeKey.value === route.fullPath) {
       const currentRoute = tabsList.value[Math.max(0, tabsList.value.length - 1)];
-      state.activeKey = currentRoute.fullPath;
       router.push(currentRoute);
     }
   };
@@ -225,42 +198,39 @@
   };
   // 切换页面
   const changePage = (key) => {
-    state.activeKey = key;
     router.push(key);
   };
 
   // 刷新页面
   const reloadPage = () => {
-    delKeepAliveCompName();
-    router.push({
-      path: '/redirect' + unref(route).fullPath,
+    delCurrCompFromKeepAlive();
+    router.replace({
+      name: REDIRECT_NAME,
+      params: {
+        path: unref(route).fullPath,
+      },
     });
   };
-  // 注入刷新页面方法
-  provide('reloadPage', reloadPage);
 
   // 关闭左侧
   const closeLeft = (route) => {
     // tabsViewMutations.closeLeftTabs(route)
     tabsViewStore.closeLeftTabs(route);
-    state.activeKey = route.fullPath;
-    router.replace(route.fullPath);
+    !isCurrentRoute(route) && router.replace(route.fullPath);
   };
 
   // 关闭右侧
   const closeRight = (route) => {
     // tabsViewMutations.closeRightTabs(route)
     tabsViewStore.closeRightTabs(route);
-    state.activeKey = route.fullPath;
-    router.replace(route.fullPath);
+    !isCurrentRoute(route) && router.replace(route.fullPath);
   };
 
   // 关闭其他
   const closeOther = (route) => {
     // tabsViewMutations.closeOtherTabs(route)
     tabsViewStore.closeOtherTabs(route);
-    state.activeKey = route.fullPath;
-    router.replace(route.fullPath);
+    !isCurrentRoute(route) && router.replace(route.fullPath);
   };
 
   // 关闭全部
diff --git a/src/router/constant.ts b/src/router/constant.ts
index da200ade4..916c7884b 100644
--- a/src/router/constant.ts
+++ b/src/router/constant.ts
@@ -1,5 +1,13 @@
+export const LOGIN_NAME = 'Login';
+
+export const REDIRECT_NAME = 'Redirect';
+
+export const PARENT_LAYOUT_NAME = 'ParentLayout';
+
+export const PAGE_NOT_FOUND_NAME = 'PageNotFound';
+
 // 路由白名单
-export const whiteNameList = ['login', 'icons', 'error', 'error-404'] as const; // no redirect whitelist
+export const whiteNameList = [LOGIN_NAME, 'icons', 'error', 'error-404'] as const; // no redirect whitelist
 
 export type WhiteNameList = typeof whiteNameList;
 
diff --git a/src/router/generator-router.tsx b/src/router/generator-router.tsx
index 69912aef1..ca782ec32 100644
--- a/src/router/generator-router.tsx
+++ b/src/router/generator-router.tsx
@@ -7,12 +7,13 @@ import { constantRouterComponents } from '@/router/asyncModules';
 import NotFound from '@/views/shared/error/404.vue';
 import router, { routes } from '.';
 import common from '@/router/staticModules';
-import { notFound, errorRoutes } from './staticModules/error';
-import shared from './staticModules/besidesLayout';
+import { notFound, errorRoute } from './staticModules/error';
+import { REDIRECT_ROUTE } from './staticModules/besidesLayout';
 import { type PermissionType } from '@/core/permission/modules/types';
+import outsideLayout from './outsideLayout';
 
 // 需要放在所有路由之后的路由
-const endRoutes: RouteRecordRaw[] = [...shared, errorRoutes, notFound];
+const endRoutes: RouteRecordRaw[] = [REDIRECT_ROUTE, errorRoute, notFound];
 
 export function filterAsyncRoute(
   routes: API.Menu[],
@@ -103,19 +104,20 @@ export const generatorDynamicRouter = (asyncMenus: API.Menu[]) => {
     // console.log(routeList, '根据后端返回的权限路由生成');
     // 给公共路由添加namePath
     generatorNamePath(common);
-    const menus = [...common, ...routeList];
+    const menus = [...common, ...routeList, ...endRoutes];
     layout.children = menus;
     const removeRoute = router.addRoute(layout);
     // 获取所有没有包含children的路由，上面addRoute的时候，vue-router已经帮我们拍平了所有路由
-    const filterRoutes = router.getRoutes().filter((item) => !item.children.length);
+    const filterRoutes = router
+      .getRoutes()
+      .filter((item) => !item.children.length && !outsideLayout.some((n) => n.name === item.name));
     // 清空所有路由
     removeRoute();
-    layout.children = filterRoutes;
+    layout.children = [...filterRoutes];
     // 重新添加拍平后的路由
     router.addRoute(layout);
-    // 追加末尾路由
-    endRoutes.forEach((item) => router.addRoute(item));
-    // console.log('所有路由', router.getRoutes());
+
+    console.log('所有路由', filterRoutes);
     return {
       menus: menus,
       routes: layout.children,
diff --git a/src/router/index.ts b/src/router/index.ts
index ecec7ffab..8bf1f7da6 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,11 +1,11 @@
 import 'nprogress/css/nprogress.css'; // 进度条样式
-import { App } from 'vue';
+import { type App } from 'vue';
 import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router';
 
 import { createRouterGuards } from './router-guards';
 
-import common from '@/router/staticModules';
-import shared from './staticModules/besidesLayout';
+import staticModules from './staticModules/';
+import outsideLayout from './outsideLayout';
 import { whiteNameList } from './constant';
 
 export const routes: Array<RouteRecordRaw> = [
@@ -17,9 +17,10 @@ export const routes: Array<RouteRecordRaw> = [
     meta: {
       title: '首页',
     },
-    children: [...common],
+    children: [...staticModules],
   },
-  ...shared,
+  // Layout之外的路由
+  ...outsideLayout,
 ];
 
 export const router = createRouter({
diff --git a/src/router/outsideLayout.ts b/src/router/outsideLayout.ts
new file mode 100644
index 000000000..f9845a507
--- /dev/null
+++ b/src/router/outsideLayout.ts
@@ -0,0 +1,16 @@
+import { type RouteRecordRaw } from 'vue-router';
+import { LOGIN_NAME } from '@/router/constant';
+
+/**
+ * layout布局之外的路由
+ */
+export const LoginRoute: RouteRecordRaw = {
+  path: '/login',
+  name: LOGIN_NAME,
+  component: () => import(/* webpackChunkName: "login" */ '@/views/shared/login/index.vue'),
+  meta: {
+    title: '登录',
+  },
+};
+
+export default [LoginRoute];
diff --git a/src/router/router-guards.ts b/src/router/router-guards.ts
index e1997f477..fb6af6171 100644
--- a/src/router/router-guards.ts
+++ b/src/router/router-guards.ts
@@ -4,21 +4,20 @@ import { useKeepAliveStore } from '@/store/modules/keepAlive';
 import NProgress from 'nprogress'; // progress bar
 import { ACCESS_TOKEN_KEY } from '@/enums/cacheEnum';
 import { Storage } from '@/utils/Storage';
-import { type WhiteNameList } from './constant';
+import { type WhiteNameList, LOGIN_NAME, REDIRECT_NAME } from './constant';
 
 NProgress.configure({ showSpinner: false }); // NProgress Configuration
 
-const loginRoutePath = '/login';
 const defaultRoutePath = '/dashboard/welcome';
 
 export function createRouterGuards(router: Router, whiteNameList: WhiteNameList) {
   router.beforeEach(async (to, from, next) => {
     const userStore = useUserStore();
     NProgress.start(); // start progress bar
-    const token = Storage.get(ACCESS_TOKEN_KEY);
+    const token = Storage.get(ACCESS_TOKEN_KEY, null);
 
     if (token) {
-      if (to.name === 'login') {
+      if (to.name === LOGIN_NAME) {
         next({ path: defaultRoutePath });
         NProgress.done();
       } else {
@@ -52,7 +51,7 @@ export function createRouterGuards(router: Router, whiteNameList: WhiteNameList)
         // 在免登录名单，直接进入
         next();
       } else {
-        next({ path: loginRoutePath, query: { redirect: to.fullPath }, replace: true });
+        next({ name: LOGIN_NAME, query: { redirect: to.fullPath }, replace: true });
         NProgress.done(); // if current page is login will not trigger afterEach hook, so manually handle it
       }
     }
@@ -84,7 +83,7 @@ export function createRouterGuards(router: Router, whiteNameList: WhiteNameList)
       }
     }
     // 如果进入的是 Redirect 页面，则也将离开页面的缓存清空
-    if (to.name == 'Redirect') {
+    if (to.name == REDIRECT_NAME) {
       componentName && keepAliveStore.remove(componentName);
     }
     NProgress.done(); // finish progress bar
diff --git a/src/router/staticModules/besidesLayout.ts b/src/router/staticModules/besidesLayout.ts
index c23ddcc07..82a4494b6 100644
--- a/src/router/staticModules/besidesLayout.ts
+++ b/src/router/staticModules/besidesLayout.ts
@@ -1,37 +1,52 @@
-import { type RouteRecordRaw } from 'vue-router';
 import RouterView from '@/layout/routerView/index.vue';
+import { type RouteRecordRaw } from 'vue-router';
+import { REDIRECT_NAME } from '@/router/constant';
+import router from '@/router';
 
 /**
- * 不需要展示在Layout里面的静态路由
+ * 主要用于刷新当前页面
  */
-const routes: Array<RouteRecordRaw> = [
-  {
-    path: '/login',
-    name: 'login',
-    component: () => import(/* webpackChunkName: "login" */ '@/views/shared/login/index.vue'),
+export const REDIRECT_ROUTE: RouteRecordRaw = {
+  path: '/redirect',
+  component: RouterView,
+  name: 'RedirectTo',
+  meta: {
+    title: REDIRECT_NAME,
+    hideInBreadcrumb: true,
+    hideInMenu: true,
   },
-  {
-    path: '/redirect/:path*',
-    name: 'Redirect',
-    component: RouterView,
-    meta: {
-      title: '重定向',
-      icon: 'SettingOutlined',
-      hideInMenu: true,
-    },
-    children: [
-      {
-        path: '',
-        name: 'Redirect',
-        component: () => import('@/views/shared/redirect/index.vue'),
-        meta: {
-          title: '重定向',
-          hideInMenu: true,
-          keepAlive: false,
-        },
+  children: [
+    {
+      path: '/redirect/:path(.*)',
+      name: REDIRECT_NAME,
+      component: RouterView,
+      meta: {
+        title: REDIRECT_NAME,
       },
-    ],
-  },
-];
+      beforeEnter: (to) => {
+        const { params, query } = to;
+        const { path, _redirect_type = 'path' } = params;
 
-export default routes;
+        Reflect.deleteProperty(params, '_redirect_type');
+        Reflect.deleteProperty(params, 'path');
+
+        const _path = Array.isArray(path) ? path.join('/') : path;
+        setTimeout(() => {
+          if (_redirect_type === 'name') {
+            router.replace({
+              name: _path,
+              query,
+              params,
+            });
+          } else {
+            router.replace({
+              path: _path.startsWith('/') ? _path : '/' + _path,
+              query,
+            });
+          }
+        });
+        return true;
+      },
+    },
+  ],
+};
diff --git a/src/router/staticModules/error.ts b/src/router/staticModules/error.ts
index d858a9e40..0b0fb4fb5 100644
--- a/src/router/staticModules/error.ts
+++ b/src/router/staticModules/error.ts
@@ -1,15 +1,17 @@
+import { type RouteRecordRaw } from 'vue-router';
+import { PAGE_NOT_FOUND_NAME } from '@/router/constant';
 import RouterView from '@/layout/routerView/index.vue';
 
 const moduleName = 'error';
 
-export const notFound = {
+export const notFound: RouteRecordRaw = {
   path: '/:pathMatch(.*)*',
   name: 'NotFound',
   redirect: '/error/404',
   component: () => import(/* webpackChunkName: "404" */ '@/views/shared/error/404.vue'),
 };
 
-export const errorRoutes = {
+export const errorRoute: RouteRecordRaw = {
   path: '/error',
   name: moduleName,
   redirect: '/error/404',
@@ -18,11 +20,12 @@ export const errorRoutes = {
     title: '错误页',
     icon: 'EditOutlined',
     hideInMenu: true,
+    hideInTabs: true,
   },
   children: [
     {
       path: '404',
-      name: `${moduleName}-404`,
+      name: PAGE_NOT_FOUND_NAME,
       meta: {
         title: '404',
         icon: 'UserOutlined',
@@ -32,4 +35,4 @@ export const errorRoutes = {
   ],
 };
 
-export default [notFound, errorRoutes];
+export default [errorRoute, notFound];
diff --git a/src/store/modules/tabsView.ts b/src/store/modules/tabsView.ts
index c1a6d186e..e322b1a2a 100644
--- a/src/store/modules/tabsView.ts
+++ b/src/store/modules/tabsView.ts
@@ -2,6 +2,8 @@ import { type RouteLocationNormalized } from 'vue-router';
 import { defineStore } from 'pinia';
 import { TABS_ROUTES } from '@/enums/cacheEnum';
 import router from '@/router';
+import { useKeepAliveStore } from './keepAlive';
+import { LOGIN_NAME, REDIRECT_NAME, PAGE_NOT_FOUND_NAME } from '@/router/constant';
 
 interface TabsViewState {
   /** 标签页 */
@@ -9,21 +11,41 @@ interface TabsViewState {
 }
 
 // 不需要出现在标签页中的路由
-const whiteList = ['Redirect', 'login', '404'] as const;
+export const blackList = [REDIRECT_NAME, LOGIN_NAME, PAGE_NOT_FOUND_NAME] as const;
 
 export const useTabsViewStore = defineStore({
   id: 'tabs-view',
   state: (): TabsViewState => ({
     tabsList: [],
   }),
+  getters: {
+    getTabsList: (state) => {
+      return state.tabsList.filter((item) => {
+        return !item.meta?.hideInTabs && router.hasRoute(item.name!);
+      });
+    },
+  },
   actions: {
-    // 初始化标签页
+    /** 将已关闭的标签页的组件从keep-alive中移除 */
+    delCompFormClosedTabs(closedTabs: RouteLocationNormalized[]) {
+      const keepAliveStore = useKeepAliveStore();
+      const routes = router.getRoutes();
+      const compNames = closedTabs.reduce<string[]>((prev, curr) => {
+        if (curr.name && router.hasRoute(curr.name)) {
+          const componentName = routes.find((n) => n.name === curr.name)?.components?.default?.name;
+          componentName && prev.push(componentName);
+        }
+        return prev;
+      }, []);
+      keepAliveStore.remove(compNames);
+    },
+    /** 初始化标签页 */
     initTabs(routes) {
       this.tabsList = routes;
     },
     /** 添加标签页 */
     addTabs(route): boolean {
-      if (whiteList.includes(route.name)) return false;
+      if (blackList.includes(route.name)) return false;
       const isExists = this.tabsList.some((item) => item.fullPath == route.fullPath);
       if (!isExists) {
         this.tabsList.push(route);
@@ -33,24 +55,30 @@ export const useTabsViewStore = defineStore({
     /** 关闭左侧 */
     closeLeftTabs(route) {
       const index = this.tabsList.findIndex((item) => item.fullPath == route.fullPath);
-      this.tabsList.splice(0, index);
+      this.delCompFormClosedTabs(this.tabsList.splice(0, index));
     },
     /** 关闭右侧 */
     closeRightTabs(route) {
       const index = this.tabsList.findIndex((item) => item.fullPath == route.fullPath);
-      this.tabsList.splice(index + 1);
+      this.delCompFormClosedTabs(this.tabsList.splice(index + 1));
     },
     /** 关闭其他 */
     closeOtherTabs(route) {
-      this.tabsList = this.tabsList.filter((item) => item.fullPath == route.fullPath);
+      const targetIndex = this.tabsList.findIndex((item) => item.fullPath === route.fullPath);
+      if (targetIndex !== -1) {
+        const current = this.tabsList.splice(targetIndex, 1);
+        this.delCompFormClosedTabs(this.tabsList);
+        this.tabsList = current;
+      }
     },
     /** 关闭当前页 */
     closeCurrentTab(route) {
       const index = this.tabsList.findIndex((item) => item.fullPath == route.fullPath);
-      this.tabsList.splice(index, 1);
+      this.delCompFormClosedTabs(this.tabsList.splice(index, 1));
     },
     /** 关闭全部 */
     closeAllTabs() {
+      this.delCompFormClosedTabs(this.tabsList);
       this.tabsList = [];
       localStorage.removeItem(TABS_ROUTES);
     },
diff --git a/src/utils/request.ts b/src/utils/request.ts
index de85a316d..46952118f 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -19,7 +19,8 @@ export interface RequestOptions {
 }
 
 const UNKNOWN_ERROR = '未知错误，请重试';
-
+// 是否生产环境
+// const IS_PROD = ['production', 'prod'].includes(process.env.NODE_ENV);
 /** 真实请求的路径前缀 */
 const baseApiUrl = process.env.VUE_APP_BASE_API;
 /** mock请求路径前缀 */
@@ -112,7 +113,10 @@ export const request = async <T = any>(
     }
     const fullUrl = `${(isMock ? baseMockUrl : baseApiUrl) + config.url}`;
     config.url = fullUrl.replace(/(?<!:)\/{2,}/g, '/');
-
+    // if (IS_PROD) {
+    //   // 保持api请求的协议与当前访问的站点协议一致
+    //   config.url.replace(/^https?:/g, location.protocol);
+    // }
     const res = await service.request(config);
     successMsg && $message.success(successMsg);
     errorMsg && $message.error(errorMsg);
diff --git a/src/views/shared/redirect/index.vue b/src/views/shared/redirect/index.vue
deleted file mode 100644
index 69f4f34fd..000000000
--- a/src/views/shared/redirect/index.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<script lang="tsx">
-  import { defineComponent, onBeforeMount } from 'vue';
-  import { useRoute, useRouter } from 'vue-router';
-  import { Empty } from 'ant-design-vue';
-
-  export default defineComponent({
-    name: 'RedirectComp',
-    setup() {
-      const route = useRoute();
-      const router = useRouter();
-      onBeforeMount(() => {
-        const { params, query } = route;
-        const { path } = params;
-        router.replace({
-          path: '/' + (Array.isArray(path) ? path.join('/') : path),
-          query,
-        });
-      });
-      return () => <Empty />;
-    },
-  });
-</script>
diff --git a/tsconfig.json b/tsconfig.json
index 20404fc11..6ae5b5734 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -47,6 +47,7 @@
   ],
   "exclude": [
     "node_modules",
-    "dist"
+    "dist",
+    "**/*.js"
   ]
 }
\ No newline at end of file
diff --git a/types/shims/shims-vue.d.ts b/types/shims/shims-vue.d.ts
index a1dfabb4c..3620f5add 100644
--- a/types/shims/shims-vue.d.ts
+++ b/types/shims/shims-vue.d.ts
@@ -1,11 +1,9 @@
 import type { PermissionType } from '@/core/permission/modules/types';
-
 declare module '*.vue' {
-  import { defineComponent } from 'vue';
-  const component: ReturnType<typeof defineComponent>;
-  export default component;
+  import { DefineComponent } from 'vue';
+  const Component: DefineComponent<{}, {}, any>;
+  export default Component;
 }
-
 // declare module '*.vue' {
 //     import * as vue from 'vue';
 //     export declare const render: vue.RootRenderFunction<Element | DocumentFragment>
diff --git a/types/vue-router.d.ts b/types/vue-router.d.ts
index 509cd75f7..8a6f2c6ed 100644
--- a/types/vue-router.d.ts
+++ b/types/vue-router.d.ts
@@ -27,6 +27,10 @@ declare module 'vue-router' {
     transitionName?: string;
     /** 不在菜单中显示 */
     hideInMenu?: boolean;
+    /** 不在面包屑导航中显示 */
+    hideInBreadcrumb?: boolean;
+    /** 不在tab标签页中显示 */
+    hideInTabs?: boolean;
     /** 设置当前路由高亮的菜单项，值为route fullPath或route name,一般用于详情页 */
     activeMenu?: string;
     isLink?: boolean;
diff --git a/vue.config.js b/vue.config.js
index e2e355dcd..9678291ee 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -108,8 +108,8 @@ module.exports = defineConfig({
             priority: 10,
             chunks: 'initial', // only package third parties that are initially dependent
           },
-          elementUI: {
-            name: 'chunk-elementUI', // split elementUI into a single package
+          antdv: {
+            name: 'chunk-ant-design-vue', // split ant-design-vue into a single package
             priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
             test: /[\\/]node_modules[\\/]_?ant-design-vue(.*)/, // in order to adapt to cnpm
           },
@@ -156,6 +156,9 @@ module.exports = defineConfig({
   },
   devServer: {
     port: port,
+    client: {
+      progress: true,
+    },
     proxy: {
       // '/mock-api': {
       //   target: `http://localhost:${port}`,
@@ -167,17 +170,18 @@ module.exports = defineConfig({
       // },
       '^/api': {
         // target: process.env.VUE_APP_API_URL,
-        target: 'http://buqiyuan.site:7001',
+        target: 'https://nest-api.buqiyuan.site/api/',
         changeOrigin: true,
         logLevel: 'debug',
         pathRewrite: {
           '^/api': '',
         },
       },
-      '/ws-api': {
-        target: 'ws://buqiyuan.site:7002',
+      '^/ws-api': {
+        target: 'wss://nest-api.buqiyuan.site',
         changeOrigin: true, //是否允许跨域
-        ws: true,
+        wss: true,
+        logLevel: 'debug',
       },
     },
     setupMiddlewares: require('./src/mock/mock-server.js'),
diff --git a/yarn.lock b/yarn.lock
index 62e2e8274..143efd783 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1373,11 +1373,16 @@
   resolved "https://registry.npmmirror.com/@types/minimist/download/@types/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
   integrity sha1-7nceK6Sz3Fs3KTXVSf2WF780W4w=
 
-"@types/node@*", "@types/node@^17.0.5":
+"@types/node@*":
   version "17.0.5"
   resolved "https://registry.npmmirror.com/@types/node/download/@types/node-17.0.5.tgz#57ca67ec4e57ad9e4ef5a6bab48a15387a1c83e0"
   integrity sha512-w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw==
 
+"@types/node@^17.0.6":
+  version "17.0.6"
+  resolved "https://registry.npmmirror.com/@types/node/download/@types/node-17.0.6.tgz#cc1589c9ee853b389e67e8fb4384e0f250a139b9"
+  integrity sha512-+XBAjfZmmivILUzO0HwBJoYkAyyySSLg5KCGBDFLomJo0sV6szvVLAf4ANZZ0pfWzgEds5KmGLG9D5hfEqOhaA==
+
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
   resolved "https://registry.npmmirror.com/@types/normalize-package-data/download/@types/normalize-package-data-2.4.1.tgz?cache=0&sync_timestamp=1637270290556&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40types%2Fnormalize-package-data%2Fdownload%2F%40types%2Fnormalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
@@ -1932,18 +1937,18 @@
   resolved "https://registry.npm.taobao.org/@vue/web-component-wrapper/download/@vue/web-component-wrapper-1.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40vue%2Fweb-component-wrapper%2Fdownload%2F%40vue%2Fweb-component-wrapper-1.3.0.tgz#b6b40a7625429d2bd7c2281ddba601ed05dc7f1a"
   integrity sha1-trQKdiVCnSvXwigd26YB7QXcfxo=
 
-"@vueuse/core@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.npmmirror.com/@vueuse/core/download/@vueuse/core-7.4.3.tgz#cf5b616605c6d9641715889c462d31da36226e11"
-  integrity sha512-OflPLlQ7eqaDJgKYw9DpRCbtfpkFkg1EqHFq7CFrbIEElB39wIfB9ccNypCar8e5KRDrAbOJLIOOvDZO6aC2Gg==
+"@vueuse/core@^7.5.1":
+  version "7.5.1"
+  resolved "https://registry.npmmirror.com/@vueuse/core/download/@vueuse/core-7.5.1.tgz#3038a0ca6e16f6885d2457778260712180422526"
+  integrity sha512-GczfdTWqH483zkUHdDYiLm0Tn51OtsQXYc+eBKKIeolh0mgn682KbSYmkrjNytaF7qGc74YxMDAYjkPBW6V2Pg==
   dependencies:
-    "@vueuse/shared" "7.4.3"
+    "@vueuse/shared" "7.5.1"
     vue-demi "*"
 
-"@vueuse/shared@7.4.3":
-  version "7.4.3"
-  resolved "https://registry.npmmirror.com/@vueuse/shared/download/@vueuse/shared-7.4.3.tgz#59ef90ea27a1ee4d08e001be293c821849252f0c"
-  integrity sha512-tNOCbpD3uZyzxNuw2GX5LTVkMB//IZ7GS452F7TwlY07aIoGjPgixi2Yfk/xSR4CcC9iU56zprZW33aEGj1O1Q==
+"@vueuse/shared@7.5.1":
+  version "7.5.1"
+  resolved "https://registry.npmmirror.com/@vueuse/shared/download/@vueuse/shared-7.5.1.tgz#d88a8d8a4799c30e7dd4f965808e78b3793c3da6"
+  integrity sha512-zMQEuYJyTmr5Hj2rYgSbb4H/cSI8mdaa9dUuw20j6rPV+xLV11y7vCyIkxo31uODDr0p77FMlProKzNDiK9rAA==
   dependencies:
     vue-demi "*"
 
@@ -2131,7 +2136,7 @@ acorn-walk@^8.0.0, acorn-walk@^8.0.2, acorn-walk@^8.1.1:
   resolved "https://registry.nlark.com/acorn-walk/download/acorn-walk-8.2.0.tgz?cache=0&sync_timestamp=1630916608758&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-walk%2Fdownload%2Facorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha1-dBIQ8uJCZFRQiFOi9E0KuDt/acE=
 
-acorn@^8.0.4, acorn@^8.0.5, acorn@^8.4.1, acorn@^8.6.0:
+acorn@^8.0.4, acorn@^8.0.5, acorn@^8.4.1, acorn@^8.6.0, acorn@^8.7.0:
   version "8.7.0"
   resolved "https://registry.npmmirror.com/acorn/download/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
   integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
@@ -2349,23 +2354,11 @@ array-tree-filter@^2.1.0:
   resolved "https://registry.npm.taobao.org/array-tree-filter/download/array-tree-filter-2.1.0.tgz#873ac00fec83749f255ac8dd083814b4f6329190"
   integrity sha1-hzrAD+yDdJ8lWsjdCDgUtPYykZA=
 
-array-union@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.nlark.com/array-union/download/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
-  dependencies:
-    array-uniq "^1.0.1"
-
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.nlark.com/array-union/download/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha1-t5hCCtvrHego2ErNii4j0+/oXo0=
 
-array-uniq@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.nlark.com/array-uniq/download/array-uniq-1.0.3.tgz?cache=0&sync_timestamp=1620042121153&other_urls=https%3A%2F%2Fregistry.nlark.com%2Farray-uniq%2Fdownload%2Farray-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.npm.taobao.org/array-unique/download/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -2391,7 +2384,7 @@ async-validator@^4.0.0:
   resolved "https://registry.npmmirror.com/async-validator/download/async-validator-4.0.7.tgz#034a0fd2103a6b2ebf010da75183bec299247afe"
   integrity sha1-A0oP0hA6ay6/AQ2nUYO+wpkkev4=
 
-async@^2.6.1, async@^2.6.2:
+async@^2.6.2:
   version "2.6.3"
   resolved "https://registry.npmmirror.com/async/download/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha1-1yYl4jRKNlbjo61Pp0n6gymdgv8=
@@ -2985,7 +2978,7 @@ commander@*, commander@^8.3.0:
   resolved "https://registry.npmmirror.com/commander/download/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
-commander@^2.18.0, commander@^2.20.0:
+commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.npmmirror.com/commander/download/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -3178,11 +3171,16 @@ core-js-compat@^3.18.0, core-js-compat@^3.19.1, core-js-compat@^3.8.3:
     browserslist "^4.19.1"
     semver "7.0.0"
 
-core-js@^3.15.1, core-js@^3.20.1, core-js@^3.8.3:
+core-js@^3.15.1, core-js@^3.8.3:
   version "3.20.1"
   resolved "https://registry.npmmirror.com/core-js/download/core-js-3.20.1.tgz#eb1598047b7813572f1dc24b7c6a95528c99eef3"
   integrity sha512-btdpStYFQScnNVQ5slVcr858KP0YWYjV16eGJQw8Gg7CWtu/2qNvIM3qVRIR3n1pK2R9NNOrTevbvAYxajwEjg==
 
+core-js@^3.20.2:
+  version "3.20.2"
+  resolved "https://registry.npmmirror.com/core-js/download/core-js-3.20.2.tgz#46468d8601eafc8b266bd2dd6bf9dee622779581"
+  integrity sha512-nuqhq11DcOAbFBV4zCbKeGbKQsUDRqTX0oqx7AttUBuqe3h20ixsE039QHelbL6P4h+9kytVqyEtyZ6gsiwEYw==
+
 core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.nlark.com/core-util-is/download/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
@@ -3731,11 +3729,6 @@ electron-to-chromium@^1.4.17:
   resolved "https://registry.npmmirror.com/electron-to-chromium/download/electron-to-chromium-1.4.28.tgz#fef0e92e281df6d568f482d8d53c34ca5374de48"
   integrity sha512-Gzbf0wUtKfyPaqf0Plz+Ctinf9eQIzxEqBHwSvbGfeOm9GMNdLxyu1dNiCUfM+x6r4BE0xUJNh3Nmg9gfAtTmg==
 
-email-addresses@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.nlark.com/email-addresses/download/email-addresses-3.1.0.tgz#cabf7e085cbdb63008a70319a74e6136188812fb"
-  integrity sha1-yr9+CFy9tjAIpwMZp05hNhiIEvs=
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.npmmirror.com/emoji-regex/download/emoji-regex-8.0.0.tgz?cache=0&sync_timestamp=1632751333727&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Femoji-regex%2Fdownload%2Femoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -3935,10 +3928,10 @@ eslint-webpack-plugin@^3.1.0:
     normalize-path "^3.0.0"
     schema-utils "^3.1.1"
 
-eslint@^8.5.0:
-  version "8.5.0"
-  resolved "https://registry.npmmirror.com/eslint/download/eslint-8.5.0.tgz#ddd2c1afd8f412036f87ae2a063d2aa296d3175f"
-  integrity sha512-tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg==
+eslint@^8.6.0:
+  version "8.6.0"
+  resolved "https://registry.npmmirror.com/eslint/download/eslint-8.6.0.tgz#4318c6a31c5584838c1a2e940c478190f58d558e"
+  integrity sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==
   dependencies:
     "@eslint/eslintrc" "^1.0.5"
     "@humanwhocodes/config-array" "^0.9.2"
@@ -3952,7 +3945,7 @@ eslint@^8.5.0:
     eslint-scope "^7.1.0"
     eslint-utils "^3.0.0"
     eslint-visitor-keys "^3.1.0"
-    espree "^9.2.0"
+    espree "^9.3.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -3988,6 +3981,15 @@ espree@^9.0.0, espree@^9.2.0:
     acorn-jsx "^5.3.1"
     eslint-visitor-keys "^3.1.0"
 
+espree@^9.3.0:
+  version "9.3.0"
+  resolved "https://registry.npmmirror.com/espree/download/espree-9.3.0.tgz#c1240d79183b72aaee6ccfa5a90bc9111df085a8"
+  integrity sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==
+  dependencies:
+    acorn "^8.7.0"
+    acorn-jsx "^5.3.1"
+    eslint-visitor-keys "^3.1.0"
+
 esquery@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npm.taobao.org/esquery/download/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
@@ -4248,20 +4250,6 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-filename-reserved-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.nlark.com/filename-reserved-regex/download/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229"
-  integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik=
-
-filenamify@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.npmmirror.com/filenamify/download/filenamify-4.3.0.tgz?cache=0&sync_timestamp=1634472729448&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ffilenamify%2Fdownload%2Ffilenamify-4.3.0.tgz#62391cb58f02b09971c9d4f9d63b3cf9aba03106"
-  integrity sha1-YjkctY8CsJlxydT51js8+augMQY=
-  dependencies:
-    filename-reserved-regex "^2.0.0"
-    strip-outer "^1.0.1"
-    trim-repeated "^1.0.0"
-
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npm.taobao.org/fill-range/download/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -4404,7 +4392,7 @@ fresh@0.5.2:
   resolved "https://registry.npm.taobao.org/fresh/download/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
-fs-extra@8.1.0, fs-extra@^8.1.0:
+fs-extra@8.1.0:
   version "8.1.0"
   resolved "https://registry.nlark.com/fs-extra/download/fs-extra-8.1.0.tgz?cache=0&sync_timestamp=1622604476909&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffs-extra%2Fdownload%2Ffs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
   integrity sha1-SdQ8RaiM2Wd2aMt74bRu/bjS4cA=
@@ -4503,19 +4491,6 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.npm.taobao.org/get-value/download/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
-gh-pages@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.nlark.com/gh-pages/download/gh-pages-3.2.3.tgz#897e5f15e111f42af57d21d430b83e5cdf29472c"
-  integrity sha1-iX5fFeER9Cr1fSHUMLg+XN8pRyw=
-  dependencies:
-    async "^2.6.1"
-    commander "^2.18.0"
-    email-addresses "^3.0.1"
-    filenamify "^4.3.0"
-    find-cache-dir "^3.3.1"
-    fs-extra "^8.1.0"
-    globby "^6.1.0"
-
 git-raw-commits@^2.0.0:
   version "2.0.10"
   resolved "https://registry.npm.taobao.org/git-raw-commits/download/git-raw-commits-2.0.10.tgz#e2255ed9563b1c9c3ea6bd05806410290297bbc1"
@@ -4558,7 +4533,7 @@ glob@7.1.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.6:
+glob@^7.1.1, glob@^7.1.3, glob@^7.1.6:
   version "7.2.0"
   resolved "https://registry.npmmirror.com/glob/download/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -4637,17 +4612,6 @@ globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.nlark.com/globby/download/globby-6.1.0.tgz?cache=0&sync_timestamp=1629801109090&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglobby%2Fdownload%2Fglobby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
-  dependencies:
-    array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 globjoin@^0.1.4:
   version "0.1.4"
   resolved "https://registry.npm.taobao.org/globjoin/download/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
@@ -6561,11 +6525,6 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
   resolved "https://registry.nlark.com/picomatch/download/picomatch-2.3.0.tgz?cache=0&sync_timestamp=1621648246651&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpicomatch%2Fdownload%2Fpicomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
   integrity sha1-8fBh3o9qS/AiiS4tEoI0+5gwKXI=
 
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
-
 pify@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npm.taobao.org/pify/download/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
@@ -6579,18 +6538,6 @@ pinia@2.0.9:
     "@vue/devtools-api" "^6.0.0-beta.21"
     vue-demi "*"
 
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npm.taobao.org/pinkie-promise/download/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.npm.taobao.org/pinkie/download/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
-
 pkg-dir@^4.1.0:
   version "4.2.0"
   resolved "https://registry.npmmirror.com/pkg-dir/download/pkg-dir-4.2.0.tgz?cache=0&sync_timestamp=1633498133295&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpkg-dir%2Fdownload%2Fpkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
@@ -7981,13 +7928,6 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.nlark.com/strip-json-comments/download/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha1-MfEoGzgyYwQ0gxwxDAHMzajL4AY=
 
-strip-outer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.nlark.com/strip-outer/download/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631"
-  integrity sha1-sv0qv2YEudHmATBXGV34Nrip1jE=
-  dependencies:
-    escape-string-regexp "^1.0.2"
-
 style-search@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npm.taobao.org/style-search/download/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
@@ -8341,13 +8281,6 @@ trim-newlines@^3.0.0:
   resolved "https://registry.nlark.com/trim-newlines/download/trim-newlines-3.0.1.tgz?cache=0&sync_timestamp=1623341510447&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftrim-newlines%2Fdownload%2Ftrim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha1-Jgpdli2LdSQlsy86fbDcrNF2wUQ=
 
-trim-repeated@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.nlark.com/trim-repeated/download/trim-repeated-1.0.0.tgz?cache=0&sync_timestamp=1619005444026&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftrim-repeated%2Fdownload%2Ftrim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21"
-  integrity sha1-42RqLqTokTEr9+rObPsFOAvAHCE=
-  dependencies:
-    escape-string-regexp "^1.0.2"
-
 ts-loader@^9.2.5:
   version "9.2.6"
   resolved "https://registry.nlark.com/ts-loader/download/ts-loader-9.2.6.tgz#9937c4dd0a1e3dbbb5e433f8102a6601c6615d74"