若依 3.9.0

Merge pull request !1013 from 稚屿/N/A

README.md

@@ -1,11 +1,11 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-d3d0a9303e11d522a06cd263f3079027715.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.8.8</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.9.0</h1>
 <h4 align="center">基于SpringBoot+Vue前后端分离的Java快速开发框架</h4>
 <p align="center">
 	<a href="https://gitee.com/y_project/RuoYi-Vue/stargazers"><img src="https://gitee.com/y_project/RuoYi-Vue/badge/star.svg?theme=dark"></a>
-	<a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.8.8-brightgreen.svg"></a>
+	<a href="https://gitee.com/y_project/RuoYi-Vue"><img src="https://img.shields.io/badge/RuoYi-v3.9.0-brightgreen.svg"></a>
 	<a href="https://gitee.com/y_project/RuoYi-Vue/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
 </p>
 
@@ -18,11 +18,10 @@
 * 权限认证使用Jwt，支持多终端认证系统。
 * 支持加载动态权限菜单，多方式轻松权限控制。
 * 高效率开发，使用代码生成器可以一键生成前后端代码。
-* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[RuoYi-Vue3](https://github.com/yangzongzhuan/RuoYi-Vue3)，保持同步更新。
+* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[RuoYi-Vue3](https://gitcode.com/yangzongzhuan/RuoYi-Vue3)，保持同步更新。
-* 提供了单应用版本[RuoYi-Vue-fast](https://github.com/yangzongzhuan/RuoYi-Vue-fast)，Oracle版本[RuoYi-Vue-Oracle](https://github.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。
+* 提供了单应用版本[RuoYi-Vue-fast](https://gitcode.com/yangzongzhuan/RuoYi-Vue-fast)，Oracle版本[RuoYi-Vue-Oracle](https://gitcode.com/yangzongzhuan/RuoYi-Vue-Oracle)，保持同步更新。
 * 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud)
 * 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)&nbsp;&nbsp;
-* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)&nbsp;&nbsp;
 
 ## 内置功能
 
@@ -93,4 +92,4 @@
 
 ## 若依前后端分离交流群
 
-QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/已满-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![加入QQ群](https://img.shields.io/badge/已满-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![加入QQ群](https://img.shields.io/badge/已满-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![加入QQ群](https://img.shields.io/badge/已满-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![加入QQ群](https://img.shields.io/badge/已满-136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [![加入QQ群](https://img.shields.io/badge/已满-143961921-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) [![加入QQ群](https://img.shields.io/badge/已满-174951577-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ZFAPAbp09S2ltvwrJzp7wGlbopsc0rwi&authKey=HB2cxpxP2yspk%2Bo3WKTBfktRCccVkU26cgi5B16u0KcAYrVu7sBaE7XSEqmMdFQp&noverify=0&group_code=174951577) [![加入QQ群](https://img.shields.io/badge/已满-161281055-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Fn2aF5IHpwsy8j6VlalNJK6qbwFLFHat&authKey=uyIT%2B97x2AXj3odyXpsSpVaPMC%2Bidw0LxG5MAtEqlrcBcWJUA%2FeS43rsF1Tg7IRJ&noverify=0&group_code=161281055) [![加入QQ群](https://img.shields.io/badge/已满-138988063-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XIzkm_mV2xTsUtFxo63bmicYoDBA6Ifm&authKey=dDW%2F4qsmw3x9govoZY9w%2FoWAoC4wbHqGal%2BbqLzoS6VBarU8EBptIgPKN%2FviyC8j&noverify=0&group_code=138988063) [![加入QQ群](https://img.shields.io/badge/151450850-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=DkugnCg68PevlycJSKSwjhFqfIgrWWwR&authKey=pR1Pa5lPIeGF%2FFtIk6d%2FGB5qFi0EdvyErtpQXULzo03zbhopBHLWcuqdpwY241R%2F&noverify=0&group_code=151450850) 点击按钮入群。
+QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/已满-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![加入QQ群](https://img.shields.io/badge/已满-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![加入QQ群](https://img.shields.io/badge/已满-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![加入QQ群](https://img.shields.io/badge/已满-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![加入QQ群](https://img.shields.io/badge/已满-136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [![加入QQ群](https://img.shields.io/badge/已满-143961921-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) [![加入QQ群](https://img.shields.io/badge/已满-174951577-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ZFAPAbp09S2ltvwrJzp7wGlbopsc0rwi&authKey=HB2cxpxP2yspk%2Bo3WKTBfktRCccVkU26cgi5B16u0KcAYrVu7sBaE7XSEqmMdFQp&noverify=0&group_code=174951577) [![加入QQ群](https://img.shields.io/badge/已满-161281055-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Fn2aF5IHpwsy8j6VlalNJK6qbwFLFHat&authKey=uyIT%2B97x2AXj3odyXpsSpVaPMC%2Bidw0LxG5MAtEqlrcBcWJUA%2FeS43rsF1Tg7IRJ&noverify=0&group_code=161281055) [![加入QQ群](https://img.shields.io/badge/已满-138988063-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XIzkm_mV2xTsUtFxo63bmicYoDBA6Ifm&authKey=dDW%2F4qsmw3x9govoZY9w%2FoWAoC4wbHqGal%2BbqLzoS6VBarU8EBptIgPKN%2FviyC8j&noverify=0&group_code=138988063) [![加入QQ群](https://img.shields.io/badge/已满-151450850-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=DkugnCg68PevlycJSKSwjhFqfIgrWWwR&authKey=pR1Pa5lPIeGF%2FFtIk6d%2FGB5qFi0EdvyErtpQXULzo03zbhopBHLWcuqdpwY241R%2F&noverify=0&group_code=151450850) [![加入QQ群](https://img.shields.io/badge/已满-224622315-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=F58bgRa-Dp-rsQJThiJqIYv8t4-lWfXh&authKey=UmUs4CVG5OPA1whvsa4uSespOvyd8%2FAr9olEGaWAfdLmfKQk%2FVBp2YU3u2xXXt76&noverify=0&group_code=224622315) [![加入QQ群](https://img.shields.io/badge/已满-287842588-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Nxb2EQ5qozWa218Wbs7zgBnjLSNk_tVT&authKey=obBKXj6SBKgrFTJZx0AqQnIYbNOvBB2kmgwWvGhzxR67RoRr84%2Bus5OadzMcdJl5&noverify=0&group_code=287842588) [![加入QQ群](https://img.shields.io/badge/已满-187944233-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=numtK1M_I4eVd2Gvg8qtbuL8JgX42qNh&authKey=giV9XWMaFZTY%2FqPlmWbkB9g3fi0Ev5CwEtT9Tgei0oUlFFCQLDp4ozWRiVIzubIm&noverify=0&group_code=187944233) [![加入QQ群](https://img.shields.io/badge/228578329-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=G6r5KGCaa3pqdbUSXNIgYloyb8e0_L0D&authKey=4w8tF1eGW7%2FedWn%2FHAypQksdrML%2BDHolQSx7094Agm7Luakj9EbfPnSTxSi2T1LQ&noverify=0&group_code=228578329) 点击按钮入群。

pom.xml

@@ -6,38 +6,42 @@
 	
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>3.8.8</version>
+    <version>3.9.0</version>
 
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依管理系统</description>
     
     <properties>
-        <ruoyi.version>3.8.8</ruoyi.version>
+        <ruoyi.version>3.9.0</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-        <spring-framework.version>5.3.33</spring-framework.version>
+        <spring-boot.version>2.5.15</spring-boot.version>
-        <spring-security.version>5.7.12</spring-security.version>
         <druid.version>1.2.23</druid.version>
         <bitwalker.version>1.21</bitwalker.version>
         <swagger.version>3.0.0</swagger.version>
         <kaptcha.version>2.3.3</kaptcha.version>
         <pagehelper.boot.version>1.4.7</pagehelper.boot.version>
-        <fastjson.version>2.0.43</fastjson.version>
+        <fastjson.version>2.0.57</fastjson.version>
-        <oshi.version>6.6.1</oshi.version>
+        <oshi.version>6.8.1</oshi.version>
-        <commons.io.version>2.13.0</commons.io.version>
+        <commons.io.version>2.19.0</commons.io.version>
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
+        <!-- override dependency version -->
+        <tomcat.version>9.0.105</tomcat.version>
+        <logback.version>1.2.13</logback.version>
+        <spring-security.version>5.7.12</spring-security.version>
+        <spring-framework.version>5.3.39</spring-framework.version>
     </properties>
 
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
 
-            <!-- SpringFramework的依赖配置-->
+            <!-- 覆盖SpringFramework的依赖配置-->
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-framework-bom</artifactId>
@@ -46,7 +50,7 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- SpringSecurity的依赖配置-->
+            <!-- 覆盖SpringSecurity的依赖配置-->
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-bom</artifactId>
@@ -59,11 +63,43 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.5.15</version>
+                <version>${spring-boot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
 
+            <!-- 覆盖logback的依赖配置-->
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+
+            <!-- 覆盖tomcat的依赖配置-->
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-core</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-el</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-websocket</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+
             <!-- 阿里数据库连接池 -->
             <dependency>
                 <groupId>com.alibaba</groupId>

ruoyi-admin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.8.8</version>
+        <version>3.9.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,9 +13,15 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.web.service.SysLoginService;
 import com.ruoyi.framework.web.service.SysPermissionService;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysMenuService;
 
 /**
@@ -34,6 +41,12 @@ public class SysLoginController
     @Autowired
     private SysPermissionService permissionService;
 
+    @Autowired
+    private TokenService tokenService;
+
+    @Autowired
+    private ISysConfigService configService;
+
     /**
      * 登录方法
      * 
@@ -59,15 +72,23 @@ public class SysLoginController
     @GetMapping("getInfo")
     public AjaxResult getInfo()
     {
-        SysUser user = SecurityUtils.getLoginUser().getUser();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysUser user = loginUser.getUser();
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
+        if (!loginUser.getPermissions().equals(permissions))
+        {
+            loginUser.setPermissions(permissions);
+            tokenService.refreshToken(loginUser);
+        }
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
+        ajax.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));
+        ajax.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate()));
         return ajax;
     }
 
@@ -83,4 +104,28 @@ public class SysLoginController
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
     }
+    
+    // 检查初始密码是否提醒修改
+    public boolean initPasswordIsModify(Date pwdUpdateDate)
+    {
+        Integer initPasswordModify = Convert.toInt(configService.selectConfigByKey("sys.account.initPasswordModify"));
+        return initPasswordModify != null && initPasswordModify == 1 && pwdUpdateDate == null;
+    }
+
+    // 检查密码是否过期
+    public boolean passwordIsExpiration(Date pwdUpdateDate)
+    {
+        Integer passwordValidateDays = Convert.toInt(configService.selectConfigByKey("sys.account.passwordValidateDays"));
+        if (passwordValidateDays != null && passwordValidateDays > 0)
+        {
+            if (StringUtils.isNull(pwdUpdateDate))
+            {
+                // 如果从未修改过初始密码，直接提醒过期
+                return true;
+            }
+            Date nowDate = DateUtils.getNowDate();
+            return DateUtils.differentDaysByMillisecond(nowDate, pwdUpdateDate) > passwordValidateDays;
+        }
+        return false;
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system;
 
+import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,6 +17,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
@@ -87,8 +89,10 @@ public class SysProfileController extends BaseController
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
-    public AjaxResult updatePwd(String oldPassword, String newPassword)
+    public AjaxResult updatePwd(@RequestBody Map<String, String> params)
     {
+        String oldPassword = params.get("oldPassword");
+        String newPassword = params.get("newPassword");
         LoginUser loginUser = getLoginUser();
         String userName = loginUser.getUsername();
         String password = loginUser.getPassword();
@@ -103,7 +107,8 @@ public class SysProfileController extends BaseController
         newPassword = SecurityUtils.encryptPassword(newPassword);
         if (userService.resetUserPwd(userName, newPassword) > 0)
         {
-            // 更新缓存用户密码
+            // 更新缓存用户密码&密码最后更新时间
+            loginUser.getUser().setPwdUpdateDate(DateUtils.getNowDate());
             loginUser.getUser().setPassword(newPassword);
             tokenService.setLoginUser(loginUser);
             return success();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -132,8 +132,8 @@ public class SysRoleController extends BaseController
             LoginUser loginUser = getLoginUser();
             if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
             {
-                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
                 loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
                 tokenService.setLoginUser(loginUser);
             }
             return success();

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -101,18 +101,18 @@ public class SysUserController extends BaseController
     @GetMapping(value = { "/", "/{userId}" })
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
-        userService.checkUserDataScope(userId);
         AjaxResult ajax = AjaxResult.success();
-        List<SysRole> roles = roleService.selectRoleAll();
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        ajax.put("posts", postService.selectPostAll());
         if (StringUtils.isNotNull(userId))
         {
+            userService.checkUserDataScope(userId);
             SysUser sysUser = userService.selectUserById(userId);
             ajax.put(AjaxResult.DATA_TAG, sysUser);
             ajax.put("postIds", postService.selectPostListByUserId(userId));
             ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
         }
+        List<SysRole> roles = roleService.selectRoleAll();
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("posts", postService.selectPostAll());
         return ajax;
     }
 

ruoyi-admin/src/main/resources/application.yml

@@ -3,9 +3,9 @@ ruoyi:
   # 名称
   name: RuoYi
   # 版本
-  version: 3.8.8
+  version: 3.9.0
   # 版权年份
-  copyrightYear: 2024
+  copyrightYear: 2025
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
   profile: D:/ruoyi/uploadPath
   # 获取ip地址开关

ruoyi-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.8.8</version>
+        <version>3.9.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java

@@ -83,6 +83,11 @@ public @interface Excel
      */
     public String prompt() default "";
 
+    /**
+     * 是否允许内容换行 
+     */
+    public boolean wrapText() default false;
+
     /**
      * 设置只能选择不能输入的列内容.
      */

ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java

@@ -21,6 +21,9 @@ public class UserConstants
     /** 用户封禁状态 */
     public static final String USER_DISABLE = "1";
 
+    /** 角色正常状态 */
+    public static final String ROLE_NORMAL = "0";
+
     /** 角色封禁状态 */
     public static final String ROLE_DISABLE = "1";
 

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeSelect.java

@@ -4,8 +4,10 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.utils.StringUtils;
 
 /**
  * Treeselect树结构实体类
@@ -22,6 +24,9 @@ public class TreeSelect implements Serializable
     /** 节点名称 */
     private String label;
 
+    /** 节点禁用 */
+    private boolean disabled = false;
+
     /** 子节点 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeSelect> children;
@@ -35,6 +40,7 @@ public class TreeSelect implements Serializable
     {
         this.id = dept.getDeptId();
         this.label = dept.getDeptName();
+        this.disabled = StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus());
         this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
@@ -65,6 +71,16 @@ public class TreeSelect implements Serializable
         this.label = label;
     }
 
+    public boolean isDisabled()
+    {
+        return disabled;
+    }
+
+    public void setDisabled(boolean disabled)
+    {
+        this.disabled = disabled;
+    }
+
     public List<TreeSelect> getChildren()
     {
         return children;

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -55,8 +55,8 @@ public class SysUser extends BaseEntity
     /** 密码 */
     private String password;
 
-    /** 帐号状态（0正常 1停用） */
+    /** 账号状态（0正常 1停用） */
-    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+    @Excel(name = "账号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
     /** 删除标志（0代表存在 2代表删除） */
@@ -70,6 +70,9 @@ public class SysUser extends BaseEntity
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
+    /** 密码最后更新时间 */
+    private Date pwdUpdateDate;
+
     /** 部门对象 */
     @Excels({
         @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
@@ -247,6 +250,16 @@ public class SysUser extends BaseEntity
         this.loginDate = loginDate;
     }
 
+    public Date getPwdUpdateDate()
+    {
+        return pwdUpdateDate;
+    }
+
+    public void setPwdUpdateDate(Date pwdUpdateDate)
+    {
+        this.pwdUpdateDate = pwdUpdateDate;
+    }
+
     public SysDept getDept()
     {
         return dept;
@@ -313,6 +326,7 @@ public class SysUser extends BaseEntity
             .append("delFlag", getDelFlag())
             .append("loginIp", getLoginIp())
             .append("loginDate", getLoginDate())
+            .append("pwdUpdateDate", getPwdUpdateDate())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java

@@ -37,7 +37,7 @@ public class TableDataInfo implements Serializable
      * @param list 列表数据
      * @param total 总记录数
      */
-    public TableDataInfo(List<?> list, int total)
+    public TableDataInfo(List<?> list, long total)
     {
         this.rows = list;
         this.total = total;

ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java

@@ -8,7 +8,6 @@ import java.nio.charset.Charset;
 import java.text.NumberFormat;
 import java.util.Set;
 import com.ruoyi.common.utils.StringUtils;
-import org.apache.commons.lang3.ArrayUtils;
 
 /**
  * 类型转换器
@@ -541,7 +540,7 @@ public class Convert
 
     /**
      * 转换为boolean<br>
-     * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值<br>
+     * String支持的值为：true、false、yes、ok、no、1、0、是、否, 如果给定的值为空，或者转换失败，返回默认值<br>
      * 转换失败不会报错
      *
      * @param value 被转换的值
@@ -570,10 +569,12 @@ public class Convert
             case "yes":
             case "ok":
             case "1":
+            case "是":
                 return true;
             case "false":
             case "no":
             case "0":
+            case "否":
                 return false;
             default:
                 return defaultValue;
@@ -796,14 +797,23 @@ public class Convert
         {
             return (String) obj;
         }
-        else if (obj instanceof byte[])
+        else if (obj instanceof byte[] || obj instanceof Byte[])
         {
-            return str((byte[]) obj, charset);
+            if (obj instanceof byte[])
-        }
+            {
-        else if (obj instanceof Byte[])
+                return str((byte[]) obj, charset);
-        {
+            }
-            byte[] bytes = ArrayUtils.toPrimitive((Byte[]) obj);
+            else
-            return str(bytes, charset);
+            {
+                Byte[] bytes = (Byte[]) obj;
+                int length = bytes.length;
+                byte[] dest = new byte[length];
+                for (int i = 0; i < length; i++)
+                {
+                    dest[i] = bytes[i];
+                }
+                return str(dest, charset);
+            }
         }
         else if (obj instanceof ByteBuffer)
         {
@@ -959,9 +969,7 @@ public class Convert
                 c[i] = (char) (c[i] - 65248);
             }
         }
-        String returnString = new String(c);
+        return new String(c);
-
-        return returnString;
     }
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/enums/DesensitizedType.java

@@ -23,7 +23,7 @@ public enum DesensitizedType
     /**
      * 身份证，中间10位星号替换
      */
-    ID_CARD(s -> s.replaceAll("(\\d{4})\\d{10}(\\d{4})", "$1** **** ****$2")),
+    ID_CARD(s -> s.replaceAll("(\\d{4})\\d{10}(\\d{3}[Xx]|\\d{4})", "$1** **** ****$2")),
 
     /**
      * 手机号，中间4位星号替换

ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java

@@ -108,7 +108,6 @@ public class Arith
                     "The scale must be a positive integer or zero");
         }
         BigDecimal b = new BigDecimal(Double.toString(v));
-        BigDecimal one = BigDecimal.ONE;
+        return b.divide(BigDecimal.ONE, scale, RoundingMode.HALF_UP).doubleValue();
-        return b.divide(one, scale, RoundingMode.HALF_UP).doubleValue();
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

@@ -286,6 +286,32 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         return str.substring(start, end);
     }
 
+    /**
+     * 在字符串中查找第一个出现的 `open` 和最后一个出现的 `close` 之间的子字符串
+     * 
+     * @param str 要截取的字符串
+     * @param open 起始字符串
+     * @param close 结束字符串
+     * @return 截取结果
+     */
+    public static String substringBetweenLast(final String str, final String open, final String close)
+    {
+        if (isEmpty(str) || isEmpty(open) || isEmpty(close))
+        {
+            return NULLSTR;
+        }
+        final int start = str.indexOf(open);
+        if (start != INDEX_NOT_FOUND)
+        {
+            final int end = str.lastIndexOf(close);
+            if (end != INDEX_NOT_FOUND)
+            {
+                return str.substring(start + open.length(), end);
+            }
+        }
+        return NULLSTR;
+    }
+
     /**
      * 判断是否为空，并且不是空白字符
      * 
@@ -355,6 +381,18 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         return new HashSet<String>(str2List(str, sep, true, false));
     }
 
+    /**
+     * 字符串转list
+     * 
+     * @param str 字符串
+     * @param sep 分隔符
+     * @return list集合
+     */
+    public static final List<String> str2List(String str, String sep)
+    {
+        return str2List(str, sep, true, false);
+    }
+
     /**
      * 字符串转list
      * 

ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java

@@ -21,6 +21,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.StringUtils;
+import org.springframework.http.MediaType;
 
 /**
  * 通用http发送方法
@@ -125,6 +126,19 @@ public class HttpUtils
      * @return 所代表远程资源的响应结果
      */
     public static String sendPost(String url, String param)
+    {
+        return sendPost(url, param, MediaType.APPLICATION_FORM_URLENCODED_VALUE);
+    }
+
+    /**
+     * 向指定 URL 发送POST方法的请求
+     * 
+     * @param url 发送请求的 URL
+     * @param param 请求参数
+     * @param contentType 内容类型
+     * @return 所代表远程资源的响应结果
+     */
+    public static String sendPost(String url, String param, String contentType)
     {
         PrintWriter out = null;
         BufferedReader in = null;
@@ -138,7 +152,7 @@ public class HttpUtils
             conn.setRequestProperty("connection", "Keep-Alive");
             conn.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)");
             conn.setRequestProperty("Accept-Charset", "utf-8");
-            conn.setRequestProperty("contentType", "utf-8");
+            conn.setRequestProperty("Content-Type", contentType);
             conn.setDoOutput(true);
             conn.setDoInput(true);
             out = new PrintWriter(conn.getOutputStream());
@@ -190,6 +204,11 @@ public class HttpUtils
     }
 
     public static String sendSSLPost(String url, String param)
+    {
+        return sendSSLPost(url, param, MediaType.APPLICATION_FORM_URLENCODED_VALUE);
+    }
+
+    public static String sendSSLPost(String url, String param, String contentType)
     {
         StringBuilder result = new StringBuilder();
         String urlNameString = url + "?" + param;
@@ -204,7 +223,7 @@ public class HttpUtils
             conn.setRequestProperty("connection", "Keep-Alive");
             conn.setRequestProperty("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64)");
             conn.setRequestProperty("Accept-Charset", "utf-8");
-            conn.setRequestProperty("contentType", "utf-8");
+            conn.setRequestProperty("Content-Type", contentType);
             conn.setDoOutput(true);
             conn.setDoInput(true);
 

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -95,6 +95,8 @@ public class ExcelUtil<T>
 {
     private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
 
+    public static final String SEPARATOR = ",";
+
     public static final String FORMULA_REGEX_STR = "=|-|\\+|@";
 
     public static final String[] FORMULA_STR = { "=", "-", "+", "@" };
@@ -194,6 +196,11 @@ public class ExcelUtil<T>
      */
     public Class<T> clazz;
 
+    /**
+     * 需要显示列属性
+     */
+    public String[] includeFields;
+
     /**
      * 需要排除列属性
      */
@@ -204,11 +211,20 @@ public class ExcelUtil<T>
         this.clazz = clazz;
     }
 
+    /**
+     * 仅在Excel中显示列属性
+     *
+     * @param fields 列属性名 示例[单个"name"/多个"id","name"]
+     */
+    public void showColumn(String... fields)
+    {
+        this.includeFields = fields;
+    }
+
     /**
      * 隐藏Excel中列属性
      *
      * @param fields 列属性名 示例[单个"name"/多个"id","name"]
-     * @throws Exception
      */
     public void hideColumn(String... fields)
     {
@@ -238,8 +254,6 @@ public class ExcelUtil<T>
     {
         if (StringUtils.isNotEmpty(title))
         {
-            subMergedFirstRowNum++;
-            subMergedLastRowNum++;
             int titleLastCol = this.fields.size() - 1;
             if (isSubList())
             {
@@ -250,7 +264,7 @@ public class ExcelUtil<T>
             Cell titleCell = titleRow.createCell(0);
             titleCell.setCellStyle(styles.get("title"));
             titleCell.setCellValue(title);
-            sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), titleRow.getRowNum(), titleLastCol));
+            sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), 0, titleLastCol));
         }
     }
 
@@ -261,23 +275,31 @@ public class ExcelUtil<T>
     {
         if (isSubList())
         {
-            subMergedFirstRowNum++;
-            subMergedLastRowNum++;
             Row subRow = sheet.createRow(rownum);
-            int excelNum = 0;
+            int column = 0;
+            int subFieldSize = subFields != null ? subFields.size() : 0;
             for (Object[] objects : fields)
             {
+                Field field = (Field) objects[0];
                 Excel attr = (Excel) objects[1];
-                Cell headCell1 = subRow.createCell(excelNum);
+                if (Collection.class.isAssignableFrom(field.getType()))
-                headCell1.setCellValue(attr.name());
+                {
-                headCell1.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
+                    Cell cell = subRow.createCell(column);
-                excelNum++;
+                    cell.setCellValue(attr.name());
-            }
+                    cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
-            int headFirstRow = excelNum - 1;
+                    if (subFieldSize > 1)
-            int headLastRow = headFirstRow + subFields.size() - 1;
+                    {
-            if (headLastRow > headFirstRow)
+                        CellRangeAddress cellAddress = new CellRangeAddress(rownum, rownum, column, column + subFieldSize - 1);
-            {
+                        sheet.addMergedRegion(cellAddress);
-                sheet.addMergedRegion(new CellRangeAddress(rownum, rownum, headFirstRow, headLastRow));
+                    }
+                    column += subFieldSize;
+                }
+                else
+                {
+                    Cell cell = subRow.createCell(column++);
+                    cell.setCellValue(attr.name());
+                    cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
+                }
             }
             rownum++;
         }
@@ -290,11 +312,23 @@ public class ExcelUtil<T>
      * @return 转换后集合
      */
     public List<T> importExcel(InputStream is)
+    {
+        return importExcel(is, 0);
+    }
+
+    /**
+     * 对excel表单默认第一个索引名转换成list
+     * 
+     * @param is 输入流
+     * @param titleNum 标题占用行数
+     * @return 转换后集合
+     */
+    public List<T> importExcel(InputStream is, int titleNum)
     {
         List<T> list = null;
         try
         {
-            list = importExcel(is, 0);
+            list = importExcel(StringUtils.EMPTY, is, titleNum);
         }
         catch (Exception e)
         {
@@ -308,18 +342,6 @@ public class ExcelUtil<T>
         return list;
     }
 
-    /**
-     * 对excel表单默认第一个索引名转换成list
-     * 
-     * @param is 输入流
-     * @param titleNum 标题占用行数
-     * @return 转换后集合
-     */
-    public List<T> importExcel(InputStream is, int titleNum) throws Exception
-    {
-        return importExcel(StringUtils.EMPTY, is, titleNum);
-    }
-
     /**
      * 对excel表单指定表格索引名转换成list
      * 
@@ -340,7 +362,7 @@ public class ExcelUtil<T>
             throw new IOException("文件sheet不存在");
         }
         boolean isXSSFWorkbook = !(wb instanceof HSSFWorkbook);
-        Map<String, PictureData> pictures;
+        Map<String, List<PictureData>> pictures = null;
         if (isXSSFWorkbook)
         {
             pictures = getSheetPictures07((XSSFSheet) sheet, (XSSFWorkbook) wb);
@@ -406,7 +428,7 @@ public class ExcelUtil<T>
                     if (String.class == fieldType)
                     {
                         String s = Convert.toStr(val);
-                        if (StringUtils.endsWith(s, ".0"))
+                        if (s.matches("^\\d+\\.0$"))
                         {
                             val = StringUtils.substringBefore(s, ".0");
                         }
@@ -484,16 +506,15 @@ public class ExcelUtil<T>
                         }
                         else if (ColumnType.IMAGE == attr.cellType() && StringUtils.isNotEmpty(pictures))
                         {
-                            PictureData image = pictures.get(row.getRowNum() + "_" + entry.getKey());
+                            StringBuilder propertyString = new StringBuilder();
-                            if (image == null)
+                            List<PictureData> images = pictures.get(row.getRowNum() + "_" + entry.getKey());
+                            for (PictureData picture : images)
                             {
-                                val = "";
+                                byte[] data = picture.getData();
-                            }
+                                String fileName = FileUtils.writeImportBytes(data);
-                            else
+                                propertyString.append(fileName).append(SEPARATOR);
-                            {
-                                byte[] data = image.getData();
-                                val = FileUtils.writeImportBytes(data);
                             }
+                            val = StringUtils.stripEnd(propertyString.toString(), SEPARATOR);
                         }
                         ReflectUtils.invokeSetter(entity, propertyName, val);
                     }
@@ -711,64 +732,91 @@ public class ExcelUtil<T>
     {
         int startNo = index * sheetSize;
         int endNo = Math.min(startNo + sheetSize, list.size());
-        int rowNo = (1 + rownum) - startNo;
+        int currentRowNum = rownum + 1; // 从标题行后开始
+
         for (int i = startNo; i < endNo; i++)
         {
-            rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo;
+            row = sheet.createRow(currentRowNum);
-            row = sheet.createRow(rowNo);
-            // 得到导出对象.
             T vo = (T) list.get(i);
-            Collection<?> subList = null;
-            if (isSubList())
-            {
-                if (isSubListValue(vo))
-                {
-                    subList = getListCellValue(vo);
-                    subMergedLastRowNum = subMergedLastRowNum + subList.size();
-                }
-                else
-                {
-                    subMergedFirstRowNum++;
-                    subMergedLastRowNum++;
-                }
-            }
             int column = 0;
+            int maxSubListSize = getCurrentMaxSubListSize(vo);
             for (Object[] os : fields)
             {
                 Field field = (Field) os[0];
                 Excel excel = (Excel) os[1];
-                if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList))
+                if (Collection.class.isAssignableFrom(field.getType()))
                 {
-                    boolean subFirst = false;
+                    try
-                    for (Object obj : subList)
                     {
-                        if (subFirst)
+                        Collection<?> subList = (Collection<?>) getTargetValue(vo, field, excel);
+                        if (subList != null && !subList.isEmpty())
                         {
-                            rowNo++;
+                            int subIndex = 0;
-                            row = sheet.createRow(rowNo);
+                            for (Object subVo : subList)
-                        }
-                        List<Field> subFields = FieldUtils.getFieldsListWithAnnotation(obj.getClass(), Excel.class);
-                        int subIndex = 0;
-                        for (Field subField : subFields)
-                        {
-                            if (subField.isAnnotationPresent(Excel.class))
                             {
-                                subField.setAccessible(true);
+                                Row subRow = sheet.getRow(currentRowNum + subIndex);
-                                Excel attr = subField.getAnnotation(Excel.class);
+                                if (subRow == null)
-                                this.addCell(attr, row, (T) obj, subField, column + subIndex);
+                                {
+                                    subRow = sheet.createRow(currentRowNum + subIndex);
+                                }
+
+                                int subColumn = column;
+                                for (Field subField : subFields)
+                                {
+                                    Excel subExcel = subField.getAnnotation(Excel.class);
+                                    addCell(subExcel, subRow, (T) subVo, subField, subColumn++);
+                                }
+                                subIndex++;
                             }
-                            subIndex++;
+                            column += subFields.size();
                         }
-                        subFirst = true;
                     }
-                    this.subMergedFirstRowNum = this.subMergedFirstRowNum + subList.size();
+                    catch (Exception e)
+                    {
+                        log.error("填充集合数据失败", e);
+                    }
                 }
                 else
                 {
-                    this.addCell(excel, row, vo, field, column++);
+                    // 创建单元格并设置值
+                    addCell(excel, row, vo, field, column);
+                    if (maxSubListSize > 1 && excel.needMerge())
+                    {
+                        sheet.addMergedRegion(new CellRangeAddress(currentRowNum, currentRowNum + maxSubListSize - 1, column, column));
+                    }
+                    column++;
+                }
+            }
+            currentRowNum += maxSubListSize;
+        }
+    }
+
+    /**
+     * 获取子列表最大数
+     */
+    private int getCurrentMaxSubListSize(T vo)
+    {
+        int maxSubListSize = 1;
+        for (Object[] os : fields)
+        {
+            Field field = (Field) os[0];
+            if (Collection.class.isAssignableFrom(field.getType()))
+            {
+                try
+                {
+                    Collection<?> subList = (Collection<?>) getTargetValue(vo, field, (Excel) os[1]);
+                    if (subList != null && !subList.isEmpty())
+                    {
+                        maxSubListSize = Math.max(maxSubListSize, subList.size());
+                    }
+                }
+                catch (Exception e)
+                {
+                    log.error("获取集合大小失败", e);
                 }
             }
         }
+        return maxSubListSize;
     }
 
     /**
@@ -903,7 +951,7 @@ public class ExcelUtil<T>
      */
     public void annotationDataStyles(Map<String, CellStyle> styles, Field field, Excel excel)
     {
-        String key = StringUtils.format("data_{}_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor(), excel.cellType());
+        String key = StringUtils.format("data_{}_{}_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor(), excel.cellType(), excel.wrapText());
         if (!styles.containsKey(key))
         {
             CellStyle style = wb.createCellStyle();
@@ -919,6 +967,7 @@ public class ExcelUtil<T>
             style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
             style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
             style.setFillForegroundColor(excel.backgroundColor().getIndex());
+            style.setWrapText(excel.wrapText());
             Font dataFont = wb.createFont();
             dataFont.setFontName("Arial");
             dataFont.setFontHeightInPoints((short) 10);
@@ -947,7 +996,7 @@ public class ExcelUtil<T>
         if (isSubList())
         {
             // 填充默认样式，防止合并单元格样式失效
-            sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType())));
+            sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType(), attr.wrapText())));
             if (attr.needMerge())
             {
                 sheet.addMergedRegion(new CellRangeAddress(rownum - 1, rownum, column, column));
@@ -989,12 +1038,15 @@ public class ExcelUtil<T>
         else if (ColumnType.IMAGE == attr.cellType())
         {
             ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1), cell.getRow().getRowNum() + 1);
-            String imagePath = Convert.toStr(value);
+            String propertyValue = Convert.toStr(value);
-            if (StringUtils.isNotEmpty(imagePath))
+            if (StringUtils.isNotEmpty(propertyValue))
             {
-                byte[] data = ImageUtils.getImage(imagePath);
+                List<String> imagePaths = StringUtils.str2List(propertyValue, SEPARATOR);
-                getDrawingPatriarch(cell.getSheet()).createPicture(anchor,
+                for (String imagePath : imagePaths)
-                        cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
+                {
+                    byte[] data = ImageUtils.getImage(imagePath);
+                    getDrawingPatriarch(cell.getSheet()).createPicture(anchor, cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
+                }
             }
         }
     }
@@ -1085,10 +1137,12 @@ public class ExcelUtil<T>
                 cell = row.createCell(column);
                 if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())
                 {
-                    CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column);
+                    if (subMergedLastRowNum >= subMergedFirstRowNum)
-                    sheet.addMergedRegion(cellAddress);
+                    {
+                        sheet.addMergedRegion(new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column));
+                    }
                 }
-                cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType())));
+                cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType(), attr.wrapText())));
 
                 // 用于读取对象中的属性
                 Object value = getTargetValue(vo, field, attr);
@@ -1098,6 +1152,7 @@ public class ExcelUtil<T>
                 String dictType = attr.dictType();
                 if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
                 {
+                    cell.getCellStyle().setDataFormat(this.wb.getCreationHelper().createDataFormat().getFormat(dateFormat));
                     cell.setCellValue(parseDateToStr(dateFormat, value));
                 }
                 else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
@@ -1236,7 +1291,7 @@ public class ExcelUtil<T>
     public static String convertByExp(String propertyValue, String converterExp, String separator)
     {
         StringBuilder propertyString = new StringBuilder();
-        String[] convertSource = converterExp.split(",");
+        String[] convertSource = converterExp.split(SEPARATOR);
         for (String item : convertSource)
         {
             String[] itemArray = item.split("=");
@@ -1273,7 +1328,7 @@ public class ExcelUtil<T>
     public static String reverseByExp(String propertyValue, String converterExp, String separator)
     {
         StringBuilder propertyString = new StringBuilder();
-        String[] convertSource = converterExp.split(",");
+        String[] convertSource = converterExp.split(SEPARATOR);
         for (String item : convertSource)
         {
             String[] itemArray = item.split("=");
@@ -1398,8 +1453,7 @@ public class ExcelUtil<T>
      */
     public String encodingFilename(String filename)
     {
-        filename = UUID.randomUUID() + "_" + filename + ".xlsx";
+        return UUID.randomUUID() + "_" + filename + ".xlsx";
-        return filename;
     }
 
     /**
@@ -1429,6 +1483,7 @@ public class ExcelUtil<T>
      */
     private Object getTargetValue(T vo, Field field, Excel excel) throws Exception
     {
+        field.setAccessible(true);
         Object o = field.get(vo);
         if (StringUtils.isNotEmpty(excel.targetAttr()))
         {
@@ -1488,46 +1543,83 @@ public class ExcelUtil<T>
         List<Field> tempFields = new ArrayList<>();
         tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
         tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
-        for (Field field : tempFields)
+        if (StringUtils.isNotEmpty(includeFields))
         {
-            if (!ArrayUtils.contains(this.excludeFields, field.getName()))
+            for (Field field : tempFields)
             {
-                // 单注解
+                if (ArrayUtils.contains(this.includeFields, field.getName()) || field.isAnnotationPresent(Excels.class))
-                if (field.isAnnotationPresent(Excel.class))
                 {
-                    Excel attr = field.getAnnotation(Excel.class);
+                    addField(fields, field);
-                    if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
+                }
+            }
+        }
+        else if (StringUtils.isNotEmpty(excludeFields))
+        {
+            for (Field field : tempFields)
+            {
+                if (!ArrayUtils.contains(this.excludeFields, field.getName()))
+                {
+                    addField(fields, field);
+                }
+            }
+        }
+        else
+        {
+            for (Field field : tempFields)
+            {
+                addField(fields, field);
+            }
+        }
+        return fields;
+    }
+
+    /**
+     * 添加字段信息
+     */
+    public void addField(List<Object[]> fields, Field field)
+    {
+        // 单注解
+        if (field.isAnnotationPresent(Excel.class))
+        {
+            Excel attr = field.getAnnotation(Excel.class);
+            if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
+            {
+                fields.add(new Object[] { field, attr });
+            }
+            if (Collection.class.isAssignableFrom(field.getType()))
+            {
+                subMethod = getSubMethod(field.getName(), clazz);
+                ParameterizedType pt = (ParameterizedType) field.getGenericType();
+                Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
+                this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
+            }
+        }
+
+        // 多注解
+        if (field.isAnnotationPresent(Excels.class))
+        {
+            Excels attrs = field.getAnnotation(Excels.class);
+            Excel[] excels = attrs.value();
+            for (Excel attr : excels)
+            {
+                if (StringUtils.isNotEmpty(includeFields))
+                {
+                    if (ArrayUtils.contains(this.includeFields, field.getName() + "." + attr.targetAttr())
+                            && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))
                     {
-                        field.setAccessible(true);
                         fields.add(new Object[] { field, attr });
                     }
-                    if (Collection.class.isAssignableFrom(field.getType()))
-                    {
-                        subMethod = getSubMethod(field.getName(), clazz);
-                        ParameterizedType pt = (ParameterizedType) field.getGenericType();
-                        Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
-                        this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
-                    }
                 }
-
+                else
-                // 多注解
-                if (field.isAnnotationPresent(Excels.class))
                 {
-                    Excels attrs = field.getAnnotation(Excels.class);
+                    if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr())
-                    Excel[] excels = attrs.value();
+                            && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))
-                    for (Excel attr : excels)
                     {
-                        if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr())
+                        fields.add(new Object[] { field, attr });
-                                && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))
-                        {
-                            field.setAccessible(true);
-                            fields.add(new Object[] { field, attr });
-                        }
                     }
                 }
             }
         }
-        return fields;
     }
 
     /**
@@ -1662,30 +1754,24 @@ public class ExcelUtil<T>
      * @param workbook 工作簿对象
      * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData
      */
-    public static Map<String, PictureData> getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook)
+    public static Map<String, List<PictureData>> getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook)
     {
-        Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
+        Map<String, List<PictureData>> sheetIndexPicMap = new HashMap<>();
         List<HSSFPictureData> pictures = workbook.getAllPictures();
-        if (!pictures.isEmpty())
+        if (!pictures.isEmpty() && sheet.getDrawingPatriarch() != null)
         {
             for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren())
             {
-                HSSFClientAnchor anchor = (HSSFClientAnchor) shape.getAnchor();
                 if (shape instanceof HSSFPicture)
                 {
                     HSSFPicture pic = (HSSFPicture) shape;
-                    int pictureIndex = pic.getPictureIndex() - 1;
+                    HSSFClientAnchor anchor = (HSSFClientAnchor) pic.getAnchor();
-                    HSSFPictureData picData = pictures.get(pictureIndex);
                     String picIndex = anchor.getRow1() + "_" + anchor.getCol1();
-                    sheetIndexPicMap.put(picIndex, picData);
+                    sheetIndexPicMap.computeIfAbsent(picIndex, k -> new ArrayList<>()).add(pic.getPictureData());
                 }
             }
-            return sheetIndexPicMap;
-        }
-        else
-        {
-            return sheetIndexPicMap;
         }
+        return sheetIndexPicMap;
     }
 
     /**
@@ -1695,16 +1781,15 @@ public class ExcelUtil<T>
      * @param workbook 工作簿对象
      * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData
      */
-    public static Map<String, PictureData> getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook)
+    public static Map<String, List<PictureData>> getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook)
     {
-        Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
+        Map<String, List<PictureData>> sheetIndexPicMap = new HashMap<>();
         for (POIXMLDocumentPart dr : sheet.getRelations())
         {
             if (dr instanceof XSSFDrawing)
             {
                 XSSFDrawing drawing = (XSSFDrawing) dr;
-                List<XSSFShape> shapes = drawing.getShapes();
+                for (XSSFShape shape : drawing.getShapes())
-                for (XSSFShape shape : shapes)
                 {
                     if (shape instanceof XSSFPicture)
                     {
@@ -1712,7 +1797,7 @@ public class ExcelUtil<T>
                         XSSFClientAnchor anchor = pic.getPreferredSize();
                         CTMarker ctMarker = anchor.getFrom();
                         String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol();
-                        sheetIndexPicMap.put(picIndex, pic.getPictureData());
+                        sheetIndexPicMap.computeIfAbsent(picIndex, k -> new ArrayList<>()).add(pic.getPictureData());
                     }
                 }
             }

ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java

@@ -1,5 +1,6 @@
 package com.ruoyi.common.utils.spring;
 
+import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -120,7 +121,12 @@ public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationC
     @SuppressWarnings("unchecked")
     public static <T> T getAopProxy(T invoker)
     {
-        return (T) AopContext.currentProxy();
+        Object proxy = AopContext.currentProxy();
+        if (((Advised) proxy).getTargetSource().getTargetClass() == invoker.getClass())
+        {
+            return (T) proxy;
+        }
+        return invoker;
     }
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java

@@ -13,7 +13,7 @@ public class SqlUtil
     /**
      * 定义常用的 sql关键字
      */
-    public static String SQL_REGEX = "and |extractvalue|updatexml|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |+|user()";
+    public static String SQL_REGEX = "\u000B|and |extractvalue|updatexml|sleep|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |union |like |+|/*|user()";
 
     /**
      * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）

ruoyi-framework/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.8.8</version>
+        <version>3.9.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

@@ -7,6 +7,7 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
@@ -73,8 +74,7 @@ public class DataScopeAspect
             if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
             {
                 String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), PermissionContextHolder.getContext());
-                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
+                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias(), permission);
-                        controllerDataScope.userAlias(), permission);
             }
         }
     }
@@ -94,7 +94,7 @@ public class DataScopeAspect
         List<String> conditions = new ArrayList<String>();
         List<String> scopeCustomIds = new ArrayList<String>();
         user.getRoles().forEach(role -> {
-            if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
+            if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
             {
                 scopeCustomIds.add(Convert.toStr(role.getRoleId()));
             }
@@ -103,7 +103,7 @@ public class DataScopeAspect
         for (SysRole role : user.getRoles())
         {
             String dataScope = role.getDataScope();
-            if (conditions.contains(dataScope))
+            if (conditions.contains(dataScope) || StringUtils.equals(role.getStatus(), UserConstants.ROLE_DISABLE))
             {
                 continue;
             }

ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java

@@ -20,9 +20,11 @@ import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.enums.BusinessStatus;
 import com.ruoyi.common.enums.HttpMethod;
 import com.ruoyi.common.filter.PropertyPreExcludeFilter;
+import com.ruoyi.common.utils.ExceptionUtil;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -52,7 +54,7 @@ public class LogAspect
      * 处理请求前执行
      */
     @Before(value = "@annotation(controllerLog)")
-    public void boBefore(JoinPoint joinPoint, Log controllerLog)
+    public void doBefore(JoinPoint joinPoint, Log controllerLog)
     {
         TIME_THREADLOCAL.set(System.currentTimeMillis());
     }
@@ -107,7 +109,7 @@ public class LogAspect
             if (e != null)
             {
                 operLog.setStatus(BusinessStatus.FAIL.ordinal());
-                operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
+                operLog.setErrorMsg(StringUtils.substring(Convert.toStr(e.getMessage(), ExceptionUtil.getExceptionMessage(e)), 0, 2000));
             }
             // 设置方法名称
             String className = joinPoint.getTarget().getClass().getName();
@@ -172,8 +174,7 @@ public class LogAspect
     {
         Map<?, ?> paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest());
         String requestMethod = operLog.getRequestMethod();
-        if (StringUtils.isEmpty(paramsMap)
+        if (StringUtils.isEmpty(paramsMap) && StringUtils.equalsAny(requestMethod, HttpMethod.PUT.name(), HttpMethod.POST.name(), HttpMethod.DELETE.name()))
-                && (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod)))
         {
             String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames);
             operLog.setOperParam(StringUtils.substring(params, 0, 2000));

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java

@@ -36,7 +36,7 @@ public class ResourcesConfig implements WebMvcConfigurer
         /** swagger配置 */
         registry.addResourceHandler("/swagger-ui/**")
                 .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/")
-                .setCacheControl(CacheControl.maxAge(5, TimeUnit.HOURS).cachePublic());;
+                .setCacheControl(CacheControl.maxAge(5, TimeUnit.HOURS).cachePublic());
     }
 
     /**
@@ -55,7 +55,6 @@ public class ResourcesConfig implements WebMvcConfigurer
     public CorsFilter corsFilter()
     {
         CorsConfiguration config = new CorsConfiguration();
-        config.setAllowCredentials(true);
         // 设置访问源地址
         config.addAllowedOriginPattern("*");
         // 设置访问源请求头

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java

@@ -6,8 +6,10 @@ import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
+import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysMenuService;
 import com.ruoyi.system.service.ISysRoleService;
 
@@ -68,9 +70,12 @@ public class SysPermissionService
                 // 多角色设置permissions属性，以便数据权限匹配权限
                 for (SysRole role : roles)
                 {
-                    Set<String> rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());
+                    if (StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && !role.isAdmin())
-                    role.setPermissions(rolePerms);
+                    {
-                    perms.addAll(rolePerms);
+                        Set<String> rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());
+                        role.setPermissions(rolePerms);
+                        perms.addAll(rolePerms);
+                    }
                 }
             }
             else

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.model.RegisterBody;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.user.CaptchaException;
 import com.ruoyi.common.exception.user.CaptchaExpireException;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.MessageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -76,6 +77,7 @@ public class SysRegisterService
         else
         {
             sysUser.setNickName(username);
+            sysUser.setPwdUpdateDate(DateUtils.getNowDate());
             sysUser.setPassword(SecurityUtils.encryptPassword(password));
             boolean regFlag = userService.registerUser(sysUser);
             if (!regFlag)

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

@@ -25,7 +25,7 @@ import io.jsonwebtoken.SignatureAlgorithm;
 
 /**
  * token验证处理
- *
+ * 
  * @author ruoyi
  */
 @Component
@@ -49,14 +49,14 @@ public class TokenService
 
     protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
 
-    private static final Long MILLIS_MINUTE_TEN = 20 * 60 * 1000L;
+    private static final Long MILLIS_MINUTE_TWENTY = 20 * 60 * 1000L;
 
     @Autowired
     private RedisCache redisCache;
 
     /**
      * 获取用户身份信息
-     *
+     * 
      * @return 用户信息
      */
     public LoginUser getLoginUser(HttpServletRequest request)
@@ -107,7 +107,7 @@ public class TokenService
 
     /**
      * 创建令牌
-     *
+     * 
      * @param loginUser 用户信息
      * @return 令牌
      */
@@ -120,20 +120,21 @@ public class TokenService
 
         Map<String, Object> claims = new HashMap<>();
         claims.put(Constants.LOGIN_USER_KEY, token);
+        claims.put(Constants.JWT_USERNAME, loginUser.getUsername());
         return createToken(claims);
     }
 
     /**
      * 验证令牌有效期，相差不足20分钟，自动刷新缓存
-     *
+     * 
-     * @param loginUser
+     * @param loginUser 登录信息
      * @return 令牌
      */
     public void verifyToken(LoginUser loginUser)
     {
         long expireTime = loginUser.getExpireTime();
         long currentTime = System.currentTimeMillis();
-        if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
+        if (expireTime - currentTime <= MILLIS_MINUTE_TWENTY)
         {
             refreshToken(loginUser);
         }
@@ -141,7 +142,7 @@ public class TokenService
 
     /**
      * 刷新令牌有效期
-     *
+     * 
      * @param loginUser 登录信息
      */
     public void refreshToken(LoginUser loginUser)
@@ -155,7 +156,7 @@ public class TokenService
 
     /**
      * 设置用户代理信息
-     *
+     * 
      * @param loginUser 登录信息
      */
     public void setUserAgent(LoginUser loginUser)

ruoyi-generator/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.8.8</version>
+        <version>3.9.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java

@@ -21,12 +21,15 @@ public class GenConfig
     /** 生成包路径 */
     public static String packageName;
 
-    /** 自动去除表前缀，默认是false */
+    /** 自动去除表前缀 */
     public static boolean autoRemovePre;
 
-    /** 表前缀(类名不会包含表前缀) */
+    /** 表前缀 */
     public static String tablePrefix;
 
+    /** 是否允许生成文件覆盖到本地（自定义路径） */
+    public static boolean allowOverwrite;
+
     public static String getAuthor()
     {
         return author;
@@ -70,4 +73,15 @@ public class GenConfig
     {
         GenConfig.tablePrefix = tablePrefix;
     }
+
+    public static boolean isAllowOverwrite()
+    {
+        return allowOverwrite;
+    }
+
+    @Value("${allowOverwrite}")
+    public void setAllowOverwrite(boolean allowOverwrite)
+    {
+        GenConfig.allowOverwrite = allowOverwrite;
+    }
 }

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

@@ -30,6 +30,7 @@ import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.sql.SqlUtil;
+import com.ruoyi.generator.config.GenConfig;
 import com.ruoyi.generator.domain.GenTable;
 import com.ruoyi.generator.domain.GenTableColumn;
 import com.ruoyi.generator.service.IGenTableColumnService;
@@ -63,7 +64,7 @@ public class GenController extends BaseController
     }
 
     /**
-     * 修改代码生成业务
+     * 获取代码生成信息
      */
     @PreAuthorize("@ss.hasPermi('tool:gen:query')")
     @GetMapping(value = "/{tableId}")
@@ -213,6 +214,10 @@ public class GenController extends BaseController
     @GetMapping("/genCode/{tableName}")
     public AjaxResult genCode(@PathVariable("tableName") String tableName)
     {
+        if (!GenConfig.isAllowOverwrite())
+        {
+            return AjaxResult.error("【系统预设】不允许生成文件覆盖到本地");
+        }
         genTableService.generatorCode(tableName);
         return success();
     }

ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

@@ -93,7 +93,7 @@ public class GenTable extends BaseEntity
     private String treeName;
 
     /** 上级菜单ID字段 */
-    private String parentMenuId;
+    private Long parentMenuId;
 
     /** 上级菜单名称字段 */
     private String parentMenuName;
@@ -318,12 +318,12 @@ public class GenTable extends BaseEntity
         this.treeName = treeName;
     }
 
-    public String getParentMenuId()
+    public Long getParentMenuId()
     {
         return parentMenuId;
     }
 
-    public void setParentMenuId(String parentMenuId)
+    public void setParentMenuId(Long parentMenuId)
     {
         this.parentMenuId = parentMenuId;
     }

ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

@@ -128,9 +128,9 @@ public class GenTableServiceImpl implements IGenTableService
         int row = genTableMapper.updateGenTable(genTable);
         if (row > 0)
         {
-            for (GenTableColumn cenTableColumn : genTable.getColumns())
+            for (GenTableColumn genTableColumn : genTable.getColumns())
             {
-                genTableColumnMapper.updateGenTableColumn(cenTableColumn);
+                genTableColumnMapper.updateGenTableColumn(genTableColumn);
             }
         }
     }
@@ -424,16 +424,16 @@ public class GenTableServiceImpl implements IGenTableService
             {
                 throw new ServiceException("树名称字段不能为空");
             }
-            else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory()))
+        }
+        else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory()))
+        {
+            if (StringUtils.isEmpty(genTable.getSubTableName()))
             {
-                if (StringUtils.isEmpty(genTable.getSubTableName()))
+                throw new ServiceException("关联子表的表名不能为空");
-                {
+            }
-                    throw new ServiceException("关联子表的表名不能为空");
+            else if (StringUtils.isEmpty(genTable.getSubTableFkName()))
-                }
+            {
-                else if (StringUtils.isEmpty(genTable.getSubTableFkName()))
+                throw new ServiceException("子表关联的外键名不能为空");
-                {
-                    throw new ServiceException("子表关联的外键名不能为空");
-                }
             }
         }
     }
@@ -501,7 +501,7 @@ public class GenTableServiceImpl implements IGenTableService
             String treeCode = paramsObj.getString(GenConstants.TREE_CODE);
             String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE);
             String treeName = paramsObj.getString(GenConstants.TREE_NAME);
-            String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID);
+            Long parentMenuId = paramsObj.getLongValue(GenConstants.PARENT_MENU_ID);
             String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);
 
             genTable.setTreeCode(treeCode);

ruoyi-generator/src/main/resources/generator.yml

@@ -7,4 +7,6 @@ gen:
   # 自动去除表前缀，默认是false
   autoRemovePre: false
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
-  tablePrefix: sys_
+  tablePrefix: sys_
+  # 是否允许生成文件覆盖到本地（自定义路径），默认不允许
+  allowOverwrite: false

ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -68,10 +68,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+				AND date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+				AND date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
 			</if>
 		</where>
 	</select>
@@ -88,10 +88,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND lower(table_comment) like lower(concat('%', #{tableComment}, '%'))
 		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			AND date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
 		</if>
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			AND date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
 		</if>
         order by create_time desc
 	</select>

ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -71,9 +71,9 @@ public class ${ClassName} extends ${Entity}
     {
         return $column.javaField;
     }
-#end
-#end
 
+#end
+#end
 #if($table.sub)
     public List<${subClassName}> get${subClassName}List()
     {

ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm

@@ -75,7 +75,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['${moduleName}:${businessName}:add']"
+          v-hasPermi="['${permissionPrefix}:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -144,21 +144,21 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:edit']"
+            v-hasPermi="['${permissionPrefix}:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:add']"
+            v-hasPermi="['${permissionPrefix}:add']"
           >新增</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:remove']"
+            v-hasPermi="['${permissionPrefix}:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -283,9 +283,9 @@
 </template>
 
 <script>
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-import Treeselect from "@riophae/vue-treeselect";
+import Treeselect from "@riophae/vue-treeselect"
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css"
 
 export default {
   name: "${BusinessName}",
@@ -346,18 +346,18 @@ export default {
 #end
 #end
       }
-    };
+    }
   },
   created() {
-    this.getList();
+    this.getList()
   },
   methods: {
     /** 查询${functionName}列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      this.queryParams.params = {};
+      this.queryParams.params = {}
 #break
 #end
 #end
@@ -365,40 +365,40 @@ export default {
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
       if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
-        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
+        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0]
-        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
+        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1]
       }
 #end
 #end
       list${BusinessName}(this.queryParams).then(response => {
-        this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+        this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}")
-        this.loading = false;
+        this.loading = false
-      });
+      })
     },
     /** 转换${functionName}数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
-        delete node.children;
+        delete node.children
       }
       return {
         id: node.${treeCode},
         label: node.${treeName},
         children: node.children
-      };
+      }
     },
 	/** 查询${functionName}下拉树结构 */
     getTreeselect() {
       list${BusinessName}().then(response => {
-        this.${businessName}Options = [];
+        this.${businessName}Options = []
-        const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
+        const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] }
-        data.children = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+        data.children = this.handleTree(response.data, "${treeCode}", "${treeParentCode}")
-        this.${businessName}Options.push(data);
+        this.${businessName}Options.push(data)
-      });
+      })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
+      this.open = false
-      this.reset();
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -410,61 +410,61 @@ export default {
         $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
-      };
+      }
-      this.resetForm("form");
+      this.resetForm("form")
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.getList();
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      this.daterange${AttrName} = [];
+      this.daterange${AttrName} = []
 #end
 #end
-      this.resetForm("queryForm");
+      this.resetForm("queryForm")
-      this.handleQuery();
+      this.handleQuery()
     },
     /** 新增按钮操作 */
     handleAdd(row) {
-      this.reset();
+      this.reset()
-      this.getTreeselect();
+      this.getTreeselect()
       if (row != null && row.${treeCode}) {
-        this.form.${treeParentCode} = row.${treeCode};
+        this.form.${treeParentCode} = row.${treeCode}
       } else {
-        this.form.${treeParentCode} = 0;
+        this.form.${treeParentCode} = 0
       }
-      this.open = true;
+      this.open = true
-      this.title = "添加${functionName}";
+      this.title = "添加${functionName}"
     },
     /** 展开/折叠操作 */
     toggleExpandAll() {
-      this.refreshTable = false;
+      this.refreshTable = false
-      this.isExpandAll = !this.isExpandAll;
+      this.isExpandAll = !this.isExpandAll
       this.$nextTick(() => {
-        this.refreshTable = true;
+        this.refreshTable = true
-      });
+      })
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
-      this.getTreeselect();
+      this.getTreeselect()
       if (row != null) {
-        this.form.${treeParentCode} = row.${treeParentCode};
+        this.form.${treeParentCode} = row.${treeParentCode}
       }
       get${BusinessName}(row.${pkColumn.javaField}).then(response => {
-        this.form = response.data;
+        this.form = response.data
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-        this.form.$column.javaField = this.form.${column.javaField}.split(",");
+        this.form.$column.javaField = this.form.${column.javaField}.split(",")
 #end
 #end
-        this.open = true;
+        this.open = true
-        this.title = "修改${functionName}";
+        this.title = "修改${functionName}"
-      });
+      })
     },
     /** 提交按钮 */
     submitForm() {
@@ -472,34 +472,34 @@ export default {
         if (valid) {
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-          this.form.$column.javaField = this.form.${column.javaField}.join(",");
+          this.form.$column.javaField = this.form.${column.javaField}.join(",")
 #end
 #end
           if (this.form.${pkColumn.javaField} != null) {
             update${BusinessName}(this.form).then(response => {
-              this.#[[$modal]]#.msgSuccess("修改成功");
+              this.#[[$modal]]#.msgSuccess("修改成功")
-              this.open = false;
+              this.open = false
-              this.getList();
+              this.getList()
-            });
+            })
           } else {
             add${BusinessName}(this.form).then(response => {
-              this.#[[$modal]]#.msgSuccess("新增成功");
+              this.#[[$modal]]#.msgSuccess("新增成功")
-              this.open = false;
+              this.open = false
-              this.getList();
+              this.getList()
-            });
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
-        return del${BusinessName}(row.${pkColumn.javaField});
+        return del${BusinessName}(row.${pkColumn.javaField})
       }).then(() => {
-        this.getList();
+        this.getList()
-        this.#[[$modal]]#.msgSuccess("删除成功");
+        this.#[[$modal]]#.msgSuccess("删除成功")
-      }).catch(() => {});
+      }).catch(() => {})
     }
   }
-};
+}
 </script>

ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -75,7 +75,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['${moduleName}:${businessName}:add']"
+          v-hasPermi="['${permissionPrefix}:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -86,7 +86,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['${moduleName}:${businessName}:edit']"
+          v-hasPermi="['${permissionPrefix}:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -97,7 +97,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['${moduleName}:${businessName}:remove']"
+          v-hasPermi="['${permissionPrefix}:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -107,7 +107,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['${moduleName}:${businessName}:export']"
+          v-hasPermi="['${permissionPrefix}:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -158,14 +158,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:edit']"
+            v-hasPermi="['${permissionPrefix}:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:remove']"
+            v-hasPermi="['${permissionPrefix}:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -353,7 +353,7 @@
 </template>
 
 <script>
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
 
 export default {
   name: "${BusinessName}",
@@ -423,18 +423,18 @@ export default {
 #end
 #end
       }
-    };
+    }
   },
   created() {
-    this.getList();
+    this.getList()
   },
   methods: {
     /** 查询${functionName}列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      this.queryParams.params = {};
+      this.queryParams.params = {}
 #break
 #end
 #end
@@ -442,21 +442,21 @@ export default {
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
       if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
-        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
+        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0]
-        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
+        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1]
       }
 #end
 #end
       list${BusinessName}(this.queryParams).then(response => {
-        this.${businessName}List = response.rows;
+        this.${businessName}List = response.rows
-        this.total = response.total;
+        this.total = response.total
-        this.loading = false;
+        this.loading = false
-      });
+      })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
+      this.open = false
-      this.reset();
+      this.reset()
     },
     // 表单重置
     reset() {
@@ -468,27 +468,27 @@ export default {
         $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
-      };
+      }
 #if($table.sub)
-      this.${subclassName}List = [];
+      this.${subclassName}List = []
 #end
-      this.resetForm("form");
+      this.resetForm("form")
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
+      this.queryParams.pageNum = 1
-      this.getList();
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      this.daterange${AttrName} = [];
+      this.daterange${AttrName} = []
 #end
 #end
-      this.resetForm("queryForm");
+      this.resetForm("queryForm")
-      this.handleQuery();
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -498,27 +498,27 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
+      this.reset()
-      this.open = true;
+      this.open = true
-      this.title = "添加${functionName}";
+      this.title = "添加${functionName}"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
       const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
       get${BusinessName}(${pkColumn.javaField}).then(response => {
-        this.form = response.data;
+        this.form = response.data
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-        this.form.$column.javaField = this.form.${column.javaField}.split(",");
+        this.form.$column.javaField = this.form.${column.javaField}.split(",")
 #end
 #end
 #if($table.sub)
-        this.${subclassName}List = response.data.${subclassName}List;
+        this.${subclassName}List = response.data.${subclassName}List
 #end
-        this.open = true;
+        this.open = true
-        this.title = "修改${functionName}";
+        this.title = "修改${functionName}"
-      });
+      })
     },
     /** 提交按钮 */
     submitForm() {
@@ -526,64 +526,64 @@ export default {
         if (valid) {
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-          this.form.$column.javaField = this.form.${column.javaField}.join(",");
+          this.form.$column.javaField = this.form.${column.javaField}.join(",")
 #end
 #end
 #if($table.sub)
-          this.form.${subclassName}List = this.${subclassName}List;
+          this.form.${subclassName}List = this.${subclassName}List
 #end
           if (this.form.${pkColumn.javaField} != null) {
             update${BusinessName}(this.form).then(response => {
-              this.#[[$modal]]#.msgSuccess("修改成功");
+              this.#[[$modal]]#.msgSuccess("修改成功")
-              this.open = false;
+              this.open = false
-              this.getList();
+              this.getList()
-            });
+            })
           } else {
             add${BusinessName}(this.form).then(response => {
-              this.#[[$modal]]#.msgSuccess("新增成功");
+              this.#[[$modal]]#.msgSuccess("新增成功")
-              this.open = false;
+              this.open = false
-              this.getList();
+              this.getList()
-            });
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;
+      const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids
       this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {
-        return del${BusinessName}(${pkColumn.javaField}s);
+        return del${BusinessName}(${pkColumn.javaField}s)
       }).then(() => {
-        this.getList();
+        this.getList()
-        this.#[[$modal]]#.msgSuccess("删除成功");
+        this.#[[$modal]]#.msgSuccess("删除成功")
-      }).catch(() => {});
+      }).catch(() => {})
     },
 #if($table.sub)
 	/** ${subTable.functionName}序号 */
     row${subClassName}Index({ row, rowIndex }) {
-      row.index = rowIndex + 1;
+      row.index = rowIndex + 1
     },
     /** ${subTable.functionName}添加按钮操作 */
     handleAdd${subClassName}() {
-      let obj = {};
+      let obj = {}
 #foreach($column in $subTable.columns)
 #if($column.pk || $column.javaField == ${subTableFkclassName})
 #elseif($column.list && "" != $javaField)
-      obj.$column.javaField = "";
+      obj.$column.javaField = ""
 #end
 #end
-      this.${subclassName}List.push(obj);
+      this.${subclassName}List.push(obj)
     },
     /** ${subTable.functionName}删除按钮操作 */
     handleDelete${subClassName}() {
       if (this.checked${subClassName}.length == 0) {
-        this.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
+        this.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据")
       } else {
-        const ${subclassName}List = this.${subclassName}List;
+        const ${subclassName}List = this.${subclassName}List
-        const checked${subClassName} = this.checked${subClassName};
+        const checked${subClassName} = this.checked${subClassName}
         this.${subclassName}List = ${subclassName}List.filter(function(item) {
           return checked${subClassName}.indexOf(item.index) == -1
-        });
+        })
       }
     },
     /** 复选框选中数据 */
@@ -598,5 +598,5 @@ export default {
       }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
     }
   }
-};
+}
 </script>

ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm

@@ -73,7 +73,7 @@
           plain
           icon="Plus"
           @click="handleAdd"
-          v-hasPermi="['${moduleName}:${businessName}:add']"
+          v-hasPermi="['${permissionPrefix}:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -136,9 +136,9 @@
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">修改</el-button>
-          <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['${moduleName}:${businessName}:add']">新增</el-button>
+          <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['${permissionPrefix}:add']">新增</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -271,26 +271,26 @@
 </template>
 
 <script setup name="${BusinessName}">
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
 
-const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = proxy.useDict(${dicts});
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
 #end
 
-const ${businessName}List = ref([]);
+const ${businessName}List = ref([])
-const ${businessName}Options = ref([]);
+const ${businessName}Options = ref([])
-const open = ref(false);
+const open = ref(false)
-const loading = ref(true);
+const loading = ref(true)
-const showSearch = ref(true);
+const showSearch = ref(true)
-const title = ref("");
+const title = ref("")
-const isExpandAll = ref(true);
+const isExpandAll = ref(true)
-const refreshTable = 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)})
-const daterange${AttrName} = ref([]);
+const daterange${AttrName} = ref([])
 #end
 #end
 
@@ -318,16 +318,16 @@ const data = reactive({
 #end
 #end
   }
-});
+})
 
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams, form, rules } = toRefs(data)
 
 /** 查询${functionName}列表 */
 function getList() {
-  loading.value = true;
+  loading.value = true
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-  queryParams.value.params = {};
+  queryParams.value.params = {}
 #break
 #end
 #end
@@ -335,31 +335,31 @@ function getList() {
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
   if (null != daterange${AttrName} && '' != daterange${AttrName}) {
-    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0];
+    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
-    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1];
+    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
   }
 #end
 #end
   list${BusinessName}(queryParams.value).then(response => {
-    ${businessName}List.value = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+    ${businessName}List.value = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}")
-    loading.value = false;
+    loading.value = false
-  });
+  })
 }
 
 /** 查询${functionName}下拉树结构 */
 function getTreeselect() {
   list${BusinessName}().then(response => {
-    ${businessName}Options.value = [];
+    ${businessName}Options.value = []
-    const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
+    const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] }
-    data.children = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}");
+    data.children = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}")
-    ${businessName}Options.value.push(data);
+    ${businessName}Options.value.push(data)
-  });
+  })
 }
 	
 // 取消按钮
 function cancel() {
-  open.value = false;
+  open.value = false
-  reset();
+  reset()
 }
 
 // 表单重置
@@ -372,13 +372,13 @@ function reset() {
     $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
-  };
+  }
-  proxy.resetForm("${businessName}Ref");
+  proxy.resetForm("${businessName}Ref")
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  getList();
+  getList()
 }
 
 /** 重置按钮操作 */
@@ -386,52 +386,52 @@ function resetQuery() {
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  daterange${AttrName}.value = [];
+  daterange${AttrName}.value = []
 #end
 #end
-  proxy.resetForm("queryRef");
+  proxy.resetForm("queryRef")
-  handleQuery();
+  handleQuery()
 }
 
 /** 新增按钮操作 */
 function handleAdd(row) {
-  reset();
+  reset()
-  getTreeselect();
+  getTreeselect()
   if (row != null && row.${treeCode}) {
-    form.value.${treeParentCode} = row.${treeCode};
+    form.value.${treeParentCode} = row.${treeCode}
   } else {
-    form.value.${treeParentCode} = 0;
+    form.value.${treeParentCode} = 0
   }
-  open.value = true;
+  open.value = true
-  title.value = "添加${functionName}";
+  title.value = "添加${functionName}"
 }
 
 /** 展开/折叠操作 */
 function toggleExpandAll() {
-  refreshTable.value = false;
+  refreshTable.value = false
-  isExpandAll.value = !isExpandAll.value;
+  isExpandAll.value = !isExpandAll.value
   nextTick(() => {
-    refreshTable.value = true;
+    refreshTable.value = true
-  });
+  })
 }
 
 /** 修改按钮操作 */
 async function handleUpdate(row) {
-  reset();
+  reset()
-  await getTreeselect();
+  await getTreeselect()
   if (row != null) {
-    form.value.${treeParentCode} = row.${treeParentCode};
+    form.value.${treeParentCode} = row.${treeParentCode}
   }
   get${BusinessName}(row.${pkColumn.javaField}).then(response => {
-    form.value = response.data;
+    form.value = response.data
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-    form.value.$column.javaField = form.value.${column.javaField}.split(",");
+    form.value.$column.javaField = form.value.${column.javaField}.split(",")
 #end
 #end
-    open.value = true;
+    open.value = true
-    title.value = "修改${functionName}";
+    title.value = "修改${functionName}"
-  });
+  })
 }
 
 /** 提交按钮 */
@@ -440,35 +440,35 @@ function submitForm() {
     if (valid) {
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-      form.value.$column.javaField = form.value.${column.javaField}.join(",");
+      form.value.$column.javaField = form.value.${column.javaField}.join(",")
 #end
 #end
       if (form.value.${pkColumn.javaField} != null) {
         update${BusinessName}(form.value).then(response => {
-          proxy.#[[$modal]]#.msgSuccess("修改成功");
+          proxy.#[[$modal]]#.msgSuccess("修改成功")
-          open.value = false;
+          open.value = false
-          getList();
+          getList()
-        });
+        })
       } else {
         add${BusinessName}(form.value).then(response => {
-          proxy.#[[$modal]]#.msgSuccess("新增成功");
+          proxy.#[[$modal]]#.msgSuccess("新增成功")
-          open.value = false;
+          open.value = false
-          getList();
+          getList()
-        });
+        })
       }
     }
-  });
+  })
 }
 
 /** 删除按钮操作 */
 function handleDelete(row) {
   proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
-    return del${BusinessName}(row.${pkColumn.javaField});
+    return del${BusinessName}(row.${pkColumn.javaField})
   }).then(() => {
-    getList();
+    getList()
-    proxy.#[[$modal]]#.msgSuccess("删除成功");
+    proxy.#[[$modal]]#.msgSuccess("删除成功")
-  }).catch(() => {});
+  }).catch(() => {})
 }
 
-getList();
+getList()
 </script>

ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm

@@ -73,7 +73,7 @@
           plain
           icon="Plus"
           @click="handleAdd"
-          v-hasPermi="['${moduleName}:${businessName}:add']"
+          v-hasPermi="['${permissionPrefix}:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -83,7 +83,7 @@
           icon="Edit"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['${moduleName}:${businessName}:edit']"
+          v-hasPermi="['${permissionPrefix}:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -93,7 +93,7 @@
           icon="Delete"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['${moduleName}:${businessName}:remove']"
+          v-hasPermi="['${permissionPrefix}:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -102,7 +102,7 @@
           plain
           icon="Download"
           @click="handleExport"
-          v-hasPermi="['${moduleName}:${businessName}:export']"
+          v-hasPermi="['${permissionPrefix}:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -148,8 +148,8 @@
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -343,33 +343,33 @@
 </template>
 
 <script setup name="${BusinessName}">
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
 
-const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = proxy.useDict(${dicts});
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
 #end
 
-const ${businessName}List = ref([]);
+const ${businessName}List = ref([])
 #if($table.sub)
-const ${subclassName}List = ref([]);
+const ${subclassName}List = ref([])
 #end
-const open = ref(false);
+const open = ref(false)
-const loading = ref(true);
+const loading = ref(true)
-const showSearch = ref(true);
+const showSearch = ref(true)
-const ids = ref([]);
+const ids = ref([])
 #if($table.sub)
-const checked${subClassName} = ref([]);
+const checked${subClassName} = ref([])
 #end
-const single = ref(true);
+const single = ref(true)
-const multiple = ref(true);
+const multiple = ref(true)
-const total = ref(0);
+const total = ref(0)
-const title = ref("");
+const title = ref("")
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-const daterange${AttrName} = ref([]);
+const daterange${AttrName} = ref([])
 #end
 #end
 
@@ -399,16 +399,16 @@ const data = reactive({
 #end
 #end
   }
-});
+})
 
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams, form, rules } = toRefs(data)
 
 /** 查询${functionName}列表 */
 function getList() {
-  loading.value = true;
+  loading.value = true
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-  queryParams.value.params = {};
+  queryParams.value.params = {}
 #break
 #end
 #end
@@ -416,22 +416,22 @@ function getList() {
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
   if (null != daterange${AttrName} && '' != daterange${AttrName}) {
-    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0];
+    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
-    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1];
+    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
   }
 #end
 #end
   list${BusinessName}(queryParams.value).then(response => {
-    ${businessName}List.value = response.rows;
+    ${businessName}List.value = response.rows
-    total.value = response.total;
+    total.value = response.total
-    loading.value = false;
+    loading.value = false
-  });
+  })
 }
 
 // 取消按钮
 function cancel() {
-  open.value = false;
+  open.value = false
-  reset();
+  reset()
 }
 
 // 表单重置
@@ -444,17 +444,17 @@ function reset() {
     $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
-  };
+  }
 #if($table.sub)
-  ${subclassName}List.value = [];
+  ${subclassName}List.value = []
 #end
-  proxy.resetForm("${businessName}Ref");
+  proxy.resetForm("${businessName}Ref")
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1;
+  queryParams.value.pageNum = 1
-  getList();
+  getList()
 }
 
 /** 重置按钮操作 */
@@ -462,44 +462,44 @@ function resetQuery() {
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  daterange${AttrName}.value = [];
+  daterange${AttrName}.value = []
 #end
 #end
-  proxy.resetForm("queryRef");
+  proxy.resetForm("queryRef")
-  handleQuery();
+  handleQuery()
 }
 
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.${pkColumn.javaField});
+  ids.value = selection.map(item => item.${pkColumn.javaField})
-  single.value = selection.length != 1;
+  single.value = selection.length != 1
-  multiple.value = !selection.length;
+  multiple.value = !selection.length
 }
 
 /** 新增按钮操作 */
 function handleAdd() {
-  reset();
+  reset()
-  open.value = true;
+  open.value = true
-  title.value = "添加${functionName}";
+  title.value = "添加${functionName}"
 }
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  reset();
+  reset()
   const _${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value
   get${BusinessName}(_${pkColumn.javaField}).then(response => {
-    form.value = response.data;
+    form.value = response.data
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-    form.value.$column.javaField = form.value.${column.javaField}.split(",");
+    form.value.$column.javaField = form.value.${column.javaField}.split(",")
 #end
 #end
 #if($table.sub)
-    ${subclassName}List.value = response.data.${subclassName}List;
+    ${subclassName}List.value = response.data.${subclassName}List
 #end
-    open.value = true;
+    open.value = true
-    title.value = "修改${functionName}";
+    title.value = "修改${functionName}"
-  });
+  })
 }
 
 /** 提交按钮 */
@@ -508,68 +508,68 @@ function submitForm() {
     if (valid) {
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-      form.value.$column.javaField = form.value.${column.javaField}.join(",");
+      form.value.$column.javaField = form.value.${column.javaField}.join(",")
 #end
 #end
 #if($table.sub)
-      form.value.${subclassName}List = ${subclassName}List.value;
+      form.value.${subclassName}List = ${subclassName}List.value
 #end
       if (form.value.${pkColumn.javaField} != null) {
         update${BusinessName}(form.value).then(response => {
-          proxy.#[[$modal]]#.msgSuccess("修改成功");
+          proxy.#[[$modal]]#.msgSuccess("修改成功")
-          open.value = false;
+          open.value = false
-          getList();
+          getList()
-        });
+        })
       } else {
         add${BusinessName}(form.value).then(response => {
-          proxy.#[[$modal]]#.msgSuccess("新增成功");
+          proxy.#[[$modal]]#.msgSuccess("新增成功")
-          open.value = false;
+          open.value = false
-          getList();
+          getList()
-        });
+        })
       }
     }
-  });
+  })
 }
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const _${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value;
+  const _${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value
   proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + _${pkColumn.javaField}s + '"的数据项？').then(function() {
-    return del${BusinessName}(_${pkColumn.javaField}s);
+    return del${BusinessName}(_${pkColumn.javaField}s)
   }).then(() => {
-    getList();
+    getList()
-    proxy.#[[$modal]]#.msgSuccess("删除成功");
+    proxy.#[[$modal]]#.msgSuccess("删除成功")
-  }).catch(() => {});
+  }).catch(() => {})
 }
 
 #if($table.sub)
 /** ${subTable.functionName}序号 */
 function row${subClassName}Index({ row, rowIndex }) {
-  row.index = rowIndex + 1;
+  row.index = rowIndex + 1
 }
 
 /** ${subTable.functionName}添加按钮操作 */
 function handleAdd${subClassName}() {
-  let obj = {};
+  let obj = {}
 #foreach($column in $subTable.columns)
 #if($column.pk || $column.javaField == ${subTableFkclassName})
 #elseif($column.list && "" != $javaField)
-  obj.$column.javaField = "";
+  obj.$column.javaField = ""
 #end
 #end
-  ${subclassName}List.value.push(obj);
+  ${subclassName}List.value.push(obj)
 }
 
 /** ${subTable.functionName}删除按钮操作 */
 function handleDelete${subClassName}() {
   if (checked${subClassName}.value.length == 0) {
-    proxy.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
+    proxy.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据")
   } else {
-    const ${subclassName}s = ${subclassName}List.value;
+    const ${subclassName}s = ${subclassName}List.value
-    const checked${subClassName}s = checked${subClassName}.value;
+    const checked${subClassName}s = checked${subClassName}.value
     ${subclassName}List.value = ${subclassName}s.filter(function(item) {
       return checked${subClassName}s.indexOf(item.index) == -1
-    });
+    })
   }
 }
 
@@ -586,5 +586,5 @@ function handleExport() {
   }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
 }
 
-getList();
+getList()
 </script>

ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm

@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 #if($table.sub)
 
-    <select id="select${subClassName}List" resultType="${subClassName}" resultMap="${subClassName}Result">
+    <select id="select${subClassName}List" resultMap="${subClassName}Result">
         select#foreach ($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end
         from ${subTableName}
         where ${subTableFkName} = #{${subTableFkName}}

ruoyi-quartz/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.8.8</version>
+        <version>3.9.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java

@@ -177,7 +177,7 @@ public class SysJobController extends BaseController
     @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
     @Log(title = "定时任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{jobIds}")
-    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
+    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException
     {
         jobService.deleteJobByIds(jobIds);
         return success();

ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java

@@ -3,7 +3,6 @@ package com.ruoyi.quartz.util;
 import java.util.Date;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.ruoyi.common.constant.Constants;
@@ -31,7 +30,7 @@ public abstract class AbstractQuartzJob implements Job
     private static ThreadLocal<Date> threadLocal = new ThreadLocal<>();
 
     @Override
-    public void execute(JobExecutionContext context) throws JobExecutionException
+    public void execute(JobExecutionContext context)
     {
         SysJob sysJob = new SysJob();
         BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES));

ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java

@@ -105,7 +105,7 @@ public class JobInvokeUtil
      */
     public static List<Object[]> getMethodParams(String invokeTarget)
     {
-        String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
+        String methodStr = StringUtils.substringBetweenLast(invokeTarget, "(", ")");
         if (StringUtils.isEmpty(methodStr))
         {
             return null;

ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml

@@ -36,10 +36,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND invoke_target like concat('%', #{invokeTarget}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+				and date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+				and date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
 			</if>
 		</where>
 		order by create_time desc

ruoyi-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ruoyi</artifactId>
         <groupId>com.ruoyi</groupId>
-        <version>3.8.8</version>
+        <version>3.9.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -365,7 +365,7 @@ public class SysMenuServiceImpl implements ISysMenuService
     /**
      * 获取路由名称，如没有配置路由名称则取路由地址
      * 
-     * @param routerName 路由名称
+     * @param name 路由名称
      * @param path 路由地址
      * @return 路由名称（驼峰格式）
      */

ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -51,10 +51,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND config_key like concat('%', #{configKey}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+				and date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+				and date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
 			</if>
 		</where>
     </select>

ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -33,10 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND dict_type like concat('%', #{dictType}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+				and date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+				and date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
 			</if>
 	    </where>
 	</select>

ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -46,10 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND r.role_key like concat('%', #{roleKey}, '%')
 		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			and date_format(r.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			and date_format(r.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
 		</if>
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			and date_format(r.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -5,24 +5,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
 
     <resultMap type="SysUser" id="SysUserResult">
-        <id     property="userId"       column="user_id"      />
+        <id     property="userId"        column="user_id"         />
-        <result property="deptId"       column="dept_id"      />
+        <result property="deptId"        column="dept_id"         />
-        <result property="userName"     column="user_name"    />
+        <result property="userName"      column="user_name"       />
-        <result property="nickName"     column="nick_name"    />
+        <result property="nickName"      column="nick_name"       />
-        <result property="email"        column="email"        />
+        <result property="email"         column="email"           />
-        <result property="phonenumber"  column="phonenumber"  />
+        <result property="phonenumber"   column="phonenumber"     />
-        <result property="sex"          column="sex"          />
+        <result property="sex"           column="sex"             />
-        <result property="avatar"       column="avatar"       />
+        <result property="avatar"        column="avatar"          />
-        <result property="password"     column="password"     />
+        <result property="password"      column="password"        />
-        <result property="status"       column="status"       />
+        <result property="status"        column="status"          />
-        <result property="delFlag"      column="del_flag"     />
+        <result property="delFlag"       column="del_flag"        />
-        <result property="loginIp"      column="login_ip"     />
+        <result property="loginIp"       column="login_ip"        />
-        <result property="loginDate"    column="login_date"   />
+        <result property="loginDate"     column="login_date"      />
-        <result property="createBy"     column="create_by"    />
+        <result property="pwdUpdateDate" column="pwd_update_date" />
-        <result property="createTime"   column="create_time"  />
+        <result property="createBy"     column="create_by"        />
-        <result property="updateBy"     column="update_by"    />
+        <result property="createTime"   column="create_time"      />
-        <result property="updateTime"   column="update_time"  />
+        <result property="updateBy"     column="update_by"        />
-        <result property="remark"       column="remark"       />
+        <result property="updateTime"   column="update_time"      />
+        <result property="remark"       column="remark"           />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
@@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        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, 
+        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.pwd_update_date, u.create_by, u.create_time, u.remark, 
         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
@@ -73,10 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+			AND date_format(u.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
 		</if>
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			AND date_format(u.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
 		</if>
 		<if test="deptId != null and deptId != 0">
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
@@ -154,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="sex != null and sex != ''">sex,</if>
  			<if test="password != null and password != ''">password,</if>
  			<if test="status != null and status != ''">status,</if>
+ 			<if test="pwdUpdateDate != null">pwd_update_date,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
  			create_time
@@ -168,6 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="sex != null and sex != ''">#{sex},</if>
  			<if test="password != null and password != ''">#{password},</if>
  			<if test="status != null and status != ''">#{status},</if>
+ 			<if test="pwdUpdateDate != null">#{pwdUpdateDate},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			sysdate()
@@ -178,7 +181,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update sys_user
  		<set>
  			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
- 			<if test="userName != null and userName != ''">user_name = #{userName},</if>
  			<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
  			<if test="email != null ">email = #{email},</if>
  			<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
@@ -204,7 +206,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 	
 	<update id="resetUserPwd" parameterType="SysUser">
- 		update sys_user set password = #{password} where user_name = #{userName}
+ 		update sys_user set pwd_update_date = sysdate(), password = #{password} where user_name = #{userName}
 	</update>
 	
 	<delete id="deleteUserById" parameterType="Long">

ruoyi-ui/.env.staging

@@ -1,6 +1,8 @@
 # 页面标题
 VUE_APP_TITLE = 若依管理系统
 
+BABEL_ENV = production
+
 NODE_ENV = production
 
 # 测试环境配置

ruoyi-ui/.eslintignore

@@ -1,10 +0,0 @@
-# 忽略build目录下类型为js的文件的语法检查
-build/*.js
-# 忽略src/assets目录下文件的语法检查
-src/assets
-# 忽略public目录下文件的语法检查
-public
-# 忽略当前目录下为js的文件的语法检查
-*.js
-# 忽略当前目录下为vue的文件的语法检查
-*.vue

ruoyi-ui/.eslintrc.js

@@ -1,199 +0,0 @@
-// ESlint 检查配置
-module.exports = {
-  root: true,
-  parserOptions: {
-    parser: 'babel-eslint',
-    sourceType: 'module'
-  },
-  env: {
-    browser: true,
-    node: true,
-    es6: true,
-  },
-  extends: ['plugin:vue/recommended', 'eslint:recommended'],
-
-  // add your custom rules here
-  //it is base on https://github.com/vuejs/eslint-config-vue
-  rules: {
-    "vue/max-attributes-per-line": [2, {
-      "singleline": 10,
-      "multiline": {
-        "max": 1,
-        "allowFirstLine": false
-      }
-    }],
-    "vue/singleline-html-element-content-newline": "off",
-    "vue/multiline-html-element-content-newline":"off",
-    "vue/name-property-casing": ["error", "PascalCase"],
-    "vue/no-v-html": "off",
-    'accessor-pairs': 2,
-    'arrow-spacing': [2, {
-      'before': true,
-      'after': true
-    }],
-    'block-spacing': [2, 'always'],
-    'brace-style': [2, '1tbs', {
-      'allowSingleLine': true
-    }],
-    'camelcase': [0, {
-      'properties': 'always'
-    }],
-    'comma-dangle': [2, 'never'],
-    'comma-spacing': [2, {
-      'before': false,
-      'after': true
-    }],
-    'comma-style': [2, 'last'],
-    'constructor-super': 2,
-    'curly': [2, 'multi-line'],
-    'dot-location': [2, 'property'],
-    'eol-last': 2,
-    'eqeqeq': ["error", "always", {"null": "ignore"}],
-    'generator-star-spacing': [2, {
-      'before': true,
-      'after': true
-    }],
-    'handle-callback-err': [2, '^(err|error)$'],
-    'indent': [2, 2, {
-      'SwitchCase': 1
-    }],
-    'jsx-quotes': [2, 'prefer-single'],
-    'key-spacing': [2, {
-      'beforeColon': false,
-      'afterColon': true
-    }],
-    'keyword-spacing': [2, {
-      'before': true,
-      'after': true
-    }],
-    'new-cap': [2, {
-      'newIsCap': true,
-      'capIsNew': false
-    }],
-    'new-parens': 2,
-    'no-array-constructor': 2,
-    'no-caller': 2,
-    'no-console': 'off',
-    'no-class-assign': 2,
-    'no-cond-assign': 2,
-    'no-const-assign': 2,
-    'no-control-regex': 0,
-    'no-delete-var': 2,
-    'no-dupe-args': 2,
-    'no-dupe-class-members': 2,
-    'no-dupe-keys': 2,
-    'no-duplicate-case': 2,
-    'no-empty-character-class': 2,
-    'no-empty-pattern': 2,
-    'no-eval': 2,
-    'no-ex-assign': 2,
-    'no-extend-native': 2,
-    'no-extra-bind': 2,
-    'no-extra-boolean-cast': 2,
-    'no-extra-parens': [2, 'functions'],
-    'no-fallthrough': 2,
-    'no-floating-decimal': 2,
-    'no-func-assign': 2,
-    'no-implied-eval': 2,
-    'no-inner-declarations': [2, 'functions'],
-    'no-invalid-regexp': 2,
-    'no-irregular-whitespace': 2,
-    'no-iterator': 2,
-    'no-label-var': 2,
-    'no-labels': [2, {
-      'allowLoop': false,
-      'allowSwitch': false
-    }],
-    'no-lone-blocks': 2,
-    'no-mixed-spaces-and-tabs': 2,
-    'no-multi-spaces': 2,
-    'no-multi-str': 2,
-    'no-multiple-empty-lines': [2, {
-      'max': 1
-    }],
-    'no-native-reassign': 2,
-    'no-negated-in-lhs': 2,
-    'no-new-object': 2,
-    'no-new-require': 2,
-    'no-new-symbol': 2,
-    'no-new-wrappers': 2,
-    'no-obj-calls': 2,
-    'no-octal': 2,
-    'no-octal-escape': 2,
-    'no-path-concat': 2,
-    'no-proto': 2,
-    'no-redeclare': 2,
-    'no-regex-spaces': 2,
-    'no-return-assign': [2, 'except-parens'],
-    'no-self-assign': 2,
-    'no-self-compare': 2,
-    'no-sequences': 2,
-    'no-shadow-restricted-names': 2,
-    'no-spaced-func': 2,
-    'no-sparse-arrays': 2,
-    'no-this-before-super': 2,
-    'no-throw-literal': 2,
-    'no-trailing-spaces': 2,
-    'no-undef': 2,
-    'no-undef-init': 2,
-    'no-unexpected-multiline': 2,
-    'no-unmodified-loop-condition': 2,
-    'no-unneeded-ternary': [2, {
-      'defaultAssignment': false
-    }],
-    'no-unreachable': 2,
-    'no-unsafe-finally': 2,
-    'no-unused-vars': [2, {
-      'vars': 'all',
-      'args': 'none'
-    }],
-    'no-useless-call': 2,
-    'no-useless-computed-key': 2,
-    'no-useless-constructor': 2,
-    'no-useless-escape': 0,
-    'no-whitespace-before-property': 2,
-    'no-with': 2,
-    'one-var': [2, {
-      'initialized': 'never'
-    }],
-    'operator-linebreak': [2, 'after', {
-      'overrides': {
-        '?': 'before',
-        ':': 'before'
-      }
-    }],
-    'padded-blocks': [2, 'never'],
-    'quotes': [2, 'single', {
-      'avoidEscape': true,
-      'allowTemplateLiterals': true
-    }],
-    'semi': [2, 'never'],
-    'semi-spacing': [2, {
-      'before': false,
-      'after': true
-    }],
-    'space-before-blocks': [2, 'always'],
-    'space-before-function-paren': [2, 'never'],
-    'space-in-parens': [2, 'never'],
-    'space-infix-ops': 2,
-    'space-unary-ops': [2, {
-      'words': true,
-      'nonwords': false
-    }],
-    'spaced-comment': [2, 'always', {
-      'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
-    }],
-    'template-curly-spacing': [2, 'never'],
-    'use-isnan': 2,
-    'valid-typeof': 2,
-    'wrap-iife': [2, 'any'],
-    'yield-star-spacing': [2, 'both'],
-    'yoda': [2, 'never'],
-    'prefer-const': 2,
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-    'object-curly-spacing': [2, 'always', {
-      objectsInObjects: false
-    }],
-    'array-bracket-spacing': [2, 'never']
-  }
-}

ruoyi-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "3.8.8",
+  "version": "3.9.0",
   "description": "若依管理系统",
   "author": "若依",
   "license": "MIT",
@@ -8,19 +8,7 @@
     "dev": "vue-cli-service serve",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
-    "preview": "node build/index.js --preview",
+    "preview": "node build/index.js --preview"
-    "lint": "eslint --ext .js,.vue src"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "src/**/*.{js,vue}": [
-      "eslint --fix",
-      "git add"
-    ]
   },
   "keywords": [
     "vue",
@@ -37,7 +25,7 @@
   },
   "dependencies": {
     "@riophae/vue-treeselect": "0.4.0",
-    "axios": "0.24.0",
+    "axios": "0.28.1",
     "clipboard": "2.0.8",
     "core-js": "3.37.1",
     "echarts": "5.4.0",
@@ -49,30 +37,24 @@
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
     "nprogress": "0.2.0",
-    "quill": "1.3.7",
+    "quill": "2.0.2",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
+    "splitpanes": "2.4.1",
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
-    "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
-    "@vue/cli-plugin-eslint": "4.4.6",
     "@vue/cli-service": "4.4.6",
-    "babel-eslint": "10.1.0",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "chalk": "4.1.0",
     "compression-webpack-plugin": "6.1.2",
     "connect": "3.6.6",
-    "eslint": "7.15.0",
-    "eslint-plugin-vue": "7.2.0",
-    "lint-staged": "10.5.3",
-    "runjs": "4.4.2",
     "sass": "1.32.13",
     "sass-loader": "10.1.1",
     "script-ext-html-webpack-plugin": "2.1.5",

ruoyi-ui/src/App.vue

@@ -6,20 +6,12 @@
 </template>
 
 <script>
-import ThemePicker from "@/components/ThemePicker";
+import ThemePicker from "@/components/ThemePicker"
 
 export default {
   name: "App",
-  components: { ThemePicker },
+  components: { ThemePicker }
-  metaInfo() {
+}
-    return {
-      title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
-      titleTemplate: title => {
-        return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
-      }
-    }
-  }
-};
 </script>
 <style scoped>
 #app .theme-picker {

ruoyi-ui/src/api/system/user.js

@@ -96,7 +96,7 @@ export function updateUserPwd(oldPassword, newPassword) {
   return request({
     url: '/system/user/profile/updatePwd',
     method: 'put',
-    params: data
+    data: data
   })
 }
 
@@ -105,6 +105,7 @@ export function uploadAvatar(data) {
   return request({
     url: '/system/user/profile/avatar',
     method: 'post',
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
     data: data
   })
 }

ruoyi-ui/src/assets/icons/svg/enter.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1746590936918" class="icon" viewBox="0 0 1194 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5378" xmlns:xlink="http://www.w3.org/1999/xlink" width="233.203125" height="200"><path d="M1151.9144 325.11999969V89.12a57.04000031 57.04000031 0 0 0-28.8-49.44 58.15999969 58.15999969 0 0 0-57.76000031 0 57.04000031 57.04000031 0 0 0-28.8 49.44v235.99999969c0.24 84.31999969-33.6 152.56000031-94.08 212.00000062-60.07999969 59.83999969-141.84 80.64-227.04 80.4H225.91440031L388.07439969 457.11999969a56.80000031 56.80000031 0 0 0 12.40000031-62.16 57.76000031 57.76000031 0 0 0-94.00000031-18.63999938L48.8744 631.20000031a56.88 56.88 0 0 0 0 80.79999938l264.96 262.56a58.08 58.08 0 0 0 96.55999969-25.59999938 56.80000031 56.80000031 0 0 0-14.95999969-55.2L232.07439969 731.67999969h483.44000062c116.56000031 0 226.15999969-32.08000031 308.64-113.76 82.15999969-80.80000031 128.23999969-178.15999969 127.83999938-292.87999969" p-id="5379"></path></svg>

ruoyi-ui/src/assets/icons/svg/more-up.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1746760911144" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12537" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M395.21211 182.914448c0 62.669318 49.541323 113.472378 110.642936 113.472378 61.093427 0 110.652146-50.80306 110.65214601-113.472378 0-62.685691-49.559742-113.487727-110.65214601-113.487727C444.75241 69.426721 395.21211 120.22978 395.21211 182.914448zM395.21211 523.34693101c0 62.668295 49.541323 113.487727 110.642936 113.48772699 61.093427 0 110.652146-50.820456 110.652146-113.487727 0-62.669318-49.559742-113.472378-110.652146-113.472378C444.75241 409.874553 395.21211 460.67761301 395.21211 523.34693101zM395.21211 841.084529c0 62.686714 49.541323 113.488751 110.642936 113.488751 61.093427 0 110.652146-50.80203599 110.65214601-113.488751 0-62.669318-49.559742-113.471354-110.65214601-113.471354C444.75241 727.614198 395.21211 778.416234 395.21211 841.084529z" p-id="12538"></path></svg>

ruoyi-ui/src/assets/styles/index.scss

@@ -129,10 +129,6 @@ aside {
   position: relative;
 }
 
-.pagination-container {
-  margin-top: 30px;
-}
-
 .text-center {
   text-align: center
 }

ruoyi-ui/src/assets/styles/ruoyi.scss

@@ -117,11 +117,9 @@
 
 /** 表格布局 **/
 .pagination-container {
-  position: relative;
+  display: flex;
-  height: 25px;
+  justify-content: flex-end;
-  margin-bottom: 10px;
+  margin-top: 20px;
-  margin-top: 15px;
-  padding: 10px 20px !important;
 }
 
 /* tree border */
@@ -132,11 +130,6 @@
   border-radius: 4px;
 }
 
-.pagination-container .el-pagination {
-  right: 0;
-  position: absolute;
-}
-
 @media (max-width: 768px) {
   .pagination-container .el-pagination > .el-pagination__jump {
     display: none !important;
@@ -201,8 +194,6 @@
 }
 
 .card-box {
-  padding-right: 15px;
-  padding-left: 15px;
   margin-bottom: 10px;
 }
 
@@ -289,3 +280,8 @@
   position: relative;
   float: right;
 }
+
+/* 分割面板样式 */
+.splitpanes.default-theme .splitpanes__pane {
+  background-color: #fff!important;
+}

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -25,7 +25,7 @@
     z-index: 1001;
     overflow: hidden;
     -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
-    box-shadow: 2px 0 6px rgba(0,21,41,.35);
+    box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 
     // reset element-ui css
     .horizontal-collapse-transition {

ruoyi-ui/src/components/Breadcrumb/index.vue

@@ -1,7 +1,7 @@
 <template>
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
+      <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
         <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{ item.meta.title }}</span>
         <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
       </el-breadcrumb-item>
@@ -31,15 +31,45 @@ export default {
   methods: {
     getBreadcrumb() {
       // only show routes with meta.title
-      let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
+      let matched = []
-      const first = matched[0]
+      const router = this.$route
-
+      const pathNum = this.findPathNum(router.path)
-      if (!this.isDashboard(first)) {
+      // multi-level menu
-        matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched)
+      if (pathNum > 2) {
+        const reg = /\/\w+/gi
+        const pathList = router.path.match(reg).map((item, index) => {
+          if (index !== 0) item = item.slice(1)
+          return item
+        })
+        this.getMatched(pathList, this.$store.getters.defaultRoutes, matched)
+      } else {
+        matched = router.matched.filter(item => item.meta && item.meta.title)
+      }
+      // 判断是否为首页
+      if (!this.isDashboard(matched[0])) {
+        matched = [{ path: "/index", meta: { title: "首页" } }].concat(matched)
       }
-
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
     },
+    findPathNum(str, char = "/") {
+      let index = str.indexOf(char)
+      let num = 0
+      while (index !== -1) {
+        num++
+        index = str.indexOf(char, index + 1)
+      }
+      return num
+    },
+    getMatched(pathList, routeList, matched) {
+      let data = routeList.find(item => item.path == pathList[0] || (item.name += '').toLowerCase() == pathList[0])
+      if (data) {
+        matched.push(data)
+        if (data.children && pathList.length) {
+          pathList.shift()
+          this.getMatched(pathList, data.children, matched)
+        }
+      }
+    },
     isDashboard(route) {
       const name = route && route.name
       if (!name) {
@@ -65,7 +95,6 @@ export default {
   font-size: 14px;
   line-height: 50px;
   margin-left: 8px;
-
   .no-redirect {
     color: #97a8be;
     cursor: text;

ruoyi-ui/src/components/Crontab/day.vue

@@ -71,58 +71,58 @@ export default {
 	methods: {
 		// 单选按钮值变化时
 		radioChange() {
-			('day rachange');
+			('day rachange')
 			if (this.radioValue !== 2 && this.cron.week !== '?') {
 				this.$emit('update', 'week', '?', 'day')
 			}
 
 			switch (this.radioValue) {
 				case 1:
-					this.$emit('update', 'day', '*');
+					this.$emit('update', 'day', '*')
-					break;
+					break
 				case 2:
-					this.$emit('update', 'day', '?');
+					this.$emit('update', 'day', '?')
-					break;
+					break
 				case 3:
-					this.$emit('update', 'day', this.cycleTotal);
+					this.$emit('update', 'day', this.cycleTotal)
-					break;
+					break
 				case 4:
-					this.$emit('update', 'day', this.averageTotal);
+					this.$emit('update', 'day', this.averageTotal)
-					break;
+					break
 				case 5:
-					this.$emit('update', 'day', this.workday + 'W');
+					this.$emit('update', 'day', this.workday + 'W')
-					break;
+					break
 				case 6:
-					this.$emit('update', 'day', 'L');
+					this.$emit('update', 'day', 'L')
-					break;
+					break
 				case 7:
-					this.$emit('update', 'day', this.checkboxString);
+					this.$emit('update', 'day', this.checkboxString)
-					break;
+					break
 			}
-			('day rachange end');
+			('day rachange end')
 		},
 		// 周期两个值变化时
 		cycleChange() {
 			if (this.radioValue == '3') {
-				this.$emit('update', 'day', this.cycleTotal);
+				this.$emit('update', 'day', this.cycleTotal)
 			}
 		},
 		// 平均两个值变化时
 		averageChange() {
 			if (this.radioValue == '4') {
-				this.$emit('update', 'day', this.averageTotal);
+				this.$emit('update', 'day', this.averageTotal)
 			}
 		},
 		// 最近工作日值变化时
 		workdayChange() {
 			if (this.radioValue == '5') {
-				this.$emit('update', 'day', this.workdayCheck + 'W');
+				this.$emit('update', 'day', this.workdayCheck + 'W')
 			}
 		},
 		// checkbox值变化时
 		checkboxChange() {
 			if (this.radioValue == '7') {
-				this.$emit('update', 'day', this.checkboxString);
+				this.$emit('update', 'day', this.checkboxString)
 			}
 		}
 	},
@@ -138,23 +138,23 @@ export default {
 		cycleTotal: function () {
 			const cycle01 = this.checkNum(this.cycle01, 1, 30)
 			const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 2, 31, 31)
-			return cycle01 + '-' + cycle02;
+			return cycle01 + '-' + cycle02
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
 			const average01 = this.checkNum(this.average01, 1, 30)
 			const average02 = this.checkNum(this.average02, 1, 31 - average01 || 0)
-			return average01 + '/' + average02;
+			return average01 + '/' + average02
 		},
 		// 计算工作日格式
 		workdayCheck: function () {
 			const workday = this.checkNum(this.workday, 1, 31)
-			return workday;
+			return workday
 		},
 		// 计算勾选的checkbox值合集
 		checkboxString: function () {
-			let str = this.checkboxList.join();
+			let str = this.checkboxList.join()
-			return str == '' ? '*' : str;
+			return str == '' ? '*' : str
 		}
 	}
 }

ruoyi-ui/src/components/Crontab/hour.vue

@@ -52,42 +52,42 @@ export default {
 		// 单选按钮值变化时
 		radioChange() {
 			if (this.cron.min === '*') {
-			    this.$emit('update', 'min', '0', 'hour');
+			    this.$emit('update', 'min', '0', 'hour')
 			}
 			if (this.cron.second === '*') {
-			    this.$emit('update', 'second', '0', 'hour');
+			    this.$emit('update', 'second', '0', 'hour')
 			}
 			switch (this.radioValue) {
 				case 1:
 					this.$emit('update', 'hour', '*')
-					break;
+					break
 				case 2:
-					this.$emit('update', 'hour', this.cycleTotal);
+					this.$emit('update', 'hour', this.cycleTotal)
-					break;
+					break
 				case 3:
-					this.$emit('update', 'hour', this.averageTotal);
+					this.$emit('update', 'hour', this.averageTotal)
-					break;
+					break
 				case 4:
-					this.$emit('update', 'hour', this.checkboxString);
+					this.$emit('update', 'hour', this.checkboxString)
-					break;
+					break
 			}
 		},
 		// 周期两个值变化时
 		cycleChange() {
 			if (this.radioValue == '2') {
-				this.$emit('update', 'hour', this.cycleTotal);
+				this.$emit('update', 'hour', this.cycleTotal)
 			}
 		},
 		// 平均两个值变化时
 		averageChange() {
 			if (this.radioValue == '3') {
-				this.$emit('update', 'hour', this.averageTotal);
+				this.$emit('update', 'hour', this.averageTotal)
 			}
 		},
 		// checkbox值变化时
 		checkboxChange() {
 			if (this.radioValue == '4') {
-				this.$emit('update', 'hour', this.checkboxString);
+				this.$emit('update', 'hour', this.checkboxString)
 			}
 		}
 	},
@@ -102,18 +102,18 @@ export default {
 		cycleTotal: function () {
 			const cycle01 = this.checkNum(this.cycle01, 0, 22)
 			const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 1, 23)
-			return cycle01 + '-' + cycle02;
+			return cycle01 + '-' + cycle02
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
 			const average01 = this.checkNum(this.average01, 0, 22)
 			const average02 = this.checkNum(this.average02, 1, 23 - average01 || 0)
-			return average01 + '/' + average02;
+			return average01 + '/' + average02
 		},
 		// 计算勾选的checkbox值合集
 		checkboxString: function () {
-			let str = this.checkboxList.join();
+			let str = this.checkboxList.join()
-			return str == '' ? '*' : str;
+			return str == '' ? '*' : str
 		}
 	}
 }

ruoyi-ui/src/components/Crontab/index.vue

@@ -113,14 +113,14 @@
 </template>
 
 <script>
-import CrontabSecond from "./second.vue";
+import CrontabSecond from "./second.vue"
-import CrontabMin from "./min.vue";
+import CrontabMin from "./min.vue"
-import CrontabHour from "./hour.vue";
+import CrontabHour from "./hour.vue"
-import CrontabDay from "./day.vue";
+import CrontabDay from "./day.vue"
-import CrontabMonth from "./month.vue";
+import CrontabMonth from "./month.vue"
-import CrontabWeek from "./week.vue";
+import CrontabWeek from "./week.vue"
-import CrontabYear from "./year.vue";
+import CrontabYear from "./year.vue"
-import CrontabResult from "./result.vue";
+import CrontabResult from "./result.vue"
 
 export default {
   data() {
@@ -137,19 +137,19 @@ export default {
         week: "?",
         year: "",
       },
-    };
+    }
   },
   name: "vcrontab",
   props: ["expression", "hideComponent"],
   methods: {
     shouldHide(key) {
-      if (this.hideComponent && this.hideComponent.includes(key)) return false;
+      if (this.hideComponent && this.hideComponent.includes(key)) return false
-      return true;
+      return true
     },
     resolveExp() {
       // 反解析 表达式
       if (this.expression) {
-        let arr = this.expression.split(" ");
+        let arr = this.expression.split(" ")
         if (arr.length >= 6) {
           //6 位以上是合法表达式
           let obj = {
@@ -160,160 +160,160 @@ export default {
             month: arr[4],
             week: arr[5],
             year: arr[6] ? arr[6] : "",
-          };
+          }
           this.crontabValueObj = {
             ...obj,
-          };
+          }
           for (let i in obj) {
-            if (obj[i]) this.changeRadio(i, obj[i]);
+            if (obj[i]) this.changeRadio(i, obj[i])
           }
         }
       } else {
         // 没有传入的表达式 则还原
-        this.clearCron();
+        this.clearCron()
       }
     },
     // tab切换值
     tabCheck(index) {
-      this.tabActive = index;
+      this.tabActive = index
     },
     // 由子组件触发，更改表达式组成的字段值
     updateCrontabValue(name, value, from) {
-      "updateCrontabValue", name, value, from;
+      "updateCrontabValue", name, value, from
-      this.crontabValueObj[name] = value;
+      this.crontabValueObj[name] = value
       if (from && from !== name) {
-        console.log(`来自组件 ${from} 改变了 ${name} ${value}`);
+        console.log(`来自组件 ${from} 改变了 ${name} ${value}`)
-        this.changeRadio(name, value);
+        this.changeRadio(name, value)
       }
     },
     // 赋值到组件
     changeRadio(name, value) {
       let arr = ["second", "min", "hour", "month"],
         refName = "cron" + name,
-        insValue;
+        insValue
 
-      if (!this.$refs[refName]) return;
+      if (!this.$refs[refName]) return
 
       if (arr.includes(name)) {
         if (value === "*") {
-          insValue = 1;
+          insValue = 1
         } else if (value.indexOf("-") > -1) {
-          let indexArr = value.split("-");
+          let indexArr = value.split("-")
           isNaN(indexArr[0])
             ? (this.$refs[refName].cycle01 = 0)
-            : (this.$refs[refName].cycle01 = indexArr[0]);
+            : (this.$refs[refName].cycle01 = indexArr[0])
-          this.$refs[refName].cycle02 = indexArr[1];
+          this.$refs[refName].cycle02 = indexArr[1]
-          insValue = 2;
+          insValue = 2
         } else if (value.indexOf("/") > -1) {
-          let indexArr = value.split("/");
+          let indexArr = value.split("/")
           isNaN(indexArr[0])
             ? (this.$refs[refName].average01 = 0)
-            : (this.$refs[refName].average01 = indexArr[0]);
+            : (this.$refs[refName].average01 = indexArr[0])
-          this.$refs[refName].average02 = indexArr[1];
+          this.$refs[refName].average02 = indexArr[1]
-          insValue = 3;
+          insValue = 3
         } else {
-          insValue = 4;
+          insValue = 4
-          this.$refs[refName].checkboxList = value.split(",");
+          this.$refs[refName].checkboxList = value.split(",")
         }
       } else if (name == "day") {
         if (value === "*") {
-          insValue = 1;
+          insValue = 1
         } else if (value == "?") {
-          insValue = 2;
+          insValue = 2
         } else if (value.indexOf("-") > -1) {
-          let indexArr = value.split("-");
+          let indexArr = value.split("-")
           isNaN(indexArr[0])
             ? (this.$refs[refName].cycle01 = 0)
-            : (this.$refs[refName].cycle01 = indexArr[0]);
+            : (this.$refs[refName].cycle01 = indexArr[0])
-          this.$refs[refName].cycle02 = indexArr[1];
+          this.$refs[refName].cycle02 = indexArr[1]
-          insValue = 3;
+          insValue = 3
         } else if (value.indexOf("/") > -1) {
-          let indexArr = value.split("/");
+          let indexArr = value.split("/")
           isNaN(indexArr[0])
             ? (this.$refs[refName].average01 = 0)
-            : (this.$refs[refName].average01 = indexArr[0]);
+            : (this.$refs[refName].average01 = indexArr[0])
-          this.$refs[refName].average02 = indexArr[1];
+          this.$refs[refName].average02 = indexArr[1]
-          insValue = 4;
+          insValue = 4
         } else if (value.indexOf("W") > -1) {
-          let indexArr = value.split("W");
+          let indexArr = value.split("W")
           isNaN(indexArr[0])
             ? (this.$refs[refName].workday = 0)
-            : (this.$refs[refName].workday = indexArr[0]);
+            : (this.$refs[refName].workday = indexArr[0])
-          insValue = 5;
+          insValue = 5
         } else if (value === "L") {
-          insValue = 6;
+          insValue = 6
         } else {
-          this.$refs[refName].checkboxList = value.split(",");
+          this.$refs[refName].checkboxList = value.split(",")
-          insValue = 7;
+          insValue = 7
         }
       } else if (name == "week") {
         if (value === "*") {
-          insValue = 1;
+          insValue = 1
         } else if (value == "?") {
-          insValue = 2;
+          insValue = 2
         } else if (value.indexOf("-") > -1) {
-          let indexArr = value.split("-");
+          let indexArr = value.split("-")
           isNaN(indexArr[0])
             ? (this.$refs[refName].cycle01 = 0)
-            : (this.$refs[refName].cycle01 = indexArr[0]);
+            : (this.$refs[refName].cycle01 = indexArr[0])
-          this.$refs[refName].cycle02 = indexArr[1];
+          this.$refs[refName].cycle02 = indexArr[1]
-          insValue = 3;
+          insValue = 3
         } else if (value.indexOf("#") > -1) {
-          let indexArr = value.split("#");
+          let indexArr = value.split("#")
           isNaN(indexArr[0])
             ? (this.$refs[refName].average01 = 1)
-            : (this.$refs[refName].average01 = indexArr[0]);
+            : (this.$refs[refName].average01 = indexArr[0])
-          this.$refs[refName].average02 = indexArr[1];
+          this.$refs[refName].average02 = indexArr[1]
-          insValue = 4;
+          insValue = 4
         } else if (value.indexOf("L") > -1) {
-          let indexArr = value.split("L");
+          let indexArr = value.split("L")
           isNaN(indexArr[0])
             ? (this.$refs[refName].weekday = 1)
-            : (this.$refs[refName].weekday = indexArr[0]);
+            : (this.$refs[refName].weekday = indexArr[0])
-          insValue = 5;
+          insValue = 5
         } else {
-          this.$refs[refName].checkboxList = value.split(",");
+          this.$refs[refName].checkboxList = value.split(",")
-          insValue = 6;
+          insValue = 6
         }
       } else if (name == "year") {
         if (value == "") {
-          insValue = 1;
+          insValue = 1
         } else if (value == "*") {
-          insValue = 2;
+          insValue = 2
         } else if (value.indexOf("-") > -1) {
-          insValue = 3;
+          insValue = 3
         } else if (value.indexOf("/") > -1) {
-          insValue = 4;
+          insValue = 4
         } else {
-          this.$refs[refName].checkboxList = value.split(",");
+          this.$refs[refName].checkboxList = value.split(",")
-          insValue = 5;
+          insValue = 5
         }
       }
-      this.$refs[refName].radioValue = insValue;
+      this.$refs[refName].radioValue = insValue
     },
     // 表单选项的子组件校验数字格式（通过-props传递）
     checkNumber(value, minLimit, maxLimit) {
       // 检查必须为整数
-      value = Math.floor(value);
+      value = Math.floor(value)
       if (value < minLimit) {
-        value = minLimit;
+        value = minLimit
       } else if (value > maxLimit) {
-        value = maxLimit;
+        value = maxLimit
       }
-      return value;
+      return value
     },
     // 隐藏弹窗
     hidePopup() {
-      this.$emit("hide");
+      this.$emit("hide")
     },
     // 填充表达式
     submitFill() {
-      this.$emit("fill", this.crontabValueString);
+      this.$emit("fill", this.crontabValueString)
-      this.hidePopup();
+      this.hidePopup()
     },
     clearCron() {
       // 还原选择项
-      ("准备还原");
+      ("准备还原")
       this.crontabValueObj = {
         second: "*",
         min: "*",
@@ -322,15 +322,15 @@ export default {
         month: "*",
         week: "?",
         year: "",
-      };
+      }
       for (let j in this.crontabValueObj) {
-        this.changeRadio(j, this.crontabValueObj[j]);
+        this.changeRadio(j, this.crontabValueObj[j])
       }
     },
   },
   computed: {
     crontabValueString: function() {
-      let obj = this.crontabValueObj;
+      let obj = this.crontabValueObj
       let str =
         obj.second +
         " " +
@@ -343,8 +343,8 @@ export default {
         obj.month +
         " " +
         obj.week +
-        (obj.year == "" ? "" : " " + obj.year);
+        (obj.year == "" ? "" : " " + obj.year)
-      return str;
+      return str
     },
   },
   components: {
@@ -364,9 +364,9 @@ export default {
     },
   },
   mounted: function() {
-    this.resolveExp();
+    this.resolveExp()
   },
-};
+}
 </script>
 <style scoped>
 .pop_btn {

ruoyi-ui/src/components/Crontab/min.vue

@@ -54,35 +54,35 @@ export default {
 		radioChange() {
 			switch (this.radioValue) {
 				case 1:
-					this.$emit('update', 'min', '*', 'min');
+					this.$emit('update', 'min', '*', 'min')
-					break;
+					break
 				case 2:
-					this.$emit('update', 'min', this.cycleTotal, 'min');
+					this.$emit('update', 'min', this.cycleTotal, 'min')
-					break;
+					break
 				case 3:
-					this.$emit('update', 'min', this.averageTotal, 'min');
+					this.$emit('update', 'min', this.averageTotal, 'min')
-					break;
+					break
 				case 4:
-					this.$emit('update', 'min', this.checkboxString, 'min');
+					this.$emit('update', 'min', this.checkboxString, 'min')
-					break;
+					break
 			}
 		},
 		// 周期两个值变化时
 		cycleChange() {
 			if (this.radioValue == '2') {
-				this.$emit('update', 'min', this.cycleTotal, 'min');
+				this.$emit('update', 'min', this.cycleTotal, 'min')
 			}
 		},
 		// 平均两个值变化时
 		averageChange() {
 			if (this.radioValue == '3') {
-				this.$emit('update', 'min', this.averageTotal, 'min');
+				this.$emit('update', 'min', this.averageTotal, 'min')
 			}
 		},
 		// checkbox值变化时
 		checkboxChange() {
 			if (this.radioValue == '4') {
-				this.$emit('update', 'min', this.checkboxString, 'min');
+				this.$emit('update', 'min', this.checkboxString, 'min')
 			}
 		},
 
@@ -98,18 +98,18 @@ export default {
 		cycleTotal: function () {
 			const cycle01 = this.checkNum(this.cycle01, 0, 58)
 			const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 1, 59)
-			return cycle01 + '-' + cycle02;
+			return cycle01 + '-' + cycle02
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
 			const average01 = this.checkNum(this.average01, 0, 58)
 			const average02 = this.checkNum(this.average02, 1, 59 - average01 || 0)
-			return average01 + '/' + average02;
+			return average01 + '/' + average02
 		},
 		// 计算勾选的checkbox值合集
 		checkboxString: function () {
-			let str = this.checkboxList.join();
+			let str = this.checkboxList.join()
-			return str == '' ? '*' : str;
+			return str == '' ? '*' : str
 		}
 	}
 }

ruoyi-ui/src/components/Crontab/month.vue

@@ -53,35 +53,35 @@ export default {
 		radioChange() {
 			switch (this.radioValue) {
 				case 1:
-					this.$emit('update', 'month', '*');
+					this.$emit('update', 'month', '*')
-					break;
+					break
 				case 2:
-					this.$emit('update', 'month', this.cycleTotal);
+					this.$emit('update', 'month', this.cycleTotal)
-					break;
+					break
 				case 3:
-					this.$emit('update', 'month', this.averageTotal);
+					this.$emit('update', 'month', this.averageTotal)
-					break;
+					break
 				case 4:
-					this.$emit('update', 'month', this.checkboxString);
+					this.$emit('update', 'month', this.checkboxString)
-					break;
+					break
 			}
 		},
 		// 周期两个值变化时
 		cycleChange() {
 			if (this.radioValue == '2') {
-				this.$emit('update', 'month', this.cycleTotal);
+				this.$emit('update', 'month', this.cycleTotal)
 			}
 		},
 		// 平均两个值变化时
 		averageChange() {
 			if (this.radioValue == '3') {
-				this.$emit('update', 'month', this.averageTotal);
+				this.$emit('update', 'month', this.averageTotal)
 			}
 		},
 		// checkbox值变化时
 		checkboxChange() {
 			if (this.radioValue == '4') {
-				this.$emit('update', 'month', this.checkboxString);
+				this.$emit('update', 'month', this.checkboxString)
 			}
 		}
 	},
@@ -96,18 +96,18 @@ export default {
 		cycleTotal: function () {
 			const cycle01 = this.checkNum(this.cycle01, 1, 11)
 			const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 2, 12)
-			return cycle01 + '-' + cycle02;
+			return cycle01 + '-' + cycle02
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
 			const average01 = this.checkNum(this.average01, 1, 11)
 			const average02 = this.checkNum(this.average02, 1, 12 - average01 || 0)
-			return average01 + '/' + average02;
+			return average01 + '/' + average02
 		},
 		// 计算勾选的checkbox值合集
 		checkboxString: function () {
-			let str = this.checkboxList.join();
+			let str = this.checkboxList.join()
-			return str == '' ? '*' : str;
+			return str == '' ? '*' : str
 		}
 	}
 }

ruoyi-ui/src/components/Crontab/result.vue

@@ -27,135 +27,135 @@ export default {
 		expressionChange() {
 
 			// 计算开始-隐藏结果
-			this.isShow = false;
+			this.isShow = false
 			// 获取规则数组[0秒、1分、2时、3日、4月、5星期、6年]
-			let ruleArr = this.$options.propsData.ex.split(' ');
+			let ruleArr = this.$options.propsData.ex.split(' ')
 			// 用于记录进入循环的次数
-			let nums = 0;
+			let nums = 0
 			// 用于暂时存符号时间规则结果的数组
-			let resultArr = [];
+			let resultArr = []
 			// 获取当前时间精确至[年、月、日、时、分、秒]
-			let nTime = new Date();
+			let nTime = new Date()
-			let nYear = nTime.getFullYear();
+			let nYear = nTime.getFullYear()
-			let nMonth = nTime.getMonth() + 1;
+			let nMonth = nTime.getMonth() + 1
-			let nDay = nTime.getDate();
+			let nDay = nTime.getDate()
-			let nHour = nTime.getHours();
+			let nHour = nTime.getHours()
-			let nMin = nTime.getMinutes();
+			let nMin = nTime.getMinutes()
-			let nSecond = nTime.getSeconds();
+			let nSecond = nTime.getSeconds()
 			// 根据规则获取到近100年可能年数组、月数组等等
-			this.getSecondArr(ruleArr[0]);
+			this.getSecondArr(ruleArr[0])
-			this.getMinArr(ruleArr[1]);
+			this.getMinArr(ruleArr[1])
-			this.getHourArr(ruleArr[2]);
+			this.getHourArr(ruleArr[2])
-			this.getDayArr(ruleArr[3]);
+			this.getDayArr(ruleArr[3])
-			this.getMonthArr(ruleArr[4]);
+			this.getMonthArr(ruleArr[4])
-			this.getWeekArr(ruleArr[5]);
+			this.getWeekArr(ruleArr[5])
-			this.getYearArr(ruleArr[6], nYear);
+			this.getYearArr(ruleArr[6], nYear)
 			// 将获取到的数组赋值-方便使用
-			let sDate = this.dateArr[0];
+			let sDate = this.dateArr[0]
-			let mDate = this.dateArr[1];
+			let mDate = this.dateArr[1]
-			let hDate = this.dateArr[2];
+			let hDate = this.dateArr[2]
-			let DDate = this.dateArr[3];
+			let DDate = this.dateArr[3]
-			let MDate = this.dateArr[4];
+			let MDate = this.dateArr[4]
-			let YDate = this.dateArr[5];
+			let YDate = this.dateArr[5]
 			// 获取当前时间在数组中的索引
-			let sIdx = this.getIndex(sDate, nSecond);
+			let sIdx = this.getIndex(sDate, nSecond)
-			let mIdx = this.getIndex(mDate, nMin);
+			let mIdx = this.getIndex(mDate, nMin)
-			let hIdx = this.getIndex(hDate, nHour);
+			let hIdx = this.getIndex(hDate, nHour)
-			let DIdx = this.getIndex(DDate, nDay);
+			let DIdx = this.getIndex(DDate, nDay)
-			let MIdx = this.getIndex(MDate, nMonth);
+			let MIdx = this.getIndex(MDate, nMonth)
-			let YIdx = this.getIndex(YDate, nYear);
+			let YIdx = this.getIndex(YDate, nYear)
 			// 重置月日时分秒的函数(后面用的比较多)
 			const resetSecond = function () {
-				sIdx = 0;
+				sIdx = 0
 				nSecond = sDate[sIdx]
 			}
 			const resetMin = function () {
-				mIdx = 0;
+				mIdx = 0
 				nMin = mDate[mIdx]
-				resetSecond();
+				resetSecond()
 			}
 			const resetHour = function () {
-				hIdx = 0;
+				hIdx = 0
 				nHour = hDate[hIdx]
-				resetMin();
+				resetMin()
 			}
 			const resetDay = function () {
-				DIdx = 0;
+				DIdx = 0
 				nDay = DDate[DIdx]
-				resetHour();
+				resetHour()
 			}
 			const resetMonth = function () {
-				MIdx = 0;
+				MIdx = 0
 				nMonth = MDate[MIdx]
-				resetDay();
+				resetDay()
 			}
 			// 如果当前年份不为数组中当前值
 			if (nYear !== YDate[YIdx]) {
-				resetMonth();
+				resetMonth()
 			}
 			// 如果当前月份不为数组中当前值
 			if (nMonth !== MDate[MIdx]) {
-				resetDay();
+				resetDay()
 			}
 			// 如果当前“日”不为数组中当前值
 			if (nDay !== DDate[DIdx]) {
-				resetHour();
+				resetHour()
 			}
 			// 如果当前“时”不为数组中当前值
 			if (nHour !== hDate[hIdx]) {
-				resetMin();
+				resetMin()
 			}
 			// 如果当前“分”不为数组中当前值
 			if (nMin !== mDate[mIdx]) {
-				resetSecond();
+				resetSecond()
 			}
 
 			// 循环年份数组
 			goYear: for (let Yi = YIdx; Yi < YDate.length; Yi++) {
-				let YY = YDate[Yi];
+				let YY = YDate[Yi]
 				// 如果到达最大值时
 				if (nMonth > MDate[MDate.length - 1]) {
-					resetMonth();
+					resetMonth()
-					continue;
+					continue
 				}
 				// 循环月份数组
 				goMonth: for (let Mi = MIdx; Mi < MDate.length; Mi++) {
 					// 赋值、方便后面运算
 					let MM = MDate[Mi];
-					MM = MM < 10 ? '0' + MM : MM;
+					MM = MM < 10 ? '0' + MM : MM
 					// 如果到达最大值时
 					if (nDay > DDate[DDate.length - 1]) {
-						resetDay();
+						resetDay()
 						if (Mi == MDate.length - 1) {
-							resetMonth();
+							resetMonth()
-							continue goYear;
+							continue goYear
 						}
-						continue;
+						continue
 					}
 					// 循环日期数组
 					goDay: for (let Di = DIdx; Di < DDate.length; Di++) {
 						// 赋值、方便后面运算
-						let DD = DDate[Di];
+						let DD = DDate[Di]
-						let thisDD = DD < 10 ? '0' + DD : DD;
+						let thisDD = DD < 10 ? '0' + DD : DD
 
 						// 如果到达最大值时
 						if (nHour > hDate[hDate.length - 1]) {
-							resetHour();
+							resetHour()
 							if (Di == DDate.length - 1) {
-								resetDay();
+								resetDay()
 								if (Mi == MDate.length - 1) {
-									resetMonth();
+									resetMonth()
-									continue goYear;
+									continue goYear
 								}
-								continue goMonth;
+								continue goMonth
 							}
-							continue;
+							continue
 						}
 
 						// 判断日期的合法性，不合法的话也是跳出当前循环
 						if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true && this.dayRule !== 'workDay' && this.dayRule !== 'lastWeek' && this.dayRule !== 'lastDay') {
-							resetDay();
+							resetDay()
-							continue goMonth;
+							continue goMonth
 						}
 						// 如果日期规则中有值时
 						if (this.dayRule == 'lastDay') {
@@ -163,84 +163,83 @@ export default {
 
 							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
 								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
-									DD--;
+									DD--
-
+									thisDD = DD < 10 ? '0' + DD : DD
-									thisDD = DD < 10 ? '0' + DD : DD;
 								}
 							}
 						} else if (this.dayRule == 'workDay') {
 							// 校验并调整如果是2月30号这种日期传进来时需调整至正常月底
 							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
 								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
-									DD--;
+									DD--
-									thisDD = DD < 10 ? '0' + DD : DD;
+									thisDD = DD < 10 ? '0' + DD : DD
 								}
 							}
 							// 获取达到条件的日期是星期X
-							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week');
+							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week')
 							// 当星期日时
 							if (thisWeek == 1) {
 								// 先找下一个日，并判断是否为月底
-								DD++;
+								DD++
-								thisDD = DD < 10 ? '0' + DD : DD;
+								thisDD = DD < 10 ? '0' + DD : DD
 								// 判断下一日已经不是合法日期
 								if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
-									DD -= 3;
+									DD -= 3
 								}
 							} else if (thisWeek == 7) {
 								// 当星期6时只需判断不是1号就可进行操作
 								if (this.dayRuleSup !== 1) {
-									DD--;
+									DD--
 								} else {
-									DD += 2;
+									DD += 2
 								}
 							}
 						} else if (this.dayRule == 'weekDay') {
 							// 如果指定了是星期几
 							// 获取当前日期是属于星期几
-							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week');
+							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week')
 							// 校验当前星期是否在星期池（dayRuleSup）中
 							if (this.dayRuleSup.indexOf(thisWeek) < 0) {
 								// 如果到达最大值时
 								if (Di == DDate.length - 1) {
-									resetDay();
+									resetDay()
 									if (Mi == MDate.length - 1) {
-										resetMonth();
+										resetMonth()
-										continue goYear;
+										continue goYear
 									}
-									continue goMonth;
+									continue goMonth
 								}
-								continue;
+								continue
 							}
 						} else if (this.dayRule == 'assWeek') {
 							// 如果指定了是第几周的星期几
 							// 获取每月1号是属于星期几
-							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week');
+							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week')
 							if (this.dayRuleSup[1] >= thisWeek) {
-								DD = (this.dayRuleSup[0] - 1) * 7 + this.dayRuleSup[1] - thisWeek + 1;
+								DD = (this.dayRuleSup[0] - 1) * 7 + this.dayRuleSup[1] - thisWeek + 1
 							} else {
-								DD = this.dayRuleSup[0] * 7 + this.dayRuleSup[1] - thisWeek + 1;
+								DD = this.dayRuleSup[0] * 7 + this.dayRuleSup[1] - thisWeek + 1
 							}
 						} else if (this.dayRule == 'lastWeek') {
 							// 如果指定了每月最后一个星期几
 							// 校验并调整如果是2月30号这种日期传进来时需调整至正常月底
 							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
 								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
-									DD--;
+									DD--
-									thisDD = DD < 10 ? '0' + DD : DD;
+									thisDD = DD < 10 ? '0' + DD : DD
 								}
 							}
 							// 获取月末最后一天是星期几
-							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week');
+							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week')
 							// 找到要求中最近的那个星期几
 							if (this.dayRuleSup < thisWeek) {
-								DD -= thisWeek - this.dayRuleSup;
+								DD -= thisWeek - this.dayRuleSup
 							} else if (this.dayRuleSup > thisWeek) {
 								DD -= 7 - (this.dayRuleSup - thisWeek)
 							}
 						}
 						// 判断时间值是否小于10置换成“05”这种格式
-						DD = DD < 10 ? '0' + DD : DD;
+						DD = DD < 10 ? '0' + DD : DD
 
 						// 循环“时”数组
 						goHour: for (let hi = hIdx; hi < hDate.length; hi++) {
@@ -248,76 +247,76 @@ export default {
 
 							// 如果到达最大值时
 							if (nMin > mDate[mDate.length - 1]) {
-								resetMin();
+								resetMin()
 								if (hi == hDate.length - 1) {
-									resetHour();
+									resetHour()
 									if (Di == DDate.length - 1) {
-										resetDay();
+										resetDay()
 										if (Mi == MDate.length - 1) {
-											resetMonth();
+											resetMonth()
-											continue goYear;
+											continue goYear
 										}
-										continue goMonth;
+										continue goMonth
 									}
-									continue goDay;
+									continue goDay
 								}
-								continue;
+								continue
 							}
 							// 循环"分"数组
 							goMin: for (let mi = mIdx; mi < mDate.length; mi++) {
-								let mm = mDate[mi] < 10 ? '0' + mDate[mi] : mDate[mi];
+								let mm = mDate[mi] < 10 ? '0' + mDate[mi] : mDate[mi]
 
 								// 如果到达最大值时
 								if (nSecond > sDate[sDate.length - 1]) {
-									resetSecond();
+									resetSecond()
 									if (mi == mDate.length - 1) {
-										resetMin();
+										resetMin()
 										if (hi == hDate.length - 1) {
-											resetHour();
+											resetHour()
 											if (Di == DDate.length - 1) {
-												resetDay();
+												resetDay()
 												if (Mi == MDate.length - 1) {
-													resetMonth();
+													resetMonth()
-													continue goYear;
+													continue goYear
 												}
-												continue goMonth;
+												continue goMonth
 											}
-											continue goDay;
+											continue goDay
 										}
-										continue goHour;
+										continue goHour
 									}
-									continue;
+									continue
 								}
 								// 循环"秒"数组
 								goSecond: for (let si = sIdx; si <= sDate.length - 1; si++) {
-									let ss = sDate[si] < 10 ? '0' + sDate[si] : sDate[si];
+									let ss = sDate[si] < 10 ? '0' + sDate[si] : sDate[si]
 									// 添加当前时间（时间合法性在日期循环时已经判断）
 									if (MM !== '00' && DD !== '00') {
 										resultArr.push(YY + '-' + MM + '-' + DD + ' ' + hh + ':' + mm + ':' + ss)
-										nums++;
+										nums++
 									}
 									// 如果条数满了就退出循环
-									if (nums == 5) break goYear;
+									if (nums == 5) break goYear
 									// 如果到达最大值时
 									if (si == sDate.length - 1) {
-										resetSecond();
+										resetSecond()
 										if (mi == mDate.length - 1) {
-											resetMin();
+											resetMin()
 											if (hi == hDate.length - 1) {
-												resetHour();
+												resetHour()
 												if (Di == DDate.length - 1) {
-													resetDay();
+													resetDay()
 													if (Mi == MDate.length - 1) {
-														resetMonth();
+														resetMonth()
-														continue goYear;
+														continue goYear
 													}
-													continue goMonth;
+													continue goMonth
 												}
-												continue goDay;
+												continue goDay
 											}
-											continue goHour;
+											continue goHour
 										}
-										continue goMin;
+										continue goMin
 									}
 								} //goSecond
 							} //goMin
@@ -327,33 +326,33 @@ export default {
 			}
 			// 判断100年内的结果条数
 			if (resultArr.length == 0) {
-				this.resultList = ['没有达到条件的结果！'];
+				this.resultList = ['没有达到条件的结果！']
 			} else {
-				this.resultList = resultArr;
+				this.resultList = resultArr
 				if (resultArr.length !== 5) {
 					this.resultList.push('最近100年内只有上面' + resultArr.length + '条结果！')
 				}
 			}
 			// 计算完成-显示结果
-			this.isShow = true;
+			this.isShow = true
 
 
 		},
 		// 用于计算某位数字在数组中的索引
 		getIndex(arr, value) {
 			if (value <= arr[0] || value > arr[arr.length - 1]) {
-				return 0;
+				return 0
 			} else {
 				for (let i = 0; i < arr.length - 1; i++) {
 					if (value > arr[i] && value <= arr[i + 1]) {
-						return i + 1;
+						return i + 1
 					}
 				}
 			}
 		},
 		// 获取"年"数组
 		getYearArr(rule, year) {
-			this.dateArr[5] = this.getOrderArr(year, year + 100);
+			this.dateArr[5] = this.getOrderArr(year, year + 100)
 			if (rule !== undefined) {
 				if (rule.indexOf('-') >= 0) {
 					this.dateArr[5] = this.getCycleArr(rule, year + 100, false)
@@ -366,7 +365,7 @@ export default {
 		},
 		// 获取"月"数组
 		getMonthArr(rule) {
-			this.dateArr[4] = this.getOrderArr(1, 12);
+			this.dateArr[4] = this.getOrderArr(1, 12)
 			if (rule.indexOf('-') >= 0) {
 				this.dateArr[4] = this.getCycleArr(rule, 12, false)
 			} else if (rule.indexOf('/') >= 0) {
@@ -380,58 +379,58 @@ export default {
 			// 只有当日期规则的两个值均为“”时则表达日期是有选项的
 			if (this.dayRule == '' && this.dayRuleSup == '') {
 				if (rule.indexOf('-') >= 0) {
-					this.dayRule = 'weekDay';
+					this.dayRule = 'weekDay'
 					this.dayRuleSup = this.getCycleArr(rule, 7, false)
 				} else if (rule.indexOf('#') >= 0) {
-					this.dayRule = 'assWeek';
+					this.dayRule = 'assWeek'
-					let matchRule = rule.match(/[0-9]{1}/g);
+					let matchRule = rule.match(/[0-9]{1}/g)
-					this.dayRuleSup = [Number(matchRule[1]), Number(matchRule[0])];
+					this.dayRuleSup = [Number(matchRule[1]), Number(matchRule[0])]
-					this.dateArr[3] = [1];
+					this.dateArr[3] = [1]
 					if (this.dayRuleSup[1] == 7) {
-						this.dayRuleSup[1] = 0;
+						this.dayRuleSup[1] = 0
 					}
 				} else if (rule.indexOf('L') >= 0) {
-					this.dayRule = 'lastWeek';
+					this.dayRule = 'lastWeek'
-					this.dayRuleSup = Number(rule.match(/[0-9]{1,2}/g)[0]);
+					this.dayRuleSup = Number(rule.match(/[0-9]{1,2}/g)[0])
-					this.dateArr[3] = [31];
+					this.dateArr[3] = [31]
 					if (this.dayRuleSup == 7) {
-						this.dayRuleSup = 0;
+						this.dayRuleSup = 0
 					}
 				} else if (rule !== '*' && rule !== '?') {
-					this.dayRule = 'weekDay';
+					this.dayRule = 'weekDay'
 					this.dayRuleSup = this.getAssignArr(rule)
 				}
 			}
 		},
 		// 获取"日"数组-少量为日期规则
 		getDayArr(rule) {
-			this.dateArr[3] = this.getOrderArr(1, 31);
+			this.dateArr[3] = this.getOrderArr(1, 31)
-			this.dayRule = '';
+			this.dayRule = ''
-			this.dayRuleSup = '';
+			this.dayRuleSup = ''
 			if (rule.indexOf('-') >= 0) {
 				this.dateArr[3] = this.getCycleArr(rule, 31, false)
-				this.dayRuleSup = 'null';
+				this.dayRuleSup = 'null'
 			} else if (rule.indexOf('/') >= 0) {
 				this.dateArr[3] = this.getAverageArr(rule, 31)
-				this.dayRuleSup = 'null';
+				this.dayRuleSup = 'null'
 			} else if (rule.indexOf('W') >= 0) {
-				this.dayRule = 'workDay';
+				this.dayRule = 'workDay'
-				this.dayRuleSup = Number(rule.match(/[0-9]{1,2}/g)[0]);
+				this.dayRuleSup = Number(rule.match(/[0-9]{1,2}/g)[0])
-				this.dateArr[3] = [this.dayRuleSup];
+				this.dateArr[3] = [this.dayRuleSup]
 			} else if (rule.indexOf('L') >= 0) {
-				this.dayRule = 'lastDay';
+				this.dayRule = 'lastDay'
-				this.dayRuleSup = 'null';
+				this.dayRuleSup = 'null'
-				this.dateArr[3] = [31];
+				this.dateArr[3] = [31]
 			} else if (rule !== '*' && rule !== '?') {
 				this.dateArr[3] = this.getAssignArr(rule)
-				this.dayRuleSup = 'null';
+				this.dayRuleSup = 'null'
 			} else if (rule == '*') {
-				this.dayRuleSup = 'null';
+				this.dayRuleSup = 'null'
 			}
 		},
 		// 获取"时"数组
 		getHourArr(rule) {
-			this.dateArr[2] = this.getOrderArr(0, 23);
+			this.dateArr[2] = this.getOrderArr(0, 23)
 			if (rule.indexOf('-') >= 0) {
 				this.dateArr[2] = this.getCycleArr(rule, 24, true)
 			} else if (rule.indexOf('/') >= 0) {
@@ -442,7 +441,7 @@ export default {
 		},
 		// 获取"分"数组
 		getMinArr(rule) {
-			this.dateArr[1] = this.getOrderArr(0, 59);
+			this.dateArr[1] = this.getOrderArr(0, 59)
 			if (rule.indexOf('-') >= 0) {
 				this.dateArr[1] = this.getCycleArr(rule, 60, true)
 			} else if (rule.indexOf('/') >= 0) {
@@ -453,7 +452,7 @@ export default {
 		},
 		// 获取"秒"数组
 		getSecondArr(rule) {
-			this.dateArr[0] = this.getOrderArr(0, 59);
+			this.dateArr[0] = this.getOrderArr(0, 59)
 			if (rule.indexOf('-') >= 0) {
 				this.dateArr[0] = this.getCycleArr(rule, 60, true)
 			} else if (rule.indexOf('/') >= 0) {
@@ -464,86 +463,86 @@ export default {
 		},
 		// 根据传进来的min-max返回一个顺序的数组
 		getOrderArr(min, max) {
-			let arr = [];
+			let arr = []
 			for (let i = min; i <= max; i++) {
-				arr.push(i);
+				arr.push(i)
 			}
-			return arr;
+			return arr
 		},
 		// 根据规则中指定的零散值返回一个数组
 		getAssignArr(rule) {
-			let arr = [];
+			let arr = []
-			let assiginArr = rule.split(',');
+			let assiginArr = rule.split(',')
 			for (let i = 0; i < assiginArr.length; i++) {
 				arr[i] = Number(assiginArr[i])
 			}
 			arr.sort(this.compare)
-			return arr;
+			return arr
 		},
 		// 根据一定算术规则计算返回一个数组
 		getAverageArr(rule, limit) {
-			let arr = [];
+			let arr = []
-			let agArr = rule.split('/');
+			let agArr = rule.split('/')
-			let min = Number(agArr[0]);
+			let min = Number(agArr[0])
-			let step = Number(agArr[1]);
+			let step = Number(agArr[1])
 			while (min <= limit) {
-				arr.push(min);
+				arr.push(min)
-				min += step;
+				min += step
 			}
-			return arr;
+			return arr
 		},
 		// 根据规则返回一个具有周期性的数组
 		getCycleArr(rule, limit, status) {
 			// status--表示是否从0开始（则从1开始）
-			let arr = [];
+			let arr = []
-			let cycleArr = rule.split('-');
+			let cycleArr = rule.split('-')
-			let min = Number(cycleArr[0]);
+			let min = Number(cycleArr[0])
-			let max = Number(cycleArr[1]);
+			let max = Number(cycleArr[1])
 			if (min > max) {
-				max += limit;
+				max += limit
 			}
 			for (let i = min; i <= max; i++) {
-				let add = 0;
+				let add = 0
 				if (status == false && i % limit == 0) {
-					add = limit;
+					add = limit
 				}
 				arr.push(Math.round(i % limit + add))
 			}
 			arr.sort(this.compare)
-			return arr;
+			return arr
 		},
 		// 比较数字大小（用于Array.sort）
 		compare(value1, value2) {
 			if (value2 - value1 > 0) {
-				return -1;
+				return -1
 			} else {
-				return 1;
+				return 1
 			}
 		},
 		// 格式化日期格式如：2017-9-19 18:04:33
 		formatDate(value, type) {
 			// 计算日期相关值
-			let time = typeof value == 'number' ? new Date(value) : value;
+			let time = typeof value == 'number' ? new Date(value) : value
-			let Y = time.getFullYear();
+			let Y = time.getFullYear()
-			let M = time.getMonth() + 1;
+			let M = time.getMonth() + 1
-			let D = time.getDate();
+			let D = time.getDate()
-			let h = time.getHours();
+			let h = time.getHours()
-			let m = time.getMinutes();
+			let m = time.getMinutes()
-			let s = time.getSeconds();
+			let s = time.getSeconds()
-			let week = time.getDay();
+			let week = time.getDay()
 			// 如果传递了type的话
 			if (type == undefined) {
-				return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s);
+				return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s)
 			} else if (type == 'week') {
 				// 在quartz中 1为星期日
-				return week + 1;
+				return week + 1
 			}
 		},
 		// 检查日期是否存在
 		checkDate(value) {
-			let time = new Date(value);
+			let time = new Date(value)
 			let format = this.formatDate(time)
-			return value === format;
+			return value === format
 		}
 	},
 	watch: {
@@ -552,7 +551,7 @@ export default {
 	props: ['ex'],
 	mounted: function () {
 		// 初始化 获取一次结果
-		this.expressionChange();
+		this.expressionChange()
 	}
 }
 

ruoyi-ui/src/components/Crontab/second.vue

@@ -53,35 +53,35 @@ export default {
 		radioChange() {
 			switch (this.radioValue) {
 				case 1:
-					this.$emit('update', 'second', '*', 'second');
+					this.$emit('update', 'second', '*', 'second')
-					break;
+					break
 				case 2:
-					this.$emit('update', 'second', this.cycleTotal);
+					this.$emit('update', 'second', this.cycleTotal)
-					break;
+					break
 				case 3:
-					this.$emit('update', 'second', this.averageTotal);
+					this.$emit('update', 'second', this.averageTotal)
-					break;
+					break
 				case 4:
-					this.$emit('update', 'second', this.checkboxString);
+					this.$emit('update', 'second', this.checkboxString)
-					break;
+					break
 			}
 		},
 		// 周期两个值变化时
 		cycleChange() {
 			if (this.radioValue == '2') {
-				this.$emit('update', 'second', this.cycleTotal);
+				this.$emit('update', 'second', this.cycleTotal)
 			}
 		},
 		// 平均两个值变化时
 		averageChange() {
 			if (this.radioValue == '3') {
-				this.$emit('update', 'second', this.averageTotal);
+				this.$emit('update', 'second', this.averageTotal)
 			}
 		},
 		// checkbox值变化时
 		checkboxChange() {
 			if (this.radioValue == '4') {
-				this.$emit('update', 'second', this.checkboxString);
+				this.$emit('update', 'second', this.checkboxString)
 			}
 		}
 	},
@@ -99,18 +99,18 @@ export default {
 		cycleTotal: function () {
 			const cycle01 = this.checkNum(this.cycle01, 0, 58)
 			const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 1, 59)
-			return cycle01 + '-' + cycle02;
+			return cycle01 + '-' + cycle02
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
 			const average01 = this.checkNum(this.average01, 0, 58)
 			const average02 = this.checkNum(this.average02, 1, 59 - average01 || 0)
-			return average01 + '/' + average02;
+			return average01 + '/' + average02
 		},
 		// 计算勾选的checkbox值合集
 		checkboxString: function () {
-			let str = this.checkboxList.join();
+			let str = this.checkboxList.join()
-			return str == '' ? '*' : str;
+			return str == '' ? '*' : str
 		}
 	}
 }

ruoyi-ui/src/components/Crontab/week.vue

@@ -118,52 +118,52 @@ export default {
 		// 单选按钮值变化时
 		radioChange() {
 			if (this.radioValue !== 2 && this.cron.day !== '?') {
-				this.$emit('update', 'day', '?', 'week');
+				this.$emit('update', 'day', '?', 'week')
 			}
 			switch (this.radioValue) {
 				case 1:
-					this.$emit('update', 'week', '*');
+					this.$emit('update', 'week', '*')
-					break;
+					break
 				case 2:
-					this.$emit('update', 'week', '?');
+					this.$emit('update', 'week', '?')
-					break;
+					break
 				case 3:
-					this.$emit('update', 'week', this.cycleTotal);
+					this.$emit('update', 'week', this.cycleTotal)
-					break;
+					break
 				case 4:
-					this.$emit('update', 'week', this.averageTotal);
+					this.$emit('update', 'week', this.averageTotal)
-					break;
+					break
 				case 5:
-					this.$emit('update', 'week', this.weekdayCheck + 'L');
+					this.$emit('update', 'week', this.weekdayCheck + 'L')
-					break;
+					break
 				case 6:
-					this.$emit('update', 'week', this.checkboxString);
+					this.$emit('update', 'week', this.checkboxString)
-					break;
+					break
 			}
 		},
 
 		// 周期两个值变化时
 		cycleChange() {
 			if (this.radioValue == '3') {
-				this.$emit('update', 'week', this.cycleTotal);
+				this.$emit('update', 'week', this.cycleTotal)
 			}
 		},
 		// 平均两个值变化时
 		averageChange() {
 			if (this.radioValue == '4') {
-				this.$emit('update', 'week', this.averageTotal);
+				this.$emit('update', 'week', this.averageTotal)
 			}
 		},
 		// 最近工作日值变化时
 		weekdayChange() {
 			if (this.radioValue == '5') {
-				this.$emit('update', 'week', this.weekday + 'L');
+				this.$emit('update', 'week', this.weekday + 'L')
 			}
 		},
 		// checkbox值变化时
 		checkboxChange() {
 			if (this.radioValue == '6') {
-				this.$emit('update', 'week', this.checkboxString);
+				this.$emit('update', 'week', this.checkboxString)
 			}
 		},
 	},
@@ -179,23 +179,23 @@ export default {
 		cycleTotal: function () {
 			this.cycle01 = this.checkNum(this.cycle01, 1, 7)
 			this.cycle02 = this.checkNum(this.cycle02, 1, 7)
-			return this.cycle01 + '-' + this.cycle02;
+			return this.cycle01 + '-' + this.cycle02
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
 			this.average01 = this.checkNum(this.average01, 1, 4)
 			this.average02 = this.checkNum(this.average02, 1, 7)
-			return this.average02 + '#' + this.average01;
+			return this.average02 + '#' + this.average01
 		},
 		// 最近的工作日（格式）
 		weekdayCheck: function () {
 			this.weekday = this.checkNum(this.weekday, 1, 7)
-			return this.weekday;
+			return this.weekday
 		},
 		// 计算勾选的checkbox值合集
 		checkboxString: function () {
-			let str = this.checkboxList.join();
+			let str = this.checkboxList.join()
-			return str == '' ? '*' : str;
+			return str == '' ? '*' : str
 		}
 	}
 }

ruoyi-ui/src/components/Crontab/year.vue

@@ -61,38 +61,38 @@ export default {
 		radioChange() {
 			switch (this.radioValue) {
 				case 1:
-					this.$emit('update', 'year', '');
+					this.$emit('update', 'year', '')
-					break;
+					break
 				case 2:
-					this.$emit('update', 'year', '*');
+					this.$emit('update', 'year', '*')
-					break;
+					break
 				case 3:
-					this.$emit('update', 'year', this.cycleTotal);
+					this.$emit('update', 'year', this.cycleTotal)
-					break;
+					break
 				case 4:
-					this.$emit('update', 'year', this.averageTotal);
+					this.$emit('update', 'year', this.averageTotal)
-					break;
+					break
 				case 5:
-					this.$emit('update', 'year', this.checkboxString);
+					this.$emit('update', 'year', this.checkboxString)
-					break;
+					break
 			}
 		},
 		// 周期两个值变化时
 		cycleChange() {
 			if (this.radioValue == '3') {
-				this.$emit('update', 'year', this.cycleTotal);
+				this.$emit('update', 'year', this.cycleTotal)
 			}
 		},
 		// 平均两个值变化时
 		averageChange() {
 			if (this.radioValue == '4') {
-				this.$emit('update', 'year', this.averageTotal);
+				this.$emit('update', 'year', this.averageTotal)
 			}
 		},
 		// checkbox值变化时
 		checkboxChange() {
 			if (this.radioValue == '5') {
-				this.$emit('update', 'year', this.checkboxString);
+				this.$emit('update', 'year', this.checkboxString)
 			}
 		}
 	},
@@ -107,23 +107,23 @@ export default {
 		cycleTotal: function () {
 			const cycle01 = this.checkNum(this.cycle01, this.fullYear, 2098)
 			const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : this.fullYear + 1, 2099)
-			return cycle01 + '-' + cycle02;
+			return cycle01 + '-' + cycle02
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
 			const average01 = this.checkNum(this.average01, this.fullYear, 2098)
 			const average02 = this.checkNum(this.average02, 1, 2099 - average01 || this.fullYear)
-			return average01 + '/' + average02;
+			return average01 + '/' + average02
 		},
 		// 计算勾选的checkbox值合集
 		checkboxString: function () {
-			let str = this.checkboxList.join();
+			let str = this.checkboxList.join()
-			return str;
+			return str
 		}
 	},
 	mounted: function () {
 		// 仅获取当前年份
-		this.fullYear = Number(new Date().getFullYear());
+		this.fullYear = Number(new Date().getFullYear())
 		this.cycle01 = this.fullYear
 		this.average01 = this.fullYear
 	}

ruoyi-ui/src/components/DictTag/index.vue

@@ -74,13 +74,13 @@ export default {
   },
   filters: {
     handleArray(array) {
-      if (array.length === 0) return '';
+      if (array.length === 0) return ''
       return array.reduce((pre, cur) => {
-        return pre + ' ' + cur;
+        return pre + ' ' + cur
       })
     },
   }
-};
+}
 </script>
 <style scoped>
 .el-tag + .el-tag {

ruoyi-ui/src/components/Editor/index.vue

@@ -18,11 +18,12 @@
 </template>
 
 <script>
-import Quill from "quill";
+import axios from "axios"
-import "quill/dist/quill.core.css";
+import Quill from "quill"
-import "quill/dist/quill.snow.css";
+import "quill/dist/quill.core.css"
-import "quill/dist/quill.bubble.css";
+import "quill/dist/quill.snow.css"
-import { getToken } from "@/utils/auth";
+import "quill/dist/quill.bubble.css"
+import { getToken } from "@/utils/auth"
 
 export default {
   name: "Editor",
@@ -88,27 +89,27 @@ export default {
         placeholder: "请输入内容",
         readOnly: this.readOnly,
       },
-    };
+    }
   },
   computed: {
     styles() {
-      let style = {};
+      let style = {}
       if (this.minHeight) {
-        style.minHeight = `${this.minHeight}px`;
+        style.minHeight = `${this.minHeight}px`
       }
       if (this.height) {
-        style.height = `${this.height}px`;
+        style.height = `${this.height}px`
       }
-      return style;
+      return style
-    },
+    }
   },
   watch: {
     value: {
       handler(val) {
         if (val !== this.currentValue) {
-          this.currentValue = val === null ? "" : val;
+          this.currentValue = val === null ? "" : val
           if (this.Quill) {
-            this.Quill.pasteHTML(this.currentValue);
+            this.Quill.clipboard.dangerouslyPasteHTML(this.currentValue)
           }
         }
       },
@@ -116,84 +117,106 @@ export default {
     },
   },
   mounted() {
-    this.init();
+    this.init()
   },
   beforeDestroy() {
-    this.Quill = null;
+    this.Quill = null
   },
   methods: {
     init() {
-      const editor = this.$refs.editor;
+      const editor = this.$refs.editor
-      this.Quill = new Quill(editor, this.options);
+      this.Quill = new Quill(editor, this.options)
       // 如果设置了上传地址则自定义图片上传事件
       if (this.type == 'url') {
-        let toolbar = this.Quill.getModule("toolbar");
+        let toolbar = this.Quill.getModule("toolbar")
         toolbar.addHandler("image", (value) => {
           if (value) {
-            this.$refs.upload.$children[0].$refs.input.click();
+            this.$refs.upload.$children[0].$refs.input.click()
           } else {
-            this.quill.format("image", false);
+            this.quill.format("image", false)
           }
-        });
+        })
+        this.Quill.root.addEventListener('paste', this.handlePasteCapture, true)
       }
-      this.Quill.pasteHTML(this.currentValue);
+      this.Quill.clipboard.dangerouslyPasteHTML(this.currentValue)
       this.Quill.on("text-change", (delta, oldDelta, source) => {
-        const html = this.$refs.editor.children[0].innerHTML;
+        const html = this.$refs.editor.children[0].innerHTML
-        const text = this.Quill.getText();
+        const text = this.Quill.getText()
-        const quill = this.Quill;
+        const quill = this.Quill
-        this.currentValue = html;
+        this.currentValue = html
-        this.$emit("input", html);
+        this.$emit("input", html)
-        this.$emit("on-change", { html, text, quill });
+        this.$emit("on-change", { html, text, quill })
-      });
+      })
       this.Quill.on("text-change", (delta, oldDelta, source) => {
-        this.$emit("on-text-change", delta, oldDelta, source);
+        this.$emit("on-text-change", delta, oldDelta, source)
-      });
+      })
       this.Quill.on("selection-change", (range, oldRange, source) => {
-        this.$emit("on-selection-change", range, oldRange, source);
+        this.$emit("on-selection-change", range, oldRange, source)
-      });
+      })
       this.Quill.on("editor-change", (eventName, ...args) => {
-        this.$emit("on-editor-change", eventName, ...args);
+        this.$emit("on-editor-change", eventName, ...args)
-      });
+      })
     },
     // 上传前校检格式和大小
     handleBeforeUpload(file) {
-      const type = ["image/jpeg", "image/jpg", "image/png", "image/svg"];
+      const type = ["image/jpeg", "image/jpg", "image/png", "image/svg"]
-      const isJPG = type.includes(file.type);
+      const isJPG = type.includes(file.type)
       // 检验文件格式
       if (!isJPG) {
-        this.$message.error(`图片格式错误!`);
+        this.$message.error(`图片格式错误!`)
-        return false;
+        return false
       }
       // 校检文件大小
       if (this.fileSize) {
-        const isLt = file.size / 1024 / 1024 < this.fileSize;
+        const isLt = file.size / 1024 / 1024 < this.fileSize
         if (!isLt) {
-          this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
+          this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`)
-          return false;
+          return false
         }
       }
-      return true;
+      return true
     },
     handleUploadSuccess(res, file) {
       // 如果上传成功
       if (res.code == 200) {
         // 获取富文本组件实例
-        let quill = this.Quill;
+        let quill = this.Quill
         // 获取光标所在位置
-        let length = quill.getSelection().index;
+        let length = quill.getSelection().index
         // 插入图片  res.url为服务器返回的图片地址
-        quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName);
+        quill.insertEmbed(length, "image", process.env.VUE_APP_BASE_API + res.fileName)
         // 调整光标到最后
-        quill.setSelection(length + 1);
+        quill.setSelection(length + 1)
       } else {
-        this.$message.error("图片插入失败");
+        this.$message.error("图片插入失败")
       }
     },
     handleUploadError() {
-      this.$message.error("图片插入失败");
+      this.$message.error("图片插入失败")
     },
-  },
+    // 复制粘贴图片处理
-};
+    handlePasteCapture(e) {
+      const clipboard = e.clipboardData || window.clipboardData
+      if (clipboard && clipboard.items) {
+        for (let i = 0; i < clipboard.items.length; i++) {
+          const item = clipboard.items[i]
+          if (item.type.indexOf('image') !== -1) {
+            e.preventDefault()
+            const file = item.getAsFile()
+            this.insertImage(file)
+          }
+        }
+      }
+    },
+    insertImage(file) {
+      const formData = new FormData()
+      formData.append("file", file)
+      axios.post(this.uploadUrl, formData, { headers: { "Content-Type": "multipart/form-data", Authorization: this.headers.Authorization } }).then(res => {
+        this.handleUploadSuccess(res.data)
+      })
+    }
+  }
+}
 </script>
 
 <style>

ruoyi-ui/src/components/FileUpload/index.vue

@@ -5,6 +5,7 @@
       :action="uploadFileUrl"
       :before-upload="handleBeforeUpload"
       :file-list="fileList"
+      :data="data"
       :limit="limit"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
@@ -13,6 +14,7 @@
       :headers="headers"
       class="upload-file-uploader"
       ref="fileUpload"
+      v-if="!disabled"
     >
       <!-- 上传按钮 -->
       <el-button size="mini" type="primary">选取文件</el-button>
@@ -26,13 +28,13 @@
     </el-upload>
 
     <!-- 文件列表 -->
-    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+    <transition-group ref="uploadFileList" class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
       <li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
         <el-link :href="`${baseUrl}${file.url}`" :underline="false" target="_blank">
           <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
         </el-link>
         <div class="ele-upload-list__item-content-action">
-          <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
+          <el-link :underline="false" @click="handleDelete(index)" type="danger" v-if="!disabled">删除</el-link>
         </div>
       </li>
     </transition-group>
@@ -40,32 +42,52 @@
 </template>
 
 <script>
-import { getToken } from "@/utils/auth";
+import { getToken } from "@/utils/auth"
+import Sortable from 'sortablejs'
 
 export default {
   name: "FileUpload",
   props: {
     // 值
     value: [String, Object, Array],
+    // 上传接口地址
+    action: {
+      type: String,
+      default: "/common/upload"
+    },
+    // 上传携带的参数
+    data: {
+      type: Object
+    },
     // 数量限制
     limit: {
       type: Number,
-      default: 5,
+      default: 5
     },
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 5,
+      default: 5
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "xls", "ppt", "txt", "pdf"],
+      default: () => ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "pdf"]
     },
     // 是否显示提示
     isShowTip: {
       type: Boolean,
       default: true
+    },
+    // 禁用组件（仅查看文件）
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    // 拖动排序
+    drag: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -73,31 +95,46 @@ export default {
       number: 0,
       uploadList: [],
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址
+      uploadFileUrl: process.env.VUE_APP_BASE_API + this.action, // 上传文件服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },
-      fileList: [],
+      fileList: []
-    };
+    }
+  },
+  mounted() {
+    if (this.drag && !this.disabled) {
+      this.$nextTick(() => {
+        const element = this.$refs.uploadFileList?.$el || this.$refs.uploadFileList
+        Sortable.create(element, {
+          ghostClass: 'file-upload-darg',
+          onEnd: (evt) => {
+            const movedItem = this.fileList.splice(evt.oldIndex, 1)[0]
+            this.fileList.splice(evt.newIndex, 0, movedItem)
+            this.$emit("input", this.listToString(this.fileList))
+          }
+        })
+      })
+    }
   },
   watch: {
     value: {
       handler(val) {
         if (val) {
-          let temp = 1;
+          let temp = 1
           // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',');
+          const list = Array.isArray(val) ? val : this.value.split(',')
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
             if (typeof item === "string") {
-              item = { name: item, url: item };
+              item = { name: item, url: item }
             }
-            item.uid = item.uid || new Date().getTime() + temp++;
+            item.uid = item.uid || new Date().getTime() + temp++
-            return item;
+            return item
-          });
+          })
         } else {
-          this.fileList = [];
+          this.fileList = []
-          return [];
+          return []
         }
       },
       deep: true,
@@ -107,7 +144,7 @@ export default {
   computed: {
     // 是否显示提示
     showTip() {
-      return this.isShowTip && (this.fileType || this.fileSize);
+      return this.isShowTip && (this.fileType || this.fileSize)
     },
   },
   methods: {
@@ -115,86 +152,95 @@ export default {
     handleBeforeUpload(file) {
       // 校检文件类型
       if (this.fileType) {
-        const fileName = file.name.split('.');
+        const fileName = file.name.split('.')
-        const fileExt = fileName[fileName.length - 1];
+        const fileExt = fileName[fileName.length - 1]
-        const isTypeOk = this.fileType.indexOf(fileExt) >= 0;
+        const isTypeOk = this.fileType.indexOf(fileExt) >= 0
         if (!isTypeOk) {
-          this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
+          this.$modal.msgError(`文件格式不正确，请上传${this.fileType.join("/")}格式文件!`)
-          return false;
+          return false
         }
       }
+      // 校检文件名是否包含特殊字符
+      if (file.name.includes(',')) {
+        this.$modal.msgError('文件名不正确，不能包含英文逗号!')
+        return false
+      }
       // 校检文件大小
       if (this.fileSize) {
-        const isLt = file.size / 1024 / 1024 < this.fileSize;
+        const isLt = file.size / 1024 / 1024 < this.fileSize
         if (!isLt) {
-          this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`);
+          this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`)
-          return false;
+          return false
         }
       }
-      this.$modal.loading("正在上传文件，请稍候...");
+      this.$modal.loading("正在上传文件，请稍候...")
-      this.number++;
+      this.number++
-      return true;
+      return true
     },
     // 文件个数超出
     handleExceed() {
-      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
+      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`)
     },
     // 上传失败
     handleUploadError(err) {
-      this.$modal.msgError("上传文件失败，请重试");
+      this.$modal.msgError("上传文件失败，请重试")
-      this.$modal.closeLoading();
+      this.$modal.closeLoading()
     },
     // 上传成功回调
     handleUploadSuccess(res, file) {
       if (res.code === 200) {
-        this.uploadList.push({ name: res.fileName, url: res.fileName });
+        this.uploadList.push({ name: res.fileName, url: res.fileName })
-        this.uploadedSuccessfully();
+        this.uploadedSuccessfully()
       } else {
-        this.number--;
+        this.number--
-        this.$modal.closeLoading();
+        this.$modal.closeLoading()
-        this.$modal.msgError(res.msg);
+        this.$modal.msgError(res.msg)
-        this.$refs.fileUpload.handleRemove(file);
+        this.$refs.fileUpload.handleRemove(file)
-        this.uploadedSuccessfully();
+        this.uploadedSuccessfully()
       }
     },
     // 删除文件
     handleDelete(index) {
-      this.fileList.splice(index, 1);
+      this.fileList.splice(index, 1)
-      this.$emit("input", this.listToString(this.fileList));
+      this.$emit("input", this.listToString(this.fileList))
     },
     // 上传结束处理
     uploadedSuccessfully() {
       if (this.number > 0 && this.uploadList.length === this.number) {
-        this.fileList = this.fileList.concat(this.uploadList);
+        this.fileList = this.fileList.concat(this.uploadList)
-        this.uploadList = [];
+        this.uploadList = []
-        this.number = 0;
+        this.number = 0
-        this.$emit("input", this.listToString(this.fileList));
+        this.$emit("input", this.listToString(this.fileList))
-        this.$modal.closeLoading();
+        this.$modal.closeLoading()
       }
     },
     // 获取文件名称
     getFileName(name) {
       // 如果是url那么取最后的名字 如果不是直接返回
       if (name.lastIndexOf("/") > -1) {
-        return name.slice(name.lastIndexOf("/") + 1);
+        return name.slice(name.lastIndexOf("/") + 1)
       } else {
-        return name;
+        return name
       }
     },
     // 对象转成指定字符串分隔
     listToString(list, separator) {
-      let strs = "";
+      let strs = ""
-      separator = separator || ",";
+      separator = separator || ","
       for (let i in list) {
-        strs += list[i].url + separator;
+        strs += list[i].url + separator
       }
-      return strs != '' ? strs.substr(0, strs.length - 1) : '';
+      return strs != '' ? strs.substr(0, strs.length - 1) : ''
     }
   }
-};
+}
 </script>
 
 <style scoped lang="scss">
+.file-upload-darg {
+  opacity: 0.5;
+  background: #c8ebfb;
+}
 .upload-file-uploader {
   margin-bottom: 5px;
 }

ruoyi-ui/src/components/HeaderSearch/index.vue

@@ -1,27 +1,52 @@
 <template>
-  <div :class="{'show':show}" class="header-search">
+  <div class="header-search">
     <svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />
-    <el-select
+    <el-dialog
-      ref="headerSearchSelect"
+      :visible.sync="show"
-      v-model="search"
+      width="600px"
-      :remote-method="querySearch"
+      @close="close"
-      filterable
+      :show-close="false"
-      default-first-option
+      append-to-body
-      remote
-      placeholder="Search"
-      class="header-search-select"
-      @change="change"
     >
-      <el-option v-for="option in options" :key="option.item.path" :value="option.item" :label="option.item.title.join(' > ')" />
+      <el-input
-    </el-select>
+        v-model="search"
+        ref="headerSearchSelectRef"
+        size="large"
+        @input="querySearch"
+        prefix-icon="el-icon-search"
+        placeholder="菜单搜索，支持标题、URL模糊查询"
+        clearable
+        @keyup.enter.native="selectActiveResult"
+        @keydown.up.native="navigateResult('up')"
+        @keydown.down.native="navigateResult('down')"
+      >
+      </el-input>
+      <el-scrollbar wrap-class="right-scrollbar-wrapper">
+        <div class="result-wrap">
+          <div class="search-item" v-for="(item, index) in options" :key="item.path" :style="activeStyle(index)" @mouseenter="activeIndex = index" @mouseleave="activeIndex = -1">
+            <div class="left">
+              <svg-icon class="menu-icon" :icon-class="item.icon" />
+            </div>
+            <div class="search-info" @click="change(item)">
+              <div class="menu-title">
+                {{ item.title.join(" / ") }}
+              </div>
+              <div class="menu-path">
+                {{ item.path }}
+              </div>
+            </div>
+            <svg-icon icon-class="enter" v-show="index === activeIndex"/>
+          </div>
+       </div>
+      </el-scrollbar>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-// fuse is a lightweight fuzzy-search module
-// make search results more in line with expectations
 import Fuse from 'fuse.js/dist/fuse.min.js'
 import path from 'path'
+import { isHttp } from '@/utils/validate'
 
 export default {
   name: 'HeaderSearch',
@@ -30,13 +55,17 @@ export default {
       search: '',
       options: [],
       searchPool: [],
+      activeIndex: -1,
       show: false,
       fuse: undefined
     }
   },
   computed: {
+    theme() {
+      return this.$store.state.settings.theme
+    },
     routes() {
-      return this.$store.getters.permission_routes
+      return this.$store.getters.defaultRoutes
     }
   },
   watch: {
@@ -45,13 +74,6 @@ export default {
     },
     searchPool(list) {
       this.initFuse(list)
-    },
-    show(value) {
-      if (value) {
-        document.body.addEventListener('click', this.close)
-      } else {
-        document.body.removeEventListener('click', this.close)
-      }
     }
   },
   mounted() {
@@ -62,23 +84,26 @@ export default {
       this.show = !this.show
       if (this.show) {
         this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.focus()
+        this.options = this.searchPool
       }
     },
     close() {
       this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.blur()
+      this.search = ''
       this.options = []
       this.show = false
+      this.activeIndex = -1
     },
     change(val) {
-      const path = val.path;
+      const path = val.path
-      const query = val.query;
+      const query = val.query
-      if(this.ishttp(val.path)) {
+      if(isHttp(val.path)) {
         // http(s):// 路径新窗口打开
-        const pindex = path.indexOf("http");
+        const pindex = path.indexOf("http")
-        window.open(path.substr(pindex, path.length), "_blank");
+        window.open(path.substr(pindex, path.length), "_blank")
       } else {
         if (query) {
-          this.$router.push({ path: path, query: JSON.parse(query) });
+          this.$router.push({ path: path, query: JSON.parse(query) })
         } else {
           this.$router.push(path)
         }
@@ -115,12 +140,14 @@ export default {
         if (router.hidden) { continue }
 
         const data = {
-          path: !this.ishttp(router.path) ? path.resolve(basePath, router.path) : router.path,
+          path: !isHttp(router.path) ? path.resolve(basePath, router.path) : router.path,
-          title: [...prefixTitle]
+          title: [...prefixTitle],
+          icon: ''
         }
 
         if (router.meta && router.meta.title) {
           data.title = [...data.title, router.meta.title]
+          data.icon = router.meta.icon
 
           if (router.redirect !== 'noRedirect') {
             // only push the routes with title
@@ -144,55 +171,94 @@ export default {
       return res
     },
     querySearch(query) {
+      this.activeIndex = -1
       if (query !== '') {
-        this.options = this.fuse.search(query)
+        this.options = this.fuse.search(query).map((item) => item.item) ?? this.searchPool
       } else {
-        this.options = []
+        this.options = this.searchPool
       }
     },
-    ishttp(url) {
+    activeStyle(index) {
-      return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
+      if (index !== this.activeIndex) return {}
+      return {
+        "background-color": this.theme,
+        "color": "#fff"
+      }
+    },
+    navigateResult(direction) {
+      if (direction === "up") {
+        this.activeIndex = this.activeIndex <= 0 ? this.options.length - 1 : this.activeIndex - 1
+      } else if (direction === "down") {
+        this.activeIndex = this.activeIndex >= this.options.length - 1 ? 0 : this.activeIndex + 1
+      }
+    },
+    selectActiveResult() {
+      if (this.options.length > 0 && this.activeIndex >= 0) {
+        this.change(this.options[this.activeIndex])
+      }
     }
   }
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang='scss' scoped>
-.header-search {
+::v-deep {
-  font-size: 0 !important;
+  .el-dialog__header {
+    padding: 0 !important;
+  }
+}
 
+.header-search {
   .search-icon {
     cursor: pointer;
     font-size: 18px;
     vertical-align: middle;
   }
+}
 
-  .header-search-select {
+.result-wrap {
-    font-size: 18px;
+  height: 280px;
-    transition: width 0.2s;
+  margin: 6px 0;
-    width: 0;
-    overflow: hidden;
-    background: transparent;
-    border-radius: 0;
-    display: inline-block;
-    vertical-align: middle;
 
-    ::v-deep .el-input__inner {
+  .search-item {
-      border-radius: 0;
+    display: flex;
-      border: 0;
+    height: 48px;
-      padding-left: 0;
+    align-items: center;
-      padding-right: 0;
+    padding-right: 10px;
-      box-shadow: none !important;
+
-      border-bottom: 1px solid #d9d9d9;
+    .left {
-      vertical-align: middle;
+      width: 60px;
+      text-align: center;
+
+      .menu-icon {
+        width: 18px;
+        height: 18px;
+      }
+    }
+
+    .search-info {
+      padding-left: 5px;
+      margin-top: 10px;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      justify-content: flex-start;
+      flex: 1;
+
+      .menu-title,
+      .menu-path {
+        height: 20px;
+      }
+      .menu-path {
+        color: #ccc;
+        font-size: 10px;
+      }
     }
   }
 
-  &.show {
+  .search-item:hover {
-    .header-search-select {
+    cursor: pointer;
-      width: 210px;
-      margin-left: 10px;
-    }
   }
 }
 </style>
+

ruoyi-ui/src/components/ImagePreview/index.vue

@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import { isExternal } from "@/utils/validate";
+import { isExternal } from "@/utils/validate"
 
 export default {
   name: "ImagePreview",
@@ -33,36 +33,36 @@ export default {
   computed: {
     realSrc() {
       if (!this.src) {
-        return;
+        return
       }
-      let real_src = this.src.split(",")[0];
+      let real_src = this.src.split(",")[0]
       if (isExternal(real_src)) {
-        return real_src;
+        return real_src
       }
-      return process.env.VUE_APP_BASE_API + real_src;
+      return process.env.VUE_APP_BASE_API + real_src
     },
     realSrcList() {
       if (!this.src) {
-        return;
+        return
       }
-      let real_src_list = this.src.split(",");
+      let real_src_list = this.src.split(",")
-      let srcList = [];
+      let srcList = []
       real_src_list.forEach(item => {
         if (isExternal(item)) {
-          return srcList.push(item);
+          return srcList.push(item)
         }
-        return srcList.push(process.env.VUE_APP_BASE_API + item);
+        return srcList.push(process.env.VUE_APP_BASE_API + item)
-      });
+      })
-      return srcList;
+      return srcList
     },
     realWidth() {
-      return typeof this.width == "string" ? this.width : `${this.width}px`;
+      return typeof this.width == "string" ? this.width : `${this.width}px`
     },
     realHeight() {
-      return typeof this.height == "string" ? this.height : `${this.height}px`;
+      return typeof this.height == "string" ? this.height : `${this.height}px`
     }
-  },
+  }
-};
+}
 </script>
 
 <style lang="scss" scoped>

ruoyi-ui/src/components/ImageUpload/index.vue

@@ -2,10 +2,12 @@
   <div class="component-upload-image">
     <el-upload
       multiple
+      :disabled="disabled"
       :action="uploadImgUrl"
       list-type="picture-card"
       :on-success="handleUploadSuccess"
       :before-upload="handleBeforeUpload"
+      :data="data"
       :limit="limit"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
@@ -21,7 +23,7 @@
     </el-upload>
 
     <!-- 上传提示 -->
-    <div class="el-upload__tip" slot="tip" v-if="showTip">
+    <div class="el-upload__tip" slot="tip" v-if="showTip && !disabled">
       请上传
       <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
       <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
@@ -43,30 +45,51 @@
 </template>
 
 <script>
-import { getToken } from "@/utils/auth";
+import { getToken } from "@/utils/auth"
+import { isExternal } from "@/utils/validate"
+import Sortable from 'sortablejs'
 
 export default {
   props: {
     value: [String, Object, Array],
+    // 上传接口地址
+    action: {
+      type: String,
+      default: "/common/upload"
+    },
+    // 上传携带的参数
+    data: {
+      type: Object
+    },
     // 图片数量限制
     limit: {
       type: Number,
-      default: 5,
+      default: 5
     },
     // 大小限制(MB)
     fileSize: {
        type: Number,
-      default: 5,
+      default: 5
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["png", "jpg", "jpeg"],
+      default: () => ["png", "jpg", "jpeg"]
     },
     // 是否显示提示
     isShowTip: {
       type: Boolean,
       default: true
+    },
+    // 禁用组件（仅查看图片）
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    // 拖动排序
+    drag: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
@@ -77,33 +100,47 @@ export default {
       dialogVisible: false,
       hideUpload: false,
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      uploadImgUrl: process.env.VUE_APP_BASE_API + this.action, // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },
       fileList: []
-    };
+    }
+  },
+  mounted() {
+    if (this.drag && !this.disabled) {
+      this.$nextTick(() => {
+        const element = this.$refs.imageUpload?.$el?.querySelector('.el-upload-list')
+        Sortable.create(element, {
+          onEnd: (evt) => {
+            const movedItem = this.fileList.splice(evt.oldIndex, 1)[0]
+            this.fileList.splice(evt.newIndex, 0, movedItem)
+            this.$emit("input", this.listToString(this.fileList))
+          }
+        })
+      })
+    }
   },
   watch: {
     value: {
       handler(val) {
         if (val) {
           // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',');
+          const list = Array.isArray(val) ? val : this.value.split(',')
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
             if (typeof item === "string") {
-              if (item.indexOf(this.baseUrl) === -1) {
+              if (item.indexOf(this.baseUrl) === -1 && !isExternal(item)) {
-                  item = { name: this.baseUrl + item, url: this.baseUrl + item };
+                  item = { name: this.baseUrl + item, url: this.baseUrl + item }
               } else {
-                  item = { name: item, url: item };
+                  item = { name: item, url: item }
               }
             }
-            return item;
+            return item
-          });
+          })
         } else {
-          this.fileList = [];
+          this.fileList = []
-          return [];
+          return []
         }
       },
       deep: true,
@@ -113,109 +150,118 @@ export default {
   computed: {
     // 是否显示提示
     showTip() {
-      return this.isShowTip && (this.fileType || this.fileSize);
+      return this.isShowTip && (this.fileType || this.fileSize)
     },
   },
   methods: {
     // 上传前loading加载
     handleBeforeUpload(file) {
-      let isImg = false;
+      let isImg = false
       if (this.fileType.length) {
-        let fileExtension = "";
+        let fileExtension = ""
         if (file.name.lastIndexOf(".") > -1) {
-          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
+          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1)
         }
         isImg = this.fileType.some(type => {
-          if (file.type.indexOf(type) > -1) return true;
+          if (file.type.indexOf(type) > -1) return true
-          if (fileExtension && fileExtension.indexOf(type) > -1) return true;
+          if (fileExtension && fileExtension.indexOf(type) > -1) return true
-          return false;
+          return false
-        });
+        })
       } else {
-        isImg = file.type.indexOf("image") > -1;
+        isImg = file.type.indexOf("image") > -1
       }
 
       if (!isImg) {
-        this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}图片格式文件!`);
+        this.$modal.msgError(`文件格式不正确，请上传${this.fileType.join("/")}图片格式文件!`)
-        return false;
+        return false
+      }
+      if (file.name.includes(',')) {
+        this.$modal.msgError('文件名不正确，不能包含英文逗号!')
+        return false
       }
       if (this.fileSize) {
-        const isLt = file.size / 1024 / 1024 < this.fileSize;
+        const isLt = file.size / 1024 / 1024 < this.fileSize
         if (!isLt) {
-          this.$modal.msgError(`上传头像图片大小不能超过 ${this.fileSize} MB!`);
+          this.$modal.msgError(`上传头像图片大小不能超过 ${this.fileSize} MB!`)
-          return false;
+          return false
         }
       }
-      this.$modal.loading("正在上传图片，请稍候...");
+      this.$modal.loading("正在上传图片，请稍候...")
-      this.number++;
+      this.number++
     },
     // 文件个数超出
     handleExceed() {
-      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
+      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`)
     },
     // 上传成功回调
     handleUploadSuccess(res, file) {
       if (res.code === 200) {
-        this.uploadList.push({ name: res.fileName, url: res.fileName });
+        this.uploadList.push({ name: res.fileName, url: res.fileName })
-        this.uploadedSuccessfully();
+        this.uploadedSuccessfully()
       } else {
-        this.number--;
+        this.number--
-        this.$modal.closeLoading();
+        this.$modal.closeLoading()
-        this.$modal.msgError(res.msg);
+        this.$modal.msgError(res.msg)
-        this.$refs.imageUpload.handleRemove(file);
+        this.$refs.imageUpload.handleRemove(file)
-        this.uploadedSuccessfully();
+        this.uploadedSuccessfully()
       }
     },
     // 删除图片
     handleDelete(file) {
-      const findex = this.fileList.map(f => f.name).indexOf(file.name);
+      const findex = this.fileList.map(f => f.name).indexOf(file.name)
       if (findex > -1) {
-        this.fileList.splice(findex, 1);
+        this.fileList.splice(findex, 1)
-        this.$emit("input", this.listToString(this.fileList));
+        this.$emit("input", this.listToString(this.fileList))
       }
     },
     // 上传失败
     handleUploadError() {
-      this.$modal.msgError("上传图片失败，请重试");
+      this.$modal.msgError("上传图片失败，请重试")
-      this.$modal.closeLoading();
+      this.$modal.closeLoading()
     },
     // 上传结束处理
     uploadedSuccessfully() {
       if (this.number > 0 && this.uploadList.length === this.number) {
-        this.fileList = this.fileList.concat(this.uploadList);
+        this.fileList = this.fileList.concat(this.uploadList)
-        this.uploadList = [];
+        this.uploadList = []
-        this.number = 0;
+        this.number = 0
-        this.$emit("input", this.listToString(this.fileList));
+        this.$emit("input", this.listToString(this.fileList))
-        this.$modal.closeLoading();
+        this.$modal.closeLoading()
       }
     },
     // 预览
     handlePictureCardPreview(file) {
-      this.dialogImageUrl = file.url;
+      this.dialogImageUrl = file.url
-      this.dialogVisible = true;
+      this.dialogVisible = true
     },
     // 对象转成指定字符串分隔
     listToString(list, separator) {
-      let strs = "";
+      let strs = ""
-      separator = separator || ",";
+      separator = separator || ","
       for (let i in list) {
         if (list[i].url) {
-          strs += list[i].url.replace(this.baseUrl, "") + separator;
+          strs += list[i].url.replace(this.baseUrl, "") + separator
         }
       }
-      return strs != '' ? strs.substr(0, strs.length - 1) : '';
+      return strs != '' ? strs.substr(0, strs.length - 1) : ''
     }
   }
-};
+}
 </script>
 <style scoped lang="scss">
 // .el-upload--picture-card 控制加号部分
 ::v-deep.hide .el-upload--picture-card {
-    display: none;
+  display: none;
 }
+
+::v-deep .el-upload-list--picture-card.is-disabled + .el-upload--picture-card {
+  display: none !important;
+} 
+
 // 去掉动画效果
 ::v-deep .el-list-enter-active,
 ::v-deep .el-list-leave-active {
-    transition: all 0s;
+  transition: all 0s;
 }
 
 ::v-deep .el-list-enter, .el-list-leave-active {

ruoyi-ui/src/components/Pagination/index.vue

@@ -63,7 +63,7 @@ export default {
   },
   data() {
     return {
-    };
+    }
   },
   computed: {
     currentPage: {
@@ -106,7 +106,6 @@ export default {
 <style scoped>
 .pagination-container {
   background: #fff;
-  padding: 32px 16px;
 }
 .pagination-container.hidden {
   display: none;

ruoyi-ui/src/components/PanThumb/index.vue

@@ -5,7 +5,6 @@
         <slot />
       </div>
     </div>
-    <!-- eslint-disable-next-line -->
     <div :style="{backgroundImage: `url(${image})`}" class="pan-thumb"></div>
   </div>
 </template>

ruoyi-ui/src/components/RightPanel/index.vue

@@ -1,106 +0,0 @@
-<template>
-  <div ref="rightPanel" class="rightPanel-container">
-    <div class="rightPanel-background" />
-    <div class="rightPanel">
-      <div class="rightPanel-items">
-        <slot />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'RightPanel',
-  props: {
-    clickNotClose: {
-      default: false,
-      type: Boolean
-    }
-  },
-  computed: {
-    show: {
-      get() {
-        return this.$store.state.settings.showSettings
-      },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'showSettings',
-          value: val
-        })
-      }
-    }
-  },
-  watch: {
-    show(value) {
-      if (value && !this.clickNotClose) {
-        this.addEventClick()
-      }
-    }
-  },
-  mounted() {
-    this.addEventClick()
-  },
-  beforeDestroy() {
-    const elx = this.$refs.rightPanel
-    elx.remove()
-  },
-  methods: {
-    addEventClick() {
-      window.addEventListener('click', this.closeSidebar)
-    },
-    closeSidebar(evt) {
-      const parent = evt.target.closest('.el-drawer__body')
-      if (!parent) {
-        this.show = false
-        window.removeEventListener('click', this.closeSidebar)
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.rightPanel-background {
-  position: fixed;
-  top: 0;
-  left: 0;
-  opacity: 0;
-  transition: opacity .3s cubic-bezier(.7, .3, .1, 1);
-  background: rgba(0, 0, 0, .2);
-  z-index: -1;
-}
-
-.rightPanel {
-  width: 100%;
-  max-width: 260px;
-  height: 100vh;
-  position: fixed;
-  top: 0;
-  right: 0;
-  box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, .05);
-  transition: all .25s cubic-bezier(.7, .3, .1, 1);
-  transform: translate(100%);
-  background: #fff;
-  z-index: 40000;
-}
-
-.handle-button {
-  width: 48px;
-  height: 48px;
-  position: absolute;
-  left: -48px;
-  text-align: center;
-  font-size: 24px;
-  border-radius: 6px 0 0 6px !important;
-  z-index: 0;
-  pointer-events: auto;
-  cursor: pointer;
-  color: #fff;
-  line-height: 48px;
-  i {
-    font-size: 24px;
-    line-height: 48px;
-  }
-}
-</style>

ruoyi-ui/src/components/RightToolbar/index.vue

@@ -12,9 +12,14 @@
         <el-dropdown trigger="click" :hide-on-click="false" style="padding-left: 12px" v-if="showColumnsType == 'checkbox'">
           <el-button size="mini" circle icon="el-icon-menu" />
           <el-dropdown-menu slot="dropdown">
+            <!-- 全选/反选 按钮 -->
+            <el-dropdown-item>
+              <el-checkbox :indeterminate="isIndeterminate" v-model="isChecked" @change="toggleCheckAll"> 列展示 </el-checkbox>
+            </el-dropdown-item>
+            <div class="check-line"></div>
             <template v-for="item in columns">
               <el-dropdown-item :key="item.key">
-                <el-checkbox :checked="item.visible" @change="checkboxChange($event, item.label)" :label="item.label" />
+                <el-checkbox v-model="item.visible" @change="checkboxChange($event, item.label)" :label="item.label" />
               </el-dropdown-item>
             </template>
           </el-dropdown-menu>
@@ -41,42 +46,51 @@ export default {
       // 弹出层标题
       title: "显示/隐藏",
       // 是否显示弹出层
-      open: false,
+      open: false
-    };
+    }
   },
   props: {
     /* 是否显示检索条件 */
     showSearch: {
       type: Boolean,
-      default: true,
+      default: true
     },
     /* 显隐列信息 */
     columns: {
-      type: Array,
+      type: Array
     },
     /* 是否显示检索图标 */
     search: {
       type: Boolean,
-      default: true,
+      default: true
     },
     /* 显隐列类型（transfer穿梭框、checkbox复选框） */
     showColumnsType: {
       type: String,
-      default: "checkbox",
+      default: "checkbox"
     },
     /* 右外边距 */
     gutter: {
       type: Number,
-      default: 10,
+      default: 10
     },
   },
   computed: {
     style() {
-      const ret = {};
+      const ret = {}
       if (this.gutter) {
-        ret.marginRight = `${this.gutter / 2}px`;
+        ret.marginRight = `${this.gutter / 2}px`
       }
-      return ret;
+      return ret
+    },
+    isChecked: {
+      get() {
+        return this.columns.every((col) => col.visible)
+      },
+      set() {}
+    },
+    isIndeterminate() {
+      return this.columns.some((col) => col.visible) && !this.isChecked
     }
   },
   created() {
@@ -84,7 +98,7 @@ export default {
       // 显隐列初始默认隐藏列
       for (let item in this.columns) {
         if (this.columns[item].visible === false) {
-          this.value.push(parseInt(item));
+          this.value.push(parseInt(item))
         }
       }
     }
@@ -92,29 +106,34 @@ export default {
   methods: {
     // 搜索
     toggleSearch() {
-      this.$emit("update:showSearch", !this.showSearch);
+      this.$emit("update:showSearch", !this.showSearch)
     },
     // 刷新
     refresh() {
-      this.$emit("queryTable");
+      this.$emit("queryTable")
     },
     // 右侧列表元素变化
     dataChange(data) {
       for (let item in this.columns) {
-        const key = this.columns[item].key;
+        const key = this.columns[item].key
-        this.columns[item].visible = !data.includes(key);
+        this.columns[item].visible = !data.includes(key)
       }
     },
     // 打开显隐列dialog
     showColumn() {
-      this.open = true;
+      this.open = true
     },
-    // 勾选
+    // 单勾选
     checkboxChange(event, label) {
-      this.columns.filter(item => item.label == label)[0].visible = event;
+      this.columns.filter(item => item.label == label)[0].visible = event
+    },
+    // 切换全选/反选
+    toggleCheckAll() {
+      const newValue = !this.isChecked
+      this.columns.forEach((col) => (col.visible = newValue))
     }
   },
-};
+}
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-transfer__button {
@@ -126,4 +145,10 @@ export default {
 ::v-deep .el-transfer__button:first-child {
   margin-bottom: 10px;
 }
+.check-line {
+  width: 90%;
+  height: 1px;
+  background-color: #ccc;
+  margin: 3px auto;
+}
 </style>

ruoyi-ui/src/components/SizeSelect/index.vue

@@ -51,6 +51,5 @@ export default {
       })
     }
   }
-
 }
 </script>

ruoyi-ui/src/components/ThemePicker/index.vue

@@ -1,173 +1,170 @@
-<template>
+<template>
-  <el-color-picker
+  <el-color-picker
-    v-model="theme"
+    v-model="theme"
-    :predefine="['#409EFF', '#1890ff', '#304156','#212121','#11a983', '#13c2c2', '#6959CD', '#f5222d', ]"
+    :predefine="['#409EFF', '#1890ff', '#304156','#212121','#11a983', '#13c2c2', '#6959CD', '#f5222d', ]"
-    class="theme-picker"
+    class="theme-picker"
-    popper-class="theme-picker-dropdown"
+    popper-class="theme-picker-dropdown"
-  />
+  />
-</template>
+</template>
-
+
-<script>
+<script>
-const version = require('element-ui/package.json').version // element-ui version from node_modules
+const ORIGINAL_THEME = '#409EFF' // default color
-const ORIGINAL_THEME = '#409EFF' // default color
+
-
+export default {
-export default {
+  data() {
-  data() {
+    return {
-    return {
+      chalk: '', // content of theme-chalk css
-      chalk: '', // content of theme-chalk css
+      theme: ''
-      theme: ''
+    }
-    }
+  },
-  },
+  computed: {
-  computed: {
+    defaultTheme() {
-    defaultTheme() {
+      return this.$store.state.settings.theme
-      return this.$store.state.settings.theme
+    }
-    }
+  },
-  },
+  watch: {
-  watch: {
+    defaultTheme: {
-    defaultTheme: {
+      handler: function(val, oldVal) {
-      handler: function(val, oldVal) {
+        this.theme = val
-        this.theme = val
+      },
-      },
+      immediate: true
-      immediate: true
+    },
-    },
+    async theme(val) {
-    async theme(val) {
+      await this.setTheme(val)
-      await this.setTheme(val)
+    }
-    }
+  },
-  },
+  created() {
-  created() {
+    if(this.defaultTheme !== ORIGINAL_THEME) {
-    if(this.defaultTheme !== ORIGINAL_THEME) {
+      this.setTheme(this.defaultTheme)
-      this.setTheme(this.defaultTheme)
+    }
-    }
+  },
-  },
+  methods: {
-
+    async setTheme(val) {
-  methods: {
+      const oldVal = this.chalk ? this.theme : ORIGINAL_THEME
-    async setTheme(val) {
+      if (typeof val !== 'string') return
-      const oldVal = this.chalk ? this.theme : ORIGINAL_THEME
+      const themeCluster = this.getThemeCluster(val.replace('#', ''))
-      if (typeof val !== 'string') return
+      const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
-      const themeCluster = this.getThemeCluster(val.replace('#', ''))
+
-      const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
+      const getHandler = (variable, id) => {
-
+        return () => {
-      const getHandler = (variable, id) => {
+          const originalCluster = this.getThemeCluster(ORIGINAL_THEME.replace('#', ''))
-        return () => {
+          const newStyle = this.updateStyle(this[variable], originalCluster, themeCluster)
-          const originalCluster = this.getThemeCluster(ORIGINAL_THEME.replace('#', ''))
+
-          const newStyle = this.updateStyle(this[variable], originalCluster, themeCluster)
+          let styleTag = document.getElementById(id)
-
+          if (!styleTag) {
-          let styleTag = document.getElementById(id)
+            styleTag = document.createElement('style')
-          if (!styleTag) {
+            styleTag.setAttribute('id', id)
-            styleTag = document.createElement('style')
+            document.head.appendChild(styleTag)
-            styleTag.setAttribute('id', id)
+          }
-            document.head.appendChild(styleTag)
+          styleTag.innerText = newStyle
-          }
+        }
-          styleTag.innerText = newStyle
+      }
-        }
+
-      }
+      if (!this.chalk) {
-
+        const url = `/styles/theme-chalk/index.css`
-      if (!this.chalk) {
+        await this.getCSSString(url, 'chalk')
-        const url = `https://unpkg.com/element-ui@${version}/lib/theme-chalk/index.css`
+      }
-        await this.getCSSString(url, 'chalk')
+
-      }
+      const chalkHandler = getHandler('chalk', 'chalk-style')
-
+      chalkHandler()
-      const chalkHandler = getHandler('chalk', 'chalk-style')
+
-
+      const styles = [].slice.call(document.querySelectorAll('style'))
-      chalkHandler()
+        .filter(style => {
-
+          const text = style.innerText
-      const styles = [].slice.call(document.querySelectorAll('style'))
+          return new RegExp(oldVal, 'i').test(text) && !/Chalk Variables/.test(text)
-        .filter(style => {
+        })
-          const text = style.innerText
+      styles.forEach(style => {
-          return new RegExp(oldVal, 'i').test(text) && !/Chalk Variables/.test(text)
+        const { innerText } = style
-        })
+        if (typeof innerText !== 'string') return
-      styles.forEach(style => {
+        style.innerText = this.updateStyle(innerText, originalCluster, themeCluster)
-        const { innerText } = style
+      })
-        if (typeof innerText !== 'string') return
+
-        style.innerText = this.updateStyle(innerText, originalCluster, themeCluster)
+      this.$emit('change', val)
-      })
+    },
-
+
-      this.$emit('change', val)
+    updateStyle(style, oldCluster, newCluster) {
-    },
+      let newStyle = style
-
+      oldCluster.forEach((color, index) => {
-    updateStyle(style, oldCluster, newCluster) {
+        newStyle = newStyle.replace(new RegExp(color, 'ig'), newCluster[index])
-      let newStyle = style
+      })
-      oldCluster.forEach((color, index) => {
+      return newStyle
-        newStyle = newStyle.replace(new RegExp(color, 'ig'), newCluster[index])
+    },
-      })
+
-      return newStyle
+    getCSSString(url, variable) {
-    },
+      return new Promise(resolve => {
-
+        const xhr = new XMLHttpRequest()
-    getCSSString(url, variable) {
+        xhr.onreadystatechange = () => {
-      return new Promise(resolve => {
+          if (xhr.readyState === 4 && xhr.status === 200) {
-        const xhr = new XMLHttpRequest()
+            this[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, '')
-        xhr.onreadystatechange = () => {
+            resolve()
-          if (xhr.readyState === 4 && xhr.status === 200) {
+          }
-            this[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, '')
+        }
-            resolve()
+        xhr.open('GET', url)
-          }
+        xhr.send()
-        }
+      })
-        xhr.open('GET', url)
+    },
-        xhr.send()
+
-      })
+    getThemeCluster(theme) {
-    },
+      const tintColor = (color, tint) => {
-
+        let red = parseInt(color.slice(0, 2), 16)
-    getThemeCluster(theme) {
+        let green = parseInt(color.slice(2, 4), 16)
-      const tintColor = (color, tint) => {
+        let blue = parseInt(color.slice(4, 6), 16)
-        let red = parseInt(color.slice(0, 2), 16)
+
-        let green = parseInt(color.slice(2, 4), 16)
+        if (tint === 0) { // when primary color is in its rgb space
-        let blue = parseInt(color.slice(4, 6), 16)
+          return [red, green, blue].join(',')
-
+        } else {
-        if (tint === 0) { // when primary color is in its rgb space
+          red += Math.round(tint * (255 - red))
-          return [red, green, blue].join(',')
+          green += Math.round(tint * (255 - green))
-        } else {
+          blue += Math.round(tint * (255 - blue))
-          red += Math.round(tint * (255 - red))
+
-          green += Math.round(tint * (255 - green))
+          red = red.toString(16)
-          blue += Math.round(tint * (255 - blue))
+          green = green.toString(16)
-
+          blue = blue.toString(16)
-          red = red.toString(16)
+
-          green = green.toString(16)
+          return `#${red}${green}${blue}`
-          blue = blue.toString(16)
+        }
-
+      }
-          return `#${red}${green}${blue}`
+
-        }
+      const shadeColor = (color, shade) => {
-      }
+        let red = parseInt(color.slice(0, 2), 16)
-
+        let green = parseInt(color.slice(2, 4), 16)
-      const shadeColor = (color, shade) => {
+        let blue = parseInt(color.slice(4, 6), 16)
-        let red = parseInt(color.slice(0, 2), 16)
+
-        let green = parseInt(color.slice(2, 4), 16)
+        red = Math.round((1 - shade) * red)
-        let blue = parseInt(color.slice(4, 6), 16)
+        green = Math.round((1 - shade) * green)
-
+        blue = Math.round((1 - shade) * blue)
-        red = Math.round((1 - shade) * red)
+
-        green = Math.round((1 - shade) * green)
+        red = red.toString(16)
-        blue = Math.round((1 - shade) * blue)
+        green = green.toString(16)
-
+        blue = blue.toString(16)
-        red = red.toString(16)
+
-        green = green.toString(16)
+        return `#${red}${green}${blue}`
-        blue = blue.toString(16)
+      }
-
+
-        return `#${red}${green}${blue}`
+      const clusters = [theme]
-      }
+      for (let i = 0; i <= 9; i++) {
-
+        clusters.push(tintColor(theme, Number((i / 10).toFixed(2))))
-      const clusters = [theme]
+      }
-      for (let i = 0; i <= 9; i++) {
+      clusters.push(shadeColor(theme, 0.1))
-        clusters.push(tintColor(theme, Number((i / 10).toFixed(2))))
+      return clusters
-      }
+    }
-      clusters.push(shadeColor(theme, 0.1))
+  }
-      return clusters
+}
-    }
+</script>
-  }
+
-}
+<style>
-</script>
+.theme-message,
-
+.theme-picker-dropdown {
-<style>
+  z-index: 99999 !important;
-.theme-message,
+}
-.theme-picker-dropdown {
+
-  z-index: 99999 !important;
+.theme-picker .el-color-picker__trigger {
-}
+  height: 26px !important;
-
+  width: 26px !important;
-.theme-picker .el-color-picker__trigger {
+  padding: 2px;
-  height: 26px !important;
+}
-  width: 26px !important;
+
-  padding: 2px;
+.theme-picker-dropdown .el-color-dropdown__link-btn {
-}
+  display: none;
-
+}
-.theme-picker-dropdown .el-color-dropdown__link-btn {
+</style>
-  display: none;
-}
-</style>

ruoyi-ui/src/components/TopNav/index.vue

@@ -14,7 +14,7 @@
     </template>
 
     <!-- 顶部菜单超出数量折叠 -->
-    <el-submenu :style="{'--theme': theme}" index="more" v-if="topMenus.length > visibleNumber">
+    <el-submenu :style="{'--theme': theme}" index="more" :key="visibleNumber" v-if="topMenus.length > visibleNumber">
       <template slot="title">更多菜单</template>
       <template v-for="(item, index) in topMenus">
         <el-menu-item
@@ -32,10 +32,11 @@
 </template>
 
 <script>
-import { constantRoutes } from "@/router";
+import { constantRoutes } from "@/router"
+import { isHttp } from "@/utils/validate"
 
 // 隐藏侧边栏路由
-const hideList = ['/index', '/user/profile'];
+const hideList = ['/index', '/user/profile']
 
 export default {
   data() {
@@ -44,67 +45,67 @@ export default {
       visibleNumber: 5,
       // 当前激活菜单的 index
       currentIndex: undefined
-    };
+    }
   },
   computed: {
     theme() {
-      return this.$store.state.settings.theme;
+      return this.$store.state.settings.theme
     },
     // 顶部显示菜单
     topMenus() {
-      let topMenus = [];
+      let topMenus = []
       this.routers.map((menu) => {
         if (menu.hidden !== true) {
           // 兼容顶部栏一级菜单内部跳转
-          if (menu.path === "/") {
+          if (menu.path === '/' && menu.children) {
-            topMenus.push(menu.children[0]);
+            topMenus.push(menu.children[0])
           } else {
-            topMenus.push(menu);
+            topMenus.push(menu)
           }
         }
-      });
+      })
-      return topMenus;
+      return topMenus
     },
     // 所有的路由信息
     routers() {
-      return this.$store.state.permission.topbarRouters;
+      return this.$store.state.permission.topbarRouters
     },
     // 设置子路由
     childrenMenus() {
-      var childrenMenus = [];
+      var childrenMenus = []
       this.routers.map((router) => {
         for (var item in router.children) {
           if (router.children[item].parentPath === undefined) {
             if(router.path === "/") {
-              router.children[item].path = "/" + router.children[item].path;
+              router.children[item].path = "/" + router.children[item].path
             } else {
-              if(!this.ishttp(router.children[item].path)) {
+              if(!isHttp(router.children[item].path)) {
-                router.children[item].path = router.path + "/" + router.children[item].path;
+                router.children[item].path = router.path + "/" + router.children[item].path
               }
             }
-            router.children[item].parentPath = router.path;
+            router.children[item].parentPath = router.path
           }
-          childrenMenus.push(router.children[item]);
+          childrenMenus.push(router.children[item])
         }
-      });
+      })
-      return constantRoutes.concat(childrenMenus);
+      return constantRoutes.concat(childrenMenus)
     },
     // 默认激活的菜单
     activeMenu() {
-      const path = this.$route.path;
+      const path = this.$route.path
-      let activePath = path;
+      let activePath = path
       if (path !== undefined && path.lastIndexOf("/") > 0 && hideList.indexOf(path) === -1) {
-        const tmpPath = path.substring(1, path.length);
+        const tmpPath = path.substring(1, path.length)
-        activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
         if (!this.$route.meta.link) {
-          this.$store.dispatch('app/toggleSideBarHide', false);
+          activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"))
+          this.$store.dispatch('app/toggleSideBarHide', false)
         }
       } else if(!this.$route.children) {
-        activePath = path;
+        activePath = path
-        this.$store.dispatch('app/toggleSideBarHide', true);
+        this.$store.dispatch('app/toggleSideBarHide', true)
       }
-      this.activeRoutes(activePath);
+      this.activeRoutes(activePath)
-      return activePath;
+      return activePath
     },
   },
   beforeMount() {
@@ -114,58 +115,55 @@ export default {
     window.removeEventListener('resize', this.setVisibleNumber)
   },
   mounted() {
-    this.setVisibleNumber();
+    this.setVisibleNumber()
   },
   methods: {
     // 根据宽度计算设置显示栏数
     setVisibleNumber() {
-      const width = document.body.getBoundingClientRect().width / 3;
+      const width = document.body.getBoundingClientRect().width / 3
-      this.visibleNumber = parseInt(width / 85);
+      this.visibleNumber = parseInt(width / 85)
     },
     // 菜单选择事件
     handleSelect(key, keyPath) {
-      this.currentIndex = key;
+      this.currentIndex = key
-      const route = this.routers.find(item => item.path === key);
+      const route = this.routers.find(item => item.path === key)
-      if (this.ishttp(key)) {
+      if (isHttp(key)) {
         // http(s):// 路径新窗口打开
-        window.open(key, "_blank");
+        window.open(key, "_blank")
       } else if (!route || !route.children) {
         // 没有子路由路径内部打开
-        const routeMenu = this.childrenMenus.find(item => item.path === key);
+        const routeMenu = this.childrenMenus.find(item => item.path === key)
         if (routeMenu && routeMenu.query) {
-          let query = JSON.parse(routeMenu.query);
+          let query = JSON.parse(routeMenu.query)
-          this.$router.push({ path: key, query: query });
+          this.$router.push({ path: key, query: query })
         } else {
-          this.$router.push({ path: key });
+          this.$router.push({ path: key })
         }
-        this.$store.dispatch('app/toggleSideBarHide', true);
+        this.$store.dispatch('app/toggleSideBarHide', true)
       } else {
         // 显示左侧联动菜单
-        this.activeRoutes(key);
+        this.activeRoutes(key)
-        this.$store.dispatch('app/toggleSideBarHide', false);
+        this.$store.dispatch('app/toggleSideBarHide', false)
       }
     },
     // 当前激活的路由
     activeRoutes(key) {
-      var routes = [];
+      var routes = []
       if (this.childrenMenus && this.childrenMenus.length > 0) {
         this.childrenMenus.map((item) => {
           if (key == item.parentPath || (key == "index" && "" == item.path)) {
-            routes.push(item);
+            routes.push(item)
           }
-        });
+        })
       }
       if(routes.length > 0) {
-        this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
+        this.$store.commit("SET_SIDEBAR_ROUTERS", routes)
       } else {
-        this.$store.dispatch('app/toggleSideBarHide', true);
+        this.$store.dispatch('app/toggleSideBarHide', true)
       }
-    },
-    ishttp(url) {
-      return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
     }
   },
-};
+}
 </script>
 
 <style lang="scss">

ruoyi-ui/src/components/iFrame/index.vue

@@ -21,16 +21,16 @@ export default {
       height: document.documentElement.clientHeight - 94.5 + "px;",
       loading: true,
       url: this.src
-    };
+    }
   },
   mounted: function () {
     setTimeout(() => {
-      this.loading = false;
+      this.loading = false
-    }, 300);
+    }, 300)
-    const that = this;
+    const that = this
     window.onresize = function temp() {
-      that.height = document.documentElement.clientHeight - 94.5 + "px;";
+      that.height = document.documentElement.clientHeight - 94.5 + "px;"
-    };
+    }
   }
-};
+}
 </script>

ruoyi-ui/src/directive/dialog/drag.js

@@ -8,57 +8,57 @@ export default {
     const value = binding.value
     if (value == false) return
     // 获取拖拽内容头部
-    const dialogHeaderEl = el.querySelector('.el-dialog__header');
+    const dialogHeaderEl = el.querySelector('.el-dialog__header')
-    const dragDom = el.querySelector('.el-dialog');
+    const dragDom = el.querySelector('.el-dialog')
-    dialogHeaderEl.style.cursor = 'move';
+    dialogHeaderEl.style.cursor = 'move'
-    // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
+    // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null)
-    const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null);
+    const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null)
-    dragDom.style.position = 'absolute';
+    dragDom.style.position = 'absolute'
-    dragDom.style.marginTop = 0;
+    dragDom.style.marginTop = 0
-    let width = dragDom.style.width;
+    let width = dragDom.style.width
     if (width.includes('%')) {
-      width = +document.body.clientWidth * (+width.replace(/\%/g, '') / 100);
+      width = +document.body.clientWidth * (+width.replace(/\%/g, '') / 100)
     } else {
-      width = +width.replace(/\px/g, '');
+      width = +width.replace(/\px/g, '')
     }
-    dragDom.style.left = `${(document.body.clientWidth - width) / 2}px`;
+    dragDom.style.left = `${(document.body.clientWidth - width) / 2}px`
     // 鼠标按下事件
     dialogHeaderEl.onmousedown = (e) => {
       // 鼠标按下，计算当前元素距离可视区的距离 (鼠标点击位置距离可视窗口的距离)
-      const disX = e.clientX - dialogHeaderEl.offsetLeft;
+      const disX = e.clientX - dialogHeaderEl.offsetLeft
-      const disY = e.clientY - dialogHeaderEl.offsetTop;
+      const disY = e.clientY - dialogHeaderEl.offsetTop
 
       // 获取到的值带px 正则匹配替换
-      let styL, styT;
+      let styL, styT
 
       // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
       if (sty.left.includes('%')) {
-        styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100);
+        styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100)
-        styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100);
+        styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100)
       } else {
-        styL = +sty.left.replace(/\px/g, '');
+        styL = +sty.left.replace(/\px/g, '')
-        styT = +sty.top.replace(/\px/g, '');
+        styT = +sty.top.replace(/\px/g, '')
-      };
+      }
 
       // 鼠标拖拽事件
       document.onmousemove = function (e) {
         // 通过事件委托，计算移动的距离 （开始拖拽至结束拖拽的距离）
-        const l = e.clientX - disX;
+        const l = e.clientX - disX
-        const t = e.clientY - disY;
+        const t = e.clientY - disY
 
         let finallyL = l + styL
         let finallyT = t + styT
 
         // 移动当前元素
-        dragDom.style.left = `${finallyL}px`;
+        dragDom.style.left = `${finallyL}px`
-        dragDom.style.top = `${finallyT}px`;
+        dragDom.style.top = `${finallyT}px`
 
-      };
+      }
 
       document.onmouseup = function (e) {
-        document.onmousemove = null;
+        document.onmousemove = null
-        document.onmouseup = null;
+        document.onmouseup = null
-      };
+      }
     }
   }
-};
+}

ruoyi-ui/src/directive/dialog/dragHeight.js

@@ -5,30 +5,30 @@
 
 export default {
   bind(el) {
-    const dragDom = el.querySelector('.el-dialog');
+    const dragDom = el.querySelector('.el-dialog')
-    const lineEl = document.createElement('div');
+    const lineEl = document.createElement('div')
-    lineEl.style = 'width: 6px; background: inherit; height: 10px; position: absolute; right: 0; bottom: 0; margin: auto; z-index: 1; cursor: nwse-resize;';
+    lineEl.style = 'width: 6px; background: inherit; height: 10px; position: absolute; right: 0; bottom: 0; margin: auto; z-index: 1; cursor: nwse-resize;'
     lineEl.addEventListener('mousedown',
       function(e) {
         // 鼠标按下，计算当前元素距离可视区的距离
-        const disX = e.clientX - el.offsetLeft;
+        const disX = e.clientX - el.offsetLeft
-        const disY = e.clientY - el.offsetTop;
+        const disY = e.clientY - el.offsetTop
         // 当前宽度 高度
-        const curWidth = dragDom.offsetWidth;
+        const curWidth = dragDom.offsetWidth
-        const curHeight = dragDom.offsetHeight;
+        const curHeight = dragDom.offsetHeight
         document.onmousemove = function(e) {
-          e.preventDefault(); // 移动时禁用默认事件
+          e.preventDefault() // 移动时禁用默认事件
           // 通过事件委托，计算移动的距离
-          const xl = e.clientX - disX;
+          const xl = e.clientX - disX
           const yl = e.clientY - disY
-          dragDom.style.width = `${curWidth + xl}px`;
+          dragDom.style.width = `${curWidth + xl}px`
-          dragDom.style.height = `${curHeight + yl}px`;
+          dragDom.style.height = `${curHeight + yl}px`
-        };
+        }
         document.onmouseup = function(e) {
-          document.onmousemove = null;
+          document.onmousemove = null
-          document.onmouseup = null;
+          document.onmouseup = null
-        };
+        }
-      }, false);
+      }, false)
-    dragDom.appendChild(lineEl);
+    dragDom.appendChild(lineEl)
   }
 }

ruoyi-ui/src/directive/dialog/dragWidth.js

@@ -5,26 +5,26 @@
 
 export default {
   bind(el) {
-    const dragDom = el.querySelector('.el-dialog');
+    const dragDom = el.querySelector('.el-dialog')
-    const lineEl = document.createElement('div');
+    const lineEl = document.createElement('div')
-    lineEl.style = 'width: 5px; background: inherit; height: 80%; position: absolute; right: 0; top: 0; bottom: 0; margin: auto; z-index: 1; cursor: w-resize;';
+    lineEl.style = 'width: 5px; background: inherit; height: 80%; position: absolute; right: 0; top: 0; bottom: 0; margin: auto; z-index: 1; cursor: w-resize;'
     lineEl.addEventListener('mousedown',
       function (e) {
         // 鼠标按下，计算当前元素距离可视区的距离
-        const disX = e.clientX - el.offsetLeft;
+        const disX = e.clientX - el.offsetLeft
         // 当前宽度
-        const curWidth = dragDom.offsetWidth;
+        const curWidth = dragDom.offsetWidth
         document.onmousemove = function (e) {
-          e.preventDefault(); // 移动时禁用默认事件
+          e.preventDefault() // 移动时禁用默认事件
           // 通过事件委托，计算移动的距离
-          const l = e.clientX - disX;
+          const l = e.clientX - disX
-          dragDom.style.width = `${curWidth + l}px`;
+          dragDom.style.width = `${curWidth + l}px`
-        };
+        }
         document.onmouseup = function (e) {
-          document.onmousemove = null;
+          document.onmousemove = null
-          document.onmouseup = null;
+          document.onmouseup = null
-        };
+        }
-      }, false);
+      }, false)
-    dragDom.appendChild(lineEl);
+    dragDom.appendChild(lineEl)
   }
 }

ruoyi-ui/src/directive/index.js

@@ -17,7 +17,7 @@ const install = function(Vue) {
 if (window.Vue) {
   window['hasRole'] = hasRole
   window['hasPermi'] = hasPermi
-  Vue.use(install); // eslint-disable-line
+  Vue.use(install)
 }
 
 export default install

ruoyi-ui/src/directive/module/clipboard.js

@@ -8,47 +8,47 @@ export default {
   bind(el, binding, vnode) {
     switch (binding.arg) {
       case 'success':
-        el._vClipBoard_success = binding.value;
+        el._vClipBoard_success = binding.value
-        break;
+        break
       case 'error':
-        el._vClipBoard_error = binding.value;
+        el._vClipBoard_error = binding.value
-        break;
+        break
       default: {
         const clipboard = new Clipboard(el, {
           text: () => binding.value,
           action: () => binding.arg === 'cut' ? 'cut' : 'copy'
-        });
+        })
         clipboard.on('success', e => {
-          const callback = el._vClipBoard_success;
+          const callback = el._vClipBoard_success
-          callback && callback(e);
+          callback && callback(e)
-        });
+        })
         clipboard.on('error', e => {
-          const callback = el._vClipBoard_error;
+          const callback = el._vClipBoard_error
-          callback && callback(e);
+          callback && callback(e)
-        });
+        })
-        el._vClipBoard = clipboard;
+        el._vClipBoard = clipboard
       }
     }
   },
   update(el, binding) {
     if (binding.arg === 'success') {
-      el._vClipBoard_success = binding.value;
+      el._vClipBoard_success = binding.value
     } else if (binding.arg === 'error') {
-      el._vClipBoard_error = binding.value;
+      el._vClipBoard_error = binding.value
     } else {
-      el._vClipBoard.text = function () { return binding.value; };
+      el._vClipBoard.text = function () { return binding.value }
-      el._vClipBoard.action = () => binding.arg === 'cut' ? 'cut' : 'copy';
+      el._vClipBoard.action = () => binding.arg === 'cut' ? 'cut' : 'copy'
     }
   },
   unbind(el, binding) {
     if (!el._vClipboard) return
     if (binding.arg === 'success') {
-      delete el._vClipBoard_success;
+      delete el._vClipBoard_success
     } else if (binding.arg === 'error') {
-      delete el._vClipBoard_error;
+      delete el._vClipBoard_error
     } else {
-      el._vClipBoard.destroy();
+      el._vClipBoard.destroy()
-      delete el._vClipBoard;
+      delete el._vClipBoard
     }
   }
 }

ruoyi-ui/src/directive/permission/hasPermi.js

@@ -8,7 +8,7 @@ import store from '@/store'
 export default {
   inserted(el, binding, vnode) {
     const { value } = binding
-    const all_permission = "*:*:*";
+    const all_permission = "*:*:*"
     const permissions = store.getters && store.getters.permissions
 
     if (value && value instanceof Array && value.length > 0) {

ruoyi-ui/src/directive/permission/hasRole.js

@@ -8,7 +8,7 @@ import store from '@/store'
 export default {
   inserted(el, binding, vnode) {
     const { value } = binding
-    const super_admin = "admin";
+    const super_admin = "admin"
     const roles = store.getters && store.getters.roles
 
     if (value && value instanceof Array && value.length > 0) {

ruoyi-ui/src/layout/components/AppMain.vue

@@ -6,15 +6,17 @@
       </keep-alive>
     </transition>
     <iframe-toggle />
+    <copyright />
   </section>
 </template>
 
 <script>
+import copyright from "./Copyright/index"
 import iframeToggle from "./IframeToggle/index"
 
 export default {
   name: 'AppMain',
-  components: { iframeToggle },
+  components: { iframeToggle, copyright },
   computed: {
     cachedViews() {
       return this.$store.state.tagsView.cachedViews
@@ -22,6 +24,22 @@ export default {
     key() {
       return this.$route.path
     }
+  },
+  watch: {
+    $route() {
+      this.addIframe()
+    }
+  },
+  mounted() {
+    this.addIframe()
+  },
+  methods: {
+    addIframe() {
+      const { name } = this.$route
+      if (name && this.$route.meta.link) {
+        this.$store.dispatch('tagsView/addIframeView', this.$route)
+      }
+    }
   }
 }
 </script>
@@ -35,6 +53,10 @@ export default {
   overflow: hidden;
 }
 
+.app-main:has(.copyright) {
+  padding-bottom: 36px;
+}
+
 .fixed-header + .app-main {
   padding-top: 50px;
 }

ruoyi-ui/src/layout/components/Copyright/index.vue

@@ -0,0 +1,35 @@
+<template>
+  <footer v-if="visible" class="copyright">
+    <span>{{ content }}</span>
+  </footer>
+</template>
+
+<script>
+export default {
+  computed: {
+    visible() {
+      return this.$store.state.settings.footerVisible
+    },
+    content() {
+      return this.$store.state.settings.footerContent
+    }
+  }
+}
+</script>
+
+<style scoped>
+.copyright {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 36px;
+  padding: 10px 20px;
+  text-align: right;
+  background-color: #f8f8f8;
+  color: #666;
+  font-size: 14px;
+  border-top: 1px solid #e7e7e7;
+  z-index: 999;
+}
+</style>

ruoyi-ui/src/layout/components/IframeToggle/index.vue

@@ -11,22 +11,22 @@
 </template>
 
 <script>
-import InnerLink from "../InnerLink/index";
+import InnerLink from "../InnerLink/index"
 
 export default {
   components: { InnerLink },
   computed: {
     iframeViews() {
-      return this.$store.state.tagsView.iframeViews;
+      return this.$store.state.tagsView.iframeViews
     }
   },
   methods: {
     iframeUrl(url, query) {
       if (Object.keys(query).length > 0) {
-        let params = Object.keys(query).map((key) => key + "=" + query[key]).join("&");
+        let params = Object.keys(query).map((key) => key + "=" + query[key]).join("&")
-        return url + "?" + params;
+        return url + "?" + params
       }
-      return url;
+      return url
     }
   }
 }