From 8db4a059d97a07d82a2bff52e35fe8571dcfa2d1 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 23 Nov 2023 10:39:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=20v4.7.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- pom.xml | 4 +- ruoyi-admin/pom.xml | 2 +- .../src/main/resources/application.yml | 2 +- .../ajax/libs/layui/css/modules/laydate.css | 2 +- .../templates/demo/form/summernote.html | 4 +- .../src/main/resources/templates/include.html | 6 +-- .../resources/templates/index-topnav.html | 6 +-- .../src/main/resources/templates/index.html | 6 +-- .../src/main/resources/templates/lock.html | 2 +- .../src/main/resources/templates/login.html | 4 +- .../src/main/resources/templates/main.html | 46 ++++++++++++++++++- .../main/resources/templates/register.html | 4 +- .../src/main/resources/templates/skin.html | 2 +- ruoyi-common/pom.xml | 2 +- ruoyi-framework/pom.xml | 2 +- ruoyi-generator/pom.xml | 2 +- ruoyi-quartz/pom.xml | 2 +- .../resources/templates/monitor/job/cron.html | 2 +- ruoyi-system/pom.xml | 2 +- 20 files changed, 75 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 9fb070a00..5ba7e721c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

logo

-

RuoYi v4.7.7

+

RuoYi v4.7.8

基于SpringBoot开发的轻量级Java快速开发框架

- +

diff --git a/pom.xml b/pom.xml index 86ed33028..ec255f119 100644 --- a/pom.xml +++ b/pom.xml @@ -5,14 +5,14 @@ com.ruoyi ruoyi - 4.7.7 + 4.7.8 ruoyi http://www.ruoyi.vip 若依管理系统 - 4.7.7 + 4.7.8 UTF-8 UTF-8 1.8 diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 457e24379..2e28443e9 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 4.7.7 + 4.7.8 4.0.0 jar diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 9b21a51c5..74157b46c 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -3,7 +3,7 @@ ruoyi: # 名称 name: RuoYi # 版本 - version: 4.7.7 + version: 4.7.8 # 版权年份 copyrightYear: 2023 # 实例演示开关 diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/laydate.css b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/laydate.css index e0ca08cb7..1c3277249 100644 --- a/ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/laydate.css +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/layui/css/modules/laydate.css @@ -1,2 +1,2 @@ -/*! laydate 日期与时间组件 */ +/*! laydate-v5.5.0 日期与时间组件 */ @font-face{font-family: 'laydate-icon';src: url('../../../../../fonts/iconfont.woff?v=282') format('woff');}.laydate-icon{font-family:"laydate-icon"!important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}html #layuicss-laydate{display:none;position:absolute;width:1989px}.layui-laydate *{margin:0;padding:0}.layui-laydate,.layui-laydate *{box-sizing:border-box}.layui-laydate{position:absolute;z-index:66666666;margin:5px 0;border-radius:2px;font-size:14px;-webkit-animation-duration:.2s;animation-duration:.2s;-webkit-animation-fill-mode:both;animation-fill-mode:both}.layui-laydate-main{width:272px}.layui-laydate-header *,.layui-laydate-content td,.layui-laydate-list li{transition-duration:.3s;-webkit-transition-duration:.3s}@keyframes laydate-downbit{0%{opacity:.3;transform:translate3d(0,-5px,0)}100%{opacity:1;transform:translate3d(0,0,0)}}.layui-laydate{animation-name:laydate-downbit}.layui-laydate-static{position:relative;z-index:0;display:inline-block;margin:0;-webkit-animation:none;animation:none}.laydate-ym-show .laydate-prev-m,.laydate-ym-show .laydate-next-m{display:none!important}.laydate-ym-show .laydate-prev-y,.laydate-ym-show .laydate-next-y{display:inline-block!important}.laydate-ym-show .laydate-set-ym span[lay-type="month"]{display:none!important}.laydate-time-show .layui-laydate-header .layui-icon,.laydate-time-show .laydate-set-ym span[lay-type="year"],.laydate-time-show .laydate-set-ym span[lay-type="month"]{display:none!important}.layui-laydate-header{position:relative;line-height:30px;padding:10px 70px 5px}.layui-laydate-header *{display:inline-block;vertical-align:bottom}.layui-laydate-header i{position:absolute;top:10px;padding:0 5px;color:#999;font-size:18px;cursor:pointer}.layui-laydate-header i.laydate-prev-y{left:15px}.layui-laydate-header i.laydate-prev-m{left:45px}.layui-laydate-header i.laydate-next-y{right:15px}.layui-laydate-header i.laydate-next-m{right:45px}.laydate-set-ym{width:100%;text-align:center;box-sizing:border-box;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.laydate-set-ym span{padding:0 10px;cursor:pointer}.laydate-time-text{cursor:default!important}.layui-laydate-content{position:relative;padding:10px;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.layui-laydate-content table{border-collapse:collapse;border-spacing:0}.layui-laydate-content th,.layui-laydate-content td{width:36px;height:30px;padding:5px;text-align:center}.layui-laydate-content th{font-weight:400}.layui-laydate-content td{position:relative;cursor:pointer}.laydate-day-mark{position:absolute;left:0;top:0;width:100%;line-height:30px;font-size:12px;overflow:hidden}.laydate-day-mark::after{position:absolute;content:'';right:2px;top:2px;width:5px;height:5px;border-radius:50%}.laydate-day-holidays:before{position:absolute;left:0;top:0;font-size:12px;transform:scale(.7)}.laydate-day-holidays:before{content:'\4F11';color:#ff5722}.laydate-day-holidays[type="work"]:before{content:'\73ED';color:inherit}.layui-laydate .layui-this .laydate-day-holidays:before{color:#fff}.layui-laydate-footer{position:relative;height:46px;line-height:26px;padding:10px}.layui-laydate-footer span{display:inline-block;vertical-align:top;height:26px;line-height:24px;padding:0 10px;border:1px solid #c9c9c9;border-radius:2px;background-color:#fff;font-size:12px;cursor:pointer;white-space:nowrap;transition:all .3s}.layui-laydate-footer span:hover{color:#5fb878}.layui-laydate-footer span.layui-laydate-preview{cursor:default;border-color:transparent!important}.layui-laydate-footer span.layui-laydate-preview:hover{color:#666}.layui-laydate-footer span:first-child.layui-laydate-preview{padding-left:0}.laydate-footer-btns{position:absolute;right:10px;top:10px}.laydate-footer-btns span{margin:0 0 0 -1px}.layui-laydate-list{position:absolute;left:0;top:0;width:100%;height:100%;padding:10px;box-sizing:border-box;background-color:#fff}.layui-laydate-list>li{position:relative;display:inline-block;width:33.3%;height:36px;line-height:36px;margin:3px 0;vertical-align:middle;text-align:center;cursor:pointer}.laydate-month-list>li{width:25%;margin:17px 0}.laydate-time-list>li{height:100%;margin:0;line-height:normal;cursor:default}.laydate-time-list p{position:relative;top:-4px;line-height:29px}.laydate-time-list ol{height:181px;overflow:hidden}.laydate-time-list>li:hover ol{overflow-y:auto}.laydate-time-list ol li{width:130%;padding-left:33px;height:30px;line-height:30px;text-align:left;cursor:pointer}.layui-laydate-hint{position:absolute;top:115px;left:50%;width:250px;margin-left:-125px;line-height:20px;padding:15px;text-align:center;font-size:12px;color:#ff5722}.layui-laydate-range{width:546px}.layui-laydate-range .layui-laydate-main{display:inline-block;vertical-align:middle}.layui-laydate-range .laydate-main-list-1 .layui-laydate-header,.layui-laydate-range .laydate-main-list-1 .layui-laydate-content{border-left:1px solid #e2e2e2}.layui-laydate,.layui-laydate-hint{border:1px solid #d2d2d2;box-shadow:0 2px 4px rgba(0,0,0,.12);background-color:#fff;color:#666}.layui-laydate-header{border-bottom:1px solid #e2e2e2}.layui-laydate-header i:hover,.layui-laydate-header span:hover{color:#5fb878}.layui-laydate-content{border-top:none 0;border-bottom:none 0}.layui-laydate-content th{color:#333}.layui-laydate-content td{color:#666}.layui-laydate-content td.laydate-selected{background-color:#b5fff8}.laydate-selected:hover{background-color:#00f7de!important}.layui-laydate-content td:hover,.layui-laydate-list li:hover{background-color:#eee;color:#333}.laydate-time-list li ol{margin:0;padding:0;border:1px solid #e2e2e2;border-left-width:0}.laydate-time-list li:first-child ol{border-left-width:1px}.laydate-time-list>li:hover{background:0}.layui-laydate-content .laydate-day-prev,.layui-laydate-content .laydate-day-next{color:#d2d2d2}.laydate-selected.laydate-day-prev,.laydate-selected.laydate-day-next{background-color:#f8f8f8!important}.layui-laydate-footer{border-top:1px solid #e2e2e2}.layui-laydate-hint{color:#ff5722}.laydate-day-mark::after{background-color:#5fb878}.layui-laydate-content td.layui-this .laydate-day-mark::after{display:none}.layui-laydate-footer span[lay-type="date"]{color:#5fb878}.layui-laydate .layui-this{background-color:#009688!important;color:#fff!important}.layui-laydate .laydate-disabled,.layui-laydate .laydate-disabled:hover{background:none!important;color:#d2d2d2!important;cursor:not-allowed!important;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none}.laydate-theme-molv{border:0}.laydate-theme-molv.layui-laydate-range{width:548px}.laydate-theme-molv .layui-laydate-main{width:274px}.laydate-theme-molv .layui-laydate-header{border:0;background-color:#009688}.laydate-theme-molv .layui-laydate-header i,.laydate-theme-molv .layui-laydate-header span{color:#f6f6f6}.laydate-theme-molv .layui-laydate-header i:hover,.laydate-theme-molv .layui-laydate-header span:hover{color:#fff}.laydate-theme-molv .layui-laydate-content{border:1px solid #e2e2e2;border-top:0;border-bottom:0}.laydate-theme-molv .laydate-main-list-1 .layui-laydate-content{border-left:none}.laydate-theme-molv .layui-laydate-footer{border:1px solid #e2e2e2}.laydate-theme-grid .layui-laydate-content td,.laydate-theme-grid .layui-laydate-content thead,.laydate-theme-grid .laydate-year-list>li,.laydate-theme-grid .laydate-month-list>li{border:1px solid #e2e2e2}.laydate-theme-grid .laydate-selected,.laydate-theme-grid .laydate-selected:hover{background-color:#f2f2f2!important;color:#009688!important}.laydate-theme-grid .laydate-selected.laydate-day-prev,.laydate-theme-grid .laydate-selected.laydate-day-next{color:#d2d2d2!important}.laydate-theme-grid .laydate-year-list,.laydate-theme-grid .laydate-month-list{margin:1px 0 0 1px}.laydate-theme-grid .laydate-year-list>li,.laydate-theme-grid .laydate-month-list>li{margin:0 -1px -1px 0}.laydate-theme-grid .laydate-year-list>li{height:43px;line-height:43px}.laydate-theme-grid .laydate-month-list>li{height:71px;line-height:71px} \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/demo/form/summernote.html b/ruoyi-admin/src/main/resources/templates/demo/form/summernote.html index e894dff10..a14b04319 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/form/summernote.html +++ b/ruoyi-admin/src/main/resources/templates/demo/form/summernote.html @@ -17,7 +17,7 @@
Summernote 富文本编辑器

若依后台管理系统

ruoyi是一个完全响应式，基于Bootstrap3.3.7最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了Html5+CSS3等现代技术，她提供了诸多的强大的可以重新组合的UI组件，并集成了最新的jQuery版本(v2.1.1)，当然，也集成了很多功能强大，用途广泛的就jQuery插件，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。

- 当前版本：v4.7.7 + 当前版本：v4.7.8

免费开源 @@ -56,7 +56,7 @@

编辑/保存为html代码示例

你好，若依

H+是一个完全响应式，基于Bootstrap3.3.7最新版本开发的扁平化主题，她采用了主流的左右两栏式布局，使用了Html5+CSS3等现代技术，她提供了诸多的强大的可以重新组合的UI组件，并集成了最新的jQuery版本(v2.1.1)，当然，也集成了很多功能强大，用途广泛的就jQuery插件，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。

- 当前版本：v4.7.7 + 当前版本：v4.7.8

开源免费 diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html index 64f7ad59e..7a600944c 100644 --- a/ruoyi-admin/src/main/resources/templates/include.html +++ b/ruoyi-admin/src/main/resources/templates/include.html @@ -12,7 +12,7 @@ - + @@ -36,8 +36,8 @@ - - + + diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html index 813ac2784..181c65de9 100644 --- a/ruoyi-admin/src/main/resources/templates/index-topnav.html +++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html @@ -14,7 +14,7 @@ - + @@ -318,8 +318,8 @@ - - + + diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 7f72ea280..22377fd7b 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -14,7 +14,7 @@ - +

@@ -264,8 +264,8 @@ - - + + - + - + diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html index 3e82db448..bf5634f77 100644 --- a/ruoyi-admin/src/main/resources/templates/main.html +++ b/ruoyi-admin/src/main/resources/templates/main.html @@ -96,13 +96,57 @@
更新日志
+
+
+
+ v4.7.82023.11.23 +
+
+
+
+
    +
  1. 用户列表新增抽屉效果详细信息
    2. +
  2. 操作日志列表新增IP地址查询
    3. +
  3. 定时任务新增页去除状态选项
    4. +
  4. 系统管理角色列表显示数据权限
    5. +
  5. 通用排序属性orderBy参数限制长度
    6. +
  6. 新增isScrollToTop页签切换滚动到顶部
    7. +
  7. Excel自定义数据处理器增加单元格/工作簿对象
    8. +
  8. 新增表格参数（数据值为空时显示的内容undefinedText）
    9. +
  9. 升级oshi到最新版本6.4.7
    10. +
  10. 升级shiro到最新版本1.13.0
    11. +
  11. 升级druid到最新版本1.2.20
    12. +
  12. 升级pagehelper到最新版1.4.7
    13. +
  13. 升级spring-boot到最新版本2.5.15
    14. +
  14. 升级jquery到最新版v3.7.1
    15. +
  15. 升级layer到最新版本v3.7.0
    16. +
  16. 升级layui到最新版本v2.8.18
    17. +
  17. 升级x-editable到最新版本1.5.3
    18. +
  18. 修复自定义字典样式不生效的问题
    19. +
  19. 修复弹窗按钮启用禁用方法无效问题
    20. +
  20. 修复横向菜单关闭最后一个页签状态问题
    21. +
  21. 修复Excel导入数据临时文件无法删除问题
    22. +
  22. 修复表格行内编辑启用翻页记住选择无效问题
    23. +
  23. 修复Excels导入时无法获取到dictType字典值问题
    24. +
  24. 优化重置密码鼠标按下显示密码
    25. +
  25. 优化参数键值文本框改为文本域
    26. +
  26. 优化表格重置默认返回到第一页
    27. +
  27. 优化菜单管理类型为按钮状态可选
    28. +
  28. 优化数字金额大写转换精度丢失问题
    29. +
  29. 优化树表查询无数据时清除分页信息
    30. +
  30. 优化通用detail详细信息弹窗不显示按钮
    31. +
  31. 其他细节优化
    32. +
+
+
+
v4.7.72023.04.14
-
+
  1. 操作日志新增消耗时间属性
    2. diff --git a/ruoyi-admin/src/main/resources/templates/register.html b/ruoyi-admin/src/main/resources/templates/register.html index d3fc1d479..530f46dc4 100644 --- a/ruoyi-admin/src/main/resources/templates/register.html +++ b/ruoyi-admin/src/main/resources/templates/register.html @@ -9,7 +9,7 @@ - + @@ -74,7 +74,7 @@

    注册：

    - + diff --git a/ruoyi-admin/src/main/resources/templates/skin.html b/ruoyi-admin/src/main/resources/templates/skin.html index e22a6aa37..c25f24e42 100644 --- a/ruoyi-admin/src/main/resources/templates/skin.html +++ b/ruoyi-admin/src/main/resources/templates/skin.html @@ -140,7 +140,7 @@ - + - +