diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json index cb7058aa8ed76afb3ef00c390cd9c812fe15b714..8fc97863ce84dc537b4edcd5b7d48e9b62c89146 100644 --- a/.eslintrc-auto-import.json +++ b/.eslintrc-auto-import.json @@ -17,6 +17,8 @@ "MaybeRefOrGetter": true, "PropType": true, "Ref": true, + "Slot": true, + "Slots": true, "VNode": true, "WritableComputedRef": true, "acceptHMRUpdate": true, @@ -35,6 +37,7 @@ "createInjectionState": true, "createPinia": true, "createReactiveFn": true, + "createRef": true, "createReusableTemplate": true, "createSharedComposable": true, "createTemplatePromise": true, @@ -277,6 +280,7 @@ "useThrottleFn": true, "useThrottledRefHistory": true, "useTimeAgo": true, + "useTimeAgoIntl": true, "useTimeout": true, "useTimeoutFn": true, "useTimeoutPoll": true, @@ -315,9 +319,6 @@ "watchThrottled": true, "watchTriggerable": true, "watchWithFilter": true, - "whenever": true, - "Slot": true, - "Slots": true, - "createRef": true + "whenever": true } } diff --git a/package.json b/package.json index d9e2ab6b7a5d091dca37002570263ac7fba1193b..0a5514b68278969ebb9fa7e12103b4bf9da48717 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "$schema": "https://json.schemastore.org/package", "name": "ruoyi-vue-plus", - "version": "5.5.1-2.5.1", + "version": "5.5.2-2.5.2", "description": "RuoYi-Vue-Plus多租户管理系统", "author": "LionLi", "license": "MIT", @@ -20,65 +20,65 @@ "url": "https://gitee.com/JavaLionLi/plus-ui.git" }, "dependencies": { - "@element-plus/icons-vue": "2.3.1", - "@highlightjs/vue-plugin": "2.1.0", + "@element-plus/icons-vue": "2.3.2", + "@highlightjs/vue-plugin": "2.1.2", "@vueup/vue-quill": "1.2.0", - "@vueuse/core": "13.1.0", + "@vueuse/core": "13.9.0", "animate.css": "4.1.1", "await-to-js": "3.0.0", - "axios": "1.8.4", + "axios": "1.13.1", "crypto-js": "4.2.0", "echarts": "5.6.0", - "element-plus": "2.9.8", + "element-plus": "2.11.7", "file-saver": "2.0.5", - "highlight.js": "11.9.0", + "highlight.js": "11.11.1", "image-conversion": "2.1.1", "js-cookie": "3.0.5", - "jsencrypt": "3.3.2", + "jsencrypt": "3.5.4", "nprogress": "0.2.0", - "pinia": "3.0.2", + "pinia": "3.0.3", "screenfull": "6.0.2", - "vue": "3.5.13", - "vue-cropper": "1.1.1", - "vue-i18n": "11.1.3", - "vue-json-pretty": "2.4.0", - "vue-router": "4.5.0", + "vue": "3.5.22", + "vue-cropper": "1.1.4", + "vue-i18n": "11.1.12", + "vue-json-pretty": "2.6.0", + "vue-router": "4.6.3", "vue-types": "6.0.0", - "vxe-table": "4.13.7" + "vxe-table": "4.17.7" }, "devDependencies": { - "@iconify/json": "^2.2.276", + "@iconify/json": "^2.2.403", "@types/crypto-js": "4.2.2", "@types/file-saver": "2.0.7", "@types/js-cookie": "3.0.6", - "@types/node": "^22.13.4", + "@types/node": "^22.19.0", "@types/nprogress": "0.2.3", - "@unocss/preset-attributify": "66.5.2", - "@unocss/preset-icons": "66.5.2", - "@unocss/preset-uno": "66.5.2", - "@vitejs/plugin-vue": "5.2.3", - "@vue/compiler-sfc": "3.5.13", + "@unocss/preset-attributify": "66.5.4", + "@unocss/preset-icons": "66.5.4", + "@unocss/preset-uno": "66.5.4", + "@vitejs/plugin-vue": "5.2.4", + "@vue/compiler-sfc": "3.5.22", "@vue/eslint-config-prettier": "10.2.0", - "@vue/eslint-config-typescript": "14.4.0", - "autoprefixer": "10.4.20", - "eslint": "9.21.0", - "eslint-plugin-prettier": "5.2.3", - "eslint-plugin-vue": "9.32.0", - "globals": "16.0.0", - "prettier": "3.5.2", - "sass": "1.87.0", - "typescript": "~5.8.3", - "unocss": "66.5.2", - "unplugin-auto-import": "19.1.2", - "unplugin-icons": "22.1.0", - "unplugin-vue-components": "28.5.0", + "@vue/eslint-config-typescript": "14.6.0", + "autoprefixer": "10.4.21", + "eslint": "9.39.1", + "eslint-plugin-prettier": "5.5.4", + "eslint-plugin-vue": "9.33.0", + "globals": "16.5.0", + "prettier": "3.6.2", + "sass": "1.93.3", + "typescript": "~5.9.3", + "unocss": "66.5.4", + "unplugin-auto-import": "19.3.0", + "unplugin-icons": "22.5.0", + "unplugin-vue-components": "28.8.0", "unplugin-vue-setup-extend-plus": "1.0.1", - "vite": "6.3.2", + "vite": "6.4.1", "vite-plugin-compression": "0.5.1", - "vite-plugin-svg-icons-ng": "^1.4.0", - "vite-plugin-vue-devtools": "7.7.5", - "vitest": "3.1.2", - "vue-tsc": "^2.2.8" + "vite-plugin-svg-icons-ng": "^1.5.2", + "vite-plugin-vue-devtools": "8.0.3", + "vitest": "3.2.4", + "vue-tsc": "^2.2.12" }, "overrides": { "quill": "2.0.2" diff --git a/src/api/system/social/auth.ts b/src/api/system/social/auth.ts index 69f0d7e448849002454c234287f42f9f514ac2ba..05471d9f1170a84c43b1795a1dce6b286f7bdc55 100644 --- a/src/api/system/social/auth.ts +++ b/src/api/system/social/auth.ts @@ -1,7 +1,7 @@ import request from '@/utils/request'; -// 绑定账号 -export function authBinding(source: string, tenantId: string) { +// 获取跳转URL +export function authRouterUrl(source: string, tenantId: string) { return request({ url: '/auth/binding/' + source, method: 'get', diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue index dbf5d7f39ea33a2bc560e9a2d2b883f425a37200..79e6a597155f20ef0f0ff27a3f9f1c2576c249ab 100644 --- a/src/components/DictTag/index.vue +++ b/src/components/DictTag/index.vue @@ -1,7 +1,7 @@