合并分支 '3.x' 到 'main'

feat: 依赖更新

查看合并请求 !22

package.json

@@ -57,23 +57,23 @@
         "@ant-design/colors": "^7.0.0",
         "@ant-design/icons-vue": "^6.1.0",
         "@iconify/iconify": "^3.1.1",
-        "@logicflow/core": "^1.2.10",
-        "@logicflow/extension": "^1.2.10",
+        "@logicflow/core": "^1.2.15",
+        "@logicflow/extension": "^1.2.16",
         "@stomp/stompjs": "^7.0.0",
         "@vue/runtime-core": "^3.3.4",
         "@vue/shared": "^3.3.4",
-        "@vueuse/core": "^10.3.0",
-        "@vueuse/shared": "^10.3.0",
+        "@vueuse/core": "^10.5.0",
+        "@vueuse/shared": "^10.5.0",
         "@zxcvbn-ts/core": "^2.2.1",
         "ant-design-vue": "^3.2.20",
         "axios": "^0.26.1",
-        "codemirror": "^5.65.14",
-        "cropperjs": "^1.5.13",
+        "codemirror": "^5.65.15",
+        "cropperjs": "^1.6.1",
         "crypto-js": "^4.1.1",
-        "dayjs": "^1.11.9",
+        "dayjs": "^1.11.10",
         "default-passive-events": "^2.0.0",
         "echarts": "^5.4.3",
-        "intro.js": "^7.0.1",
+        "intro.js": "^7.2.0",
         "js-file-download": "^0.4.12",
         "lodash-es": "^4.17.21",
         "mockjs": "^1.1.0",
@@ -90,44 +90,44 @@
         "sortablejs": "^1.15.0",
         "stompjs": "^2.3.3",
         "tinymce": "^5.10.7",
-        "vditor": "^3.9.4",
+        "vditor": "^3.9.6",
         "vue": "^3.3.4",
-        "vue-i18n": "^9.2.2",
+        "vue-i18n": "^9.5.0",
         "vue-json-pretty": "^2.2.4",
-        "vue-router": "^4.2.4",
+        "vue-router": "^4.2.5",
         "vue-types": "^5.1.1",
         "xlsx": "^0.18.5"
     },
     "devDependencies": {
-        "@antfu/eslint-config": "^0.40.2",
-        "@commitlint/cli": "^17.7.1",
+        "@antfu/eslint-config": "^0.40.3",
+        "@commitlint/cli": "^17.7.2",
         "@commitlint/config-conventional": "^17.7.0",
-        "@iconify/json": "^2.2.100",
-        "@types/codemirror": "^5.60.8",
-        "@types/crypto-js": "^4.1.1",
-        "@types/fs-extra": "^11.0.1",
-        "@types/inquirer": "^9.0.3",
-        "@types/intro.js": "^5.1.1",
-        "@types/lodash": "^4.14.197",
-        "@types/lodash-es": "^4.17.8",
-        "@types/mockjs": "^1.0.7",
-        "@types/node": "^18.17.5",
-        "@types/nprogress": "^0.2.0",
-        "@types/qrcode": "^1.5.1",
-        "@types/qs": "^6.9.7",
-        "@types/showdown": "^2.0.1",
-        "@types/sockjs-client": "^1.5.1",
-        "@types/sortablejs": "^1.15.1",
-        "@types/stompjs": "^2.3.5",
+        "@iconify/json": "^2.2.125",
+        "@types/codemirror": "^5.60.10",
+        "@types/crypto-js": "^4.1.2",
+        "@types/fs-extra": "^11.0.2",
+        "@types/inquirer": "^9.0.4",
+        "@types/intro.js": "^5.1.2",
+        "@types/lodash": "^4.14.199",
+        "@types/lodash-es": "^4.17.9",
+        "@types/mockjs": "^1.0.8",
+        "@types/node": "^18.18.4",
+        "@types/nprogress": "^0.2.1",
+        "@types/qrcode": "^1.5.2",
+        "@types/qs": "^6.9.8",
+        "@types/showdown": "^2.0.2",
+        "@types/sockjs-client": "^1.5.2",
+        "@types/sortablejs": "^1.15.3",
+        "@types/stompjs": "^2.3.6",
         "@typescript-eslint/eslint-plugin": "^5.62.0",
         "@typescript-eslint/parser": "^5.62.0",
         "@vitejs/plugin-legacy": "^4.1.1",
-        "@vitejs/plugin-vue": "^4.2.3",
-        "@vitejs/plugin-vue-jsx": "^3.0.1",
+        "@vitejs/plugin-vue": "^4.4.0",
+        "@vitejs/plugin-vue-jsx": "^3.0.2",
         "@vue/compiler-dom": "^3.3.4",
         "@vue/compiler-sfc": "^3.3.4",
         "@vue/test-utils": "^2.4.1",
-        "autoprefixer": "^10.4.14",
+        "autoprefixer": "^10.4.16",
         "commitizen": "^4.3.0",
         "conventional-changelog-cli": "^2.2.2",
         "cross-env": "^7.0.3",
@@ -135,51 +135,51 @@
         "cz-git": "^1.7.1",
         "czg": "^1.7.1",
         "dotenv": "^16.3.1",
-        "eslint": "^8.47.0",
+        "eslint": "^8.51.0",
         "eslint-config-prettier": "^8.10.0",
         "eslint-plugin-prettier": "^4.2.1",
         "eslint-plugin-vue": "^9.17.0",
         "esno": "^0.16.3",
         "fs-extra": "^11.1.1",
         "husky": "^8.0.3",
-        "inquirer": "^9.2.10",
+        "inquirer": "^9.2.11",
         "less": "^4.2.0",
-        "lint-staged": "^13.2.3",
+        "lint-staged": "^13.3.0",
         "lodash": "^4.17.21",
         "npm-run-all": "^4.1.5",
         "picocolors": "^1.0.0",
         "pont-engine": "^1.5.12",
-        "postcss": "^8.4.27",
+        "postcss": "^8.4.31",
         "postcss-html": "^1.5.0",
         "postcss-less": "^6.0.0",
         "prettier": "^2.8.8",
-        "rimraf": "^5.0.1",
-        "rollup": "^3.28.0",
+        "rimraf": "^5.0.5",
+        "rollup": "^3.29.4",
         "rollup-plugin-visualizer": "^5.9.2",
-        "sort-package-json": "^2.5.1",
-        "stylelint": "^15.10.2",
+        "sort-package-json": "^2.6.0",
+        "stylelint": "^15.10.3",
         "stylelint-config-recommended": "^12.0.0",
         "stylelint-config-recommended-vue": "^1.5.0",
         "stylelint-config-standard": "^33.0.0",
         "stylelint-order": "^6.0.3",
-        "terser": "^5.19.2",
+        "terser": "^5.21.0",
         "ts-node": "^10.9.1",
         "typescript": "^4.9.5",
         "unplugin-auto-import": "^0.16.6",
-        "vite": "^4.4.9",
+        "vite": "^4.4.11",
         "vite-plugin-compression": "^0.5.1",
         "vite-plugin-html": "^3.2.0",
         "vite-plugin-mkcert": "^1.16.0",
         "vite-plugin-mock": "^2.9.8",
         "vite-plugin-purge-icons": "^0.9.2",
-        "vite-plugin-pwa": "^0.16.4",
+        "vite-plugin-pwa": "^0.16.5",
         "vite-plugin-style-import": "^2.0.0",
         "vite-plugin-svg-icons": "^2.0.1",
         "vite-plugin-theme": "^0.8.6",
         "vite-plugin-vue-setup-extend": "^0.4.0",
-        "vite-plugin-windicss": "^1.9.0",
-        "vue-eslint-parser": "^9.3.1",
-        "vue-tsc": "^1.8.8"
+        "vite-plugin-windicss": "^1.9.1",
+        "vue-eslint-parser": "^9.3.2",
+        "vue-tsc": "^1.8.18"
     },
     "engines": {
         "node": ">=14"

src/store/modules/user.ts

@@ -41,7 +41,7 @@ export const useUserStore = defineStore({
     }),
     getters: {
         getUserInfo(): UserInfo {
-            return this.userInfo || getAuthCache<UserInfo>(USER_INFO_KEY) || {}
+            return this.userInfo || getAuthCache<UserInfo>(USER_INFO_KEY) || ({} as UserInfo)
         },
         getToken(): string {
             return this.token || getAuthCache<string>(TOKEN_KEY)
@@ -127,7 +127,7 @@ export const useUserStore = defineStore({
             const userInfo = await getUserInfo()
             const { roles = [] } = userInfo
             if (isArray(roles)) {
-                const roleList = roles.map((item) => item.value) as RoleEnum[]
+                const roleList = roles.map((item) => item.uid) as RoleEnum[]
                 this.setRoleList(roleList)
             } else {
                 userInfo.roles = []

types/auto-imports.d.ts

@@ -70,5 +70,5 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, InjectionKey, PropType, Ref, VNode } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
 }