diff --git a/CHANGELOG.md b/CHANGELOG.md index a292c36d..acc191bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,99 @@ # 更新日志 +## [v1.1.0](https://gitee.com/xlsea/ruoyi-plus-soybean/compare/v1.0.0...v1.1.0) (2025-07-01) + +###    🚀 新功能 + +- **components**: + - 新增表单上传组件  -  by @m-xlsea [(03c8a)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/03c8a7f5) +- **other**: + - 新增菜单字典多语言适配 SQL  -  by @m-xlsea [(0f33f)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/0f33f4a3) +- **projects**: + - add configurable user name watermark option  -  by @wenyuanw [(7c3da)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/7c3dac42) + - 菜单字典适配 i18n  -  by @m-xlsea [(39dd9)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/39dd9acc) + - 新增字典多语言适配  -  by @m-xlsea [(8c840)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/8c84063a) +- **styles**: + - 修复登录页移动端显示问题  -  by @m-xlsea [(742e3)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/742e3858) + +###    🐞 Bug 修复 + +- **app**: + - replace console.error with window.console.error for consistency  -  by @soybeanjs [(7d840)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/7d84062e) +- **auth**: + - remove redundant authStore declaration in resetStore function  -  by @soybeanjs [(c57f8)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/c57f88aa) +- **components**: + - 修复菜单树选择组件  -  by @m-xlsea [(bbda8)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/bbda803e) + - 修复树选择组件再次勾选父子联动导致全选问题  -  by @m-xlsea [(aeb73)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/aeb736eb) + - 修复部门选择组件非树结构，默认展开失败问题  -  by **AN** [(da1c1)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/da1c16e0) + - 修复上传组件回显问题，修改accept参数逻辑  -  by **AN** [(e16a0)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/e16a0fa6) + - 修复菜单选择标签渲染问题  -  by @m-xlsea [(6e6cc)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/6e6cc4d9) +- **other**: + - 修复代码生成问题  -  by @m-xlsea [(1ec10)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/1ec10991) + - 代码生成模板 dateRangeTime 错误  -  by @m-xlsea [(f0810)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/f0810bce) + - 修复代码生成字典相关问题  -  by @m-xlsea [(94d18)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/94d1863e) + - 修复代码生成类型定义文件重复问题  -  by @m-xlsea [(f7c7fc41)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/f7c7fc41) +- **projects**: + - 修复自定义数据权限没有保存角色部门bug  -  by **AN** [(a0f33)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/a0f33664) + - 修复登录过期后，重复弹窗问题  -  by **AN** [(cafee)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/cafee1db) + - 修复首页未从环境变量获取问题  -  by @m-xlsea [(031b7)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/031b7f69) + - 修复导出查询参数问题  -  by @m-xlsea [(ffa47)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/ffa47c37) + - 修复权限字符显示逻辑错误问题  -  by **AN** [(0ac0a)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/0ac0a093) + - 目录类型禁用iframe选项  -  by **AN** [(72b8f)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/72b8f56e) + - 修复切换用户或登录过期部分问题  -  by @m-xlsea [(27f06)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/27f06195) + - 修复接口请求异常拦截问题  -  by @m-xlsea [(031d0)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/031d071a) + - 修复个人信息-修改密码未加密且参数错误问题  -  by **AN** [(8b315)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/8b3151b8) + - 调整属性名  -  by **AN** [(62e6c)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/62e6c776) + - ensure proper text color when themes are inverted  -  by @wenyuanw [(afd60)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/afd60421) +- **styles**: + - 添加滚动条，去除页码  -  by **AN** [(d37ad)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/d37adc36) +- **types**: + - The environment variable VITE_ICON_LOCAL_PREFIX has the wrong type.  -  by **chenziwen** [(da149)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/da149e5b) +- **utils**: + - 修复 删除当前tab为最后一个时，tab切换错误bug.  -  by **AN** [(64bd1)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/64bd119c) + +###    🛠 优化 + +- **components**: + - optimize spacing for lang-switch dropdown options  -  by @wenyuanw [(fcb89)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/fcb89883) +- **projects**: + - optimize tab deletion logic. closed #755  -  by @wenyuanw in https://gitee.com/xlsea/ruoyi-plus-soybean/issues/755 [(e6044)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/e6044d0f) + - optimize tab deletion logic  -  by **AN** [(858c3)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/858c3180) + - 优化接口请求异常拦截代码  -  by @m-xlsea [(47191)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/471912e1) + +###    💅 重构 + +- **iframe-page**: remove unused lifecycle hooks and clean up script setup  -  by @soybeanjs [(276d8)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/276d836c) +- **projects**: 补充formTip信息  -  by **AN** [(f36ac)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/f36ac9ab) + +###    📖 文档 + +- **readme**: + - 更新 README.md 文件  -  by @m-xlsea [(99675cb)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/99675cb) + +###    🏡 杂项 + +- **deps**: + - update deps  -  by @soybeanjs [(3e4e1)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/3e4e17ab) + - update deps  -  by @soybeanjs [(dc674)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/dc674ce8) + - update deps  -  by @m-xlsea [(fec05)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/fec0563e) +- **projects**: + - 移除未使用代码  -  by **AN** [(d141e)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/d141ed5b) + - update deps & fix `moduleResolution`  -  by @soybeanjs [(dbd99)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/dbd995c1) + +###    🎨 样式 + +- **projects**: + - 更换 logo 与加载样式  -  by @m-xlsea [(7e4ec)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/7e4ecae6) + - 重构登录页样式  -  by @m-xlsea [(40680)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/406800de) + - 修改按钮文本颜色  -  by @m-xlsea [(907f0)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/907f0439) + - 优化移动端字体大小  -  by @m-xlsea [(8b4e4)](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/8b4e41ce) + +###    ❤️ 贡献者 + +[![xlsea](https://github.com/m-xlsea.png?size=48)](https://gitee.com/xlsea)  [![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)  [![wenyuanw](https://github.com/wenyuanw.png?size=48)](https://github.com/wenyuanw)  [![Elio-An](https://github.com/Elio-An.png?size=48)](https://gitee.com/elio-an)  [![wenyuanw](https://github.com/chen-ziwen.png?size=48)](https://github.com/chen-ziwen)   +[![wangzhongqi0917](https://gitee.com/wangzhongqi0917.png?width=48)](https://gitee.com/wangzhongqi0917)  [![qq1822213252](https://gitee.com/qq1822213252.png?width=48)](https://gitee.com/qq1822213252)  [![tangzc](https://gitee.com/tangzc.png?width=48)](https://gitee.com/tangzc), [metabytes](https://gitee.com/metabytes) + + ## [v1.0.0](https://gitee.com/xlsea/ruoyi-plus-soybean/releases/tag/v1.0.0) (2025-06-05) ###    🚀 新功能 diff --git a/README.md b/README.md index 3e85d45f..484050dc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ -
- +
+ +

RuoYi-Plus-Soybean

@@ -7,19 +8,21 @@

一个基于 RuoYi-Vue-Plus 的后端能力和 Soybean Admin 前端特性的现代化多租户管理系统

- Gitee - Github - vue - typescript - vite - naive-ui - license + Gitee + Gitee-forks + Github + Github-forks + vue + typescript + vite + naive-ui + license

# 📢 重要通知 -虽然 1.0.0 版本已经包含了完整的核心功能，但我们仍然建议： +1.1.0 版本已发布，但仍然建议： - 在生产环境使用前进行充分测试 - 关注项目更新，及时获取最新版本 - 积极反馈问题，帮助我们快速迭代 @@ -27,10 +30,8 @@ **后续规划** - 工作流引擎集成 - 多语言国际化完善 -- 更多企业级功能模块 - 性能优化和稳定性提升 - > 如果对该项目感兴趣，可以给一个 Star 支持一下，谢谢！ > 请大家踊跃提交 PR 和 Issue，一起完善这个项目 @@ -348,6 +349,8 @@ console.log(t('common.confirm')); - [RuoYi-Vue-Plus](https://gitee.com/dromara/RuoYi-Vue-Plus) - 后端基础框架 - [Soybean Admin](https://github.com/soybeanjs/soybean-admin) - 前端基础框架 - [RuoYi-Plus-Soybean](https://ruoyi.xlsea.cn) - 官方演示站点 +- [RuoYi-Plus-Soybean-Docs](https://docs.ruoyi.xlsea.cn) - 项目文档 +- [Open Hives](https://openhives.com/questions) - OpenHives 问答社区 ## 📮 联系方式 @@ -362,6 +365,12 @@ console.log(t('common.confirm')); ## 💬 交流群 +**加群前请先阅读一下内容：** + +- 禁止内容：黄腔、暴力言论、政治话题，违者直接飞机票（踢出群） +- 遇到问题请先阅读 [项目文档](https://docs.ruoyi.xlsea.cn) 和 [Soybean 文档](https://docs.soybeanjs.cn/)，某些简单问题不予理睬 +- 蜡笔小新头像为机器人助手，私聊不保证回复，问题请在群内讨论 + 添加作者微信备注：加群 @@ -374,61 +383,4 @@ console.log(t('common.confirm')); ## 🫡 捐赠列表 -感谢下方各位老板的捐赠 🫡 - -> 如果不想出现在下方捐赠列表，请在备注中说明，我会匿名处理 - -
- - 酷酷冬天 20元 -
- -
- - Selfish Altruism(JackSue) 200元 -
- -
- - 匿名用户 50元 -
- -
- - 匿名用户 10元 -
- -
- - DAS 20元 -
- -
- - 大山 100元 -
- -
- - 依依 20元 -
- -
- - 沙海 20元 -
- -
- - xxl 50元 -
- -
- - 莫离支🤴 10元 -
- -
- - Ivan 100元 -
+**捐赠列表已移至 [捐赠列表](https://docs.ruoyi.xlsea.cn/other/donate.html)** diff --git a/docs/java/VelocityUtils.java b/docs/java/VelocityUtils.java index f064c6ee..a1c47602 100644 --- a/docs/java/VelocityUtils.java +++ b/docs/java/VelocityUtils.java @@ -190,7 +190,7 @@ public class VelocityUtils { } else if (template.contains("index-tree.vue.vm")) { fileName = StringUtils.format("{}/views/{}/{}/index.vue", soybeanPath, moduleName, StrUtil.toSymbolCase(businessName, '-')); } else if (template.contains("api.d.ts.vm")) { - fileName = StringUtils.format("{}/typings/api/{}.api.d.ts", soybeanPath, moduleName); + fileName = StringUtils.format("{}/typings/api/{}.{}.api.d.ts", soybeanPath, moduleName, StrUtil.toSymbolCase(businessName, '-')); } else if (template.contains("api.ts.vm")) { fileName = StringUtils.format("{}/service/api/{}/{}.ts", soybeanPath, moduleName, StrUtil.toSymbolCase(businessName, '-')); } else if (template.contains("search.vue.vm")) { diff --git a/package.json b/package.json index d0fc3525..82a81901 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,15 @@ { "name": "ruoyi-vue-plus", "type": "module", - "version": "1.0.0", - "description": "RuoYi-Vue-Plus多租户管理系统", + "version": "1.1.0", + "description": "结合了 RuoYi-Vue-Plus 的强大后端功能和 Soybean Admin 的现代化前端特性，为开发者提供了完整的企业管理解决方案。", "author": { "name": "xlsea", - "email": "xlsea@linux.do", - "url": "https://gitee.com/xlsea/ruoyi-plus-soybean" + "email": "m@xlsea.cn", + "url": "https://gitee.com/xlsea" }, "license": "MIT", - "homepage": "https://ruoyi.xlsea.cn", + "homepage": "https://docs.ruoyi.xlsea.cn", "repository": { "url": "https://gitee.com/xlsea/ruoyi-plus-soybean.git" }, @@ -18,6 +18,7 @@ }, "keywords": [ "RuoYi-Vue-Plus", + "Soybean Admin", "Vue3 admin ", "vue-admin-template", "Vite6", @@ -26,6 +27,13 @@ "naive-ui-admin", "UnoCSS" ], + "contributors": [ + { + "name": "Elio", + "email": "1983933789@qq.com", + "url": "https://gitee.com/elio-an" + } + ], "engines": { "node": ">=20.19.0", "pnpm": ">=10.5.0" diff --git a/src/views/system/dept/modules/dept-search.vue b/src/views/system/dept/modules/dept-search.vue index 666f2b81..eb0d0c9e 100644 --- a/src/views/system/dept/modules/dept-search.vue +++ b/src/views/system/dept/modules/dept-search.vue @@ -17,7 +17,7 @@ const { formRef, validate, restoreValidation } = useNaiveForm(); const model = defineModel('model', { required: true }); -const { options: sysNormalDisableOptions } = useDict('sys_normal_disable'); +const { options: sysNormalDisableOptions } = useDict('sys_normal_disable', false); async function reset() { await restoreValidation();