Merge remote-tracking branch 'soybeanjs/main' into ruoyi

# Conflicts:
#	CHANGELOG.md
#	README.md
#	build/config/proxy.ts
#	build/plugins/index.ts
#	package.json
#	src/plugins/loading.ts
#	src/service/request/index.ts
#	src/store/modules/auth/index.ts
#	src/store/modules/route/index.ts
#	src/typings/vite-env.d.ts
#	src/views/_builtin/login/modules/pwd-login.vue
This commit is contained in:
xlsea
2025-04-23 15:18:24 +08:00
70 changed files with 1652 additions and 2152 deletions

View File

@ -1,7 +1,7 @@
{
"name": "ruoyi-vue-plus",
"type": "module",
"version": "1.3.11",
"version": "1.3.13",
"description": "RuoYi-Vue-Plus多租户管理系统",
"author": {
"name": "xlsea",
@ -10,18 +10,24 @@
},
"license": "MIT",
"homepage": "https://gitee.com/xlsea/ruoyi-plus-soybean",
"repository": {
"url": "https://gitee.com/xlsea/ruoyi-plus-soybean.git"
},
"bugs": {
"url": "https://gitee.com/xlsea/ruoyi-plus-soybean/issues"
},
"keywords": [
"RuoYi-Vue-Plus",
"Vue3 admin ",
"vue-admin-template",
"Vite5",
"Vite6",
"TypeScript",
"naive-ui",
"naive-ui-admin",
"UnoCSS"
],
"engines": {
"node": ">=18.12.0",
"node": ">=18.20.0",
"pnpm": ">=8.7.0"
},
"scripts": {
@ -51,7 +57,7 @@
"@sa/materials": "workspace:*",
"@sa/utils": "workspace:*",
"@tinymce/tinymce-vue": "^6.1.0",
"@vueuse/core": "12.5.0",
"@vueuse/core": "13.0.0",
"clipboard": "2.0.11",
"dayjs": "1.11.13",
"defu": "6.1.4",
@ -61,47 +67,49 @@
"monaco-editor": "^0.52.0",
"naive-ui": "2.41.0",
"nprogress": "0.2.0",
"pinia": "3.0.0",
"tailwind-merge": "3.0.1",
"pinia": "3.0.1",
"tailwind-merge": "3.0.2",
"tinymce": "^7",
"vue": "3.5.13",
"vue-draggable-plus": "0.6.0",
"vue-i18n": "11.1.1",
"vue-i18n": "11.1.2",
"vue-json-pretty": "^2.4.0",
"vue-router": "4.5.0"
},
"devDependencies": {
"@elegant-router/vue": "0.3.8",
"@iconify/json": "2.2.305",
"@iconify/json": "2.2.318",
"@sa/scripts": "workspace:*",
"@sa/uno-preset": "workspace:*",
"@soybeanjs/eslint-config": "1.4.4",
"@types/node": "22.13.1",
"@soybeanjs/eslint-config": "1.6.0",
"@types/node": "22.13.10",
"@types/nprogress": "0.2.3",
"@unocss/eslint-config": "65.4.3",
"@unocss/preset-icons": "65.4.3",
"@unocss/preset-uno": "65.4.3",
"@unocss/transformer-directives": "65.4.3",
"@unocss/transformer-variant-group": "65.4.3",
"@unocss/vite": "65.4.3",
"@vitejs/plugin-vue": "5.2.1",
"@vitejs/plugin-vue-jsx": "4.1.1",
"eslint": "9.20.0",
"eslint-plugin-vue": "9.32.0",
"lint-staged": "15.4.3",
"sass": "1.84.0",
"@unocss/eslint-config": "66.0.0",
"@unocss/preset-icons": "66.0.0",
"@unocss/preset-uno": "66.0.0",
"@unocss/transformer-directives": "66.0.0",
"@unocss/transformer-variant-group": "66.0.0",
"@unocss/vite": "66.0.0",
"@vitejs/plugin-vue": "5.2.3",
"@vitejs/plugin-vue-jsx": "4.1.2",
"consola": "3.4.2",
"eslint": "9.22.0",
"eslint-plugin-vue": "10.0.0",
"kolorist": "1.8.0",
"lint-staged": "15.5.0",
"sass": "1.86.0",
"simple-git-hooks": "2.11.1",
"tsx": "4.19.2",
"typescript": "5.7.3",
"unplugin-icons": "22.0.0",
"unplugin-vue-components": "28.0.0",
"vite": "6.1.0",
"tsx": "4.19.3",
"typescript": "5.8.2",
"unplugin-icons": "22.1.0",
"unplugin-vue-components": "28.4.1",
"vite": "6.2.2",
"vite-plugin-monaco-editor": "^1.1.0",
"vite-plugin-progress": "0.0.7",
"vite-plugin-svg-icons": "2.0.1",
"vite-plugin-vue-devtools": "7.7.1",
"vue-eslint-parser": "9.4.3",
"vue-tsc": "2.2.0"
"vite-plugin-vue-devtools": "7.7.2",
"vue-eslint-parser": "10.1.1",
"vue-tsc": "2.2.8"
},
"simple-git-hooks": {
"commit-msg": "pnpm sa git-commit-verify",