From 923eb98a5c5b0c77f37f4bf23d5d623337d65420 Mon Sep 17 00:00:00 2001 From: Soybean Date: Sun, 20 Jul 2025 01:12:19 +0800 Subject: [PATCH 1/7] fix(readme): update GitHub stars and forks links for gitee --- README.en_US.md | 4 ++-- README.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.en_US.md b/README.en_US.md index d329f266..c80c8af4 100644 --- a/README.en_US.md +++ b/README.en_US.md @@ -7,8 +7,8 @@ --- [![license](https://img.shields.io/badge/license-MIT-green.svg)](./LICENSE) -[![github stars](https://img.shields.io/github/stars/soybeanjs/soybean-admin)](https://github.com/soybeanjs/soybean-admin) -[![github forks](https://img.shields.io/github/forks/soybeanjs/soybean-admin)](https://github.com/soybeanjs/soybean-admin) +[![github stars](https://img.shields.io/github/stars/honghuangdc/soybean-admin)](https://github.com/soybeanjs/soybean-admin) +[![github forks](https://img.shields.io/github/forks/honghuangdc/soybean-admin)](https://github.com/soybeanjs/soybean-admin) [![gitee stars](https://gitee.com/honghuangdc/soybean-admin/badge/star.svg)](https://gitee.com/honghuangdc/soybean-admin) [![gitcode star](https://gitcode.com/soybeanjs/soybean-admin/star/badge.svg)](https://gitcode.com/soybeanjs/soybean-admin) [![Powered by DartNode](https://dartnode.com/branding/DN-Open-Source-sm.png)](https://dartnode.com "Powered by DartNode - Free VPS for Open Source") diff --git a/README.md b/README.md index f7745723..d0de71ba 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ --- [![license](https://img.shields.io/badge/license-MIT-green.svg)](./LICENSE) -[![github stars](https://img.shields.io/github/stars/soybeanjs/soybean-admin)](https://github.com/soybeanjs/soybean-admin) -[![github forks](https://img.shields.io/github/forks/soybeanjs/soybean-admin)](https://github.com/soybeanjs/soybean-admin) +[![github stars](https://img.shields.io/github/stars/honghuangdc/soybean-admin)](https://github.com/soybeanjs/soybean-admin) +[![github forks](https://img.shields.io/github/forks/honghuangdc/soybean-admin)](https://github.com/soybeanjs/soybean-admin) [![gitee stars](https://gitee.com/honghuangdc/soybean-admin/badge/star.svg)](https://gitee.com/honghuangdc/soybean-admin) [![gitcode star](https://gitcode.com/soybeanjs/soybean-admin/star/badge.svg)](https://gitcode.com/soybeanjs/soybean-admin) [![Powered by DartNode](https://dartnode.com/branding/DN-Open-Source-sm.png)](https://dartnode.com "Powered by DartNode - Free VPS for Open Source") From 4539fe01fb75dc9722ef9d7a72e4c7a1f1761da0 Mon Sep 17 00:00:00 2001 From: xlsea Date: Fri, 8 Aug 2025 17:17:23 +0800 Subject: [PATCH 2/7] fix(projects): Fix the icon size in the image preview toolbar --- src/styles/css/reset.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/styles/css/reset.css b/src/styles/css/reset.css index b813d307..77a00356 100644 --- a/src/styles/css/reset.css +++ b/src/styles/css/reset.css @@ -13,6 +13,13 @@ border-color: var(--un-default-border-color, #e5e7eb); /* 2 */ } +/* +* [Naive UI] Fix the icon size in the image preview toolbar +*/ +.n-image-preview-toolbar .n-base-icon { + box-sizing: unset !important; +} + /* 1. Use a consistent sensible line-height in all browsers. 2. Prevent adjustments of font size after orientation changes in iOS. From 765181649551685aa05e4a43f61c953598fe8c65 Mon Sep 17 00:00:00 2001 From: AN <1983933789@qq.com> Date: Mon, 11 Aug 2025 09:22:05 +0800 Subject: [PATCH 3/7] =?UTF-8?q?typo(projects):=20=E5=8E=BB=E9=99=A4console?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/modules/user-import-modal.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/system/user/modules/user-import-modal.vue b/src/views/system/user/modules/user-import-modal.vue index 5dc4410f..06050d7b 100644 --- a/src/views/system/user/modules/user-import-modal.vue +++ b/src/views/system/user/modules/user-import-modal.vue @@ -48,7 +48,6 @@ function closeDrawer() { } async function handleSubmit() { - console.log(data.value); fileList.value.forEach(item => { item.status = 'pending'; }); From 33ade5390471c43e79d4ad57bfb8f4938d69a648 Mon Sep 17 00:00:00 2001 From: Soybean Date: Mon, 11 Aug 2025 08:23:00 +0800 Subject: [PATCH 4/7] chore(readme): remove DartNode sponsorship badge from README files --- README.en_US.md | 1 - README.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.en_US.md b/README.en_US.md index c80c8af4..e1fd000d 100644 --- a/README.en_US.md +++ b/README.en_US.md @@ -11,7 +11,6 @@ [![github forks](https://img.shields.io/github/forks/honghuangdc/soybean-admin)](https://github.com/soybeanjs/soybean-admin) [![gitee stars](https://gitee.com/honghuangdc/soybean-admin/badge/star.svg)](https://gitee.com/honghuangdc/soybean-admin) [![gitcode star](https://gitcode.com/soybeanjs/soybean-admin/star/badge.svg)](https://gitcode.com/soybeanjs/soybean-admin) -[![Powered by DartNode](https://dartnode.com/branding/DN-Open-Source-sm.png)](https://dartnode.com "Powered by DartNode - Free VPS for Open Source") Featured｜HelloGitHub diff --git a/README.md b/README.md index d0de71ba..c581412b 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,6 @@ [![github forks](https://img.shields.io/github/forks/honghuangdc/soybean-admin)](https://github.com/soybeanjs/soybean-admin) [![gitee stars](https://gitee.com/honghuangdc/soybean-admin/badge/star.svg)](https://gitee.com/honghuangdc/soybean-admin) [![gitcode star](https://gitcode.com/soybeanjs/soybean-admin/star/badge.svg)](https://gitcode.com/soybeanjs/soybean-admin) -[![Powered by DartNode](https://dartnode.com/branding/DN-Open-Source-sm.png)](https://dartnode.com "Powered by DartNode - Free VPS for Open Source") Featured｜HelloGitHub From 8d7f91dccf5b4715643e13b5a4385e109b7434f2 Mon Sep 17 00:00:00 2001 From: Azir-11 <2075125282@qq.com> Date: Wed, 13 Aug 2025 10:10:10 +0800 Subject: [PATCH 5/7] chore(other): update the ESLint validation configuration to support more file types. --- .vscode/settings.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 2c70ecf9..ee081a60 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,7 +4,18 @@ "source.organizeImports": "never" }, "editor.formatOnSave": false, - "eslint.validate": ["html", "css", "scss", "json", "jsonc"], + "eslint.validate": [ + "html", + "css", + "scss", + "json", + "jsonc", + "javascript", + "javascriptreact", + "typescript", + "typescriptreact", + "vue" + ], "i18n-ally.displayLanguage": "zh-cn", "i18n-ally.enabledParsers": ["ts"], "i18n-ally.enabledFrameworks": ["vue"], From d6ae85d21880f091a912d93d6d05c44b315d8af9 Mon Sep 17 00:00:00 2001 From: AN <1983933789@qq.com> Date: Fri, 15 Aug 2025 17:45:11 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix(projects):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E6=9C=AA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=97=E8=A1=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/modules/user-operate-drawer.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/system/user/modules/user-operate-drawer.vue b/src/views/system/user/modules/user-operate-drawer.vue index f48c0b17..95697a5d 100644 --- a/src/views/system/user/modules/user-operate-drawer.vue +++ b/src/views/system/user/modules/user-operate-drawer.vue @@ -78,9 +78,9 @@ const rules: Record = { roleIds: [{ ...createRequiredRule('请选择角色'), type: 'array' }] }; -async function getUserInfo() { +async function getUserInfo(id: CommonType.IdType = '') { startLoading(); - const { error, data } = await fetchGetUserInfo(props.rowData?.userId); + const { error, data } = await fetchGetUserInfo(id); if (!error) { model.roleIds = data.roleIds; model.postIds = data.postIds; @@ -94,6 +94,7 @@ async function getUserInfo() { function handleUpdateModelWhenEdit() { if (props.operateType === 'add') { + getUserInfo(); Object.assign(model, createDefaultModel()); model.deptId = props.deptId; return; @@ -103,7 +104,7 @@ function handleUpdateModelWhenEdit() { startDeptLoading(); Object.assign(model, props.rowData); model.password = ''; - getUserInfo(); + getUserInfo(props.rowData.userId); endDeptLoading(); } } From 4e625111ce173e5c2f40dbfc47475f2849c58feb Mon Sep 17 00:00:00 2001 From: xlsea Date: Sat, 16 Aug 2025 11:14:41 +0800 Subject: [PATCH 7/7] chore(projects): release v1.1.3 --- CHANGELOG.md | 39 +++++++++++++++++++++++++++++++++++++++ README.md | 7 ++++++- package.json | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28afe0f9..28799360 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,44 @@ # 更新日志 +## [v1.1.3](https://gitee.com/xlsea/ruoyi-plus-soybean/compare/v1.1.2...v1.1.3) (2025-08-16) + +###    🐞 Bug 修复 + +- **hooks**: + - 非安全环境下不使用流式下载  -  by @m-xlsea [(f8983)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/f8983557) + - 修复oss下载时未转码问题  -  by **AN** [(2d31d)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/2d31d7dc) +- **project**: + - 关闭多租户功能后仍然遍历租户列表导致控制台报错的问题  -  by **wang_rui** [(b96c4)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/b96c46ba) + - 关闭多租户功能后仍然遍历租户列表导致控制台报错的问题 Merge pull request !25 from littleghost2016/dev  -  by **不寻俗** [(90276)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/9027632b) +- **projects**: + - 修复一级菜单隐藏失效问题  -  by **AN** [(8fcc7)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/8fcc70d7) + - 修复日期搜索条件清除问题  -  by **AN** [(52318)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/52318c10) + - 修复登录过期事件监听未被重置  -  by @m-xlsea [(71037)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/71037439) + - 修复用户新增时角色下拉包含超级管理员问题  -  by **AN** [(a15b6)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/a15b683b) + - 修复用户导入功能无法更新问题  -  by **AN** [(4e983)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/4e9839bd) + - Fix the icon size in the image preview toolbar  -  by @m-xlsea [(4539f)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/4539fe01) + - 修复新增用户未查询角色列表问题  -  by **AN** [(d6ae8)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/d6ae85d2) +- **readme**: + - update GitHub stars and forks links for gitee  -  by @soybeanjs [(923eb)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/923eb98a) + +###    💅 重构 + +- **menu**: + - 菜单管理中隐藏的菜单显示灰色  -  by **NicholasLD** [(adca2)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/adca2e26) + - 菜单管理中隐藏的菜单显示灰色 Merge pull request !24 from NicholasLD/N/A  -  by **不寻俗** [(4eb77)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/4eb77eac) +- **projects**: + - 菜单列表新增禁用菜单样式  -  by @m-xlsea [(e5383)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/e538355f) + +###    🏡 杂项 + +- **other**: update the ESLint validation configuration to support more file types.  -  by **Azir-11** [(8d7f9)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/8d7f91dc) +- **readme**: remove DartNode sponsorship badge from README files  -  by @soybeanjs [(33ade)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/33ade539) + +###    ❤️ 贡献者 + +[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)  [![m-xlsea](https://github.com/m-xlsea.png?size=48)](https://github.com/m-xlsea)  [![Elio-An](https://github.com/Elio-An.png?size=48)](https://gitee.com/elio-an)  [![Azir-11](https://github.com/Azir-11.png?size=48)](https://github.com/Azir-11)  [![Azir-11](https://github.com/NicholasLD.png?size=48)](https://github.com/NicholasLD)   +[wang_rui](mailto:wrr1996@163.com) + ## [v1.1.2](https://gitee.com/xlsea/ruoyi-plus-soybean/compare/v1.1.1...v1.1.2) (2025-07-24) ###    🐞 Bug 修复 diff --git a/README.md b/README.md index d04d2d4b..7d4652eb 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ # 📢 重要通知 -1.1.2 版本已经正式发布，工作流版本迎来首个版本（请切换 [flow](https://gitee.com/xlsea/ruoyi-plus-soybean/tree/flow/) 分支查看），但仍然建议： +1.1.3 版本已经正式发布（工作流版本请切换 [flow](https://gitee.com/xlsea/ruoyi-plus-soybean/tree/flow/) 分支查看），但仍然建议： - 在生产环境使用前进行充分测试 - 关注项目更新，及时获取最新版本 - 积极反馈问题，帮助我们快速迭代 @@ -40,6 +40,11 @@

后端需要替换代码生成模板与菜单 SQL，详细请看 代码生成与菜单更新

+# 💎 友情链接 + +- [Snail Job Pro](https://pro.snailjob.opensnail.com/home) - 灵活，可靠和快速的分布式任务重试和分布式任务调度平台 +- [AiZuDa - 爱组搭（飞龙工作流企业版）](https://naiveui.aizuda.com) - 像搭积木一样进行低代码甚至零代码快速构建应用 + ## 📋 项目概述 RuoYi-Plus-Soybean 是一个现代化的企业级多租户管理系统，它结合了 RuoYi-Vue-Plus 的强大后端功能和 Soybean Admin 的现代化前端特性，为开发者提供了完整的企业管理解决方案。 diff --git a/package.json b/package.json index c0aec9a5..7ec81fff 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ruoyi-vue-plus", "type": "module", - "version": "1.1.2", + "version": "1.1.3", "description": "结合了 RuoYi-Vue-Plus 的强大后端功能和 Soybean Admin 的现代化前端特性，为开发者提供了完整的企业管理解决方案。", "author": { "name": "xlsea",