add @vueuse

package.json

@@ -11,6 +11,8 @@
     "serve": "vite preview"
   },
   "dependencies": {
+    "@vueuse/core": "^6.5.3",
+    "@vueuse/router": "^6.5.3",
     "ant-design-vue": "^2.2.8",
     "axios": "^0.21.4",
     "axios-progress-bar": "^1.2.0",
@@ -24,7 +26,8 @@
     "pinia": "^2.0.0-rc.9",
     "ua-parser-js": "^0.7.28",
     "vue": "^3.2.14",
-    "vue-router": "4.0.10"
+    "vue-router": "4.0.10",
+    "windicss": "^3.1.8"
   },
   "devDependencies": {
     "@types/crypto-js": "^4.0.2",
@@ -41,8 +44,7 @@
     "unplugin-auto-import": "^0.4.8",
     "unplugin-vue-components": "^0.15.2",
     "vite": "^2.5.10",
-    "vite-plugin-windicss": "^1.4.7",
-    "vue-tsc": "^0.3.0",
-    "windicss": "^3.1.7"
+    "vite-plugin-windicss": "^1.4.8",
+    "vue-tsc": "^0.3.0"
   }
 }

src/features/Login/Login.vue

@@ -36,18 +36,17 @@
 <script setup lang="ts">
 import { loginByUsername } from "@/api/loginPage";
 import { ref } from "vue";
-import { useRoute, useRouter } from "vue-router";
+import { useRouteQuery } from "@vueuse/router";
+import { useRouter } from "vue-router";
 import { useMainStore } from "@/store";
 const store = useMainStore();
 
 let accountValue = ref("");
 let password = ref("");
-const route = useRoute();
-let rootOrgId = route.query.rootOrgId as string;
+let rootOrgId = useRouteQuery("rootOrgId");
 const router = useRouter();
-if (!rootOrgId) {
+if (!rootOrgId.value) {
   router.push("/?rootOrgId=1");
-  rootOrgId = "1";
 }
 
 let errorInfo = ref("");
@@ -57,7 +56,7 @@ async function login() {
     const res = await loginByUsername({
       accountValue: accountValue.value,
       password: password.value,
-      rootOrgId: rootOrgId,
+      rootOrgId: rootOrgId.value,
     });
     console.log(res);
     store.setUserInfo(res.data);

tsconfig.json

@@ -7,6 +7,7 @@
     "strict": true,
     "jsx": "preserve",
     "sourceMap": true,
+    "isolatedModules": true,
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "lib": ["esnext", "dom"],
@@ -16,7 +17,7 @@
       "@/*": ["src/*"]
     }
   },
-    "include": [
+  "include": [
     "src/**/*.ts",
     "src/**/*.d.ts",
     "src/**/*.tsx",

yarn.lock

@@ -313,23 +313,46 @@
   resolved "https://registry.npmmirror.com/@vue/shared/download/@vue/shared-3.2.19.tgz#111ec3da18337d86274446984c49925b1b2b2dd7"
   integrity sha1-ER7D2hgzfYYnREaYTEmSWxsrLdc=
 
-"@windicss/config@1.4.7":
-  version "1.4.7"
-  resolved "https://registry.npmmirror.com/@windicss/config/download/@windicss/config-1.4.7.tgz?cache=0&sync_timestamp=1632593163424&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40windicss%2Fconfig%2Fdownload%2F%40windicss%2Fconfig-1.4.7.tgz#5562a36b907cc28a1b8ecc7d2ddc534a43e11ae8"
-  integrity sha1-VWKja5B8woobjsx9LdxTSkPhGug=
+"@vueuse/core@^6.5.3":
+  version "6.5.3"
+  resolved "https://registry.npmmirror.com/@vueuse/core/download/@vueuse/core-6.5.3.tgz#15848eaccad18652df4cb4b6ccae7bd7921a0c7e"
+  integrity sha1-FYSOrMrRhlLfTLS2zK5715IaDH4=
+  dependencies:
+    "@vueuse/shared" "6.5.3"
+    vue-demi "*"
+
+"@vueuse/router@^6.5.3":
+  version "6.5.3"
+  resolved "https://registry.npmmirror.com/@vueuse/router/download/@vueuse/router-6.5.3.tgz#ca97993d70f6dae3df876b2ab49d8e4396fc1e71"
+  integrity sha1-ypeZPXD22uPfh2sqtJ2OQ5b8HnE=
+  dependencies:
+    "@vueuse/shared" "6.5.3"
+    vue-demi "*"
+
+"@vueuse/shared@6.5.3":
+  version "6.5.3"
+  resolved "https://registry.npmmirror.com/@vueuse/shared/download/@vueuse/shared-6.5.3.tgz#6503fa4bfbf45d0616bacedb8a4bd003f01da73b"
+  integrity sha1-ZQP6S/v0XQYWus7bikvQA/Adpzs=
+  dependencies:
+    vue-demi "*"
+
+"@windicss/config@1.4.8":
+  version "1.4.8"
+  resolved "https://registry.npmmirror.com/@windicss/config/download/@windicss/config-1.4.8.tgz#78f46b823e7989ecd69640b38df35dc52b8f8215"
+  integrity sha1-ePRrgj55iezWlkCzjfNdxSuPghU=
   dependencies:
     debug "^4.3.2"
     jiti "^1.12.3"
     tsup "^5.2.0"
     windicss "^3.1.7"
 
-"@windicss/plugin-utils@1.4.7":
-  version "1.4.7"
-  resolved "https://registry.npmmirror.com/@windicss/plugin-utils/download/@windicss/plugin-utils-1.4.7.tgz?cache=0&sync_timestamp=1632593163721&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40windicss%2Fplugin-utils%2Fdownload%2F%40windicss%2Fplugin-utils-1.4.7.tgz#d1b1ba445a85e6847a1385bf9348b4b5b3a00267"
-  integrity sha1-0bG6RFqF5oR6E4W/k0i0tbOgAmc=
+"@windicss/plugin-utils@1.4.8":
+  version "1.4.8"
+  resolved "https://registry.npmmirror.com/@windicss/plugin-utils/download/@windicss/plugin-utils-1.4.8.tgz#aa4ee7624ec843f004a8e57251d2935e4881f4f7"
+  integrity sha1-qk7nYk7IQ/AEqOVyUdKTXkiB9Pc=
   dependencies:
     "@antfu/utils" "^0.3.0"
-    "@windicss/config" "1.4.7"
+    "@windicss/config" "1.4.8"
     debug "^4.3.2"
     fast-glob "^3.2.7"
     magic-string "^0.25.7"
@@ -1582,12 +1605,12 @@ upath@^2.0.1:
   resolved "https://registry.npm.taobao.org/upath/download/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
   integrity sha1-UMc96mjW9rmQ9R0nnOYIFmXWGos=
 
-vite-plugin-windicss@^1.4.7:
-  version "1.4.7"
-  resolved "https://registry.npmmirror.com/vite-plugin-windicss/download/vite-plugin-windicss-1.4.7.tgz?cache=0&sync_timestamp=1632593163979&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvite-plugin-windicss%2Fdownload%2Fvite-plugin-windicss-1.4.7.tgz#505ff1deb4209b95681c0d6eff59775e600e0f2b"
-  integrity sha1-UF/x3rQgm5VoHA1u/1l3XmAODys=
+vite-plugin-windicss@^1.4.8:
+  version "1.4.8"
+  resolved "https://registry.npmmirror.com/vite-plugin-windicss/download/vite-plugin-windicss-1.4.8.tgz#3277128beae53379e8cd1a66d54734bc846b6e51"
+  integrity sha1-MncSi+rlM3nozRpm1Uc0vIRrblE=
   dependencies:
-    "@windicss/plugin-utils" "1.4.7"
+    "@windicss/plugin-utils" "1.4.8"
     chalk "^4.1.2"
     debug "^4.3.2"
     windicss "^3.1.7"
@@ -1799,6 +1822,11 @@ windicss@^3.1.7:
   resolved "https://registry.nlark.com/windicss/download/windicss-3.1.7.tgz#8a3b8a07ed97c2c1354a6e31820d8059da35f724"
   integrity sha1-ijuKB+2XwsE1Sm4xgg2AWdo19yQ=
 
+windicss@^3.1.8:
+  version "3.1.8"
+  resolved "https://registry.npmmirror.com/windicss/download/windicss-3.1.8.tgz#56e80e362e6d1d32cc3d1d5c63069dca14d9fe4a"
+  integrity sha1-VugONi5tHTLMPR1cYwadyhTZ/ko=
+
 with@^7.0.0:
   version "7.0.2"
   resolved "https://registry.npm.taobao.org/with/download/with-7.0.2.tgz#ccee3ad542d25538a7a7a80aad212b9828495bac"