From a047a8592c3bffdcbbdece55c260d18c29148eda Mon Sep 17 00:00:00 2001
From: xiangheng <11675084@qq.com>
Date: Tue, 12 Mar 2024 09:55:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/.vscode/settings.json              | 19 +++++++++---------
 admin/package.json                       |  4 ++--
 admin/src/stores/modules/app.ts          |  3 +--
 admin/src/stores/modules/multipleTabs.ts |  3 +--
 admin/src/stores/modules/setting.ts      |  3 +--
 admin/src/stores/modules/user.ts         | 25 ++++++++++++------------
 admin/tsconfig.json                      |  2 ++
 7 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/admin/.vscode/settings.json b/admin/.vscode/settings.json
index 2a24d8a..80a0a21 100644
--- a/admin/.vscode/settings.json
+++ b/admin/.vscode/settings.json
@@ -1,11 +1,12 @@
 {
-  "editor.detectIndentation": false,
-  "editor.tabSize": 4,
-  "editor.formatOnSave": true,
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit"
-},
-  "css.validate": false,
-  "less.validate": false,
-  "scss.validate": false
+    "editor.detectIndentation": false,
+    "editor.tabSize": 4,
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": "explicit"
+    },
+    "css.validate": false,
+    "less.validate": false,
+    "scss.validate": false,
+    "cSpell.words": ["nprogress", "pinia", "vform"]
 }
diff --git a/admin/package.json b/admin/package.json
index c8c8fbc..4d22b59 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -25,7 +25,7 @@
         "crypto-js": "^4.2.0",
         "css-color-function": "^1.3.3",
         "echarts": "^5.5.0",
-        "element-plus": "^2.6.0",
+        "element-plus": "^2.6.1",
         "highlight.js": "^11.9.0",
         "lodash-es": "^4.17.21",
         "nprogress": "^0.2.0",
@@ -47,7 +47,7 @@
         "@vitejs/plugin-vue": "^5.0.4",
         "@vitejs/plugin-vue-jsx": "^3.1.0",
         "@vue/eslint-config-prettier": "^9.0.0",
-        "@vue/eslint-config-typescript": "^12.0.0",
+        "@vue/eslint-config-typescript": "^13.0.0",
         "@vue/tsconfig": "^0.5.1",
         "autoprefixer": "^10.4.18",
         "eslint": "^8.57.0",
diff --git a/admin/src/stores/modules/app.ts b/admin/src/stores/modules/app.ts
index f51e1f7..8e2229a 100644
--- a/admin/src/stores/modules/app.ts
+++ b/admin/src/stores/modules/app.ts
@@ -7,8 +7,7 @@ interface AppSate {
     isRouteShow: boolean
 }
 
-const useAppStore = defineStore({
-    id: 'app',
+const useAppStore = defineStore('app', {
     state: (): AppSate => {
         return {
             config: {},
diff --git a/admin/src/stores/modules/multipleTabs.ts b/admin/src/stores/modules/multipleTabs.ts
index b14e366..0186360 100644
--- a/admin/src/stores/modules/multipleTabs.ts
+++ b/admin/src/stores/modules/multipleTabs.ts
@@ -57,8 +57,7 @@ export const getRouteParams = (tabItem: TabItem) => {
     }
 }
 
-const useTabsStore = defineStore({
-    id: 'tabs',
+const useTabsStore = defineStore('tabs', {
     state: (): TabsSate => ({
         cacheTabList: new Set(),
         tabList: [],
diff --git a/admin/src/stores/modules/setting.ts b/admin/src/stores/modules/setting.ts
index ee0800f..7fd7af7 100644
--- a/admin/src/stores/modules/setting.ts
+++ b/admin/src/stores/modules/setting.ts
@@ -6,8 +6,7 @@ import { setTheme } from '@/utils/theme'
 import { SETTING_KEY } from '@/enums/cacheEnums'
 const storageSetting = cache.get(SETTING_KEY)
 
-export const useSettingStore = defineStore({
-    id: 'setting',
+export const useSettingStore = defineStore('setting', {
     state: () => {
         const state = {
             showDrawer: false,
diff --git a/admin/src/stores/modules/user.ts b/admin/src/stores/modules/user.ts
index fd95699..0636d90 100644
--- a/admin/src/stores/modules/user.ts
+++ b/admin/src/stores/modules/user.ts
@@ -14,18 +14,19 @@ export interface UserState {
     perms: string[]
 }
 
-const useUserStore = defineStore({
-    id: 'user',
-    state: (): UserState => ({
-        token: getToken() || '',
-        // 用户信息
-        userInfo: {},
-        // 路由
-        routes: [],
-        menu: [],
-        // 权限
-        perms: []
-    }),
+const useUserStore = defineStore('user', {
+    state: (): UserState => {
+        return {
+            token: getToken() || '',
+            // 用户信息
+            userInfo: {},
+            // 路由
+            routes: [],
+            menu: [],
+            // 权限
+            perms: []
+        }
+    },
     getters: {},
     actions: {
         resetState() {
diff --git a/admin/tsconfig.json b/admin/tsconfig.json
index 5437378..81552e6 100644
--- a/admin/tsconfig.json
+++ b/admin/tsconfig.json
@@ -2,6 +2,7 @@
     "include": [
         "global.d.ts",
         "src/**/*",
+        "src/**/*.ts",
         "src/**/*.vue",
         "components.d.ts",
         "auto-imports.d.ts",
@@ -12,6 +13,7 @@
         "module": "esnext",
         "moduleResolution": "Bundler",
         "allowJs": true,
+        "checkJs": true,
         "outDir": "./dist",
         "isolatedModules": true,
         "baseUrl": ".",