From de1766abdec87e8368a5e502ed873125779b5cd6 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 31 Mar 2022 11:48:27 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B8=85=E7=90=86?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E7=9A=84=E7=BA=BF=E7=A8=8B=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/core/controller/BaseController.java | 8 ++++++++ .../src/main/java/com/ruoyi/common/utils/PageUtils.java | 8 ++++++++ .../main/java/com/ruoyi/framework/aspectj/LogAspect.java | 1 - 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java index 2aeaf9ba..b96d93c0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java @@ -68,6 +68,14 @@ public class BaseController } } + /** + * 清理分页的线程变量 + */ + protected void clearPage() + { + PageUtils.clearPage(); + } + /** * 响应请求分页数据 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java index 7db37a2f..0585396c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java @@ -27,4 +27,12 @@ public class PageUtils extends PageHelper PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable); } } + + /** + * 清理分页的线程变量 + */ + public static void clearPage() + { + PageHelper.clearPage(); + } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index a2aaf222..c9ce3225 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -65,7 +65,6 @@ public class LogAspect { try { - // 获取当前的用户 LoginUser loginUser = SecurityUtils.getLoginUser(); From a854e0ca8edb886845397748042011247621b027 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 1 Apr 2022 08:30:48 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=203.8.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +- ruoyi-admin/pom.xml | 2 +- .../src/main/resources/application.yml | 2 +- ruoyi-common/pom.xml | 2 +- ruoyi-framework/pom.xml | 2 +- ruoyi-generator/pom.xml | 2 +- ruoyi-quartz/pom.xml | 2 +- ruoyi-system/pom.xml | 2 +- ruoyi-ui/package.json | 2 +- ruoyi-ui/src/views/index.vue | 51 ++++++++++++++++++- 10 files changed, 59 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index b536c312..850b1be2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi - 3.8.1 + 3.8.2 ruoyi http://www.ruoyi.vip 若依管理系统 - 3.8.1 + 3.8.2 UTF-8 UTF-8 1.8 diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 14769e51..ba3cab48 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 3.8.1 + 3.8.2 4.0.0 jar diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index ccef2502..5fa30a4e 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: 3.8.1 + version: 3.8.2 # 版权年份 copyrightYear: 2022 # 实例演示开关 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index e18104ca..9999a26f 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 3.8.1 + 3.8.2 4.0.0 diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index f1b68c7c..39b2d88c 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 3.8.1 + 3.8.2 4.0.0 diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml index b80b938c..426bc2c8 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-generator/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 3.8.1 + 3.8.2 4.0.0 diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml index c70da0da..ea2b8ef5 100644 --- a/ruoyi-quartz/pom.xml +++ b/ruoyi-quartz/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 3.8.1 + 3.8.2 4.0.0 diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index 611cc828..cdd5bb63 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 3.8.1 + 3.8.2 4.0.0 diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index fc15b2e1..6e1523c0 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi", - "version": "3.8.1", + "version": "3.8.2", "description": "若依管理系统", "author": "若依", "license": "MIT", diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index f5ee3b60..3b725987 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -41,7 +41,7 @@

若依后台管理框架

- 一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统。，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。 + 一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。

当前版本: v{{ version }} @@ -147,6 +147,53 @@ 更新日志 + +

    +
  1. 前端支持设置是否需要防止数据重复提交
    2. +
  2. 开启TopNav没有子菜单情况隐藏侧边栏
    3. +
  3. 侧边栏菜单名称过长悬停显示标题
    4. +
  4. 用户访问控制时校验数据权限，防止越权
    5. +
  5. 导出Excel时屏蔽公式，防止CSV注入风险
    6. +
  6. 组件ImagePreview支持多图预览显示
    7. +
  7. 组件ImageUpload支持多图同时选择上传
    8. +
  8. 组件FileUpload支持多文件同时选择上传
    9. +
  9. 服务监控新增运行参数信息显示
    10. +
  10. 定时任务目标字符串过滤特殊字符
    11. +
  11. 定时任务目标字符串验证包名白名单
    12. +
  12. 代码生成列表图片支持预览
    13. +
  13. 代码生成编辑修改打开新页签
    14. +
  14. 代码生成新增Java类型Boolean
    15. +
  15. 代码生成子表支持日期/字典配置
    16. +
  16. 代码生成同步保留必填/类型选项
    17. +
  17. 升级oshi到最新版本6.1.2
    18. +
  18. 升级fastjson到最新版1.2.80
    19. +
  19. 升级pagehelper到最新版1.4.1
    20. +
  20. 升级spring-boot到最新版本2.5.11
    21. +
  21. 升级spring-boot-mybatis到最新版2.2.2
    22. +
  22. 添加遗漏的分页参数合理化属性
    23. +
  23. 修改npm即将过期的注册源地址
    24. +
  24. 修复分页组件请求两次问题
    25. +
  25. 修复通用文件下载接口跨域问题
    26. +
  26. 修复Xss注解字段值为空时的异常问题
    27. +
  27. 修复选项卡点击右键刷新丢失参数问题
    28. +
  28. 修复表单清除元素位置未垂直居中问题
    29. +
  29. 修复服务监控中运行参数显示条件错误
    30. +
  30. 修复导入Excel时字典字段类型为Long转义为空问题
    31. +
  31. 修复登录超时刷新页面跳转登录页面还提示重新登录问题
    32. +
  32. 优化加载字典缓存数据
    33. +
  33. 优化IP地址获取到多个的问题
    34. +
  34. 优化任务队列满时任务拒绝策略
    35. +
  35. 优化文件上传兼容Weblogic环境
    36. +
  36. 优化定时任务默认保存到内存中执行
    37. +
  37. 优化部门修改缩放后出现的错位问题
    38. +
  38. 优化Excel格式化不同类型的日期对象
    39. +
  39. 优化菜单表关键字导致的插件报错问题
    40. +
  40. 优化Oracle用户头像列为空时不显示问题
    41. +
  41. 优化页面若未匹配到字典标签则返回原字典值
    42. +
  42. 优化修复登录失效后多次请求提示多次弹窗问题
    43. +
  43. 其他细节优化
    44. +
+
  1. 新增Vue3前端代码生成模板
    2. @@ -750,7 +797,7 @@ export default { data() { return { // 版本号 - version: "3.8.1", + version: "3.8.2", }; }, methods: { From 07fded4da95b4993ce65efe7f3796d3b7ecaef86 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 2 Apr 2022 10:13:58 +0800 Subject: [PATCH 3/9] update readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1801b6d4..ba50d3ef 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

    logo

    -

    RuoYi v3.8.1

    +

    RuoYi v3.8.2

    基于SpringBoot+Vue前后端分离的Java快速开发框架

    - +

    From bac3b3a0dc0c2e8fa464fd0c5247a8903af1ea21 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 2 Apr 2022 10:15:25 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E9=99=8D=E7=BA=A7jsencrypt=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=85=BC=E5=AE=B9IE=E6=B5=8F=E8=A7=88=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 6e1523c0..853a3b8c 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -47,7 +47,7 @@ "highlight.js": "9.18.5", "js-beautify": "1.13.0", "js-cookie": "3.0.1", - "jsencrypt": "3.2.1", + "jsencrypt": "3.0.0-rc.1", "nprogress": "0.2.0", "quill": "1.3.7", "screenfull": "5.0.2", From 3bc5ef38d34ff31481f013be2cc2bf1feeb2c1fc Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sat, 2 Apr 2022 10:16:09 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=8D=87=E7=BA=A7spring-boot=E5=88=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC2.5.12=20=E9=98=B2=E6=AD=A2?= =?UTF-8?q?RCE=E6=BC=8F=E6=B4=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 850b1be2..b693251f 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ org.springframework.boot spring-boot-dependencies - 2.5.11 + 2.5.12 pom import From d311d56bbfb4c37899b426457ac6a46e33874f0f Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sun, 3 Apr 2022 18:28:30 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8DExcel=E6=B3=A8=E8=A7=A3pr?= =?UTF-8?q?ompt/combo=E5=90=8C=E6=97=B6=E4=BD=BF=E7=94=A8=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/utils/poi/ExcelUtil.java | 53 +++++-------------- 1 file changed, 13 insertions(+), 40 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index 9a837c43..e0088387 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -786,17 +786,10 @@ public class ExcelUtil // 设置列宽 sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256)); } - // 如果设置了提示信息则鼠标放上去提示. - if (StringUtils.isNotEmpty(attr.prompt())) + if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0) { - // 这里默认设了2-101列提示. - setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column); - } - // 如果设置了combo属性则本列只能选择不能输入 - if (attr.combo().length > 0) - { - // 这里默认设了2-101列只能选择不能输入. - setXSSFValidation(sheet, attr.combo(), 1, 100, column, column); + // 提示信息或只能选择不能输入的列内容. + setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column); } } @@ -860,48 +853,29 @@ public class ExcelUtil } /** - * 设置 POI XSSFSheet 单元格提示 + * 设置 POI XSSFSheet 单元格提示或选择框 * * @param sheet 表单 - * @param promptTitle 提示标题 + * @param textlist 下拉框显示的内容 * @param promptContent 提示内容 * @param firstRow 开始行 * @param endRow 结束行 * @param firstCol 开始列 * @param endCol 结束列 */ - public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow, + public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol) { DataValidationHelper helper = sheet.getDataValidationHelper(); - DataValidationConstraint constraint = helper.createCustomConstraint("DD1"); + DataValidationConstraint constraint = textlist.length > 0 ? helper.createExplicitListConstraint(textlist) : helper.createCustomConstraint("DD1"); CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); DataValidation dataValidation = helper.createValidation(constraint, regions); - dataValidation.createPromptBox(promptTitle, promptContent); - dataValidation.setShowPromptBox(true); - sheet.addValidationData(dataValidation); - } - - /** - * 设置某些列的值只能输入预制的数据,显示下拉框. - * - * @param sheet 要设置的sheet. - * @param textlist 下拉框显示的内容 - * @param firstRow 开始行 - * @param endRow 结束行 - * @param firstCol 开始列 - * @param endCol 结束列 - * @return 设置好的sheet. - */ - public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol) - { - DataValidationHelper helper = sheet.getDataValidationHelper(); - // 加载下拉列表内容 - DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist); - // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列 - CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol); - // 数据有效性对象 - DataValidation dataValidation = helper.createValidation(constraint, regions); + if (StringUtils.isNotEmpty(promptContent)) + { + // 如果设置了提示信息则鼠标放上去提示 + dataValidation.createPromptBox("", promptContent); + dataValidation.setShowPromptBox(true); + } // 处理Excel兼容性问题 if (dataValidation instanceof XSSFDataValidation) { @@ -912,7 +886,6 @@ public class ExcelUtil { dataValidation.setSuppressDropDownArrow(false); } - sheet.addValidationData(dataValidation); } From db2dfee6ae22829e942ada5070d3ae1050fdde92 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 7 Apr 2022 09:50:42 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E9=83=A8=E9=97=A8ancestors?= =?UTF-8?q?=E7=A5=96=E7=BA=A7=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/system/SysUserMapper.xml | 79 ++++++++++--------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 4a095a6f..16a64c2a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -4,50 +4,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, - d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status, + d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u left join sys_dept d on u.dept_id = d.dept_id From d910888181365139684deae21382526d21e84da1 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 7 Apr 2022 10:56:40 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=A0=91=E8=A1=A8=E6=96=B0=E5=A2=9E(=E5=B1=95=E5=BC=80/?= =?UTF-8?q?=E6=8A=98=E5=8F=A0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/vm/vue/index-tree.vue.vm | 24 ++++++++++++++++++- .../resources/vm/vue/v3/index-tree.vue.vm | 22 ++++++++++++++++- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm index a95916f4..9d29acee 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -78,14 +78,24 @@ v-hasPermi="['${moduleName}:${businessName}:add']" >新增 + + 展开/折叠 + #foreach($column in $columns) @@ -293,6 +303,10 @@ export default { title: "", // 是否显示弹出层 open: false, + // 是否展开，默认全部展开 + isExpandAll: true, + // 重新渲染表格状态 + refreshTable: true, #foreach ($column in $columns) #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN") #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) @@ -423,6 +437,14 @@ export default { this.open = true; this.title = "添加${functionName}"; }, + /** 展开/折叠操作 */ + toggleExpandAll() { + this.refreshTable = false; + this.isExpandAll = !this.isExpandAll; + this.$nextTick(() => { + this.refreshTable = true; + }); + }, /** 修改按钮操作 */ handleUpdate(row) { this.reset(); diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm index d57bbdf0..11bbe52e 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm @@ -76,14 +76,23 @@ v-hasPermi="['${moduleName}:${businessName}:add']" >新增 + + 展开/折叠 + #foreach($column in $columns) @@ -283,6 +292,8 @@ const open = ref(false); const loading = ref(true); const showSearch = ref(true); const title = ref(""); +const isExpandAll = ref(true); +const refreshTable = ref(true); #foreach ($column in $columns) #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN") #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) @@ -405,6 +416,15 @@ async function handleAdd(row) { title.value = "添加${functionName}"; } +/** 展开/折叠操作 */ +function toggleExpandAll() { + refreshTable.value = false; + isExpandAll.value = !isExpandAll.value; + nextTick(() => { + refreshTable.value = true; + }); +} + /** 修改按钮操作 */ async function handleUpdate(row) { reset(); From de5ae4a05efc19bb5d476ddc51e6a5a3d6b782be Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 8 Apr 2022 15:42:10 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B5=E7=AD=BEopenPag?= =?UTF-8?q?e=E6=94=AF=E6=8C=81=E4=BC=A0=E9=80=92=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/plugins/tab.js | 4 ++-- ruoyi-ui/src/views/tool/gen/index.vue | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ruoyi-ui/src/plugins/tab.js b/ruoyi-ui/src/plugins/tab.js index c8058a94..5e8b834a 100644 --- a/ruoyi-ui/src/plugins/tab.js +++ b/ruoyi-ui/src/plugins/tab.js @@ -55,10 +55,10 @@ export default { return store.dispatch('tagsView/delOthersViews', obj || router.currentRoute); }, // 添加tab页签 - openPage(title, url) { + openPage(title, url, params) { var obj = { path: url, meta: { title: title } } store.dispatch('tagsView/addView', obj); - return router.push(url); + return router.push({ path: url, query: params }); }, // 修改tab页签 updatePage(obj) { diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue index 4b44b86e..381e30f6 100644 --- a/ruoyi-ui/src/views/tool/gen/index.vue +++ b/ruoyi-ui/src/views/tool/gen/index.vue @@ -318,7 +318,9 @@ export default { /** 修改按钮操作 */ handleEditTable(row) { const tableId = row.tableId || this.ids[0]; - this.$router.push({ path: '/tool/gen-edit/index/' + tableId, query: { pageNum: this.queryParams.pageNum } }); + const tableName = row.tableName || this.tableNames[0]; + const params = { pageNum: this.queryParams.pageNum }; + this.$tab.openPage("修改[" + tableName + "]生成配置", '/tool/gen-edit/index/' + tableId, params); }, /** 删除按钮操作 */ handleDelete(row) {