fix: all modal should be destroy after the route change

buqiyuan · Mar 14, 2024 · 5dbc5eb · 5dbc5eb
1 parent 19d5621
commit 5dbc5eb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/layout/header/index.vue b/src/layout/header/index.vue
@@ -47,7 +47,7 @@
 </template>
 
 <script lang="tsx" setup>
-  import { computed, nextTick, type CSSProperties } from 'vue';
+  import { computed, type CSSProperties } from 'vue';
   import { useRouter, useRoute } from 'vue-router';
   import {
     QuestionCircleOutlined,
@@ -113,8 +113,6 @@
         // 移除标签页
         localStorage.clear();
         message.success('成功退出登录');
-        await nextTick();
-        console.log('router', router.getRoutes());
         router.replace({
           name: LOGIN_NAME,
           query: {

diff --git a/src/router/router-guards.ts b/src/router/router-guards.ts
@@ -1,5 +1,6 @@
 import { NavigationFailureType, isNavigationFailure } from 'vue-router';
 import NProgress from 'nprogress'; // progress bar
+import { Modal } from 'ant-design-vue';
 import { LOGIN_NAME, PAGE_NOT_FOUND_NAME, REDIRECT_NAME } from './constant';
 import type { WhiteNameList } from './constant';
 import type { Router, RouteLocationNormalized } from 'vue-router';
@@ -29,6 +30,7 @@ export function createRouterGuards(router: Router, whiteNameList: WhiteNameList)
           const [err] = await _to(userStore.afterLogin());
           if (err) {
             userStore.resetToken();
+            Modal.destroyAll();
             return next({ name: LOGIN_NAME });
           }
           // 解决警告：No match found for location with path "XXXXXXX"

diff --git a/src/views/system/monitor/online/columns.tsx b/src/views/system/monitor/online/columns.tsx
@@ -33,7 +33,6 @@ export const baseColumns: TableColumn<TableListItem>[] = [
   {
     title: '登录地点',
     dataIndex: 'address',
-    width: 140,
   },
   {
     title: '浏览器',