From 13505fdedcb9e562052e5a07070168879f95235c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=82=A0=E9=9D=99=E8=90=9D=E8=8E=89?= <i@mikuhl.cn>
Date: Sat, 30 Mar 2024 22:32:05 +0800
Subject: [PATCH] feat: upgrade to vue 3.4 and fix route issues (#699)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 升级Vue3.4，修复Route调用方式造成一系列问题

* fix: 修复编译问题
---
 package.json                  | 6 +++---
 src/pages/list/base/index.vue | 2 +-
 src/router/index.ts           | 5 +++--
 tsconfig.json                 | 1 +
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 3673697..fc37594 100644
--- a/package.json
+++ b/package.json
@@ -32,11 +32,11 @@
     "qrcode.vue": "^3.4.1",
     "qs": "^6.11.2",
     "tdesign-icons-vue-next": "^0.2.2",
-    "tdesign-vue-next": "^1.8.1",
+    "tdesign-vue-next": "^1.9.3",
     "tvision-color": "^1.6.0",
-    "vue": "~3.3.8",
+    "vue": "~3.4.21",
     "vue-i18n": "^9.9.1",
-    "vue-router": "~4.2.5"
+    "vue-router": "~4.3.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^18.6.0",
diff --git a/src/pages/list/base/index.vue b/src/pages/list/base/index.vue
index 92d2d7a..3bdce4c 100644
--- a/src/pages/list/base/index.vue
+++ b/src/pages/list/base/index.vue
@@ -31,7 +31,7 @@
         :header-affixed-top="headerAffixedTop"
         @page-change="rehandlePageChange"
         @change="rehandleChange"
-        @select-change="(value) => rehandleSelectChange(value as number[])"
+        @select-change="(value: number[]) => rehandleSelectChange(value)"
       >
         <template #status="{ row }">
           <t-tag v-if="row.status === CONTRACT_STATUS.FAIL" theme="danger" variant="light">
diff --git a/src/router/index.ts b/src/router/index.ts
index 5076429..bcd69ed 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,5 +1,5 @@
 import uniq from 'lodash/uniq';
-import { createRouter, createWebHistory, RouteRecordRaw, useRoute } from 'vue-router';
+import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router';
 
 const env = import.meta.env.MODE || 'development';
 
@@ -59,7 +59,8 @@ export const getRoutesExpanded = () => {
 };
 
 export const getActive = (maxLevel = 3): string => {
-  const route = useRoute();
+  // 非组件内调用必须通过Router实例获取当前路由
+  const route = router.currentRoute.value;
 
   if (!route.path) {
     return '';
diff --git a/tsconfig.json b/tsconfig.json
index efb7481..35e1652 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,6 +4,7 @@
     "module": "esnext",
     "moduleResolution": "node",
     "jsx": "preserve",
+    "jsxImportSource": "vue",
     "sourceMap": true,
     "resolveJsonModule": true,
     "esModuleInterop": true,