若依 3.9.2

update address url

README.md

@@ -13,8 +13,8 @@
 
 若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
 
-* 本仓库为RuoYi-Vue的Spring Boot 3 的版本，保持同步更新。
-* 后端采用Spring Boot3、Spring Security、Redis & Jwt。
+* 前端采用Vue、Element UI。
+* 后端采用Spring Boot、Spring Security、Redis & Jwt。
 * 权限认证使用Jwt，支持多终端认证系统。
 * 支持加载动态权限菜单，多方式轻松权限控制。
 * 高效率开发，使用代码生成器可以一键生成前后端代码。

pom.xml

@@ -17,27 +17,27 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
-        <spring-boot.version>3.5.14</spring-boot.version>
-        <mybatis-spring-boot.version>3.0.5</mybatis-spring-boot.version>
+        <spring-boot.version>4.0.3</spring-boot.version>
+        <mybatis-spring-boot.version>4.0.1</mybatis-spring-boot.version>
         <druid.version>1.2.28</druid.version>
-        <yauaa.version>8.1.1</yauaa.version>
+        <yauaa.version>8.1.0</yauaa.version>
         <kaptcha.version>2.3.3</kaptcha.version>
         <pagehelper.boot.version>2.1.1</pagehelper.boot.version>
-        <fastjson.version>2.0.62</fastjson.version>
-        <oshi.version>7.3.0</oshi.version>
-        <commons.io.version>2.22.0</commons.io.version>
+        <fastjson.version>2.0.61</fastjson.version>
+        <oshi.version>6.10.0</oshi.version>
+        <commons.io.version>2.21.0</commons.io.version>
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>
         <jwt.version>0.9.1</jwt.version>
         <jaxb-api.version>2.3.1</jaxb-api.version>
-        <springdoc.version>2.8.17</springdoc.version>
+        <springdoc.version>3.0.2</springdoc.version>
     </properties>
 
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
 
-            <!-- SpringBoot的依赖配置 -->
+            <!-- SpringBoot的依赖配置-->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
@@ -49,7 +49,7 @@
             <!-- 阿里数据库连接池 -->
             <dependency>
                 <groupId>com.alibaba</groupId>
-                <artifactId>druid-spring-boot-3-starter</artifactId>
+                <artifactId>druid-spring-boot-4-starter</artifactId>
                 <version>${druid.version}</version>
             </dependency>
 

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -2,7 +2,7 @@ package com.ruoyi;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
 
 /**
  * 启动程序

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

@@ -87,7 +87,6 @@ public class SysLoginController
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
-        ajax.put("pwdChrtype", getSysAccountChrtype());
         ajax.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));
         ajax.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate()));
         return ajax;
@@ -105,13 +104,7 @@ public class SysLoginController
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
     }
-
-    // 获取用户密码自定义配置规则
-    public String getSysAccountChrtype()
-    {
-        return Convert.toStr(configService.selectConfigByKey("sys.account.chrtype"), "0");
-    }
-
+    
     // 检查初始密码是否提醒修改
     public boolean initPasswordIsModify(Date pwdUpdateDate)
     {

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

@@ -53,6 +53,7 @@ public class SysNoticeController extends BaseController
     /**
      * 根据通知公告编号获取详细信息
      */
+    @PreAuthorize("@ss.hasPermi('system:notice:query')")
     @GetMapping(value = "/{noticeId}")
     public AjaxResult getInfo(@PathVariable Long noticeId)
     {
@@ -123,19 +124,6 @@ public class SysNoticeController extends BaseController
         return success();
     }
 
-    /**
-     * 已读用户列表数据
-     */
-    @PreAuthorize("@ss.hasPermi('system:notice:list')")
-    @GetMapping("/readUsers/list")
-    @ResponseBody
-    public TableDataInfo readUsersList(Long noticeId, String searchValue)
-    {
-        startPage();
-        List<?> list = noticeReadService.selectReadUsersByNoticeId(noticeId, searchValue);
-        return getDataTable(list);
-    }
-
     /**
      * 删除通知公告
      */

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

@@ -19,8 +19,10 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.framework.web.service.TokenService;
@@ -126,8 +128,14 @@ public class SysRoleController extends BaseController
         
         if (roleService.updateRole(role) > 0)
         {
-            // 刷新所有持有该角色的在线用户权限
-            tokenService.refreshPermissionByRoleId(role.getRoleId(), permissionService);
+            // 更新缓存用户权限
+            LoginUser loginUser = getLoginUser();
+            if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
+            {
+                loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+                loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+                tokenService.setLoginUser(loginUser);
+            }
             return success();
         }
         return error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");

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

@@ -60,6 +60,9 @@ spring:
       max-file-size: 10MB
       # 设置总上传的文件大小
       max-request-size: 20MB
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
   # 服务模块
   devtools:
     restart:

ruoyi-common/pom.xml

@@ -95,6 +95,11 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
+        </dependency>
+
         <!-- pool 对象池 -->
         <dependency>
             <groupId>org.apache.commons</groupId>

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

@@ -16,25 +16,15 @@ import java.lang.annotation.Target;
 @Documented
 public @interface DataScope
 {
-    /**
-     * 用户表的别名
-     */
-    public String userAlias() default "";
-
     /**
      * 部门表的别名
      */
     public String deptAlias() default "";
 
     /**
-     * 用户字段名
+     * 用户表的别名
      */
-    public String userField() default "user_id";
-
-    /**
-     * 部门字段名
-     */
-    public String deptField() default "dept_id";
+    public String userAlias() default "";
 
     /**
      * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@ss获取，多个权限用逗号分隔开来

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

@@ -170,35 +170,4 @@ public class Constants
      */
     public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
             "org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.common.config", "com.ruoyi.generator" };
-
-    /**
-     * 部门相关常量
-     */
-    public static class Dept
-    {
-        /**
-         * 全部数据权限
-         */
-        public static final String DATA_SCOPE_ALL = "1";
-
-        /**
-         * 自定数据权限
-         */
-        public static final String DATA_SCOPE_CUSTOM = "2";
-
-        /**
-         * 部门数据权限
-         */
-        public static final String DATA_SCOPE_DEPT = "3";
-
-        /**
-         * 部门及以下数据权限
-         */
-        public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
-
-        /**
-         * 仅本人数据权限
-         */
-        public static final String DATA_SCOPE_SELF = "5";
-    }
 }

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

@@ -31,9 +31,6 @@ public class GenConstants
     /** 上级菜单名称字段 */
     public static final String PARENT_MENU_NAME = "parentMenuName";
 
-    /** 生成详情页开关 */
-    public static final String GEN_VIEW = "genView";
-
     /** 数据库字符串类型 */
     public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
 

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

@@ -5,7 +5,6 @@ import java.util.List;
 import jakarta.validation.constraints.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
@@ -70,7 +69,6 @@ public class SysUser extends BaseEntity
     private String loginIp;
 
     /** 最后登录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -1,11 +1,15 @@
 package com.ruoyi.common.core.domain.model;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-import java.util.Collection;
-import java.util.Set;
 
 /**
  * 登录用户身份权限
@@ -259,8 +263,16 @@ public class LoginUser implements UserDetails
     }
 
     @Override
+    @JSONField(serialize = false)
     public Collection<? extends GrantedAuthority> getAuthorities()
     {
-        return null;
+        if (permissions == null || permissions.isEmpty())
+        {
+            return Collections.emptyList();
+        }
+        return permissions.stream()
+            .filter(Objects::nonNull)
+            .map(SimpleGrantedAuthority::new)
+            .collect(Collectors.toList());
     }
 }

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

@@ -2,7 +2,7 @@ package com.ruoyi.common.enums;
 
 import java.util.HashMap;
 import java.util.Map;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * 请求方式

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

@@ -6,6 +6,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.apache.commons.lang3.Strings;
 import org.springframework.util.AntPathMatcher;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.text.StrFormatter;
@@ -433,12 +434,24 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         return list;
     }
 
+    /**
+     * 检查子字符串是否存在
+     *
+     * @param seq 检查的字符串
+     * @param searchSeq 查找的字符串
+     * @return 结果
+     */
+    public static boolean contains(final CharSequence seq, final CharSequence searchSeq)
+    {
+        return Strings.CS.contains(seq, searchSeq);
+    }
+
     /**
      * 判断给定的collection列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value
      *
      * @param collection 给定的集合
      * @param array 给定的数组
-     * @return boolean 结果
+     * @return 结果
      */
     public static boolean containsAny(Collection<String> collection, String... array)
     {
@@ -459,6 +472,18 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         }
     }
 
+    /**
+     * 判断是否包含给定数组中的任意一个。
+     *
+     * @param cs 要判断的字符串
+     * @param searchCharSequences 要判断的数组
+     * @return 结果
+     */
+    public static boolean containsAny(final CharSequence cs, final CharSequence... searchCharSequences)
+    {
+        return Strings.CS.containsAny(cs, searchCharSequences);
+    }
+
     /**
      * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写
      *
@@ -482,6 +507,163 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         return false;
     }
 
+    /**
+     * 检查是否包含要搜索的字符串，忽略大小写
+     *
+     * @param str 要检查的字符串
+     * @param searchStr 要查找的字符串
+     * @return 如果包含要搜索的字符串（忽略大小写）则返回true，如果不包含或返回false
+     */
+    public static boolean containsIgnoreCase(final CharSequence str, final CharSequence searchStr)
+    {
+        return Strings.CI.contains(str, searchStr);
+    }
+
+    /**
+     * 检查字符串是否以任意前缀开始
+     *
+     * @param sequence 要检查的字符串
+     * @param searchStrings 区分大小写的字符串前缀数组
+     * @return 结果
+     */
+    public static boolean startsWithAny(final CharSequence sequence, final CharSequence... searchStrings)
+    {
+        return Strings.CS.startsWithAny(sequence, searchStrings);
+    }
+
+    /**
+     * 不区分大小写地检查一个字符串是否以指定前缀开头。
+     *
+     * @param str 待检查的字符串
+     * @param 要查找的前缀
+     * @return 结果
+     */
+    public static boolean startsWithIgnoreCase(final CharSequence str, final CharSequence prefix)
+    {
+        return Strings.CI.startsWith(str, prefix);
+    }
+
+    /**
+     * 比较两个字符串是否相同
+     *
+     * @param cs1 第一个字符串
+     * @param cs2 第二个字符串
+     * @return 如果给定对象与字符串相等，则返回 true；否则返回 false
+     */
+    public static boolean equals(final CharSequence cs1, final CharSequence cs2)
+    {
+        return Strings.CS.equals(cs1, cs2);
+    }
+
+    /**
+     * 替换字符串中所有匹配的字符
+     *
+     * @param text 要搜索和替换的文本
+     * @param searchString 要搜索的字符串
+     * @param replacement  用于替换的字符串
+     * @return 处理完所有替换后的文本
+     */
+    public static String replace(final String text, final String searchString, final String replacement)
+    {
+        return Strings.CS.replace(text, searchString, replacement);
+    }
+
+    /**
+     * 仅当子字符串位于源字符串末尾时才将其移除，否则返回源字符串。
+     * @param str 要搜索的源字符串
+     * @param remove 要搜索并移除的字符串
+     * @return 如果找到并移除了字符串，则返回移除后的子字符串
+     */
+    public static String removeEnd(final String str, final String remove)
+    {
+        return Strings.CS.removeEnd(str, remove);
+    }
+
+    /**
+     * 查找字符串首次出现位置的索引
+     *
+     * @param seq 要检查的字符串
+     * @param searchSeq 要查找的字符串
+     * @return 返回指定字符在字符串中第一次出现处的索引，如果此字符串中没有这样的字符，则返回 -1
+     */
+    public static int indexOf(final CharSequence seq, final CharSequence searchSeq)
+    {
+        return Strings.CS.indexOf(seq, searchSeq);
+    }
+
+    /**
+     * 检查字符串是否以指定的后缀结尾
+     *
+     * @param str 要检查的字符
+     * @param suffix 要检查的后缀
+     * @return 若参数与该字符串末尾相符 true;否则 false
+     */
+    public static boolean endsWith(final CharSequence str, final CharSequence suffix)
+    {
+        return Strings.CS.endsWith(str, suffix);
+    }
+
+    /**
+     * 将给定的字符串与数组进行比较
+     *
+     * @param string 要比较的字符串
+     * @param searchStrings 字符串数组
+     * @return 如果字符串等于（区分大小写）{@code searchStrings}中的任意其他元素，则返回true；如果{@code searchStrings}为null或不包含匹配项，则返回false
+     */
+    public static boolean equalsAny(final CharSequence string, final CharSequence... searchStrings)
+    {
+        return Strings.CS.equalsAny(string, searchStrings);
+    }
+
+    /**
+     * 检查一个字符串是否以任意提供的区分大小写的后缀结尾。
+     *
+     * @param sequence 要检查的字符串
+     * @param searchStrings 要查找的区分大小写的字符串数组
+     * @return 如果输入参数{@code sequence}为null且未提供任何{@code searchStrings}，或者输入{@code sequence}以任意提供的区分大小写的{@code searchStrings}结尾，则返回{@code true}。
+     */
+    public static boolean endsWithAny(final CharSequence sequence, final CharSequence... searchStrings)
+    {
+        return Strings.CS.endsWithAny(sequence, searchStrings);
+    }
+
+    /**
+     * 不区分大小写地检查字符序列是否以指定的后缀结尾
+     *
+     * @param str 要检查的字符序列
+     * @param suffix 要查找的后缀
+     * @return 如果字符序列以该后缀结尾（不区分大小写），或两者均为{@code null}，则返回{@code true}
+     */
+    public static boolean endsWithIgnoreCase(final CharSequence str, final CharSequence suffix)
+    {
+        return Strings.CI.endsWith(str, suffix);
+    }
+
+    /**
+     * 指定范围内查找字符串,忽略大小写
+     *
+     * @param str 要检查的字符串
+     * @param searchStr 要查找的字符串
+     * @return 搜索字符串的第一个索引，如果未找到匹配项则返回 -1
+     */
+    public static int indexOfIgnoreCase(final CharSequence str, final CharSequence searchStr)
+    {
+        return Strings.CI.indexOf(str, searchStr);
+    }
+
+    /**
+     * Compares given {@code string} to a CharSequences vararg of {@code searchStrings},
+     * returning {@code true} if the {@code string} is equal to any of the {@code searchStrings}, ignoring case.
+     *
+     * @param string to compare, may be {@code null}.
+     * @param searchStrings a vararg of strings, may be {@code null}.
+     * @return {@code true} if the string is equal (case-insensitive) to any other element of {@code searchStrings};
+     */
+    public static boolean equalsAnyIgnoreCase(final CharSequence string, final CharSequence... searchStrings)
+    {
+        return Strings.CI.equalsAny(string, searchStrings);
+    }
+
     /**
      * 驼峰转下划线命名
      */
@@ -553,6 +735,22 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         return false;
     }
 
+    /**
+     * 删除最后一个字符串
+     *
+     * @param str 输入字符串
+     * @param spit 以什么类型结尾的
+     * @return 截取后的字符串
+     */
+    public static String lastStringDel(String str, String spit)
+    {
+        if (!StringUtils.isEmpty(str) && str.endsWith(spit))
+        {
+            return str.subSequence(0, str.length() - 1).toString();
+        }
+        return str;
+    }
+
     /**
      * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
      * 

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java

@@ -30,7 +30,7 @@ public class MimeTypeUtils
             // 图片
             "bmp", "gif", "jpg", "jpeg", "png",
             // word excel powerpoint
-            "doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt",
+            "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
             // 压缩文件
             "rar", "zip", "gz", "bz2",
             // 视频格式

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

@@ -1,85 +0,0 @@
-package com.ruoyi.common.utils.poi;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 多 Sheet 导出时的数据信息
- *
- * 使用示例：
- * <pre>
- *   List<ExcelSheet<?>> sheets = new ArrayList<>();
- *   sheets.add(new ExcelSheet<>("参数数据", configList, Config.class, "参数信息"));
- *   sheets.add(new ExcelSheet<>("岗位数据", postList, Post.class, "岗位信息"));
- *   return ExcelUtil.exportMultiSheet(sheets);
- * </pre>
- * 
- * @author ruoyi
- */
-public class ExcelSheet<T>
-{
-    /** Sheet 名称 */
-    private String sheetName;
-
-    /** 导出数据集合 */
-    private List<T> list;
-
-    /** 数据对应的实体 Class */
-    private Class<T> clazz;
-
-    /** Sheet 顶部大标题（可为空） */
-    private String title;
-
-    public ExcelSheet(String sheetName, List<T> list, Class<T> clazz)
-    {
-        this(sheetName, list, clazz, "");
-    }
-
-    public ExcelSheet(String sheetName, List<T> list, Class<T> clazz, String title)
-    {
-        this.sheetName = sheetName;
-        this.list = list != null ? list : new ArrayList<>();
-        this.clazz = clazz;
-        this.title = title != null ? title : "";
-    }
-
-    public String getSheetName()
-    {
-        return sheetName;
-    }
-
-    public List<T> getList()
-    {
-        return list;
-    }
-
-    public Class<T> getClazz()
-    {
-        return clazz;
-    }
-
-    public String getTitle()
-    {
-        return title;
-    }
-
-    public void setSheetName(String sheetName)
-    {
-        this.sheetName = sheetName;
-    }
-
-    public void setList(List<T> list)
-    {
-        this.list = list;
-    }
-
-    public void setClazz(Class<T> clazz)
-    {
-        this.clazz = clazz;
-    }
-
-    public void setTitle(String title)
-    {
-        this.title = title;
-    }
-}

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

@@ -585,117 +585,6 @@ public class ExcelUtil<T>
         exportExcel(response);
     }
 
-    /**
-     * 多 Sheet 导出 —— 将多个不同类型的数据集合写入同一 Excel，直接输出到 HttpServletResponse
-     *
-     * @param response HTTP 响应
-     * @param sheets   Sheet 描述列表
-     */
-    public static void exportMultiSheet(HttpServletResponse response, List<ExcelSheet<?>> sheets)
-    {
-        if (sheets == null || sheets.isEmpty())
-        {
-            return;
-        }
-        SXSSFWorkbook wb = buildWorkbook(sheets);
-        try
-        {
-            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setCharacterEncoding("utf-8");
-            wb.write(response.getOutputStream());
-        }
-        catch (Exception e)
-        {
-            log.error("多Sheet导出Excel异常{}", e.getMessage());
-        }
-        finally
-        {
-            IOUtils.closeQuietly(wb);
-        }
-    }
-
-    /**
-     * 多 Sheet 导出 —— 将多个不同类型的数据集合写入同一 Excel，生成文件并返回下载地址
-     *
-     * @param sheets Sheet 描述列表
-     * @return AjaxResult（含文件下载地址）
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static AjaxResult exportMultiSheet(List<ExcelSheet<?>> sheets)
-    {
-        if (sheets == null || sheets.isEmpty())
-        {
-            return AjaxResult.error("导出数据不能为空");
-        }
-        SXSSFWorkbook wb = buildWorkbook(sheets);
-        OutputStream out = null;
-        try
-        {
-            ExcelUtil firstUtil = new ExcelUtil(sheets.get(0).getClazz());
-            String filename = firstUtil.encodingFilename(sheets.get(0).getSheetName());
-            out = new FileOutputStream(firstUtil.getAbsoluteFile(filename));
-            wb.write(out);
-            return AjaxResult.success(filename);
-        }
-        catch (Exception e)
-        {
-            log.error("多Sheet导出Excel异常{}", e.getMessage());
-            throw new UtilException("导出Excel失败，请联系网站管理员！");
-        }
-        finally
-        {
-            IOUtils.closeQuietly(wb);
-            IOUtils.closeQuietly(out);
-        }
-    }
-
-    /**
-     * 构建多 Sheet Workbook —— 创建 SXSSFWorkbook 并将所有 Sheet 数据写入
-     *
-     * @param sheets Sheet 描述列表
-     * @return 已写入所有 Sheet 数据的 SXSSFWorkbook
-     */
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    private static SXSSFWorkbook buildWorkbook(List<ExcelSheet<?>> sheets)
-    {
-        SXSSFWorkbook wb = new SXSSFWorkbook(500);
-        for (ExcelSheet<?> excelSheet : sheets)
-        {
-            ExcelUtil util = new ExcelUtil(excelSheet.getClazz());
-            util.initWithWorkbook(wb, excelSheet.getList(), excelSheet.getSheetName(), excelSheet.getTitle());
-            util.writeSheet();
-        }
-        return wb;
-    }
-
-    /**
-     * 使用外部传入的 Workbook 初始化（多 Sheet 导出专用）
-     * 与 init() 的区别：不新建 Workbook，而是在已有 wb 上追加新 Sheet
-     *
-     * @param wb        已有工作簿
-     * @param list      数据集合
-     * @param sheetName Sheet 名称
-     * @param title     大标题（可为空）
-     */
-    public void initWithWorkbook(SXSSFWorkbook wb, List<T> list, String sheetName, String title)
-    {
-        if (list == null)
-        {
-            list = new ArrayList<T>();
-        }
-        this.list      = list;
-        this.sheetName = sheetName;
-        this.title     = title != null ? title : "";
-        this.type      = Type.EXPORT;
-        this.rownum    = 0;
-        this.wb        = wb;
-        this.sheet     = wb.createSheet(sheetName);
-        createExcelField();
-        this.styles    = createStyles(wb);
-        createTitle();
-        createSubHead();
-    }
-
     /**
      * 对list数据源将其里面的数据导入到excel表单
      * 

ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java

@@ -7,13 +7,13 @@ import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Date;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 
 /**
  * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.

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 = "\u000B|%0A|and |extractvalue|updatexml|sleep|information_schema|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |union |like |+|/*|user()";
+    public static String SQL_REGEX = "\u000B|and |extractvalue|updatexml|sleep|information_schema|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |union |like |+|/*|user()";
 
     /**
      * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）
@@ -58,13 +58,12 @@ public class SqlUtil
         {
             return;
         }
-        String normalizedValue = value.replaceAll("\\p{Z}|\\s", "");
         String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|");
         for (String sqlKeyword : sqlKeywords)
         {
-            if (StringUtils.indexOfIgnoreCase(normalizedValue, sqlKeyword) > -1)
+            if (StringUtils.indexOfIgnoreCase(value, sqlKeyword) > -1)
             {
-                throw new UtilException("请求参数包含敏感关键词'" + sqlKeyword + "'，可能存在安全风险");
+                throw new UtilException("参数存在SQL注入风险");
             }
         }
     }

ruoyi-framework/pom.xml

@@ -20,19 +20,19 @@
         <!-- SpringBoot Web容器 -->
          <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
         </dependency>
 
         <!-- SpringBoot 拦截器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
+            <artifactId>spring-boot-starter-aspectj</artifactId>
         </dependency>
 
         <!-- 阿里数据库连接池 -->
         <dependency>
             <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-3-starter</artifactId>
+            <artifactId>druid-spring-boot-4-starter</artifactId>
         </dependency>
 
         <!-- 验证码 -->

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

@@ -7,7 +7,6 @@ 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.Constants;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.entity.SysRole;
@@ -27,6 +26,31 @@ import com.ruoyi.framework.security.context.PermissionContextHolder;
 @Component
 public class DataScopeAspect
 {
+    /**
+     * 全部数据权限
+     */
+    public static final String DATA_SCOPE_ALL = "1";
+
+    /**
+     * 自定数据权限
+     */
+    public static final String DATA_SCOPE_CUSTOM = "2";
+
+    /**
+     * 部门数据权限
+     */
+    public static final String DATA_SCOPE_DEPT = "3";
+
+    /**
+     * 部门及以下数据权限
+     */
+    public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
+
+    /**
+     * 仅本人数据权限
+     */
+    public static final String DATA_SCOPE_SELF = "5";
+
     /**
      * 数据权限过滤关键字
      */
@@ -50,7 +74,7 @@ public class DataScopeAspect
             if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
             {
                 String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), PermissionContextHolder.getContext());
-                dataScopeFilter(joinPoint, currentUser, controllerDataScope.userAlias(), controllerDataScope.deptAlias(), controllerDataScope.userField(), controllerDataScope.deptField(), permission);
+                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias(), permission);
             }
         }
     }
@@ -64,13 +88,13 @@ public class DataScopeAspect
      * @param userAlias 用户别名
      * @param permission 权限字符
      */
-    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String userAlias, String deptAlias, String userField, String deptField, String permission)
+    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String permission)
     {
         StringBuilder sqlString = new StringBuilder();
         List<String> conditions = new ArrayList<String>();
         List<String> scopeCustomIds = new ArrayList<String>();
         user.getRoles().forEach(role -> {
-            if (Constants.Dept.DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && (StringUtils.isEmpty(permission) || StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))))
+            if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && (StringUtils.isEmpty(permission) || StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))))
             {
                 scopeCustomIds.add(Convert.toStr(role.getRoleId()));
             }
@@ -87,42 +111,42 @@ public class DataScopeAspect
             {
                 continue;
             }
-            if (Constants.Dept.DATA_SCOPE_ALL.equals(dataScope))
+            if (DATA_SCOPE_ALL.equals(dataScope))
             {
                 sqlString = new StringBuilder();
                 conditions.add(dataScope);
                 break;
             }
-            else if (Constants.Dept.DATA_SCOPE_CUSTOM.equals(dataScope))
+            else if (DATA_SCOPE_CUSTOM.equals(dataScope))
             {
                 if (scopeCustomIds.size() > 1)
                 {
                     // 多个自定数据权限使用in查询，避免多次拼接。
-                    sqlString.append(StringUtils.format(" OR {}.{} IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, deptField, String.join(",", scopeCustomIds)));
+                    sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, String.join(",", scopeCustomIds)));
                 }
                 else
                 {
-                    sqlString.append(StringUtils.format(" OR {}.{} IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, deptField, role.getRoleId()));
+                    sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
                 }
             }
-            else if (Constants.Dept.DATA_SCOPE_DEPT.equals(dataScope))
+            else if (DATA_SCOPE_DEPT.equals(dataScope))
             {
-                sqlString.append(StringUtils.format(" OR {}.{} = {} ", deptAlias, deptField, user.getDeptId()));
+                sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
             }
-            else if (Constants.Dept.DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
+            else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
             {
-                sqlString.append(StringUtils.format(" OR {}.{} IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, deptField, user.getDeptId(), user.getDeptId()));
+                sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId()));
             }
-            else if (Constants.Dept.DATA_SCOPE_SELF.equals(dataScope))
+            else if (DATA_SCOPE_SELF.equals(dataScope))
             {
                 if (StringUtils.isNotBlank(userAlias))
                 {
-                    sqlString.append(StringUtils.format(" OR {}.{} = {} ", userAlias, userField, user.getUserId()));
+                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
                 }
                 else
                 {
                     // 数据权限为仅本人且没有userAlias别名不查询任何数据
-                    sqlString.append(StringUtils.format(" OR {}.{} = 0 ", deptAlias, deptField));
+                    sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
                 }
             }
             conditions.add(dataScope);
@@ -131,7 +155,7 @@ public class DataScopeAspect
         // 角色都不包含传递过来的权限字符，这个时候sqlString也会为空，所以要限制一下,不查询任何数据
         if (StringUtils.isEmpty(conditions))
         {
-            sqlString.append(StringUtils.format(" OR {}.{} = 0 ", deptAlias, deptField));
+            sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
         }
 
         if (StringUtils.isNotBlank(sqlString.toString()))

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

@@ -1,9 +1,6 @@
 package com.ruoyi.framework.config;
 
-import java.util.TimeZone;
 import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 
@@ -19,12 +16,4 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 @MapperScan("com.ruoyi.**.mapper")
 public class ApplicationConfig
 {
-    /**
-     * 时区配置
-     */
-    @Bean
-    public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization()
-    {
-        return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault());
-    }
 }

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

@@ -11,8 +11,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceBuilder;
-import com.alibaba.druid.spring.boot3.autoconfigure.properties.DruidStatProperties;
+import com.alibaba.druid.spring.boot4.autoconfigure.DruidDataSourceBuilder;
+import com.alibaba.druid.spring.boot4.autoconfigure.properties.DruidStatProperties;
 import com.alibaba.druid.util.Utils;
 import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.spring.SpringUtils;

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

@@ -49,8 +49,8 @@ public class ThreadPoolConfig
     protected ScheduledExecutorService scheduledExecutorService()
     {
         return new ScheduledThreadPoolExecutor(corePoolSize,
-                new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build(),
-                new ThreadPoolExecutor.CallerRunsPolicy())
+            BasicThreadFactory.builder().namingPattern("schedule-pool-%d").daemon(true).build(),
+            new ThreadPoolExecutor.CallerRunsPolicy())
         {
             @Override
             protected void afterExecute(Runnable r, Throwable t)

ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java

@@ -34,6 +34,7 @@ public class PermitAllUrlProperties implements InitializingBean, ApplicationCont
 
     public String ASTERISK = "*";
 
+    @SuppressWarnings("deprecation")
     @Override
     public void afterPropertiesSet()
     {
@@ -45,7 +46,7 @@ public class PermitAllUrlProperties implements InitializingBean, ApplicationCont
 
             // 获取方法上边的注解 替代path variable 为 *
             Anonymous method = AnnotationUtils.findAnnotation(handlerMethod.getMethod(), Anonymous.class);
-            Optional.ofNullable(method).ifPresent(anonymous -> Objects.requireNonNull(info.getPathPatternsCondition().getPatternValues()) //
+            Optional.ofNullable(method).ifPresent(anonymous -> Objects.requireNonNull(info.getPathPatternsCondition().getPatternValues())
                     .forEach(url -> urls.add(RegExUtils.replaceAll(url, PATTERN, ASTERISK))));
 
             // 获取类上边的注解, 替代path variable 为 *

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

@@ -1,9 +1,9 @@
 package com.ruoyi.framework.web.service;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import jakarta.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +22,6 @@ import com.ruoyi.common.utils.uuid.IdUtils;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
-import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * token验证处理
@@ -230,41 +229,4 @@ public class TokenService
     {
         return CacheConstants.LOGIN_TOKEN_KEY + uuid;
     }
-
-    /**
-     * 角色权限变更后，刷新所有持有该角色的在线用户权限
-     *
-     * @param roleId            变更的角色ID
-     * @param permissionService 权限服务
-     */
-    public void refreshPermissionByRoleId(Long roleId, SysPermissionService permissionService)
-    {
-        // 扫描所有在线 token
-        String pattern = CacheConstants.LOGIN_TOKEN_KEY + "*";
-        Collection<String> keys = redisCache.keys(pattern);
-        if (keys == null || keys.isEmpty())
-        {
-            return;
-        }
-        for (String key : keys)
-        {
-            LoginUser loginUser = redisCache.getCacheObject(key);
-            if (loginUser == null || loginUser.getUser() == null || loginUser.getUser().isAdmin())
-            {
-                // 管理员拥有所有权限，跳过
-                continue;
-            }
-            // 判断该用户是否拥有此角色
-            boolean hasRole = loginUser.getUser().getRoles() != null
-                    && loginUser.getUser().getRoles().stream().anyMatch(r -> roleId.equals(r.getRoleId()));
-            if (!hasRole)
-            {
-                continue;
-            }
-            // 刷新权限缓存
-            loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
-            refreshToken(loginUser);
-            log.info("角色[{}]权限变更，已刷新在线用户[{}]的权限缓存", roleId, loginUser.getUsername());
-        }
-    }
 }

ruoyi-generator/pom.xml

@@ -32,7 +32,7 @@
         <!-- 阿里数据库连接池 -->
         <dependency>
             <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-3-starter</artifactId>
+            <artifactId>druid-spring-boot-4-starter</artifactId>
         </dependency>
 
     </dependencies>

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

@@ -64,9 +64,6 @@ public class GenTable extends BaseEntity
     @NotBlank(message = "作者不能为空")
     private String functionAuthor;
 
-    /** 表单布局（单列 双列 三列） */
-    private Integer formColNum;
-
     /** 生成代码方式（0zip压缩包 1自定义路径） */
     private String genType;
 
@@ -101,9 +98,6 @@ public class GenTable extends BaseEntity
     /** 上级菜单名称字段 */
     private String parentMenuName;
 
-    /** 是否生成详情页 */
-    private boolean isView;
-
     public Long getTableId()
     {
         return tableId;
@@ -234,16 +228,6 @@ public class GenTable extends BaseEntity
         this.functionAuthor = functionAuthor;
     }
 
-    public Integer getFormColNum()
-    {
-        return formColNum;
-    }
-
-    public void setFormColNum(Integer formColNum)
-    {
-        this.formColNum = formColNum;
-    }
-
     public String getGenType()
     {
         return genType;
@@ -354,16 +338,6 @@ public class GenTable extends BaseEntity
         this.parentMenuName = parentMenuName;
     }
 
-    public boolean isView()
-    {
-        return isView;
-    }
-
-    public void setView(boolean isView)
-    {
-        this.isView = isView;
-    }
-
     public boolean isSub()
     {
         return isSub(this.tplCategory);

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

@@ -219,7 +219,7 @@ public class GenTableServiceImpl implements IGenTableService
         VelocityContext context = VelocityUtils.prepareContext(table);
 
         // 获取模板列表
-        List<String> templates = VelocityUtils.getTemplateList(table);
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());
         for (String template : templates)
         {
             // 渲染模板
@@ -263,10 +263,10 @@ public class GenTableServiceImpl implements IGenTableService
         VelocityContext context = VelocityUtils.prepareContext(table);
 
         // 获取模板列表
-        List<String> templates = VelocityUtils.getTemplateList(table);
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());
         for (String template : templates)
         {
-            if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "api.ts.vm", "type.ts.vm", "index.ts.vm", "index.vue.vm", "index-tree.vue.vm", "view.vue.vm"))
+            if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm"))
             {
                 // 渲染模板
                 StringWriter sw = new StringWriter();
@@ -381,7 +381,7 @@ public class GenTableServiceImpl implements IGenTableService
         VelocityContext context = VelocityUtils.prepareContext(table);
 
         // 获取模板列表
-        List<String> templates = VelocityUtils.getTemplateList(table);
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());
         for (String template : templates)
         {
             // 渲染模板
@@ -534,14 +534,12 @@ public class GenTableServiceImpl implements IGenTableService
             String treeName = paramsObj.getString(GenConstants.TREE_NAME);
             Long parentMenuId = paramsObj.getLongValue(GenConstants.PARENT_MENU_ID);
             String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);
-            boolean isView = paramsObj.getBooleanValue(GenConstants.GEN_VIEW);
 
             genTable.setTreeCode(treeCode);
             genTable.setTreeParentCode(treeParentCode);
             genTable.setTreeName(treeName);
             genTable.setParentMenuId(parentMenuId);
             genTable.setParentMenuName(parentMenuName);
-            genTable.setView(isView);
         }
     }
 

ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

@@ -60,7 +60,6 @@ public class VelocityUtils
         velocityContext.put("basePackage", getPackagePrefix(packageName));
         velocityContext.put("packageName", packageName);
         velocityContext.put("author", genTable.getFunctionAuthor());
-        velocityContext.put("colSpan", getColSpan(genTable.getFormColNum()));
         velocityContext.put("datetime", DateUtils.getDate());
         velocityContext.put("pkColumn", genTable.getPkColumn());
         velocityContext.put("importList", getImportList(genTable));
@@ -68,7 +67,6 @@ public class VelocityUtils
         velocityContext.put("columns", genTable.getColumns());
         velocityContext.put("table", genTable);
         velocityContext.put("dicts", getDicts(genTable));
-        setExtensionsContext(velocityContext, genTable.getOptions());
         setMenuVelocityContext(velocityContext, genTable);
         if (GenConstants.TPL_TREE.equals(tplCategory))
         {
@@ -81,13 +79,6 @@ public class VelocityUtils
         return velocityContext;
     }
 
-    public static void setExtensionsContext(VelocityContext context, String options)
-    {
-        JSONObject paramsObj = JSONObject.parseObject(options);
-        boolean genView = genView(paramsObj);
-        context.put("genView", genView);
-    }
-
     public static void setMenuVelocityContext(VelocityContext context, GenTable genTable)
     {
         String options = genTable.getOptions();
@@ -142,12 +133,8 @@ public class VelocityUtils
      * @param tplWebType 前端类型
      * @return 模板列表
      */
-    public static List<String> getTemplateList(GenTable table)
+    public static List<String> getTemplateList(String tplCategory, String tplWebType)
     {
-        String tplWebType = table.getTplWebType();
-        String tplCategory = table.getTplCategory();
-        JSONObject paramsObj = JSONObject.parseObject(table.getOptions());
-        boolean isView = genView(paramsObj);
         String useWebType = "vm/vue";
         String apiTemplate = "vm/js/api.js.vm";
         if (StringUtils.equals(ELEMENT_PLUS, tplWebType))
@@ -186,10 +173,6 @@ public class VelocityUtils
             templates.add(useWebType + "/index.vue.vm");
             templates.add("vm/java/sub-domain.java.vm");
         }
-        if (isView)
-        {
-            templates.add(useWebType + "/view.vue.vm");
-        }
         return templates;
     }
 
@@ -269,10 +252,6 @@ public class VelocityUtils
         {
             fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
         }
-        else if (template.contains("view.vue.vm"))
-        {
-            fileName = StringUtils.format("{}/views/{}/{}/view.vue", vuePath, moduleName, businessName);
-        }
         return fileName;
     }
 
@@ -414,21 +393,6 @@ public class VelocityUtils
         return StringUtils.EMPTY;
     }
 
-    /**
-     * 扩展功能/生成详情页
-     * 
-     * @param paramsObj 生成其他选项
-     * @return 是否生成详细页
-     */
-    public static boolean genView(JSONObject paramsObj)
-    {
-        if (StringUtils.isNotNull(paramsObj) && paramsObj.containsKey(GenConstants.GEN_VIEW))
-        {
-            return paramsObj.getBoolean(GenConstants.GEN_VIEW);
-        }
-        return false;
-    }
-
     /**
      * 获取树名称
      *
@@ -470,23 +434,4 @@ public class VelocityUtils
         }
         return num;
     }
-
-    /**
-     * 获取表单 el-col span
-     * 
-     * @param formColNum 表单布局方式（1单列 2双列 3三列）
-     * @return span 数值字符串
-     */
-    public static String getColSpan(int formColNum)
-    {
-        if (formColNum == 2)
-        {
-            return "12";
-        }
-        else if (formColNum == 3)
-        {
-            return "8";
-        }
-        return "24";
-    }
 }

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

@@ -94,7 +94,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <set>
             <if test="columnComment != null">column_comment = #{columnComment},</if>
             <if test="javaType != null">java_type = #{javaType},</if>
-            <if test="columnType != null">column_type = #{columnType},</if>
             <if test="javaField != null">java_field = #{javaField},</if>
             <if test="isInsert != null">is_insert = #{isInsert},</if>
             <if test="isEdit != null">is_edit = #{isEdit},</if>

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

@@ -18,7 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="businessName"   column="business_name"     />
 		<result property="functionName"   column="function_name"     />
 		<result property="functionAuthor" column="function_author"   />
-		<result property="formColNum"     column="form_col_num"      />
 		<result property="genType"        column="gen_type"          />
 		<result property="genPath"        column="gen_path"          />
 		<result property="options"        column="options"           />
@@ -56,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectGenTableVo">
-        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, form_col_num, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
+        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
     </sql>
     
     <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
@@ -113,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.form_col_num, t.gen_type, t.gen_path, t.options, t.remark,
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
 		FROM gen_table t
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -121,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.form_col_num, t.gen_type, t.gen_path, t.options, t.remark,
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
 		FROM gen_table t
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -129,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.form_col_num, t.options, t.remark,
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
 		FROM gen_table t
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -148,7 +147,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="businessName != null and businessName != ''">business_name,</if>
 			<if test="functionName != null and functionName != ''">function_name,</if>
 			<if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
-			<if test="formColNum != null">form_col_num,</if>
 			<if test="genType != null and genType != ''">gen_type,</if>
 			<if test="genPath != null and genPath != ''">gen_path,</if>
 			<if test="remark != null and remark != ''">remark,</if>
@@ -165,7 +163,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="businessName != null and businessName != ''">#{businessName},</if>
 			<if test="functionName != null and functionName != ''">#{functionName},</if>
 			<if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
-			<if test="formColNum != null">#{formColNum},</if>
 			<if test="genType != null and genType != ''">#{genType},</if>
 			<if test="genPath != null and genPath != ''">#{genPath},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
@@ -187,7 +184,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if>
             <if test="className != null and className != ''">class_name = #{className},</if>
             <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
-            <if test="formColNum != null">form_col_num = #{formColNum},</if>
             <if test="genType != null and genType != ''">gen_type = #{genType},</if>
             <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
             <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>

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

@@ -139,15 +139,6 @@
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-#if($genView)
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleViewData(scope.row)"
-            v-hasPermi="['${permissionPrefix}:query']"
-          >详情</el-button>
-#end
           <el-button
             size="mini"
             type="text"
@@ -173,21 +164,9 @@
       </el-table-column>
     </el-table>
 
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
     <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
-#set($dialogWidth = "800px")
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" :visible.sync="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-row>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -200,127 +179,100 @@
 #end
 #set($dictType=$column.dictType)
 #if("" != $treeParentCode && $column.javaField == $treeParentCode)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${treeParentCode}">
-              <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="请选择${comment}" />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${treeParentCode}">
+          <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="请选择${comment}" />
+        </el-form-item>
 #elseif($column.htmlType == "input")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
 #elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <image-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="form.${field}"/>
+        </el-form-item>
 #elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <file-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="form.${field}"/>
+        </el-form-item>
 #elseif($column.htmlType == "editor")
-          <el-col :span="24">
-            <el-form-item label="${comment}">
-              <editor v-model="form.${field}" :min-height="192"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
 #elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option
-                  v-for="dict in dict.type.${dictType}"
-                  :key="dict.value"
-                  :label="dict.label"
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              :label="dict.label"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
 #else
-                  :value="dict.value"
+              :value="dict.value"
 #end
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+            ></el-option>
+          </el-select>
+        </el-form-item>
 #elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option label="请选择字典生成" value="" />
-              </el-select>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox
-                  v-for="dict in dict.type.${dictType}"
-                  :key="dict.value"
-                  :label="dict.value">
-                  {{dict.label}}
-                </el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
 #elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox>请选择字典生成</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio
-                  v-for="dict in dict.type.${dictType}"
-                  :key="dict.value"
+        <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
 #else
-                  :label="dict.value"
+              :label="dict.value"
 #end
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
 #elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio label="1">请选择字典生成</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
 #elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-date-picker clearable
-                v-model="form.${field}"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择${comment}">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
+            v-model="form.${field}"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择${comment}">
+          </el-date-picker>
+        </el-form-item>
 #elseif($column.htmlType == "textarea")
-          <el-col :span="24">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
 #end
 #end
 #end
 #end
-        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -332,9 +284,6 @@
 
 <script>
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view"
-#end
 import Treeselect from "@riophae/vue-treeselect"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"
 
@@ -344,9 +293,6 @@ export default {
   dicts: [${dicts}],
 #end
   components: {
-#if($genView)
-    ${BusinessName}ViewDrawer,
-#end
     Treeselect
   },
   data() {
@@ -502,12 +448,6 @@ export default {
         this.refreshTable = true
       })
     },
-#if($genView)
-    /** 详情按钮操作 */
-    handleViewData(row) {
-      this.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-    },
-#end
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()

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

@@ -153,15 +153,6 @@
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-#if($genView)
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleViewData(scope.row)"
-            v-hasPermi="['${permissionPrefix}:query']"
-          >详情</el-button>
-#end
           <el-button
             size="mini"
             type="text"
@@ -188,21 +179,9 @@
       @pagination="getList"
     />
 
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
     <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
-#set($dialogWidth = "800px")
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" :visible.sync="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-row>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -215,121 +194,96 @@
 #end
 #set($dictType=$column.dictType)
 #if($column.htmlType == "input")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
 #elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <image-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="form.${field}"/>
+        </el-form-item>
 #elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <file-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="form.${field}"/>
+        </el-form-item>
 #elseif($column.htmlType == "editor")
-          <el-col :span="24">
-            <el-form-item label="${comment}">
-              <editor v-model="form.${field}" :min-height="192"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
 #elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option
-                  v-for="dict in dict.type.${dictType}"
-                  :key="dict.value"
-                  :label="dict.label"
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              :label="dict.label"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
 #else
-                  :value="dict.value"
+              :value="dict.value"
 #end
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+            ></el-option>
+          </el-select>
+        </el-form-item>
 #elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option label="请选择字典生成" value="" />
-              </el-select>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox
-                  v-for="dict in dict.type.${dictType}"
-                  :key="dict.value"
-                  :label="dict.value">
-                  {{dict.label}}
-                </el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
 #elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox>请选择字典生成</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio
-                  v-for="dict in dict.type.${dictType}"
-                  :key="dict.value"
+        <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
 #else
-                  :label="dict.value"
+              :label="dict.value"
 #end
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
 #elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio label="1">请选择字典生成</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
 #elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-date-picker clearable
-                v-model="form.${field}"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择${comment}">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
+            v-model="form.${field}"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择${comment}">
+          </el-date-picker>
+        </el-form-item>
 #elseif($column.htmlType == "textarea")
-          <el-col :span="24">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
 #end
 #end
 #end
 #end
-        </el-row>
 #if($table.sub)
         <el-divider content-position="center">${subTable.functionName}信息</el-divider>
         <el-row :gutter="10" class="mb8">
@@ -400,15 +354,9 @@
 
 <script>
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view"
-#end
 
 export default {
   name: "${BusinessName}",
-#if($genView)
-  components: { ${BusinessName}ViewDrawer },
-#end
 #if(${dicts} != '')
   dicts: [${dicts}],
 #end
@@ -545,7 +493,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.${pkColumn.javaField})
-      this.single = selection.length !== 1
+      this.single = selection.length!==1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -642,12 +590,6 @@ export default {
     handle${subClassName}SelectionChange(selection) {
       this.checked${subClassName} = selection.map(item => item.index)
     },
-#end
-#if($genView)
-    /** 详情按钮操作 */
-    handleViewData(row) {
-      this.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-    },
 #end
     /** 导出按钮操作 */
     handleExport() {

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

@@ -136,9 +136,6 @@
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-#if($genView)
-          <el-button link type="primary" icon="View" @click="handleViewData(scope.row)" v-hasPermi="['${permissionPrefix}:query']">详情</el-button>
-#end
           <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="['${permissionPrefix}:add']">新增</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">删除</el-button>
@@ -146,21 +143,9 @@
       </el-table-column>
     </el-table>
 
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
     <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
-#set($dialogWidth = "800px")
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
-        <el-row>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -173,134 +158,107 @@
 #end
 #set($dictType=$column.dictType)
 #if("" != $treeParentCode && $column.javaField == $treeParentCode)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${treeParentCode}">
-              <el-tree-select
-                v-model="form.${treeParentCode}"
-                :data="${businessName}Options"
-                :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
-                value-key="${treeCode}"
-                placeholder="请选择${comment}"
-                check-strictly
-              />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${treeParentCode}">
+          <el-tree-select
+            v-model="form.${treeParentCode}"
+            :data="${businessName}Options"
+            :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
+            value-key="${treeCode}"
+            placeholder="请选择${comment}"
+            check-strictly
+          />
+        </el-form-item>
 #elseif($column.htmlType == "input")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
 #elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <image-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="form.${field}"/>
+        </el-form-item>
 #elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <file-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="form.${field}"/>
+        </el-form-item>
 #elseif($column.htmlType == "editor")
-          <el-col :span="24">
-            <el-form-item label="${comment}">
-              <editor v-model="form.${field}" :min-height="192"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
 #elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-                  :label="dict.label"
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.label"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
 #else
-                  :value="dict.value"
+              :value="dict.value"
 #end
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+            ></el-option>
+          </el-select>
+        </el-form-item>
 #elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option label="请选择字典生成" value="" />
-              </el-select>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-                  :label="dict.value">
-                  {{dict.label}}
-                </el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
 #elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox>请选择字典生成</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
+        <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in ${dictType}"
+              :key="dict.value"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
 #else
-                  :label="dict.value"
+              :label="dict.value"
 #end
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
 #elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio label="1">请选择字典生成</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
 #elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-date-picker clearable
-                v-model="form.${field}"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="选择${comment}">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
+            v-model="form.${field}"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="选择${comment}">
+          </el-date-picker>
+        </el-form-item>
 #elseif($column.htmlType == "textarea")
-          <el-col :span="24">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
 #end
 #end
 #end
 #end
-        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -314,14 +272,11 @@
 
 <script setup name="${BusinessName}">
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view"
-#end
 
 const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = useDict(${dicts})
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
 #end
 
 const ${businessName}List = ref([])
@@ -344,7 +299,7 @@ const data = reactive({
   queryParams: {
     #foreach ($column in $columns)
 #if($column.query)
-    $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+    $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
   },
@@ -401,13 +356,13 @@ function getTreeselect() {
   })
 }
 	
-/** 取消按钮 */
+// 取消按钮
 function cancel() {
   open.value = false
   reset()
 }
 
-/** 表单重置 */
+// 表单重置
 function reset() {
   form.value = {
 #foreach ($column in $columns)
@@ -459,13 +414,6 @@ function toggleExpandAll() {
     refreshTable.value = true
   })
 }
-#if($genView)
-
-/** 详情按钮操作 */
-function handleViewData(row) {
-  proxy.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-}
-#end
 
 /** 修改按钮操作 */
 async function handleUpdate(row) {
@@ -496,13 +444,13 @@ function submitForm() {
 #end
 #end
       if (form.value.${pkColumn.javaField} != null) {
-        update${BusinessName}(form.value).then(() => {
+        update${BusinessName}(form.value).then(response => {
           proxy.#[[$modal]]#.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        add${BusinessName}(form.value).then(() => {
+        add${BusinessName}(form.value).then(response => {
           proxy.#[[$modal]]#.msgSuccess("新增成功")
           open.value = false
           getList()

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

@@ -148,9 +148,6 @@
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-#if($genView)
-          <el-button link type="primary" icon="View" @click="handleViewData(scope.row)" v-hasPermi="['${permissionPrefix}:query']">详情</el-button>
-#end
           <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="['${permissionPrefix}:remove']">删除</el-button>
         </template>
@@ -165,21 +162,9 @@
       @pagination="getList"
     />
 
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
     <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
-#set($dialogWidth = "800px")
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
-        <el-row>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -192,121 +177,96 @@
 #end
 #set($dictType=$column.dictType)
 #if($column.htmlType == "input")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
 #elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <image-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="form.${field}"/>
+        </el-form-item>
 #elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <file-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="form.${field}"/>
+        </el-form-item>
 #elseif($column.htmlType == "editor")
-          <el-col :span="24">
-            <el-form-item label="${comment}">
-              <editor v-model="form.${field}" :min-height="192"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
 #elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-                  :label="dict.label"
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.label"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
 #else
-                  :value="dict.value"
+              :value="dict.value"
 #end
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+            ></el-option>
+          </el-select>
+        </el-form-item>
 #elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option label="请选择字典生成" value="" />
-              </el-select>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-                  :label="dict.value">
-                  {{dict.label}}
-                </el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
 #elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox>请选择字典生成</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
+        <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in ${dictType}"
+              :key="dict.value"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
 #else
-                  :label="dict.value"
+              :label="dict.value"
 #end
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
 #elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio label="1">请选择字典生成</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
 #elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-date-picker clearable
-                v-model="form.${field}"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择${comment}">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
+            v-model="form.${field}"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择${comment}">
+          </el-date-picker>
+        </el-form-item>
 #elseif($column.htmlType == "textarea")
-          <el-col :span="24">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
 #end
 #end
 #end
 #end
-        </el-row>
 #if($table.sub)
         <el-divider content-position="center">${subTable.functionName}信息</el-divider>
         <el-row :gutter="10" class="mb8">
@@ -317,13 +277,9 @@
             <el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">删除</el-button>
           </el-col>
         </el-row>
-        <el-table :data="${subclassName}List" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
+        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="序号" width="60">
-            <template #default="{ $index }">
-              {{ $index + 1 }}
-            </template>
-          </el-table-column>
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
 #foreach($column in $subTable.columns)
 #set($javaField=$column.javaField)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -388,14 +344,11 @@
 
 <script setup name="${BusinessName}">
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view"
-#end
 
 const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = useDict(${dicts})
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
 #end
 
 const ${businessName}List = ref([])
@@ -427,7 +380,7 @@ const data = reactive({
     pageSize: 10,
     #foreach ($column in $columns)
 #if($column.query)
-    $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+    $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
   },
@@ -475,13 +428,13 @@ function getList() {
   })
 }
 
-/** 取消按钮 */
+// 取消按钮
 function cancel() {
   open.value = false
   reset()
 }
 
-/** 表单重置 */
+// 表单重置
 function reset() {
   form.value = {
 #foreach ($column in $columns)
@@ -516,7 +469,7 @@ function resetQuery() {
   handleQuery()
 }
 
-/** 多选框选中数据 */
+// 多选框选中数据
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.${pkColumn.javaField})
   single.value = selection.length != 1
@@ -562,13 +515,13 @@ function submitForm() {
       form.value.${subclassName}List = ${subclassName}List.value
 #end
       if (form.value.${pkColumn.javaField} != null) {
-        update${BusinessName}(form.value).then(() => {
+        update${BusinessName}(form.value).then(response => {
           proxy.#[[$modal]]#.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        add${BusinessName}(form.value).then(() => {
+        add${BusinessName}(form.value).then(response => {
           proxy.#[[$modal]]#.msgSuccess("新增成功")
           open.value = false
           getList()
@@ -590,13 +543,18 @@ function handleDelete(row) {
 }
 
 #if($table.sub)
+/** ${subTable.functionName}序号 */
+function row${subClassName}Index({ row, rowIndex }) {
+  row.index = rowIndex + 1
+}
+
 /** ${subTable.functionName}添加按钮操作 */
 function handleAdd${subClassName}() {
   let obj = {}
 #foreach($column in $subTable.columns)
 #if($column.pk || $column.javaField == ${subTableFkclassName})
 #elseif($column.list && "" != $javaField)
-  obj.$column.javaField = undefined
+  obj.$column.javaField = ""
 #end
 #end
   ${subclassName}List.value.push(obj)
@@ -620,13 +578,6 @@ function handle${subClassName}SelectionChange(selection) {
   checked${subClassName}.value = selection.map(item => item.index)
 }
 
-#end
-#if($genView)
-/** 详情按钮操作 */
-function handleViewData(row) {
-  proxy.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-}
-
 #end
 /** 导出按钮操作 */
 function handleExport() {

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

@@ -1,83 +0,0 @@
-<template>
-  <el-drawer title="${functionName}详情" v-model="visible" direction="rtl" size="60%" append-to-body :before-close="handleClose" class="detail-drawer">
-    <div v-loading="loading" class="drawer-content">
-      <h4 class="section-header">基本信息</h4>
-#set($i = 0)
-#foreach($column in $columns)
-#if(!$column.pk && $column.list)
-#set($dictType=$column.dictType)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($i % 2 == 0)
-      <el-row :gutter="20" class="mb8">
-#end
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">${comment}：</label>
-            <span class="info-value plaintext">
-#if("" != $dictType)
-#if($column.htmlType == "checkbox")
-              <dict-tag :options="${dictType}" :value="info.${javaField} ? info.${javaField}.split(',') : []" />
-#else
-              <dict-tag :options="${dictType}" :value="info.${javaField}" />
-#end
-#elseif($column.htmlType == "datetime")
-              {{ parseTime(info.${javaField}, '{y}-{m}-{d}') }}
-#elseif($column.htmlType == "imageUpload")
-              <image-preview :src="info.${javaField}" :width="60" :height="60" />
-#else
-              {{ info.${javaField} }}
-#end
-            </span>
-          </div>
-        </el-col>
-#set($i = $i + 1)
-#if($i % 2 == 0)
-      </el-row>
-#end
-#end
-#end
-#if($i % 2 != 0)
-      </el-row>
-#end
-    </div>
-  </el-drawer>
-</template>
-
-<script setup name="${BusinessName}ViewDrawer">
-import { get${BusinessName} } from '@/api/${moduleName}/${businessName}'
-
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = useDict(${dicts})
-#end
-
-const visible = ref(false)
-const loading = ref(false)
-const info = reactive({})
-
-const open = async (${pkColumn.javaField}) => {
-  visible.value = true
-  loading.value = true
-  try {
-    const res = await get${BusinessName}(${pkColumn.javaField})
-    Object.assign(info, res.data || {})
-  } catch (error) {
-    console.error('获取${functionName}信息失败:', error)
-  } finally {
-    loading.value = false
-  }
-}
-
-function handleClose() {
-  visible.value = false
-  Object.keys(info).forEach(key => delete info[key])
-}
-
-defineExpose({ open })
-</script>

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

@@ -136,9 +136,6 @@
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-#if($genView)
-          <el-button link type="primary" icon="View" @click="handleViewData(scope.row)" v-hasPermi="['${permissionPrefix}:query']">详情</el-button>
-#end
           <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="['${permissionPrefix}:add']">新增</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">删除</el-button>
@@ -146,21 +143,9 @@
       </el-table-column>
     </el-table>
 
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
     <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
-#set($dialogWidth = "800px")
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
-        <el-row>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -173,134 +158,107 @@
 #end
 #set($dictType=$column.dictType)
 #if("" != $treeParentCode && $column.javaField == $treeParentCode)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${treeParentCode}">
-              <el-tree-select
-                v-model="form.${treeParentCode}"
-                :data="${businessName}Options"
-                :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
-                value-key="${treeCode}"
-                placeholder="请选择${comment}"
-                check-strictly
-              />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${treeParentCode}">
+          <el-tree-select
+            v-model="form.${treeParentCode}"
+            :data="${businessName}Options"
+            :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
+            value-key="${treeCode}"
+            placeholder="请选择${comment}"
+            check-strictly
+          />
+        </el-form-item>
 #elseif($column.htmlType == "input")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
 #elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <image-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="form.${field}"/>
+        </el-form-item>
 #elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <file-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="form.${field}"/>
+        </el-form-item>
 #elseif($column.htmlType == "editor")
-          <el-col :span="24">
-            <el-form-item label="${comment}">
-              <editor v-model="form.${field}" :min-height="192"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
 #elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-                  :label="dict.label"
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.label"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
 #else
-                  :value="dict.value"
+              :value="dict.value"
 #end
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+            ></el-option>
+          </el-select>
+        </el-form-item>
 #elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option label="请选择字典生成" value="" />
-              </el-select>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-                  :label="dict.value">
-                  {{dict.label}}
-                </el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
 #elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox>请选择字典生成</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
+        <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in ${dictType}"
+              :key="dict.value"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
 #else
-                  :label="dict.value"
+              :label="dict.value"
 #end
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
 #elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio label="1">请选择字典生成</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
 #elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-date-picker clearable
-                v-model="form.${field}"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="选择${comment}">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
+            v-model="form.${field}"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="选择${comment}">
+          </el-date-picker>
+        </el-form-item>
 #elseif($column.htmlType == "textarea")
-          <el-col :span="24">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
 #end
 #end
 #end
 #end
-        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -314,16 +272,13 @@
 
 <script setup lang="ts" name="${BusinessName}">
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view.vue"
-#end
 import type { ${ClassName}, ${BusinessName}QueryParams } from "@/types/api/${moduleName}/${businessName}"
 import type { TreeSelect } from '@/types/api/common'
 
 const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = useDict(${dicts})
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
 #end
 
 const ${businessName}List = ref<any[]>([])
@@ -403,13 +358,13 @@ function getTreeselect() {
   })
 }
 	
-/** 取消按钮 */
+// 取消按钮
 function cancel() {
   open.value = false
   reset()
 }
 
-/** 表单重置 */
+// 表单重置
 function reset() {
   form.value = {
 #foreach ($column in $columns)
@@ -461,13 +416,6 @@ function toggleExpandAll() {
     refreshTable.value = true
   })
 }
-#if($genView)
-
-/** 详情按钮操作 */
-function handleViewData(row: ${ClassName}) {
-  proxy.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-}
-#end
 
 /** 修改按钮操作 */
 async function handleUpdate(row: ${ClassName}) {

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

@@ -148,9 +148,6 @@
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-#if($genView)
-          <el-button link type="primary" icon="View" @click="handleViewData(scope.row)" v-hasPermi="['${permissionPrefix}:query']">详情</el-button>
-#end
           <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="['${permissionPrefix}:remove']">删除</el-button>
         </template>
@@ -165,21 +162,9 @@
       @pagination="getList"
     />
 
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
     <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
-#set($dialogWidth = "800px")
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
-        <el-row>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -192,121 +177,96 @@
 #end
 #set($dictType=$column.dictType)
 #if($column.htmlType == "input")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
 #elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <image-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="form.${field}"/>
+        </el-form-item>
 #elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <file-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="form.${field}"/>
+        </el-form-item>
 #elseif($column.htmlType == "editor")
-          <el-col :span="24">
-            <el-form-item label="${comment}">
-              <editor v-model="form.${field}" :min-height="192"/>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
 #elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-                  :label="dict.label"
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.label"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
 #else
-                  :value="dict.value"
+              :value="dict.value"
 #end
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+            ></el-option>
+          </el-select>
+        </el-form-item>
 #elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option label="请选择字典生成" value="" />
-              </el-select>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-                  :label="dict.value">
-                  {{dict.label}}
-                </el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
+              v-for="dict in ${dictType}"
+              :key="dict.value"
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
 #elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox>请选择字典生成</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
+        <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio
+              v-for="dict in ${dictType}"
+              :key="dict.value"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
 #else
-                  :label="dict.value"
+              :label="dict.value"
 #end
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
 #elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio label="1">请选择字典生成</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
 #elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-date-picker clearable
-                v-model="form.${field}"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择${comment}">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
+            v-model="form.${field}"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择${comment}">
+          </el-date-picker>
+        </el-form-item>
 #elseif($column.htmlType == "textarea")
-          <el-col :span="24">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
 #end
 #end
 #end
 #end
-        </el-row>
 #if($table.sub)
         <el-divider content-position="center">${subTable.functionName}信息</el-divider>
         <el-row :gutter="10" class="mb8">
@@ -386,21 +346,18 @@
   </div>
 </template>
 
-<script setup lang="ts" name="${BusinessName}">
+<script setup lang="ts" name="Config">
 #if($table.sub)
 import type { ${ClassName}, ${subClassName}, ${BusinessName}QueryParams } from "@/types/api/${moduleName}/${businessName}"
 #else
 import type { ${ClassName}, ${BusinessName}QueryParams } from "@/types/api/${moduleName}/${businessName}"
 #end
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view.vue"
-#end
 
 const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = useDict(${dicts})
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
 #end
 
 const ${businessName}List = ref<${ClassName}[]>([])
@@ -480,13 +437,13 @@ function getList() {
   })
 }
 
-/** 取消按钮 */
+// 取消按钮
 function cancel() {
   open.value = false
   reset()
 }
 
-/** 表单重置 */
+// 表单重置
 function reset() {
   form.value = {
 #foreach ($column in $columns)
@@ -521,7 +478,7 @@ function resetQuery() {
   handleQuery()
 }
 
-/** 多选框选中数据 */
+// 多选框选中数据
 function handleSelectionChange(selection: ${ClassName}[]) {
   ids.value = selection.map(item => item.${pkColumn.javaField})
   single.value = selection.length != 1
@@ -625,13 +582,6 @@ function handle${subClassName}SelectionChange(selection: any[]) {
   checked${subClassName}.value = selection.map(item => item.index)
 }
 
-#end
-#if($genView)
-/** 详情按钮操作 */
-function handleViewData(row: ${ClassName}) {
-  proxy.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-}
-
 #end
 /** 导出按钮操作 */
 function handleExport() {

ruoyi-generator/src/main/resources/vm/vue/v3ts/view.vue.vm

@@ -1,84 +0,0 @@
-<template>
-  <el-drawer title="${functionName}详情" v-model="visible" direction="rtl" size="60%" append-to-body :before-close="handleClose" class="detail-drawer">
-    <div v-loading="loading" class="drawer-content">
-      <h4 class="section-header">基本信息</h4>
-#set($i = 0)
-#foreach($column in $columns)
-#if(!$column.pk && $column.list)
-#set($dictType=$column.dictType)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($i % 2 == 0)
-      <el-row :gutter="20" class="mb8">
-#end
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">${comment}：</label>
-            <span class="info-value plaintext">
-#if("" != $dictType)
-#if($column.htmlType == "checkbox")
-              <dict-tag :options="${dictType}" :value="info.${javaField} ? info.${javaField}.split(',') : []" />
-#else
-              <dict-tag :options="${dictType}" :value="info.${javaField}" />
-#end
-#elseif($column.htmlType == "datetime")
-              {{ parseTime(info.${javaField}, '{y}-{m}-{d}') }}
-#elseif($column.htmlType == "imageUpload")
-              <image-preview :src="info.${javaField}" :width="60" :height="60" />
-#else
-              {{ info.${javaField} }}
-#end
-            </span>
-          </div>
-        </el-col>
-#set($i = $i + 1)
-#if($i % 2 == 0)
-      </el-row>
-#end
-#end
-#end
-#if($i % 2 != 0)
-      </el-row>
-#end
-    </div>
-  </el-drawer>
-</template>
-
-<script setup lang="ts" name="${BusinessName}ViewDrawer">
-import type { ${ClassName} } from "@/types/api/${moduleName}/${businessName}"
-import { get${BusinessName} } from '@/api/${moduleName}/${businessName}'
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-
-const { ${dictsNoSymbol} } = useDict(${dicts})
-#end
-
-const visible = ref<boolean>(false)
-const loading = ref<boolean>(false)
-const info = reactive<Partial<${ClassName}>>({})
-
-const open = async (#if($pkColumn.javaType == "Long" || $pkColumn.javaType == "Integer")${pkColumn.javaField}: number#else${pkColumn.javaField}: string#end): Promise<void> => {
-  visible.value = true
-  loading.value = true
-  try {
-    const res = await get${BusinessName}(${pkColumn.javaField})
-    Object.assign(info, res.data ?? {})
-  } catch (error) {
-    console.error('获取${functionName}信息失败:', error)
-  } finally {
-    loading.value = false
-  }
-}
-
-const handleClose = (): void => {
-  visible.value = false
-  Object.keys(info).forEach(key => delete (info as any)[key])
-}
-
-defineExpose({ open })
-</script>

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

@@ -1,86 +0,0 @@
-<template>
-  <el-drawer title="${functionName}详情" :visible.sync="visible" direction="rtl" size="60%" append-to-body :before-close="handleClose" custom-class="detail-drawer">
-    <div v-loading="loading" class="drawer-content">
-      <h4 class="section-header">基本信息</h4>
-#set($i = 0)
-#foreach($column in $columns)
-#if(!$column.pk && $column.list)
-#set($dictType=$column.dictType)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($i % 2 == 0)
-      <el-row :gutter="20" class="mb8">
-#end
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">${comment}：</label>
-            <span class="info-value plaintext">
-#if("" != $dictType)
-#if($column.htmlType == "checkbox")
-              <dict-tag :options="dict.type.${dictType}" :value="info.${javaField} ? info.${javaField}.split(',') : []" />
-#else
-              <dict-tag :options="dict.type.${dictType}" :value="info.${javaField}" />
-#end
-#elseif($column.htmlType == "datetime")
-              {{ parseTime(info.${javaField}, '{y}-{m}-{d}') }}
-#else
-              {{ info.${javaField} }}
-#end
-            </span>
-          </div>
-        </el-col>
-#set($i = $i + 1)
-#if($i % 2 == 0)
-      </el-row>
-#end
-#end
-#end
-#if($i % 2 != 0)
-      </el-row>
-#end
-    </div>
-  </el-drawer>
-</template>
-
-<script>
-import { get${BusinessName} } from '@/api/${moduleName}/${businessName}'
-
-export default {
-  name: '${BusinessName}ViewDrawer',
-#foreach($column in $columns)
-#if("" != $column.dictType)
-#set($hasDicts = true)
-#break
-#end
-#end
-#if($hasDicts)
-  dicts: [#foreach($column in $columns)#if("" != $column.dictType)'${column.dictType}'#if($foreach.hasNext), #end#end#end],
-#end
-  data() {
-    return {
-      visible: false,
-      loading: false,
-      info: {}
-    }
-  },
-  methods: {
-    open(${pkColumn.javaField}) {
-      this.visible = true
-      this.loading = true
-      get${BusinessName}(${pkColumn.javaField}).then(res => {
-        this.info = res.data || {}
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    handleClose() {
-      this.visible = false
-    }
-  }
-}
-</script>

ruoyi-quartz/pom.xml

@@ -19,8 +19,8 @@
 
         <!-- 定时任务 -->
         <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-quartz</artifactId>
         </dependency>
 
         <!-- 通用工具-->

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeReadMapper.java

@@ -1,10 +1,9 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
-import java.util.Map;
 import org.apache.ibatis.annotations.Param;
-import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.domain.SysNoticeRead;
+import com.ruoyi.system.domain.SysNotice;
 
 /**
  * 公告已读记录 数据层
@@ -56,15 +55,6 @@ public interface SysNoticeReadMapper
      */
     public List<SysNotice> selectNoticeListWithReadStatus(@Param("userId") Long userId, @Param("limit") int limit);
 
-    /**
-     * 查询已阅读某公告的用户列表
-     *
-     * @param noticeId 公告ID
-     * @param searchValue 搜索值
-     * @return 已读用户列表
-     */
-    public List<Map<String, Object>> selectReadUsersByNoticeId(@Param("noticeId") Long noticeId, @Param("searchValue") String searchValue);
-
     /**
      * 公告删除时清理对应已读记录
      *

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeReadService.java

@@ -1,7 +1,6 @@
 package com.ruoyi.system.service;
 
 import java.util.List;
-import java.util.Map;
 import com.ruoyi.system.domain.SysNotice;
 
 /**
@@ -44,15 +43,6 @@ public interface ISysNoticeReadService
      */
     public void markReadBatch(Long userId, Long[] noticeIds);
 
-    /**
-     * 查询已阅读某公告的用户列表
-     *
-     * @param noticeId  公告ID
-     * @param searchValue 搜索值
-     * @return 已读用户列表
-     */
-    public List<Map<String, Object>> selectReadUsersByNoticeId(Long noticeId, String searchValue);
-
     /**
      * 删除公告时清理对应已读记录
      *

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java

@@ -49,7 +49,7 @@ public interface ISysNoticeService
      * @return 结果
      */
     public int deleteNoticeById(Long noticeId);
-
+    
     /**
      * 批量删除公告信息
      * 

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

@@ -1,11 +1,10 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
-import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.domain.SysNoticeRead;
+import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.mapper.SysNoticeReadMapper;
 import com.ruoyi.system.service.ISysNoticeReadService;
 
@@ -63,15 +62,6 @@ public class SysNoticeReadServiceImpl implements ISysNoticeReadService
         noticeReadMapper.insertNoticeReadBatch(userId, noticeIds);
     }
 
-    /**
-     * 查询已阅读某公告的用户列表
-     */
-    @Override
-    public List<Map<String, Object>> selectReadUsersByNoticeId(Long noticeId, String searchValue)
-    {
-        return noticeReadMapper.selectReadUsersByNoticeId(noticeId, searchValue);
-    }
-
     /**
      * 删除公告时清理对应已读记录
      */

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

@@ -63,26 +63,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
-    <!-- 查询已阅读某公告的用户列表，支持按登录名/用户名模糊筛选 -->
-    <select id="selectReadUsersByNoticeId" resultType="java.util.Map">
-        select
-            u.user_id      as userId,
-            u.user_name    as userName,
-            u.nick_name    as nickName,
-            d.dept_name    as deptName,
-            u.phonenumber  as phonenumber,
-            r.read_time    as readTime
-        from sys_notice_read r
-        inner join sys_user u on u.user_id = r.user_id and u.del_flag = '0'
-        left join sys_dept d on d.dept_id = u.dept_id
-        where r.notice_id = #{noticeId}
-        <if test="searchValue != null and searchValue != ''">
-            and (
-                u.user_name like concat('%', #{searchValue}, '%')
-                or u.nick_name like concat('%', #{searchValue}, '%')
-            )
-        </if>
-        order by r.read_time desc
-    </select>
-
 </mapper>

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

@@ -48,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.pwd_update_date, u.create_by, u.create_time, u.update_by, u.update_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

ruoyi-ui/package.json

@@ -40,6 +40,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",

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

@@ -68,12 +68,3 @@ export function markNoticeReadAll(ids) {
     params: { ids }
   })
 }
-
-// 查询公告已读用户列表
-export function listNoticeReadUsers(query) {
-  return request({
-    url: '/system/notice/readUsers/list',
-    method: 'get',
-    params: query
-  })
-}

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

@@ -233,55 +233,6 @@
 }
 
 /** 详细卡片样式 */
-.detail-drawer {
-  .el-drawer__header {
-    margin-bottom: 6px;
-    padding: 8px 12px 6px;
-    font-size: 15px;
-    color: #303133;
-    background: #f8f8f8;
-  }
-  .section-header {
-    font-size: 15px;
-    color: #6379bb;
-    border-bottom: 1px solid #ddd;
-    margin: 12px 0 16px 0;
-    padding-bottom: 8px;
-  }
-  .drawer-content {
-    padding: 0 20px 20px 20px;
-    .info-item {
-      display: flex;
-      align-items: flex-start;
-      padding: 8px 0;
-      min-height: 40px;
-    }
-    .info-label {
-      flex-shrink: 0;
-      width: 200px;
-      color: #606266;
-      font-size: 13px;
-      line-height: 1.6;
-      padding-top: 4px;
-      text-align: right;
-      margin-right: 14px;
-    }
-    .info-value {
-      flex: 1;
-      color: #303133;
-      font-size: 13px;
-      font-weight: 500;
-      line-height: 1.6;
-      word-break: break-all;
-      padding-top: 4px;
-      min-height: 1.6em;
-      &.plaintext {
-        border-bottom: 1px dashed #dde1e6;
-      }
-    }
-  }
-}
-
 .detail-wrap { padding: 0 4px; }
 
 .detail-card {
@@ -373,28 +324,6 @@
   display: block;
 }
 
-/* tree-sidebar content */
-.tree-sidebar-manage-wrap {
-  display: flex;
-  gap: 0;
-  min-height: calc(100vh - 130px);
-  padding: 0 !important;
-  overflow: hidden;
-}
-
-.tree-sidebar-content {
-  flex: 1;
-  min-width: 0;
-  overflow: hidden;
-  background: #fff;
-
-  .content-inner {
-    padding: 12px 16px;
-    height: 100%;
-    overflow-y: auto;
-  }
-}
-
 /* error */
 .error-title { color: #c0392b !important; }
 .error-title i { color: #c0392b !important; }
@@ -469,9 +398,6 @@
 }
 
 /* 拖拽列样式 */
-.allowDrag { cursor: grab; }
-.allowDrag:active { cursor: grabbing; }
-
 .sortable-ghost {
   opacity: .8;
   color: #fff !important;
@@ -482,3 +408,8 @@
   position: relative;
   float: right;
 }
+
+/* 分割面板样式 */
+.splitpanes.default-theme .splitpanes__pane {
+  background-color: #fff!important;
+}

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

@@ -1,126 +0,0 @@
-<template>
-  <el-dialog :title="title" :visible.sync="visible" :width="width" append-to-body @close="handleClose">
-    <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="headers" :action="uploadUrl" :disabled="isUploading" :on-progress="handleProgress" :on-success="handleSuccess" :auto-upload="false" drag>
-      <i class="el-icon-upload"></i>
-      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-      <div class="el-upload__tip text-center" slot="tip">
-        <div class="el-upload__tip" slot="tip">
-          <el-checkbox v-model="updateSupport"> {{ updateSupportLabel }} </el-checkbox>
-        </div>
-        <span>仅允许导入xls、xlsx格式文件。</span>
-        <el-link v-if="templateUrl" type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="handleDownloadTemplate">下载模板</el-link>
-      </div>
-    </el-upload>
-    <div slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="handleSubmit">确 定</el-button>
-      <el-button @click="visible = false">取 消</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { getToken } from '@/utils/auth'
-
-export default {
-  props: {
-    // 对话框标题
-    title: {
-      type: String,
-      default: '数据导入'
-    },
-    // 对话框宽度
-    width: {
-      type: String,
-      default: '400px'
-    },
-    // 上传接口地址（必传）
-    action: {
-      type: String,
-      required: true
-    },
-    // 模板下载接口地址，不传则不显示下载模板链接
-    templateAction: {
-      type: String,
-      default: ''
-    },
-    // 模板文件名
-    templateFileName: {
-      type: String,
-      default: 'template'
-    },
-    // 覆盖更新勾选框的说明文字
-    updateSupportLabel: {
-      type: String,
-      default: '是否更新已经存在的数据'
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      isUploading: false,
-      updateSupport: false,
-      headers: { Authorization: 'Bearer ' + getToken() }
-    }
-  },
-  computed: {
-    uploadUrl() {
-      return process.env.VUE_APP_BASE_API + this.action + '?updateSupport=' + (this.updateSupport ? 1 : 0)
-    },
-    templateUrl() {
-      return !!this.templateAction
-    }
-  },
-  methods: {
-    // 打开对话框（供父组件通过 ref 调用）
-    open() {
-      this.updateSupport = false
-      this.isUploading = false
-      this.visible = true
-      this.$nextTick(() => {
-        if (this.$refs.uploadRef) {
-          this.$refs.uploadRef.clearFiles()
-        }
-      })
-    },
-    // 关闭时清理
-    handleClose() {
-      this.isUploading = false
-      if (this.$refs.uploadRef) {
-        this.$refs.uploadRef.clearFiles()
-      }
-    },
-    // 下载模板
-    handleDownloadTemplate() {
-      this.download(this.templateAction, {}, `${this.templateFileName}_${new Date().getTime()}.xlsx`)
-    },
-    // 上传进度
-    handleProgress() {
-      this.isUploading = true
-    },
-    // 上传成功
-    handleSuccess(response) {
-      this.visible = false
-      this.isUploading = false
-      if (this.$refs.uploadRef) {
-        this.$refs.uploadRef.clearFiles()
-      }
-      this.$alert("<div style='overflow:auto;overflow-x:hidden;max-height:70vh;padding:10px 20px 0;'>" + response.msg + '</div>', '导入结果', { dangerouslyUseHTMLString: true })
-      this.$emit('success')
-    },
-    // 提交上传
-    handleSubmit() {
-      const files = this.$refs.uploadRef.uploadFiles
-      if (!files || files.length === 0) {
-        this.$modal.msgError('请选择要上传的文件。')
-        return
-      }
-      const name = files[0].name.toLowerCase()
-      if (!name.endsWith('.xls') && !name.endsWith('.xlsx')) {
-        this.$modal.msgError('请选择后缀为 "xls" 或 "xlsx" 的文件。')
-        return
-      }
-      this.$refs.uploadRef.submit()
-    }
-  }
-}
-</script>

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

@@ -38,8 +38,6 @@
 </template>
 
 <script>
-import cache from '@/plugins/cache'
-
 export default {
   name: "RightToolbar",
   data() {
@@ -78,11 +76,6 @@ export default {
       type: Number,
       default: 10
     },
-    /* 列显隐状态记忆的 localStorage key（传入则启用记忆，不传则不记忆） */
-    storageKey: {
-      type: String,
-      default: ""
-    }
   },
   computed: {
     style() {
@@ -110,23 +103,6 @@ export default {
     }
   },
   created() {
-    // 如果传入了 storageKey，从 localStorage 恢复列显隐状态
-    if (this.storageKey) {
-      try {
-        const saved = cache.local.getJSON(this.storageKey)
-        if (saved && typeof saved === 'object') {
-          if (Array.isArray(this.columns)) {
-            this.columns.forEach((col, index) => {
-              if (saved[index] !== undefined) col.visible = saved[index]
-            })
-          } else {
-            Object.keys(this.columns).forEach(key => {
-              if (saved[key] !== undefined) this.columns[key].visible = saved[key]
-            })
-          }
-        }
-      } catch (e) {}
-    }
     if (this.showColumnsType == 'transfer') {
       // transfer穿梭显隐列初始默认隐藏列
       if (Array.isArray(this.columns)) {
@@ -192,7 +168,6 @@ export default {
           this.columns[key].visible = !data.includes(index)
         })
       }
-      this.saveStorage()
     },
     // 打开显隐列dialog
     showColumn() {
@@ -205,7 +180,6 @@ export default {
       } else {
         this.columns[key].visible = event
       }
-      this.saveStorage()
     },
     // 切换全选/反选
     toggleCheckAll() {
@@ -215,20 +189,6 @@ export default {
       } else {
         Object.values(this.columns).forEach((col) => (col.visible = newValue))
       }
-      this.saveStorage()
-    },
-    // 将当前列显隐状态持久化到 localStorage
-    saveStorage() {
-      if (!this.storageKey) return
-      try {
-        let state = {}
-        if (Array.isArray(this.columns)) {
-          this.columns.forEach((col, index) => { state[index] = col.visible })
-        } else {
-          Object.keys(this.columns).forEach(key => { state[key] = this.columns[key].visible })
-        }
-        cache.local.setJSON(this.storageKey, state)
-      } catch (e) {}
     }
   },
 }

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

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

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

@@ -76,10 +76,10 @@ export default {
       this.routers.map((router) => {
         for (var item in router.children) {
           if (router.children[item].parentPath === undefined) {
-            if (router.path === "/") {
+            if(router.path === "/") {
               router.children[item].path = "/" + router.children[item].path
             } else {
-              if (!isHttp(router.children[item].path)) {
+              if(!isHttp(router.children[item].path)) {
                 router.children[item].path = router.path + "/" + router.children[item].path
               }
             }
@@ -100,7 +100,7 @@ export default {
           activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"))
           this.$store.dispatch('app/toggleSideBarHide', false)
         }
-      } else if (!this.$route.children) {
+      } else if(!this.$route.children) {
         activePath = path
         this.$store.dispatch('app/toggleSideBarHide', true)
       }
@@ -156,7 +156,7 @@ export default {
           }
         })
       }
-      if (routes.length > 0) {
+      if(routes.length > 0) {
         this.$store.commit("SET_SIDEBAR_ROUTERS", routes)
       } else {
         this.$store.dispatch('app/toggleSideBarHide', true)

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

@@ -1,709 +0,0 @@
-<template>
-  <div class="tree-sidebar" :class="{ collapsed: collapsed, resizing: isResizing, 'no-initial-transition': isLoadingFromStorage}" :style="{ width: sidebarWidth + 'px' }">
-    <!-- 右侧拖动条 -->
-    <div v-if="!collapsed" class="resize-handle" @mousedown="startResize" @touchstart="startResize" :class="{ active: isResizing }" />
-    <div class="tree-header">
-      <span class="tree-title" v-show="!collapsed">
-        <i :class="titleIconClass"></i> {{ title }}
-      </span>
-      <div class="tree-actions" v-show="!collapsed">
-        <el-tooltip :content="isExpandedAll ? '收起全部' : '展开全部'" placement="right">
-          <i class="tree-action-icon" :class="isExpandedAll ? 'el-icon-arrow-down' : 'el-icon-arrow-up'" @click="toggleExpandAll" />
-        </el-tooltip>
-        <el-tooltip content="刷新" placement="right">
-          <i class="tree-action-icon el-icon-refresh" @click="handleRefresh" />
-        </el-tooltip>
-        <slot name="actions"></slot>
-      </div>
-    </div>
-    
-    <!-- 侧边栏展开/收起按钮 -->
-    <div class="collapse-button-container">
-      <el-tooltip :content="collapsed ? '展开' : '收起'" placement="right">
-        <i class="collapse-button" :class="collapsed ? 'el-icon-d-arrow-right' : 'el-icon-d-arrow-left'" @click="toggleCollapsed" />
-      </el-tooltip>
-    </div>
-
-    <div class="tree-search" v-show="!collapsed" v-if="showSearch">
-      <el-input v-model="searchKeyword" :placeholder="searchPlaceholder" clearable size="small" prefix-icon="el-icon-search" @input="onSearch" />
-    </div>
-
-    <div class="tree-wrap" v-show="!collapsed">
-      <el-tree 
-        ref="treeRef" 
-        :data="treeData" 
-        :props="treeProps" 
-        :expand-on-click-node="expandOnClickNode"
-        :filter-node-method="filterNodeMethod"
-        :default-expand-all="defaultExpandAll"
-        :default-expanded-keys="defaultExpandedKeys"
-        :node-key="nodeKey"
-        :check-strictly="checkStrictly"
-        :show-checkbox="showCheckbox"
-        @node-click="onNodeClick"
-        @check="onCheck"
-        @node-expand="onNodeExpand"
-        @node-collapse="onNodeCollapse"
-      >
-        <span class="tree-node" slot-scope="{ node, data }">
-          <slot name="node" :node="node" :data="data">
-            <i :class="data.children && data.children.length ? 'el-icon-folder' : 'el-icon-document'" class="node-icon" />
-            <span class="node-label" :title="node.label">{{ node.label }}</span>
-          </slot>
-        </span>
-      </el-tree>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "TreeSidebar",
-  props: {
-    // 树形数据
-    treeData: {
-      type: Array,
-      default: () => []
-    },
-    // 标题
-    title: {
-      type: String,
-      default: '树形结构'
-    },
-    // 标题图标类名
-    titleIconClass: {
-      type: String,
-      default: 'el-icon-office-building'
-    },
-    // 是否显示搜索框
-    showSearch: {
-      type: Boolean,
-      default: true
-    },
-    // 搜索框占位符
-    searchPlaceholder: {
-      type: String,
-      default: '请输入名称'
-    },
-    // 是否默认收起侧边栏
-    defaultCollapsed: {
-      type: Boolean,
-      default: false
-    },
-    // 树配置项
-    treeProps: {
-      type: Object,
-      default: () => ({
-        children: "children",
-        label: "label"
-      })
-    },
-    // 节点唯一标识字段
-    nodeKey: {
-      type: String,
-      default: 'id'
-    },
-    // 是否在点击节点时展开或收起
-    expandOnClickNode: {
-      type: Boolean,
-      default: false
-    },
-    // 是否显示复选框
-    showCheckbox: {
-      type: Boolean,
-      default: false
-    },
-    // 是否严格的遵循父子不互相关联
-    checkStrictly: {
-      type: Boolean,
-      default: false
-    },
-    // 是否默认展开所有节点
-    defaultExpandAll: {
-      type: Boolean,
-      default: false
-    },
-    // 默认展开的节点的key数组
-    defaultExpandedKeys: {
-      type: Array,
-      default: () => []
-    },
-    // 默认宽度
-    defaultWidth: {
-      type: Number,
-      default: 220
-    },
-    // 收起时的宽度
-    collapsedWidth: {
-      type: Number,
-      default: 20
-    },
-    // 最小宽度
-    minWidth: {
-      type: Number,
-      default: 180
-    },
-    // 最大宽度
-    maxWidth: {
-      type: Number,
-      default: 400
-    },
-    // 本地存储的宽度key
-    storageKey: {
-      type: String,
-      default: 'tree-sidebar-width'
-    },
-    // 是否启用本地存储宽度
-    enableStorage: {
-      type: Boolean,
-      default: true
-    },
-    // 自定义过滤方法
-    filterMethod: {
-      type: Function,
-      default: null
-    }
-  },
-  data() {
-    return {
-      searchKeyword: "",
-      collapsed: this.defaultCollapsed,
-      sidebarWidth: this.defaultCollapsed ? this.collapsedWidth : this.defaultWidth,
-      isResizing: false,
-      startX: 0,
-      startWidth: 0,
-      saveWidthTimer: null,
-      rafId: null,
-      isLoadingFromStorage: false,
-      expandedAll: this.defaultExpandAll
-    };
-  },
-  computed: {
-    // 计算当前是否全部展开
-    isExpandedAll: {
-      get() {
-        return this.expandedAll;
-      },
-      set(val) {
-        this.expandedAll = val;
-      }
-    }
-  },
-  watch: {
-    collapsed(newVal, oldVal) {
-      if (newVal !== oldVal) {
-        this.handleCollapseChange(newVal);
-        this.$emit("collapsed-change", newVal);
-      }
-    },
-    // 监听内部展开状态变化，触发实际树的展开/收起
-    expandedAll(newVal) {
-      this.$nextTick(() => {
-        if (newVal) {
-          this.expandAllNodes();
-        } else {
-          this.collapseAllNodes();
-        }
-      });
-      this.$emit("expanded-all-change", newVal);
-    },
-    // 监听搜索关键词
-    searchKeyword(val) {
-      if (this.$refs.treeRef) {
-        this.$refs.treeRef.filter(val);
-        this.$emit("search", val);
-      }
-    }
-  },
-  mounted() {
-    this.isLoadingFromStorage = true
-    if (!this.collapsed && this.enableStorage) {
-      const savedWidth = this.getSavedWidth();
-      if (savedWidth !== null) {
-        this.sidebarWidth = savedWidth;
-      }
-    }
-    this.$nextTick(() => {
-      this.isLoadingFromStorage = false
-    })
-    if (this.expandedAll) {
-      this.$nextTick(() => {
-        this.expandAllNodes();
-      });
-    }
-  },
-  beforeDestroy() {
-    this.cleanup();
-  },
-  methods: {
-    // 节点过滤方法
-    filterNodeMethod(value, data) {
-      if (this.filterMethod) {
-        return this.filterMethod(value, data);
-      }
-      if (!value) return true;
-      return data.label && data.label.indexOf(value) !== -1;
-    },
-    // 清理定时器和动画帧
-    cleanup() {
-      if (this.rafId) {
-        cancelAnimationFrame(this.rafId);
-        this.rafId = null;
-      }
-      if (this.saveWidthTimer) {
-        clearTimeout(this.saveWidthTimer);
-        this.saveWidthTimer = null;
-      }
-    },
-    // 处理收起/展开状态变化
-    handleCollapseChange(isCollapsed) {
-      if (isCollapsed) {
-        this.saveWidthToStorage();
-        this.sidebarWidth = this.collapsedWidth;
-      } else {
-        const savedWidth = this.getSavedWidth();
-        this.sidebarWidth = savedWidth !== null ? savedWidth : this.defaultWidth;
-      }
-    },
-    // 获取保存的宽度
-    getSavedWidth() {
-      if (!this.enableStorage) {
-        return null;
-      }
-      try {
-        const savedWidth = localStorage.getItem(this.storageKey);
-        if (savedWidth) {
-          const width = parseInt(savedWidth, 10);
-          if (!isNaN(width) && width >= this.minWidth && width <= this.maxWidth) {
-            return width;
-          }
-        }
-      } catch (error) {
-        console.warn(`Failed to load sidebar width from storage with key ${this.storageKey}:`, error);
-      }
-      return null;
-    },
-    // 保存宽度到本地存储
-    saveWidthToStorage() {
-      if (this.collapsed || !this.enableStorage) return;
-      try {
-        localStorage.setItem(this.storageKey, this.sidebarWidth.toString());
-      } catch (error) {
-        console.warn(`Failed to save sidebar width to storage with key ${this.storageKey}:`, error);
-      }
-    },
-    // 切换侧边栏收起/展开状态
-    toggleCollapsed() {
-      this.collapsed = !this.collapsed;
-    },
-    // 切换展开/折叠所有节点
-    toggleExpandAll() {
-      this.isExpandedAll = !this.isExpandedAll;
-    },
-    // 展开所有节点
-    expandAllNodes() {
-      if (!this.$refs.treeRef) return;
-      const allNodes = this.getAllNodes(this.$refs.treeRef.root);
-      allNodes.forEach(node => {
-        if (node.expanded !== undefined && !node.expanded) {
-          node.expanded = true;
-        }
-      });
-    },
-    // 获取所有节点
-    getAllNodes(rootNode) {
-      const nodes = [];
-      const traverse = (node) => {
-        if (!node) return;
-        nodes.push(node);
-        if (node.childNodes && node.childNodes.length) {
-          node.childNodes.forEach(child => traverse(child));
-        }
-      };
-      traverse(rootNode);
-      return nodes;
-    },
-    // 收起所有节点
-    collapseAllNodes() {
-      if (!this.$refs.treeRef) return;
-      const allNodes = this.getAllNodes(this.$refs.treeRef.root);
-      allNodes.forEach(node => {
-        if (node.expanded !== undefined && node.expanded) {
-          node.expanded = false;
-        }
-      });
-    },
-    // 处理刷新操作
-    handleRefresh() {
-      this.$emit("refresh");
-    },
-    // 节点点击事件
-    onNodeClick(data, node, e) {
-      this.$emit("node-click", data, node, e);
-    },
-    // 复选框选中事件
-    onCheck(data, checkedInfo) {
-      this.$emit("check", data, checkedInfo);
-    },
-    // 节点展开事件
-    onNodeExpand(data, node, e) {
-      this.$emit("node-expand", data, node, e);
-    },
-    // 节点折叠事件
-    onNodeCollapse(data, node, e) {
-      this.$emit("node-collapse", data, node, e);
-    },
-    // 搜索处理
-    onSearch() {
-      // 搜索逻辑已在 watch 中处理
-    },
-    // 设置当前选中的节点
-    setCurrentKey(key) {
-      if (this.$refs.treeRef) {
-        this.$refs.treeRef.setCurrentKey(key);
-      }
-    },
-    // 获取当前选中的节点
-    getCurrentNode() {
-      if (this.$refs.treeRef) {
-        return this.$refs.treeRef.getCurrentNode();
-      }
-      return null;
-    },
-    // 获取当前选中的节点的key
-    getCurrentKey() {
-      if (this.$refs.treeRef) {
-        return this.$refs.treeRef.getCurrentKey();
-      }
-      return null;
-    },
-    // 设置选中的节点keys（复选框）
-    setCheckedKeys(keys) {
-      if (this.$refs.treeRef && this.showCheckbox) {
-        this.$refs.treeRef.setCheckedKeys(keys);
-      }
-    },
-    // 获取选中的节点keys（复选框）
-    getCheckedKeys() {
-      if (this.$refs.treeRef && this.showCheckbox) {
-        return this.$refs.treeRef.getCheckedKeys();
-      }
-      return [];
-    },
-    // 获取选中的节点（复选框）
-    getCheckedNodes() {
-      if (this.$refs.treeRef && this.showCheckbox) {
-        return this.$refs.treeRef.getCheckedNodes();
-      }
-      return [];
-    },
-    // 清空搜索
-    clearSearch() {
-      this.searchKeyword = "";
-      if (this.$refs.treeRef) {
-        this.$refs.treeRef.filter("");
-      }
-    },
-    // 过滤树
-    filter(value) {
-      this.searchKeyword = value;
-    },
-    // 开始调整大小
-    startResize(e) {
-      e.preventDefault();
-      e.stopPropagation();
-      this.isResizing = true;
-      this.startX = e.type === 'mousedown' ? e.clientX : e.touches[0].clientX;
-      this.startWidth = this.sidebarWidth;
-      
-      if (e.type === 'mousedown') {
-        document.addEventListener('mousemove', this.handleResizeMove);
-        document.addEventListener('mouseup', this.stopResize);
-      } else {
-        document.addEventListener('touchmove', this.handleResizeMove, { passive: false });
-        document.addEventListener('touchend', this.stopResize);
-      }
-      this.disableUserSelect();
-    },
-    // 处理调整大小移动
-    handleResizeMove(e) {
-      if (!this.isResizing) return;
-      if (this.rafId) {
-        cancelAnimationFrame(this.rafId);
-      }
-      this.rafId = requestAnimationFrame(() => {
-        e.preventDefault();
-        e.stopPropagation();
-        const clientX = e.type === 'mousemove' ? e.clientX : e.touches[0].clientX;
-        const deltaX = clientX - this.startX;
-        const newWidth = this.startWidth + deltaX;
-        const clampedWidth = Math.max(this.minWidth, Math.min(this.maxWidth, newWidth));
-        if (Math.abs(clampedWidth - this.sidebarWidth) >= 1) {
-          this.sidebarWidth = clampedWidth;
-        }
-      });
-    },
-    // 停止调整大小
-    stopResize() {
-      if (!this.isResizing) return;
-      this.isResizing = false;
-      if (this.rafId) {
-        cancelAnimationFrame(this.rafId);
-        this.rafId = null;
-      }
-      this.startX = 0;
-      this.startWidth = 0;
-      document.removeEventListener('mousemove', this.handleResizeMove);
-      document.removeEventListener('mouseup', this.stopResize);
-      document.removeEventListener('touchmove', this.handleResizeMove);
-      document.removeEventListener('touchend', this.stopResize);
-      this.enableUserSelect();
-      this.saveWidthToStorage();
-    },
-    // 禁用用户选择
-    disableUserSelect() {
-      document.body.style.userSelect = 'none';
-      document.body.style.webkitUserSelect = 'none';
-      document.body.style.mozUserSelect = 'none';
-      document.body.style.msUserSelect = 'none';
-    },
-    // 启用用户选择
-    enableUserSelect() {
-      document.body.style.userSelect = '';
-      document.body.style.webkitUserSelect = '';
-      document.body.style.mozUserSelect = '';
-      document.body.style.msUserSelect = '';
-    },
-    // 重置宽度到默认值
-    resetWidth() {
-      this.sidebarWidth = this.defaultWidth;
-      this.saveWidthToStorage();
-    },
-    // 获取当前宽度
-    getCurrentWidth() {
-      return this.sidebarWidth;
-    },
-    // 设置宽度
-    setWidth(width) {
-      if (typeof width === 'number' && width >= this.minWidth && width <= this.maxWidth) {
-        this.sidebarWidth = width;
-        if (!this.collapsed) {
-          this.saveWidthToStorage();
-        }
-      }
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.tree-sidebar {
-  flex-shrink: 0;
-  width: 220px;
-  background: #fff;
-  border-right: 1px solid #e8eaed;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-  position: relative;
-  transition: width 0.25s ease;
-  
-  &.collapsed {
-    width: 42px;
-  }
-  
-  &.resizing {
-    transition: none;
-    will-change: width;
-    
-    * {
-      pointer-events: none !important;
-    }
-  }
-  
-  &.no-initial-transition {
-    transition: none;
-  }
-}
-
-.resize-handle {
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 6px;
-  height: 100%;
-  cursor: col-resize;
-  z-index: 20;
-  background: transparent;
-  transition: background 0.2s;
-  
-  &:hover {
-    background: rgba(64, 158, 255, 0.3);
-  }
-  
-  &.active {
-    background: rgba(64, 158, 255, 0.5);
-  }
-}
-
-.collapse-button-container {
-  position: absolute;
-  top: 50%;
-  right: 0;
-  transform: translateY(-50%);
-  z-index: 100;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 15px;
-  height: 20px;
-  background: #fff;
-  border-radius: 0 4px 4px 0;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-  transition: all 0.2s ease;
-  
-  .tree-sidebar.collapsed & {
-    right: 0;
-    background: #f7f8fa;
-    border-radius: 0 4px 4px 0;
-  }
-  
-  .tree-sidebar.resizing & {
-    pointer-events: none;
-  }
-}
-
-.collapse-button {
-  font-size: 14px;
-  color: #909399;
-  cursor: pointer;
-  padding: 4px;
-  border-radius: 4px;
-  transition: all 0.2s;
-  
-  &:hover {
-    color: #409eff;
-    background: #ecf5ff;
-  }
-}
-
-.tree-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 0 10px;
-  height: 40px;
-  border-bottom: 1px solid #e8eaed;
-  background: #f7f8fa;
-  flex-shrink: 0;
-
-  .tree-title {
-    font-size: 13px;
-    font-weight: 600;
-    color: #303133;
-    white-space: nowrap;
-    overflow: hidden;
-    display: flex;
-    align-items: center;
-    gap: 5px;
-
-    i {
-      color: #409eff;
-      font-size: 14px;
-    }
-  }
-
-  .tree-actions {
-    display: flex;
-    align-items: center;
-    gap: 4px;
-    flex-shrink: 0;
-  }
-}
-
-.tree-action-icon {
-  font-size: 14px;
-  color: #909399;
-  cursor: pointer;
-  padding: 4px;
-  border-radius: 4px;
-  transition: all 0.2s;
-
-  &:hover {
-    color: #409eff;
-    background: #ecf5ff;
-  }
-}
-
-.tree-search {
-  padding: 10px 10px 4px;
-  flex-shrink: 0;
-}
-
-.tree-wrap {
-  flex: 1;
-  overflow-y: auto;
-  padding: 6px 6px 12px;
-  
-  .tree-sidebar.resizing & {
-    overflow: hidden;
-  }
-
-  &::-webkit-scrollbar {
-    width: 4px;
-  }
-
-  &::-webkit-scrollbar-thumb {
-    background: #dcdfe6;
-    border-radius: 4px;
-    
-    &:hover {
-      background: #c0c4cc;
-    }
-  }
-
-  ::v-deep .el-tree-node__content {
-    height: 32px;
-    border-radius: 4px;
-    margin-bottom: 1px;
-
-    &:hover {
-      background: #f0f7ff;
-    }
-  }
-
-  ::v-deep .el-tree-node.is-current > .el-tree-node__content {
-    background: #e6f0fd;
-    color: #409eff;
-    font-weight: 600;
-
-    .node-icon {
-      color: #409eff !important;
-    }
-  }
-}
-
-.tree-node {
-  display: flex;
-  align-items: center;
-  gap: 5px;
-  font-size: 13px;
-  overflow: hidden;
-
-  .node-icon {
-    font-size: 14px;
-    color: #f5a623;
-    flex-shrink: 0;
-  }
-
-  .node-label {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
-
-::v-deep .el-icon-document.node-icon {
-  color: #909399 !important;
-}
-</style>

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

@@ -1,4 +1,4 @@
-/**
+ /**
  * v-hasPermi 操作权限处理
  * Copyright (c) 2019 ruoyi
  */

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

@@ -1,4 +1,4 @@
-/**
+ /**
  * v-hasRole 角色权限处理
  * Copyright (c) 2019 ruoyi
  */

ruoyi-ui/src/layout/components/HeaderNotice/DetailView.vue

@@ -1,362 +0,0 @@
-<template>
-  <el-drawer title="公告详情" :visible.sync="visible" direction="rtl" size="50%" append-to-body :before-close="handleClose" custom-class="notice-detail-drawer">
-    <div v-loading="loading" class="notice-detail-drawer__body">
-      <div v-if="!detail" class="notice-empty">
-        <i class="el-icon-document"></i>
-        <span>暂无数据</span>
-      </div>
-      <div v-else class="notice-page">
-        <div class="notice-type-wrap">
-          <span v-if="detail.noticeType === '1'" class="notice-type-tag type-notify">
-            <i class="el-icon-bell"></i> 通知
-          </span>
-          <span v-else-if="detail.noticeType === '2'" class="notice-type-tag type-announce">
-            <i class="el-icon-message"></i> 公告
-          </span>
-          <span v-else class="notice-type-tag type-notify">
-            <i class="el-icon-document"></i> 消息
-          </span>
-        </div>
-
-        <h1 class="notice-title">{{ detail.noticeTitle }}</h1>
-
-        <div class="notice-meta">
-          <span class="meta-item">
-            <i class="el-icon-user"></i>
-            <span>{{ detail.createBy || '—' }}</span>
-          </span>
-          <span class="meta-item">
-            <i class="el-icon-time"></i>
-            <span>{{ detail.createTime || '—' }}</span>
-          </span>
-          <span class="meta-item">
-            <span :class="['status-dot', isStatusNormal ? 'status-ok' : 'status-off']"></span>
-            <span>{{ isStatusNormal ? '正常' : '已关闭' }}</span>
-          </span>
-        </div>
-
-        <div class="notice-divider">
-          <span class="notice-divider-dot"></span>
-          <span class="notice-divider-dot"></span>
-          <span class="notice-divider-dot"></span>
-        </div>
-
-        <div class="notice-body">
-          <div v-if="hasContent" class="notice-content" v-html="detail.noticeContent" />
-          <div v-else class="notice-empty notice-empty--inner">
-            <i class="el-icon-document"></i> 暂无内容
-          </div>
-        </div>
-      </div>
-    </div>
-  </el-drawer>
-</template>
-
-<script>
-import { getNotice } from '@/api/system/notice'
-
-export default {
-  name: 'NoticeDetailView',
-  data() {
-    return {
-      visible: false,
-      loading: false,
-      detail: null
-    }
-  },
-  computed: {
-    isStatusNormal() {
-      const s = this.detail && this.detail.status
-      return s === '0' || s === 0
-    },
-    hasContent() {
-      const c = this.detail && this.detail.noticeContent
-      return c != null && String(c).trim() !== ''
-    }
-  },
-  methods: {
-    open(payload) {
-      let id = null
-      let preset = null
-      if (payload != null && typeof payload === 'object') {
-        id = payload.noticeId
-        if (payload.noticeContent != null) {
-          preset = payload
-        }
-      } else {
-        id = payload
-      }
-      this.visible = true
-      if (preset) {
-        this.detail = preset
-        return
-      }
-      if (id == null || id === '') {
-        this.detail = null
-        return
-      }
-      this.loading = true
-      this.detail = null
-      getNotice(id).then(res => {
-        this.detail = res.data
-      }).catch(() => {
-        this.detail = null
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    handleClose() {
-      this.visible = false
-      this.detail = null
-      this.loading = false
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.notice-page {
-  max-width: 760px;
-  margin: 0 auto;
-  padding: 8px 8px 20px;
-  animation: notice-fade-up 0.28s ease both;
-}
-
-@keyframes notice-fade-up {
-  from {
-    opacity: 0;
-    transform: translateY(14px);
-  }
-  to {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
-
-.notice-type-tag {
-  display: inline-flex;
-  align-items: center;
-  gap: 5px;
-  padding: 3px 12px;
-  border-radius: 2px;
-  font-size: 11px;
-  font-weight: 700;
-  letter-spacing: 1px;
-  text-transform: uppercase;
-  margin-bottom: 14px;
-}
-
-.type-notify {
-  background: #fff8e6;
-  color: #b7791f;
-  border-left: 3px solid #d97706;
-}
-
-.type-announce {
-  background: #e8f5e9;
-  color: #276749;
-  border-left: 3px solid #38a169;
-}
-
-.notice-title {
-  font-size: 22px;
-  font-weight: 700;
-  color: #1a202c;
-  line-height: 1.45;
-  margin: 0 0 16px;
-  letter-spacing: -0.2px;
-}
-
-.notice-meta {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: 16px;
-  padding: 12px 0;
-  border-top: 1px solid #e9ecef;
-  border-bottom: 1px solid #e9ecef;
-  margin-bottom: 28px;
-}
-
-.meta-item {
-  display: flex;
-  align-items: center;
-  gap: 5px;
-  font-size: 12px;
-  color: #718096;
-}
-
-.meta-item i {
-  font-size: 12px;
-  color: #a0aec0;
-}
-
-.status-dot {
-  display: inline-block;
-  width: 7px;
-  height: 7px;
-  border-radius: 50%;
-  margin-right: 4px;
-}
-
-.status-ok {
-  background: #38a169;
-}
-
-.status-off {
-  background: #e53e3e;
-}
-
-.notice-divider {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  margin-bottom: 24px;
-}
-
-.notice-divider::before,
-.notice-divider::after {
-  content: '';
-  flex: 1;
-  height: 1px;
-  background: linear-gradient(to right, transparent, #dee2e6, transparent);
-}
-
-.notice-divider-dot {
-  width: 6px;
-  height: 6px;
-  border-radius: 50%;
-  background: #cbd5e0;
-}
-
-.notice-body {
-  background: #fff;
-  border-radius: 6px;
-  padding: 28px 32px;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(0, 0, 0, 0.04);
-  min-height: 120px;
-}
-
-.notice-content {
-  font-size: 14px;
-  line-height: 1.85;
-  color: #2d3748;
-  word-break: break-word;
-}
-
-.notice-content ::v-deep p {
-  margin: 0 0 1em;
-}
-
-.notice-content ::v-deep h1,
-.notice-content ::v-deep h2,
-.notice-content ::v-deep h3 {
-  font-weight: 700;
-  color: #1a202c;
-  margin: 1.4em 0 0.6em;
-}
-
-.notice-content ::v-deep h1 {
-  font-size: 18px;
-}
-
-.notice-content ::v-deep h2 {
-  font-size: 16px;
-}
-
-.notice-content ::v-deep h3 {
-  font-size: 14px;
-}
-
-.notice-content ::v-deep a {
-  color: #3182ce;
-  text-decoration: underline;
-}
-
-.notice-content ::v-deep a:hover {
-  color: #2b6cb0;
-}
-
-.notice-content ::v-deep img {
-  max-width: 100%;
-  border-radius: 4px;
-  margin: 8px 0;
-}
-
-.notice-content ::v-deep ul,
-.notice-content ::v-deep ol {
-  padding-left: 20px;
-  margin: 0 0 1em;
-}
-
-.notice-content ::v-deep li {
-  margin-bottom: 4px;
-}
-
-.notice-content ::v-deep blockquote {
-  border-left: 3px solid #cbd5e0;
-  margin: 1em 0;
-  padding: 6px 16px;
-  color: #718096;
-  background: #f7fafc;
-}
-
-.notice-content ::v-deep table {
-  border-collapse: collapse;
-  width: 100%;
-  margin: 1em 0;
-  font-size: 13px;
-}
-
-.notice-content ::v-deep table th,
-.notice-content ::v-deep table td {
-  border: 1px solid #e2e8f0;
-  padding: 7px 12px;
-}
-
-.notice-content ::v-deep table th {
-  background: #f7fafc;
-  font-weight: 600;
-}
-
-.notice-empty {
-  text-align: center;
-  padding: 40px 0;
-  color: #a0aec0;
-  font-size: 13px;
-}
-
-.notice-empty i {
-  font-size: 28px;
-  display: block;
-  margin-bottom: 10px;
-}
-
-.notice-empty--inner {
-  padding: 32px 0;
-}
-
-.notice-empty--inner i {
-  font-size: 28px;
-}
-
-::v-deep .notice-detail-drawer {
-  .el-drawer__header {
-    margin-bottom: 0;
-    padding: 16px 20px;
-    border-bottom: 1px solid #ebeef5;
-    font-size: 16px;
-    font-weight: 600;
-    color: #303133;
-  }
-  .el-drawer__body {
-    background: #f5f6f8;
-  }
-}
-
-.notice-detail-drawer__body {
-  height: 100%;
-  overflow: auto;
-  padding: 10px 16px 22px;
-}
-</style>

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

@@ -23,24 +23,38 @@
       <span v-if="unreadCount > 0" class="notice-badge">{{ unreadCount }}</span>
     </div>
 
-    <notice-detail-view ref="noticeViewRef" />
+    <el-dialog :title="previewTitle" :visible.sync="previewVisible" width="680px" append-to-body custom-class="notice-preview-dialog">
+      <div class="notice-preview-meta">
+        <el-tag size="small" :type="previewNoticeType === '1' ? 'warning' : 'success'">
+          {{ previewNoticeType === '1' ? '通知' : '公告' }}
+        </el-tag>
+        <span class="notice-preview-info"><i class="el-icon-user"></i> {{ previewCreateBy }}</span>
+        <span class="notice-preview-info"><i class="el-icon-time"></i> {{ previewCreateTime }}</span>
+      </div>
+      <div class="notice-preview-divider"></div>
+      <div class="notice-preview-content" v-html="previewContent"></div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import NoticeDetailView from './DetailView'
-import { listNoticeTop, markNoticeRead, markNoticeReadAll } from '@/api/system/notice'
+import { listNoticeTop, markNoticeRead, markNoticeReadAll, getNotice } from '@/api/system/notice'
 
 export default {
   name: 'HeaderNotice',
-  components: { NoticeDetailView },
   data() {
     return {
       noticeList: [], // 通知列表
       unreadCount: 0, // 未读数量
       noticeLoading: false, // 加载状态
       noticeVisible: false, // 弹出层显示状态
-      noticeLeaveTimer: null // 鼠标离开计时器
+      noticeLeaveTimer: null, // 鼠标离开计时器
+      previewVisible: false, // 预览弹窗显示状态
+      previewTitle: '', // 预览弹窗标题
+      previewContent: '', // 预览弹窗内容
+      previewNoticeType: '', // 预览弹窗类型
+      previewCreateBy: '', // 预览弹窗创建人
+      previewCreateTime: '' // 预览弹窗创建时间
     }
   },
   mounted() {
@@ -85,7 +99,15 @@ export default {
         if (idx !== -1) this.$set(this.noticeList, idx, { ...item, isRead: true })
         this.unreadCount = Math.max(0, this.unreadCount - 1)
       }
-      this.$refs.noticeViewRef.open(item.noticeId)
+      getNotice(item.noticeId).then(res => {
+        const notice = res.data
+        this.previewTitle = notice.noticeTitle
+        this.previewContent = notice.noticeContent
+        this.previewNoticeType = notice.noticeType
+        this.previewCreateBy = notice.createBy
+        this.previewCreateTime = notice.createTime
+        this.previewVisible = true
+      })
     },
     // 全部已读
     markAllRead() {
@@ -178,4 +200,30 @@ export default {
   font-size: 11px;
   color: #bbb;
 }
+::v-deep .notice-preview-dialog {
+  .el-dialog__body { padding: 0 20px 20px; }
+  .notice-preview-meta {
+    display: flex;
+    align-items: center;
+    gap: 14px;
+    padding: 12px 0;
+    font-size: 12px;
+    color: #888;
+    .notice-preview-info { display: flex; align-items: center; gap: 4px; }
+  }
+  .notice-preview-divider {
+    height: 1px;
+    background: linear-gradient(to right, transparent, #e2e8f0, transparent);
+    margin-bottom: 16px;
+  }
+  .notice-preview-content {
+    font-size: 14px;
+    line-height: 1.85;
+    color: #2d3748;
+    word-break: break-word;
+    img { max-width: 100%; border-radius: 4px; }
+    p { margin: 0 0 1em; }
+    a { color: #409EFF; text-decoration: underline; }
+  }
+}
 </style>

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

@@ -59,7 +59,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
-import TopNav from './TopNav'
+import TopNav from '@/components/TopNav'
 import TopBar from './TopBar'
 import Logo from './Sidebar/Logo'
 import Hamburger from '@/components/Hamburger'

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

@@ -61,7 +61,7 @@
         <h3 class="drawer-title">系统布局配置</h3>
 
         <div class="drawer-item">
-          <span>开启页签</span>
+          <span>开启 Tags-Views</span>
           <el-switch v-model="tagsView" class="drawer-switch" />
         </div>
 
@@ -75,14 +75,6 @@
           <el-switch v-model="tagsIcon" :disabled="!tagsView" class="drawer-switch" />
         </div>
 
-        <div class="drawer-item">
-          <span>标签页样式</span>
-          <el-radio-group v-model="tagsViewStyle" :disabled="!tagsView" size="mini" class="drawer-switch">
-            <el-radio-button label="card">卡片</el-radio-button>
-            <el-radio-button label="chrome">谷歌</el-radio-button>
-          </el-radio-group>
-        </div>
-
         <div class="drawer-item">
           <span>固定 Header</span>
           <el-switch v-model="fixedHeader" class="drawer-switch" />
@@ -171,17 +163,6 @@ export default {
         })
       }
     },
-    tagsViewStyle: {
-      get() {
-        return this.$store.state.settings.tagsViewStyle
-      },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'tagsViewStyle',
-          value: val
-        })
-      }
-    },
     sidebarLogo: {
       get() {
         return this.$store.state.settings.sidebarLogo
@@ -275,7 +256,6 @@ export default {
             "navType":${this.navType},
             "tagsView":${this.tagsView},
             "tagsIcon":${this.tagsIcon},
-            "tagsViewStyle":"${this.tagsViewStyle}",
             "tagsViewPersist":${this.tagsViewPersist},
             "fixedHeader":${this.fixedHeader},
             "sidebarLogo":${this.sidebarLogo},

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

@@ -1,5 +1,5 @@
 <template>
-  <div id="tags-view-container" class="tags-view-container" :class="{ 'tags-view-container--chrome': tagsViewStyle === 'chrome' }" :style="chromeVars">
+  <div id="tags-view-container" class="tags-view-container">
     <!-- 左切换箭头 -->
     <span class="tags-nav-btn tags-nav-btn--left" :class="{ disabled: !canScrollLeft }" @click="scrollLeft">
       <i class="el-icon-arrow-left" />
@@ -15,11 +15,11 @@
         :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
         tag="span"
         class="tags-view-item"
-        :style="tagActiveStyle(tag)"
+        :style="activeStyle(tag)"
         @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''"
         @contextmenu.prevent.native="openMenu(tag, $event)"
       >
-        <svg-icon v-if="tagsIcon && tag.meta && tag.meta.icon && tag.meta.icon !== '#'" :icon-class="tag.meta.icon" style="margin-right: 3px;" />
+        <svg-icon v-if="tagsIcon && tag.meta && tag.meta.icon && tag.meta.icon !== '#'" :icon-class="tag.meta.icon" />
         {{ tag.title }}
         <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
       </router-link>
@@ -97,20 +97,8 @@ export default {
     tagsIcon() {
       return this.$store.state.settings.tagsIcon
     },
-    tagsViewStyle() {
-      return this.$store.state.settings.tagsViewStyle
-    },
     selectedDropdownTag() {
       return this.visitedViews.find(v => this.isActive(v)) || {}
-    },
-    chromeVars() {
-      if (this.tagsViewStyle !== 'chrome') return {}
-      const primary = this.theme || '#409EFF'
-      return {
-        '--chrome-tab-active-bg': this.mixHexWithWhite(primary, 0.15),
-        '--chrome-tab-text-active': primary,
-        '--chrome-wing-r': '10px'
-      }
     }
   },
   watch: {
@@ -148,21 +136,11 @@ export default {
         this.toggleFullscreen()
       }
     },
-    mixHexWithWhite(hex, ratio) {
-      const clean = hex.replace('#', '')
-      const r = parseInt(clean.substring(0, 2), 16)
-      const g = parseInt(clean.substring(2, 4), 16)
-      const b = parseInt(clean.substring(4, 6), 16)
-      const mr = Math.round(r * ratio + 255 * (1 - ratio))
-      const mg = Math.round(g * ratio + 255 * (1 - ratio))
-      const mb = Math.round(b * ratio + 255 * (1 - ratio))
-      return `rgb(${mr}, ${mg}, ${mb})`
-    },
     isActive(route) {
       return route.path === this.$route.path
     },
-    tagActiveStyle(tag) {
-      if (!this.isActive(tag) || this.tagsViewStyle !== 'card') return {}
+    activeStyle(tag) {
+      if (!this.isActive(tag)) return {}
       return {
         "background-color": this.theme,
         "border-color": this.theme
@@ -389,16 +367,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-$tags-bar-height: 34px;
-
 .tags-view-container {
-  height: $tags-bar-height;
+  height: 34px;
   width: 100%;
   background: #fff;
   border-bottom: 1px solid #d8dce5;
   display: flex;
   align-items: center;
-  overflow: hidden;
 
   $btn-width: 28px;
   $btn-color: #71717a;
@@ -413,7 +388,7 @@ $tags-bar-height: 34px;
     align-items: center;
     justify-content: center;
     width: $btn-width;
-    height: $tags-bar-height;
+    height: 34px;
     cursor: pointer;
     color: $btn-color;
     font-size: 13px;
@@ -430,14 +405,18 @@ $tags-bar-height: 34px;
       cursor: not-allowed;
     }
 
-    &--left  { border-right: $divider; }
-    &--right { border-left: $divider; }
+    &--left {
+      border-right: $divider;
+    }
+
+    &--right {
+      border-left: $divider;
+    }
   }
 
   .tags-view-wrapper {
     flex: 1;
     min-width: 0;
-    height: 100%;
 
     .tags-view-item {
       display: inline-block;
@@ -453,27 +432,31 @@ $tags-bar-height: 34px;
       margin-left: 5px;
       border-radius: 3px;
 
-      &:first-of-type { margin-left: 6px; }
-      &:last-of-type  { margin-right: 15px; }
-    }
-  }
-  &:not(.tags-view-container--chrome) .tags-view-wrapper .tags-view-item.active {
-    background-color: #42b983;
-    color: #fff;
-    border-color: #42b983;
-    &::before {
-      content: '';
-      background: #fff;
-      display: inline-block;
-      width: 8px;
-      height: 8px;
-      border-radius: 50%;
-      position: relative;
-      margin-right: 2px;
+      &:first-of-type {
+        margin-left: 6px;
+      }
+      &:last-of-type {
+        margin-right: 15px;
+      }
+      &.active {
+        background-color: #42b983;
+        color: #fff;
+        border-color: #42b983;
+        &::before {
+          content: '';
+          background: #fff;
+          display: inline-block;
+          width: 8px;
+          height: 8px;
+          border-radius: 50%;
+          position: relative;
+          margin-right: 2px;
+        }
+      }
     }
   }
 
-  &:not(.tags-view-container--chrome) .tags-view-wrapper .tags-view-item.active.has-icon::before {
+  .tags-view-item.active.has-icon::before {
     content: none !important;
   }
 
@@ -488,7 +471,7 @@ $tags-bar-height: 34px;
     align-items: center;
     justify-content: center;
     width: $btn-width;
-    height: $tags-bar-height;
+    height: 34px;
     cursor: pointer;
     color: $btn-color;
     font-size: 13px;
@@ -528,198 +511,11 @@ $tags-bar-height: 34px;
       }
     }
   }
-  &.tags-view-container--chrome {
-    --chrome-strip-bg: #ffffff;
-    --chrome-strip-border: #e4e7ed;
-    --chrome-tab-text: #606266;
-
-    overflow: visible;
-    background: var(--chrome-strip-bg);
-    border-bottom: 1px solid var(--chrome-strip-border);
-    align-items: flex-end;
-
-    .tags-nav-btn {
-      align-self: stretch;
-      height: auto;
-      min-height: $tags-bar-height;
-      border-color: var(--chrome-strip-border);
-    }
-
-    .tags-action-btn {
-      border-color: var(--chrome-strip-border);
-    }
-
-    .tags-view-wrapper {
-      .tags-view-item {
-        display: inline-flex !important;
-        align-items: center;
-        justify-content: center;
-        position: relative;
-        z-index: 1;
-        height: 30px;
-        min-height: 30px;
-        margin: 0 0 -1px;
-        padding: 0 12px;
-        font-size: 13px;
-        font-weight: 400;
-        line-height: 1.2;
-        border: none !important;
-        border-radius: 0;
-        background: transparent !important;
-        color: var(--chrome-tab-text) !important;
-        padding-top: 0 !important;
-        box-shadow: none !important;
-        transition: background 0.12s ease, color 0.12s ease, border-radius 0.12s ease;
-
-        &::before,
-        &::after {
-          content: '' !important;
-          display: block !important;
-          position: absolute;
-          bottom: 0;
-          width: var(--chrome-wing-r);
-          height: var(--chrome-wing-r);
-          margin: 0 !important;
-          pointer-events: none;
-          background: transparent !important;
-          border-radius: 0 !important;
-          transition: box-shadow 0.12s ease;
-        }
-
-        &::before {
-          left: calc(-1 * var(--chrome-wing-r));
-          border-bottom-right-radius: var(--chrome-wing-r) !important;
-          box-shadow: none;
-        }
-
-        &::after {
-          right: calc(-1 * var(--chrome-wing-r));
-          border-bottom-left-radius: var(--chrome-wing-r) !important;
-          box-shadow: none;
-        }
-
-        &:first-of-type { margin-left: 6px; }
-        &:last-of-type  { margin-right: 10px; }
-
-        &:not(.active) + .tags-view-item:not(.active) {
-          border-left: 1px solid #e4e7ed;
-          padding-left: 11px;
-        }
-
-        &:hover:not(.active) {
-          background: #f5f7fa !important;
-          border-radius: 6px 6px 0 0;
-          color: #303133 !important;
-          z-index: 2;
-        }
-
-        &.active {
-          height: 33px;
-          min-height: 33px;
-          padding: 0 14px;
-          z-index: 3;
-          color: var(--chrome-tab-text-active) !important;
-          font-weight: 500;
-          background: var(--chrome-tab-active-bg) !important;
-          border: none !important;
-          border-bottom: 2px solid var(--chrome-tab-active-bg) !important;
-          border-radius: var(--chrome-wing-r) var(--chrome-wing-r) 0 0;
-          box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
-
-          &::before {
-            box-shadow: calc(var(--chrome-wing-r) * 0.5) calc(var(--chrome-wing-r) * 0.5) 0 calc(var(--chrome-wing-r) * 0.5) var(--chrome-tab-active-bg);
-          }
-
-          &::after {
-            box-shadow: calc(var(--chrome-wing-r) * -0.5) calc(var(--chrome-wing-r) * 0.5) 0 calc(var(--chrome-wing-r) * 0.5) var(--chrome-tab-active-bg);
-          }
-        }
-        .el-icon-close {
-          margin-left: 3px;
-          &:before {
-            vertical-align: -2px;
-          }
-        }
-      }
-    }
-  }
 }
 </style>
 
 <style lang="scss">
 .tags-view-wrapper {
-  .el-scrollbar {
-    height: 100%;
-    overflow: hidden;
-  }
-
-  .el-scrollbar__wrap {
-    height: 34px !important;
-    display: flex;
-    align-items: center;
-    overflow-x: auto;
-    overflow-y: hidden;
-    
-    &::-webkit-scrollbar {
-      width: 0;
-      height: 0;
-    }
-    
-    .tags-view-container:hover & {
-      &::-webkit-scrollbar {
-        width: 6px;
-        height: 6px;
-      }
-      
-      &::-webkit-scrollbar-track {
-        background: transparent;
-      }
-      
-      &::-webkit-scrollbar-thumb {
-        background-color: rgba(0, 0, 0, 0.2);
-        border-radius: 3px;
-        transition: background-color 0.2s;
-        
-        &:hover {
-          background-color: rgba(0, 0, 0, 0.4);
-        }
-      }
-    }
-    
-    scrollbar-width: none;
-    -ms-overflow-style: none;
-  }
-
-  .el-scrollbar__bar {
-    opacity: 0;
-    transition: opacity 0.3s;
-    z-index: 10;
-
-    .tags-view-container:hover & {
-      opacity: 1;
-    }
-  }
-
-  .tags-view-container--chrome & {
-    .el-scrollbar {
-      position: relative;
-    }
-
-    .el-scrollbar__wrap {
-      &::-webkit-scrollbar {
-        width: 0 !important;
-        height: 0 !important;
-      }
-      scrollbar-width: none;
-      -ms-overflow-style: none;
-    }
-
-    .el-scrollbar__bar.is-horizontal {
-      z-index: 20;
-      height: 6px !important;
-    }
-  }
-
   .tags-view-item {
     .el-icon-close {
       width: 16px;
@@ -750,8 +546,6 @@ $tags-bar-height: 34px;
   width: 100vw;
   height: 100vh;
   overflow: hidden;
-  margin-left: 0 !important;
-  transition: none !important;
 }
 
 .main-container.fullscreen-mode .fixed-header {
@@ -762,7 +556,6 @@ $tags-bar-height: 34px;
   right: 0;
   width: 100% !important;
   z-index: 1000;
-  transition: none !important;
 }
 
 .main-container.fullscreen-mode .fixed-header .navbar {
@@ -781,4 +574,4 @@ $tags-bar-height: 34px;
   min-height: calc(100vh - 34px) !important;
   overflow: auto;
 }
-</style>
+</style>

ruoyi-ui/src/permission.js

@@ -44,11 +44,11 @@ router.beforeEach((to, from, next) => {
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
           })
         }).catch(err => {
-          store.dispatch('LogOut').then(() => {
-            Message.error(err)
-            next({ path: '/' })
+            store.dispatch('LogOut').then(() => {
+              Message.error(err)
+              next({ path: '/' })
+            })
           })
-        })
       } else {
         next()
       }

ruoyi-ui/src/settings.js

@@ -34,11 +34,6 @@ module.exports = {
    */
   tagsIcon: false,
 
-  /**
-   * 标签页样式：card 卡片（默认）、chrome 谷歌浏览器风格
-   */
-  tagsViewStyle: 'card',
-
   /**
    * 是否固定头部
    */

ruoyi-ui/src/store/modules/settings.js

@@ -1,7 +1,7 @@
 import defaultSettings from '@/settings'
 import { useDynamicTitle } from '@/utils/dynamicTitle'
 
-const { sideTheme, showSettings, navType, tagsView, tagsViewPersist, tagsIcon, tagsViewStyle, fixedHeader, sidebarLogo, dynamicTitle, footerVisible, footerContent } = defaultSettings
+const { sideTheme, showSettings, navType, tagsView, tagsViewPersist, tagsIcon, fixedHeader, sidebarLogo, dynamicTitle, footerVisible, footerContent } = defaultSettings
 
 const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
 const state = {
@@ -13,7 +13,6 @@ const state = {
   tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
   tagsViewPersist: storageSetting.tagsViewPersist === undefined ? tagsViewPersist : storageSetting.tagsViewPersist,
   tagsIcon: storageSetting.tagsIcon === undefined ? tagsIcon : storageSetting.tagsIcon,
-  tagsViewStyle: storageSetting.tagsViewStyle === undefined ? tagsViewStyle : storageSetting.tagsViewStyle,
   fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
   sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,
   dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle,

ruoyi-ui/src/store/modules/tagsView.js

@@ -123,7 +123,7 @@ const mutations = {
       if (i > -1) {
         state.cachedViews.splice(i, 1)
       }
-      if (item.meta.link) {
+      if(item.meta.link) {
         const fi = state.iframeViews.findIndex(v => v.path === item.path)
         state.iframeViews.splice(fi, 1)
       }
@@ -144,7 +144,7 @@ const mutations = {
       if (i > -1) {
         state.cachedViews.splice(i, 1)
       }
-      if (item.meta.link) {
+      if(item.meta.link) {
         const fi = state.iframeViews.findIndex(v => v.path === item.path)
         state.iframeViews.splice(fi, 1)
       }

ruoyi-ui/src/store/modules/user.js

@@ -1,7 +1,6 @@
 import store from '@/store'
 import router from '@/router'
-import cache from '@/plugins/cache'
-import { MessageBox } from 'element-ui'
+import { MessageBox, } from 'element-ui'
 import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { isHttp, isEmpty } from "@/utils/validate"
@@ -80,7 +79,6 @@ const user = {
           commit('SET_NAME', user.userName)
           commit('SET_NICK_NAME', user.nickName)
           commit('SET_AVATAR', avatar)
-          cache.session.set('pwrChrtype', res.pwdChrtype)
           /* 初始密码提示 */
           if(res.isDefaultModifyPwd) {
             MessageBox.confirm('您的密码还是初始密码，请修改密码！',  '安全提示', {  confirmButtonText: '确定',  cancelButtonText: '取消',  type: 'warning' }).then(() => {

ruoyi-ui/src/utils/passwordRule.js

@@ -1,71 +0,0 @@
-/**
- * 密码强度规则
- * 根据参数 chrtype 动态生成校验规则
- *
- * chrtype 说明：
- *   0 - 任意字符（默认）
- *   1 - 纯数字（0-9）
- *   2 - 纯字母（a-z / A-Z）
- *   3 - 字母 + 数字（必须同时包含）
- *   4 - 字母 + 数字 + 特殊字符（必须同时包含，特殊字符：~!@#$%^&*()-=_+）
- */
-import cache from '@/plugins/cache'
-
-// 各类型对应的正则、错误提示
-const PWD_RULES = {
-  '0': { pattern: /^[^<>"'|\\]+$/, message: '密码不能包含非法字符：< > " \' \\ |' },
-  '1': { pattern: /^[0-9]+$/, message: '密码只能为数字（0-9）' },
-  '2': { pattern: /^[a-zA-Z]+$/, message: '密码只能为英文字母（a-z、A-Z）' },
-  '3': { pattern: /^(?=.*[a-zA-Z])(?=.*[0-9])[a-zA-Z0-9]+$/, message: '密码必须同时包含字母和数字' },
-  '4': { pattern: /^(?=.*[A-Za-z])(?=.*\d)(?=.*[~!@#$%^&*()\-=_+])[A-Za-z\d~!@#$%^&*()\-=_+]+$/, message: '密码必须同时包含字母、数字和特殊字符（~!@#$%^&*()-=_+）' }
-}
-
-export default {
-  data() {
-    return {
-      // 密码限制类型
-      pwdChrType: cache.session.get('pwrChrtype') || '0'
-    }
-  },
-  computed: {
-    // 默认密码校验
-    pwdValidator() {
-      const rule = PWD_RULES[this.pwdChrType] || PWD_RULES['0']
-      return [
-        { required: true, message: '密码不能为空', trigger: 'blur' },
-        { min: 6, max: 20, message: '密码长度必须介于 6 和 20 之间', trigger: 'blur' },
-        { pattern: rule.pattern, message: rule.message, trigger: 'blur' }
-      ]
-    },
-    // 校验prompt的inputValidator函数
-    pwdPromptValidator() {
-      const rule = PWD_RULES['0']
-      return (value) => {
-        if (!value || value.length < 6 || value.length > 20) {
-          return '密码长度必须介于 6 和 20 之间'
-        }
-        if (!rule.pattern.test(value)) {
-          return rule.message
-        }
-      }
-    },
-    // 个人中心密码校验
-    infoPwdValidator() {
-      const rule = PWD_RULES[this.pwdChrType] || PWD_RULES['0']
-      return [
-        { required: true, message: '新密码不能为空', trigger: 'blur' },
-        { min: 6, max: 20, message: '新密码长度必须介于 6 和 20 之间', trigger: 'blur' },
-        { pattern: rule.pattern, message: rule.message, trigger: 'blur' }
-      ]
-    },
-    // 注册页面密码校验
-    registerPwdValidator() {
-      const rule = PWD_RULES['0']
-      return [
-        { required: true, message: '请输入您的密码', trigger: 'blur' },
-        { min: 6, max: 20, message: '用户密码长度必须介于 6 和 20 之间', trigger: 'blur' },
-        { pattern: rule.pattern, message: rule.message, trigger: 'blur' }
-      ]
-    }
-  }
-}

ruoyi-ui/src/utils/request.js

@@ -68,59 +68,59 @@ service.interceptors.request.use(config => {
   }
   return config
 }, error => {
-  console.log(error)
-  Promise.reject(error)
+    console.log(error)
+    Promise.reject(error)
 })
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-  // 未设置状态码则默认成功状态
-  const code = res.data.code || 200
-  // 获取错误信息
-  const msg = errorCode[code] || res.data.msg || errorCode['default']
-  // 二进制数据则直接返回
-  if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
-    return res.data
-  }
-  if (code === 401) {
-    if (!isRelogin.show) {
-      isRelogin.show = true
-      MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
-        isRelogin.show = false
-        store.dispatch('LogOut').then(() => {
-          location.href = '/index'
-        })
+    // 未设置状态码则默认成功状态
+    const code = res.data.code || 200
+    // 获取错误信息
+    const msg = errorCode[code] || res.data.msg || errorCode['default']
+    // 二进制数据则直接返回
+    if (res.request.responseType ===  'blob' || res.request.responseType ===  'arraybuffer') {
+      return res.data
+    }
+    if (code === 401) {
+      if (!isRelogin.show) {
+        isRelogin.show = true
+        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
+          isRelogin.show = false
+          store.dispatch('LogOut').then(() => {
+            location.href = '/index'
+          })
       }).catch(() => {
         isRelogin.show = false
       })
     }
-    return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-  } else if (code === 500) {
-    Message({ message: msg, type: 'error' })
-    return Promise.reject(new Error(msg))
-  } else if (code === 601) {
-    Message({ message: msg, type: 'warning' })
-    return Promise.reject('error')
-  } else if (code !== 200) {
-    Notification.error({ title: msg })
-    return Promise.reject('error')
-  } else {
-    return res.data
+      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+    } else if (code === 500) {
+      Message({ message: msg, type: 'error' })
+      return Promise.reject(new Error(msg))
+    } else if (code === 601) {
+      Message({ message: msg, type: 'warning' })
+      return Promise.reject('error')
+    } else if (code !== 200) {
+      Notification.error({ title: msg })
+      return Promise.reject('error')
+    } else {
+      return res.data
+    }
+  },
+  error => {
+    console.log('err' + error)
+    let { message } = error
+    if (message == "Network Error") {
+      message = "后端接口连接异常"
+    } else if (message.includes("timeout")) {
+      message = "系统接口请求超时"
+    } else if (message.includes("Request failed with status code")) {
+      message = "系统接口" + message.slice(-3) + "异常"
+    }
+    Message({ message: message, type: 'error', duration: 5 * 1000 })
+    return Promise.reject(error)
   }
-},
-error => {
-  console.log('err' + error)
-  let { message } = error
-  if (message == "Network Error") {
-    message = "后端接口连接异常"
-  } else if (message.includes("timeout")) {
-    message = "系统接口请求超时"
-  } else if (message.includes("Request failed with status code")) {
-    message = "系统接口" + message.slice(-3) + "异常"
-  }
-  Message({ message: message, type: 'error', duration: 5 * 1000 })
-  return Promise.reject(error)
-}
 )
 
 // 通用下载方法

ruoyi-ui/src/utils/ruoyi.js

@@ -86,7 +86,7 @@ export function selectDictLabel(datas, value) {
 
 // 回显数据字典（字符串、数组）
 export function selectDictLabels(datas, value, separator) {
-  if (value === undefined || value.length === 0) {
+  if (value === undefined || value.length ===0) {
     return ""
   }
   if (Array.isArray(value)) {

ruoyi-ui/src/utils/validate.js

@@ -5,12 +5,7 @@
  * @returns {Boolean}
  */
 export function isPathMatch(pattern, path) {
-  const regexPattern = pattern
-    .replace(/([.+^${}()|\[\]\\])/g, '\\$1')
-    .replace(/\*\*/g, '__DOUBLE_STAR__')
-    .replace(/\*/g, '[^/]*')
-    .replace(/__DOUBLE_STAR__/g, '.*')
-    .replace(/\?/g, '[^/]')
+  const regexPattern = pattern.replace(/\//g, '\\/').replace(/\*\*/g, '.*').replace(/\*/g, '[^\\/]*')
   const regex = new RegExp(`^${regexPattern}$`)
   return regex.test(path)
 }

ruoyi-ui/src/views/monitor/cache/index.vue

@@ -1,148 +1,148 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="10">
-      <el-col :span="24" class="card-box">
-        <el-card>
-          <div slot="header"><span><i class="el-icon-monitor"></i> 基本信息</span></div>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <table cellspacing="0" style="width: 100%">
-              <tbody>
-                <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell">Redis版本</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.redis_version }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">运行模式</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.redis_mode == "standalone" ? "单机" : "集群" }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">端口</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.tcp_port }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">客户端数</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.connected_clients }}</div></td>
-                </tr>
-                <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell">运行时间(天)</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.uptime_in_days }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">使用内存</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.used_memory_human }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">使用CPU</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ parseFloat(cache.info.used_cpu_user_children).toFixed(2) }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">内存配置</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.maxmemory_human }}</div></td>
-                </tr>
-                <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell">AOF是否开启</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.aof_enabled == "0" ? "否" : "是" }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">RDB是否成功</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.rdb_last_bgsave_status }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">Key数量</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.dbSize">{{ cache.dbSize }} </div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">网络入口/出口</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.instantaneous_input_kbps }}kps/{{cache.info.instantaneous_output_kbps}}kps</div></td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </el-card>
-      </el-col>
-
-      <el-col :span="12" class="card-box">
-        <el-card>
-          <div slot="header"><span><i class="el-icon-pie-chart"></i> 命令统计</span></div>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <div ref="commandstats" style="height: 420px" />
-          </div>
-        </el-card>
-      </el-col>
-
-      <el-col :span="12" class="card-box">
-        <el-card>
-          <div slot="header"><span><i class="el-icon-odometer"></i> 内存信息</span></div>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <div ref="usedmemory" style="height: 420px" />
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { getCache } from "@/api/monitor/cache"
-import * as echarts from "echarts"
-
-export default {
-  name: "Cache",
-  data() {
-    return {
-      // 统计命令信息
-      commandstats: null,
-      // 使用内存
-      usedmemory: null,
-      // cache信息
-      cache: []
-    }
-  },
-  created() {
-    this.getList()
-    this.openLoading()
-  },
-  methods: {
-    /** 查缓存询信息 */
-    getList() {
-      getCache().then((response) => {
-        this.cache = response.data
-        this.$modal.closeLoading()
-
-        this.commandstats = echarts.init(this.$refs.commandstats, "macarons")
-        this.commandstats.setOption({
-          tooltip: {
-            trigger: "item",
-            formatter: "{a} <br/>{b} : {c} ({d}%)",
-          },
-          series: [
-            {
-              name: "命令",
-              type: "pie",
-              roseType: "radius",
-              radius: [15, 95],
-              center: ["50%", "38%"],
-              data: response.data.commandStats,
-              animationEasing: "cubicInOut",
-              animationDuration: 1000,
-            }
-          ]
-        })
-        this.usedmemory = echarts.init(this.$refs.usedmemory, "macarons")
-        this.usedmemory.setOption({
-          tooltip: {
-            formatter: "{b} <br/>{a} : " + this.cache.info.used_memory_human,
-          },
-          series: [
-            {
-              name: "峰值",
-              type: "gauge",
-              min: 0,
-              max: 1000,
-              detail: {
-                formatter: this.cache.info.used_memory_human,
-              },
-              data: [
-                {
-                  value: parseFloat(this.cache.info.used_memory_human),
-                  name: "内存消耗",
-                }
-              ]
-            }
-          ]
-        })
-        window.addEventListener("resize", () => {
-          this.commandstats.resize()
-          this.usedmemory.resize()
-        })
-      })
-    },
-    // 打开加载层
-    openLoading() {
-      this.$modal.loading("正在加载缓存监控数据，请稍候！")
-    }
-  }
-}
-</script>
+<template>
+  <div class="app-container">
+    <el-row :gutter="10">
+      <el-col :span="24" class="card-box">
+        <el-card>
+          <div slot="header"><span><i class="el-icon-monitor"></i> 基本信息</span></div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <table cellspacing="0" style="width: 100%">
+              <tbody>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell">Redis版本</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.redis_version }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">运行模式</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.redis_mode == "standalone" ? "单机" : "集群" }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">端口</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.tcp_port }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">客户端数</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.connected_clients }}</div></td>
+                </tr>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell">运行时间(天)</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.uptime_in_days }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">使用内存</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.used_memory_human }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">使用CPU</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ parseFloat(cache.info.used_cpu_user_children).toFixed(2) }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">内存配置</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.maxmemory_human }}</div></td>
+                </tr>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell">AOF是否开启</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.aof_enabled == "0" ? "否" : "是" }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">RDB是否成功</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.rdb_last_bgsave_status }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">Key数量</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.dbSize">{{ cache.dbSize }} </div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">网络入口/出口</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="cache.info">{{ cache.info.instantaneous_input_kbps }}kps/{{cache.info.instantaneous_output_kbps}}kps</div></td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </el-card>
+      </el-col>
+
+      <el-col :span="12" class="card-box">
+        <el-card>
+          <div slot="header"><span><i class="el-icon-pie-chart"></i> 命令统计</span></div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <div ref="commandstats" style="height: 420px" />
+          </div>
+        </el-card>
+      </el-col>
+
+      <el-col :span="12" class="card-box">
+        <el-card>
+          <div slot="header"><span><i class="el-icon-odometer"></i> 内存信息</span></div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <div ref="usedmemory" style="height: 420px" />
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getCache } from "@/api/monitor/cache"
+import * as echarts from "echarts"
+
+export default {
+  name: "Cache",
+  data() {
+    return {
+      // 统计命令信息
+      commandstats: null,
+      // 使用内存
+      usedmemory: null,
+      // cache信息
+      cache: []
+    }
+  },
+  created() {
+    this.getList()
+    this.openLoading()
+  },
+  methods: {
+    /** 查缓存询信息 */
+    getList() {
+      getCache().then((response) => {
+        this.cache = response.data
+        this.$modal.closeLoading()
+
+        this.commandstats = echarts.init(this.$refs.commandstats, "macarons")
+        this.commandstats.setOption({
+          tooltip: {
+            trigger: "item",
+            formatter: "{a} <br/>{b} : {c} ({d}%)",
+          },
+          series: [
+            {
+              name: "命令",
+              type: "pie",
+              roseType: "radius",
+              radius: [15, 95],
+              center: ["50%", "38%"],
+              data: response.data.commandStats,
+              animationEasing: "cubicInOut",
+              animationDuration: 1000,
+            }
+          ]
+        })
+        this.usedmemory = echarts.init(this.$refs.usedmemory, "macarons")
+        this.usedmemory.setOption({
+          tooltip: {
+            formatter: "{b} <br/>{a} : " + this.cache.info.used_memory_human,
+          },
+          series: [
+            {
+              name: "峰值",
+              type: "gauge",
+              min: 0,
+              max: 1000,
+              detail: {
+                formatter: this.cache.info.used_memory_human,
+              },
+              data: [
+                {
+                  value: parseFloat(this.cache.info.used_memory_human),
+                  name: "内存消耗",
+                }
+              ]
+            }
+          ]
+        })
+        window.addEventListener("resize", () => {
+          this.commandstats.resize()
+          this.usedmemory.resize()
+        })
+      })
+    },
+    // 打开加载层
+    openLoading() {
+      this.$modal.loading("正在加载缓存监控数据，请稍候！")
+    }
+  }
+}
+</script>

ruoyi-ui/src/views/monitor/job/index.vue

@@ -431,7 +431,7 @@ export default {
       })
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.jobId != undefined) {

ruoyi-ui/src/views/monitor/server/index.vue

@@ -1,207 +1,207 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="10">
-      <el-col :span="12" class="card-box">
-        <el-card>
-          <div slot="header"><span><i class="el-icon-cpu"></i> CPU</span></div>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <table cellspacing="0" style="width: 100%;">
-              <thead>
-                <tr>
-                  <th class="el-table__cell is-leaf"><div class="cell">属性</div></th>
-                  <th class="el-table__cell is-leaf"><div class="cell">值</div></th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell">核心数</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.cpu">{{ server.cpu.cpuNum }}</div></td>
-                </tr>
-                <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell">用户使用率</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.cpu">{{ server.cpu.used }}%</div></td>
-                </tr>
-                <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell">系统使用率</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.cpu">{{ server.cpu.sys }}%</div></td>
-                </tr>
-                <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell">当前空闲率</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.cpu">{{ server.cpu.free }}%</div></td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </el-card>
-      </el-col>
-
-      <el-col :span="12" class="card-box">
-        <el-card>
-          <div slot="header"><span><i class="el-icon-tickets"></i> 内存</span></div>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <table cellspacing="0" style="width: 100%;">
-              <thead>
-                <tr>
-                  <th class="el-table__cell is-leaf"><div class="cell">属性</div></th>
-                  <th class="el-table__cell is-leaf"><div class="cell">内存</div></th>
-                  <th class="el-table__cell is-leaf"><div class="cell">JVM</div></th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell">总内存</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.mem">{{ server.mem.total }}G</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.total }}M</div></td>
-                </tr>
-                <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell">已用内存</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.mem">{{ server.mem.used}}G</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.used}}M</div></td>
-                </tr>
-                <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell">剩余内存</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.mem">{{ server.mem.free }}G</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.free }}M</div></td>
-                </tr>
-                <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell">使用率</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.mem" :class="{'text-danger': server.mem.usage > 80}">{{ server.mem.usage }}%</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm" :class="{'text-danger': server.jvm.usage > 80}">{{ server.jvm.usage }}%</div></td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </el-card>
-      </el-col>
-
-      <el-col :span="24" class="card-box">
-        <el-card>
-          <div slot="header">
-            <span><i class="el-icon-monitor"></i> 服务器信息</span>
-          </div>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <table cellspacing="0" style="width: 100%;">
-              <tbody>
-                <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell">服务器名称</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.sys">{{ server.sys.computerName }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">操作系统</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.sys">{{ server.sys.osName }}</div></td>
-                </tr>
-                <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell">服务器IP</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.sys">{{ server.sys.computerIp }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">系统架构</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.sys">{{ server.sys.osArch }}</div></td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </el-card>
-      </el-col>
-
-      <el-col :span="24" class="card-box">
-        <el-card>
-          <div slot="header">
-            <span><i class="el-icon-coffee-cup"></i> Java虚拟机信息</span>
-          </div>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <table cellspacing="0" style="width: 100%;table-layout:fixed;">
-              <tbody>
-                <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell">Java名称</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.name }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">Java版本</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.version }}</div></td>
-                </tr>
-                <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell">启动时间</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.startTime }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">运行时长</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.runTime }}</div></td>
-                </tr>
-                <tr>
-                  <td colspan="1" class="el-table__cell is-leaf"><div class="cell">安装路径</div></td>
-                  <td colspan="3" class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.home }}</div></td>
-                </tr>
-                <tr>
-                  <td colspan="1" class="el-table__cell is-leaf"><div class="cell">项目路径</div></td>
-                  <td colspan="3" class="el-table__cell is-leaf"><div class="cell" v-if="server.sys">{{ server.sys.userDir }}</div></td>
-                </tr>
-                <tr>
-                  <td colspan="1" class="el-table__cell is-leaf"><div class="cell">运行参数</div></td>
-                  <td colspan="3" class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.inputArgs }}</div></td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </el-card>
-      </el-col>
-
-      <el-col :span="24" class="card-box">
-        <el-card>
-          <div slot="header">
-            <span><i class="el-icon-receiving"></i> 磁盘状态</span>
-          </div>
-          <div class="el-table el-table--enable-row-hover el-table--medium">
-            <table cellspacing="0" style="width: 100%;">
-              <thead>
-                <tr>
-                  <th class="el-table__cell el-table__cell is-leaf"><div class="cell">盘符路径</div></th>
-                  <th class="el-table__cell is-leaf"><div class="cell">文件系统</div></th>
-                  <th class="el-table__cell is-leaf"><div class="cell">盘符类型</div></th>
-                  <th class="el-table__cell is-leaf"><div class="cell">总大小</div></th>
-                  <th class="el-table__cell is-leaf"><div class="cell">可用大小</div></th>
-                  <th class="el-table__cell is-leaf"><div class="cell">已用大小</div></th>
-                  <th class="el-table__cell is-leaf"><div class="cell">已用百分比</div></th>
-                </tr>
-              </thead>
-              <tbody v-if="server.sysFiles">
-                <tr v-for="(sysFile, index) in server.sysFiles" :key="index">
-                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.dirName }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.sysTypeName }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.typeName }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.total }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.free }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.used }}</div></td>
-                  <td class="el-table__cell is-leaf"><div class="cell" :class="{'text-danger': sysFile.usage > 80}">{{ sysFile.usage }}%</div></td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { getServer } from "@/api/monitor/server"
-
-export default {
-  name: "Server",
-  data() {
-    return {
-      // 服务器信息
-      server: []
-    }
-  },
-  created() {
-    this.getList()
-    this.openLoading()
-  },
-  methods: {
-    /** 查询服务器信息 */
-    getList() {
-      getServer().then(response => {
-        this.server = response.data
-        this.$modal.closeLoading()
-      })
-    },
-    // 打开加载层
-    openLoading() {
-      this.$modal.loading("正在加载服务监控数据，请稍候！")
-    }
-  }
-}
-</script>
+<template>
+  <div class="app-container">
+    <el-row :gutter="10">
+      <el-col :span="12" class="card-box">
+        <el-card>
+          <div slot="header"><span><i class="el-icon-cpu"></i> CPU</span></div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <table cellspacing="0" style="width: 100%;">
+              <thead>
+                <tr>
+                  <th class="el-table__cell is-leaf"><div class="cell">属性</div></th>
+                  <th class="el-table__cell is-leaf"><div class="cell">值</div></th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell">核心数</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.cpu">{{ server.cpu.cpuNum }}</div></td>
+                </tr>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell">用户使用率</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.cpu">{{ server.cpu.used }}%</div></td>
+                </tr>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell">系统使用率</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.cpu">{{ server.cpu.sys }}%</div></td>
+                </tr>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell">当前空闲率</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.cpu">{{ server.cpu.free }}%</div></td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </el-card>
+      </el-col>
+
+      <el-col :span="12" class="card-box">
+        <el-card>
+          <div slot="header"><span><i class="el-icon-tickets"></i> 内存</span></div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <table cellspacing="0" style="width: 100%;">
+              <thead>
+                <tr>
+                  <th class="el-table__cell is-leaf"><div class="cell">属性</div></th>
+                  <th class="el-table__cell is-leaf"><div class="cell">内存</div></th>
+                  <th class="el-table__cell is-leaf"><div class="cell">JVM</div></th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell">总内存</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.mem">{{ server.mem.total }}G</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.total }}M</div></td>
+                </tr>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell">已用内存</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.mem">{{ server.mem.used}}G</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.used}}M</div></td>
+                </tr>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell">剩余内存</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.mem">{{ server.mem.free }}G</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.free }}M</div></td>
+                </tr>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell">使用率</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.mem" :class="{'text-danger': server.mem.usage > 80}">{{ server.mem.usage }}%</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm" :class="{'text-danger': server.jvm.usage > 80}">{{ server.jvm.usage }}%</div></td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </el-card>
+      </el-col>
+
+      <el-col :span="24" class="card-box">
+        <el-card>
+          <div slot="header">
+            <span><i class="el-icon-monitor"></i> 服务器信息</span>
+          </div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <table cellspacing="0" style="width: 100%;">
+              <tbody>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell">服务器名称</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.sys">{{ server.sys.computerName }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">操作系统</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.sys">{{ server.sys.osName }}</div></td>
+                </tr>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell">服务器IP</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.sys">{{ server.sys.computerIp }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">系统架构</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.sys">{{ server.sys.osArch }}</div></td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </el-card>
+      </el-col>
+
+      <el-col :span="24" class="card-box">
+        <el-card>
+          <div slot="header">
+            <span><i class="el-icon-coffee-cup"></i> Java虚拟机信息</span>
+          </div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <table cellspacing="0" style="width: 100%;table-layout:fixed;">
+              <tbody>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell">Java名称</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.name }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">Java版本</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.version }}</div></td>
+                </tr>
+                <tr>
+                  <td class="el-table__cell is-leaf"><div class="cell">启动时间</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.startTime }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">运行时长</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.runTime }}</div></td>
+                </tr>
+                <tr>
+                  <td colspan="1" class="el-table__cell is-leaf"><div class="cell">安装路径</div></td>
+                  <td colspan="3" class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.home }}</div></td>
+                </tr>
+                <tr>
+                  <td colspan="1" class="el-table__cell is-leaf"><div class="cell">项目路径</div></td>
+                  <td colspan="3" class="el-table__cell is-leaf"><div class="cell" v-if="server.sys">{{ server.sys.userDir }}</div></td>
+                </tr>
+                <tr>
+                  <td colspan="1" class="el-table__cell is-leaf"><div class="cell">运行参数</div></td>
+                  <td colspan="3" class="el-table__cell is-leaf"><div class="cell" v-if="server.jvm">{{ server.jvm.inputArgs }}</div></td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </el-card>
+      </el-col>
+
+      <el-col :span="24" class="card-box">
+        <el-card>
+          <div slot="header">
+            <span><i class="el-icon-receiving"></i> 磁盘状态</span>
+          </div>
+          <div class="el-table el-table--enable-row-hover el-table--medium">
+            <table cellspacing="0" style="width: 100%;">
+              <thead>
+                <tr>
+                  <th class="el-table__cell el-table__cell is-leaf"><div class="cell">盘符路径</div></th>
+                  <th class="el-table__cell is-leaf"><div class="cell">文件系统</div></th>
+                  <th class="el-table__cell is-leaf"><div class="cell">盘符类型</div></th>
+                  <th class="el-table__cell is-leaf"><div class="cell">总大小</div></th>
+                  <th class="el-table__cell is-leaf"><div class="cell">可用大小</div></th>
+                  <th class="el-table__cell is-leaf"><div class="cell">已用大小</div></th>
+                  <th class="el-table__cell is-leaf"><div class="cell">已用百分比</div></th>
+                </tr>
+              </thead>
+              <tbody v-if="server.sysFiles">
+                <tr v-for="(sysFile, index) in server.sysFiles" :key="index">
+                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.dirName }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.sysTypeName }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.typeName }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.total }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.free }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell">{{ sysFile.used }}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" :class="{'text-danger': sysFile.usage > 80}">{{ sysFile.usage }}%</div></td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { getServer } from "@/api/monitor/server"
+
+export default {
+  name: "Server",
+  data() {
+    return {
+      // 服务器信息
+      server: []
+    }
+  },
+  created() {
+    this.getList()
+    this.openLoading()
+  },
+  methods: {
+    /** 查询服务器信息 */
+    getList() {
+      getServer().then(response => {
+        this.server = response.data
+        this.$modal.closeLoading()
+      })
+    },
+    // 打开加载层
+    openLoading() {
+      this.$modal.loading("正在加载服务监控数据，请稍候！")
+    }
+  }
+}
+</script>

ruoyi-ui/src/views/register.vue

@@ -7,7 +7,7 @@
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
-      <el-form-item prop="password" :rules="registerPwdValidator">
+      <el-form-item prop="password">
         <el-input
           v-model="registerForm.password"
           type="password"
@@ -68,12 +68,18 @@
 
 <script>
 import { getCodeImg, register } from "@/api/login"
-import passwordRule from "@/utils/passwordRule"
 import defaultSettings from '@/settings'
 
 export default {
-  mixins: [passwordRule],
+  name: "Register",
   data() {
+    const equalToPassword = (rule, value, callback) => {
+      if (this.registerForm.password !== value) {
+        callback(new Error("两次输入的密码不一致"))
+      } else {
+        callback()
+      }
+    }
     return {
       title: process.env.VUE_APP_TITLE,
       footerContent: defaultSettings.footerContent,
@@ -85,31 +91,24 @@ export default {
         code: "",
         uuid: ""
       },
-      loading: false,
-      captchaEnabled: true
-    }
-  },
-  computed: {
-    registerRules() {
-      return {
+      registerRules: {
         username: [
           { required: true, trigger: "blur", message: "请输入您的账号" },
           { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
         ],
+        password: [
+          { required: true, trigger: "blur", message: "请输入您的密码" },
+          { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" },
+          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
+        ],
         confirmPassword: [
-          { required: true, message: "请再次输入您的密码", trigger: "blur" },
-          {
-            validator: (rule, value, callback) => {
-              if (this.registerForm.password !== value) {
-                callback(new Error("两次输入的密码不一致"))
-              } else {
-                callback()
-              }
-            }, trigger: "blur"
-          }
+          { required: true, trigger: "blur", message: "请再次输入您的密码" },
+          { required: true, validator: equalToPassword, trigger: "blur" }
         ],
         code: [{ required: true, trigger: "change", message: "请输入验证码" }]
-      }
+      },
+      loading: false,
+      captchaEnabled: true
     }
   },
   created() {

ruoyi-ui/src/views/system/config/index.vue

@@ -283,7 +283,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.configId)
-      this.single = selection.length != 1
+      this.single = selection.length!=1
       this.multiple = !selection.length
     },
     /** 修改按钮操作 */
@@ -297,7 +297,7 @@ export default {
       })
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.configId != undefined) {

ruoyi-ui/src/views/system/dept/index.vue

@@ -325,7 +325,7 @@ export default {
       })
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.deptId != undefined) {

ruoyi-ui/src/views/system/dict/data.vue

@@ -345,7 +345,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.dictCode)
-      this.single = selection.length != 1
+      this.single = selection.length!=1
       this.multiple = !selection.length
     },
     /** 修改按钮操作 */
@@ -359,7 +359,7 @@ export default {
       })
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.dictCode != undefined) {

ruoyi-ui/src/views/system/dict/index.vue

@@ -305,7 +305,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.dictId)
-      this.single = selection.length != 1
+      this.single = selection.length!=1
       this.multiple = !selection.length
     },
     /** 字典数据抽屉显示信息 */
@@ -328,7 +328,7 @@ export default {
       })
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.dictId != undefined) {

ruoyi-ui/src/views/system/menu/index.vue

@@ -466,7 +466,7 @@ export default {
       })
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.menuId != undefined) {

ruoyi-ui/src/views/system/notice/ReadUsers.vue

@@ -1,109 +0,0 @@
-<template>
-  <el-dialog :title="`「${noticeTitle}」已读用户`" :visible.sync="visible" width="760px" top="6vh" append-to-body @close="handleClose">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" style="margin-bottom: 4px;">
-      <el-form-item prop="searchValue">
-        <el-input
-          v-model="queryParams.searchValue"
-          placeholder="登录名称 / 用户名称"
-          clearable
-          prefix-icon="el-icon-search"
-          style="width: 220px;"
-          @keyup.enter.native="handleQuery"
-          @clear="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-      <el-form-item style="float: right; margin-right: 0;">
-        <span class="read-stat">
-          共 <strong>{{ total }}</strong> 人已读
-        </span>
-      </el-form-item>
-    </el-form>
-    <el-table v-loading="loading" :data="userList" size="small" stripe height="340px">
-      <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="登录名称" prop="userName" align="center" :show-overflow-tooltip="true" />
-      <el-table-column label="用户名称" prop="nickName" align="center" :show-overflow-tooltip="true" />
-      <el-table-column label="所属部门" prop="deptName" align="center" :show-overflow-tooltip="true" />
-      <el-table-column label="手机号码" prop="phonenumber" align="center" width="120" />
-      <el-table-column label="阅读时间" prop="readTime" align="center" width="160">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.readTime) }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" style="padding: 6px 0px;"/>
-  </el-dialog>
-</template>
-
-<script>
-import { listNoticeReadUsers } from "@/api/system/notice"
-
-export default {
-  name: "ReadUsers",
-  data() {
-    return {
-      visible: false,
-      loading: false,
-      noticeId: undefined,
-      noticeTitle: "",
-      total: 0,
-      userList: [],
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        noticeId: undefined,
-        searchValue: undefined
-      }
-    }
-  },
-  methods: {
-    open(row) {
-      this.noticeId = row.noticeId
-      this.noticeTitle = row.noticeTitle
-      this.queryParams.noticeId = row.noticeId
-      this.queryParams.searchValue = undefined
-      this.queryParams.pageNum = 1
-      this.visible = true
-      this.getList()
-    },
-    getList() {
-      this.loading = true
-      listNoticeReadUsers(this.queryParams).then(res => {
-        this.userList = res.rows
-        this.total = res.total
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    resetQuery() {
-      this.resetForm("queryForm")
-      this.handleQuery()
-    },
-    handleClose() {
-      this.userList = []
-      this.total = 0
-      this.queryParams.searchValue = undefined
-    }
-  }
-}
-</script>
-
-<style scoped>
-.read-stat {
-  font-size: 13px;
-  color: #606266;
-  line-height: 28px;
-}
-.read-stat strong {
-  color: #409eff;
-  font-size: 15px;
-  margin: 0 2px;
-}
-</style>

ruoyi-ui/src/views/system/notice/index.vue

@@ -72,11 +72,12 @@
     <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="noticeId" width="100" />
-      <el-table-column label="公告标题" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <a class="link-type" style="cursor:pointer" @click="handleViewData(scope.row)">{{ scope.row.noticeTitle }}</a>
-        </template>
-      </el-table-column>
+      <el-table-column
+        label="公告标题"
+        align="center"
+        prop="noticeTitle"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/>
@@ -95,13 +96,6 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-user"
-            @click="handleReadUsers(scope.row)"
-            v-hasPermi="['system:notice:list']"
-          >阅读用户</el-button>
           <el-button
             size="mini"
             type="text"
@@ -172,20 +166,14 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
-    <notice-detail-view ref="noticeViewRef" />
-    <read-users-dialog ref="readUsersRef" />
   </div>
 </template>
 
 <script>
-import NoticeDetailView from "@/layout/components/HeaderNotice/DetailView"
-import ReadUsersDialog from "./ReadUsers"
 import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice"
 
 export default {
   name: "Notice",
-  components: { NoticeDetailView, ReadUsersDialog },
   dicts: ['sys_notice_status', 'sys_notice_type'],
   data() {
     return {
@@ -270,7 +258,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.noticeId)
-      this.single = selection.length != 1
+      this.single = selection.length!=1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -290,7 +278,7 @@ export default {
       })
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.noticeId != undefined) {
@@ -309,14 +297,6 @@ export default {
         }
       })
     },
-    /** 查看公告详情 */
-    handleViewData(row) {
-      this.$refs.noticeViewRef.open(row)
-    },
-    /** 查看已读用户 */
-    handleReadUsers(row) {
-      this.$refs.readUsersRef.open(row)
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const noticeIds = row.noticeId || this.ids

ruoyi-ui/src/views/system/post/index.vue

@@ -249,7 +249,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.postId)
-      this.single = selection.length != 1
+      this.single = selection.length!=1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -269,7 +269,7 @@ export default {
       })
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.postId != undefined) {

ruoyi-ui/src/views/system/role/index.vue

@@ -451,7 +451,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.roleId)
-      this.single = selection.length != 1
+      this.single = selection.length!=1
       this.multiple = !selection.length
     },
     // 更多操作触发
@@ -527,7 +527,7 @@ export default {
     },
     /** 选择角色权限范围触发 */
     dataScopeSelectChange(value) {
-      if (value !== '2') {
+      if(value !== '2') {
         this.$refs.dept.setCheckedKeys([])
       }
     },
@@ -547,12 +547,12 @@ export default {
       this.title = "分配数据权限"
     },
     /** 分配用户操作 */
-    handleAuthUser(row) {
+    handleAuthUser: function(row) {
       const roleId = row.roleId
       this.$router.push("/system/role-auth/user/" + roleId)
     },
     /** 提交按钮 */
-    submitForm() {
+    submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.roleId != undefined) {
@@ -574,7 +574,7 @@ export default {
       })
     },
     /** 提交按钮（数据权限） */
-    submitDataScope() {
+    submitDataScope: function() {
       if (this.form.roleId != undefined) {
         this.form.deptIds = this.getDeptAllCheckedKeys()
         dataScope(this.form).then(() => {

ruoyi-ui/src/views/system/user/profile/resetPwd.vue

@@ -1,70 +1,69 @@
-<template>
-  <el-form ref="form" :model="user" :rules="formRules" label-width="80px">
-    <el-form-item label="旧密码" prop="oldPassword">
-      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
-    </el-form-item>
-    <el-form-item label="新密码" prop="newPassword" :rules="infoPwdValidator">
-      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
-    </el-form-item>
-    <el-form-item label="确认密码" prop="confirmPassword">
-      <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" size="mini" @click="submit">保存</el-button>
-      <el-button type="danger" size="mini" @click="close">关闭</el-button>
-    </el-form-item>
-  </el-form>
-</template>
-
-<script>
-import { updateUserPwd } from "@/api/system/user"
-import passwordRule from "@/utils/passwordRule"
-
-export default {
-  mixins: [passwordRule],
-  data() {
-    return {
-      user: {
-        oldPassword: undefined,
-        newPassword: undefined,
-        confirmPassword: undefined
-      }
-    }
-  },
-  computed: {
-    formRules() {
-      return {
-        oldPassword: [
-          { required: true, message: "旧密码不能为空", trigger: "blur" }
-        ],
-        confirmPassword: [
-          { required: true, message: "确认密码不能为空", trigger: "blur" },
-          {
-            validator: (rule, value, callback) => {
-              if (this.user.newPassword !== value) {
-                callback(new Error("两次输入的密码不一致"))
-              } else {
-                callback()
-              }
-            }, trigger: "blur"
-          }
-        ]
-      }
-    }
-  },
-  methods: {
-    submit() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(() => {
-            this.$modal.msgSuccess("修改成功")
-          })
-        }
-      })
-    },
-    close() {
-      this.$tab.closePage()
-    }
-  }
-}
-</script>
+<template>
+  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+    <el-form-item label="旧密码" prop="oldPassword">
+      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item label="新密码" prop="newPassword">
+      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item label="确认密码" prop="confirmPassword">
+      <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" size="mini" @click="submit">保存</el-button>
+      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { updateUserPwd } from "@/api/system/user"
+
+export default {
+  data() {
+    const equalToPassword = (rule, value, callback) => {
+      if (this.user.newPassword !== value) {
+        callback(new Error("两次输入的密码不一致"))
+      } else {
+        callback()
+      }
+    }
+    return {
+      user: {
+        oldPassword: undefined,
+        newPassword: undefined,
+        confirmPassword: undefined
+      },
+      // 表单校验
+      rules: {
+        oldPassword: [
+          { required: true, message: "旧密码不能为空", trigger: "blur" }
+        ],
+        newPassword: [
+          { required: true, message: "新密码不能为空", trigger: "blur" },
+          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" },
+          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
+        ],
+        confirmPassword: [
+          { required: true, message: "确认密码不能为空", trigger: "blur" },
+          { required: true, validator: equalToPassword, trigger: "blur" }
+        ]
+      }
+    }
+  },
+  methods: {
+    submit() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(() => {
+            this.$modal.msgSuccess("修改成功")
+          })
+        }
+      })
+    },
+    close() {
+      this.$tab.closePage()
+    }
+  }
+}
+</script>

ruoyi-ui/src/views/system/user/view.vue

@@ -1,177 +0,0 @@
-<template>
-  <el-drawer title="用户信息详情" :visible.sync="visible" direction="rtl" size="68%" append-to-body :before-close="handleClose" custom-class="detail-drawer">
-    <div v-loading="loading" class="drawer-content">
-      <!-- 基本信息 -->
-      <h4 class="section-header">基本信息</h4>
-      <el-row :gutter="20" class="mb8">
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">用户名称：</label>
-            <span class="info-value plaintext">{{ info.nickName }}</span>
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">归属部门：</label>
-            <span class="info-value plaintext">{{ (info.dept && info.dept.deptName) }}</span>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20" class="mb8">
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">手机号码：</label>
-            <span class="info-value plaintext">{{ info.phonenumber }}</span>
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">邮箱：</label>
-            <span class="info-value plaintext">{{ info.email }}</span>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20" class="mb8">
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">登录账号：</label>
-            <span class="info-value plaintext">{{ info.userName }}</span>
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">用户状态：</label>
-            <span class="info-value plaintext">
-              <el-tag size="small" :type="info.status === '0' ? 'success' : 'danger'">{{ info.status === '0' ? '正常' : '停用' }}</el-tag>
-            </span>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20" class="mb8">
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">岗位：</label>
-            <span class="info-value plaintext">{{ postNames || '无岗位' }}</span>
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">用户性别：</label>
-            <span class="info-value plaintext">{{ sexLabel }}</span>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20" class="mb8">
-        <el-col :span="24">
-          <div class="info-item full-width">
-            <label class="info-label">角色：</label>
-            <span class="info-value plaintext">{{ roleNames || '无角色' }}</span>
-          </div>
-        </el-col>
-      </el-row>
-      <!-- 其他信息 -->
-      <h4 class="section-header">其他信息</h4>
-      <el-row :gutter="20" class="mb8">
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">创建者：</label>
-            <span class="info-value plaintext">{{ info.createBy }}</span>
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">创建时间：</label>
-            <span class="info-value plaintext">{{ info.createTime }}</span>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20" class="mb8">
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">更新者：</label>
-            <span class="info-value plaintext">{{ info.updateBy }}</span>
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">更新时间：</label>
-            <span class="info-value plaintext">{{ info.updateTime }}</span>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20" class="mb8">
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">最后登录IP：</label>
-            <span class="info-value plaintext">{{ info.loginIp }}</span>
-          </div>
-        </el-col>
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">最后登录时间：</label>
-            <span class="info-value plaintext">{{ info.loginDate }}</span>
-          </div>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20" class="mb8">
-        <el-col :span="24">
-          <div class="info-item full-width">
-            <label class="info-label">备注：</label>
-            <span class="info-value plaintext">{{ info.remark }}</span>
-          </div>
-        </el-col>
-      </el-row>
-    </div>
-  </el-drawer>
-</template>
-
-<script>
-import { getUser } from '@/api/system/user'
-
-export default {
-  name: 'UserViewDrawer',
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      visible: false,
-      loading: false,
-      info: {},
-      postOptions: [],
-      roleOptions: []
-    }
-  },
-  computed: {
-    sexLabel() {
-      return this.selectDictLabel(this.dict.type.sys_user_sex, this.info.sex) || '-'
-    },
-    postNames() {
-      if (!this.postOptions.length) return ''
-      const ids = this.info.postIds || []
-      return this.postOptions.filter(p => ids.includes(p.postId)).map(p => p.postName).join('、') || ''
-    },
-    roleNames() {
-      if (!this.roleOptions.length) return ''
-      const ids = this.info.roleIds || []
-      return this.roleOptions.filter(r => ids.includes(r.roleId)).map(r => r.roleName).join('、') || ''
-    }
-  },
-  methods: {
-    open(userId) {
-      this.visible = true
-      this.loading = true
-      getUser(userId).then(res => {
-        this.info = res.data || {}
-        this.postOptions = res.posts || []
-        this.roleOptions = res.roles || []
-        this.info.postIds = res.postIds || []
-        this.info.roleIds = res.roleIds || []
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    handleClose() {
-      this.visible = false
-    }
-  }
-}
-</script>

ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -183,7 +183,6 @@ export default {
           const genTable = Object.assign({}, basicForm.model, genForm.model)
           genTable.columns = this.columns
           genTable.params = {
-            genView: genTable.view ? '1' : '0',
             treeCode: genTable.treeCode,
             treeName: genTable.treeName,
             treeParentCode: genTable.treeParentCode,

ruoyi-ui/src/views/tool/gen/genInfoForm.vue

@@ -69,29 +69,6 @@
         </el-form-item>
       </el-col>
 
-      <el-col :span="12">
-        <el-form-item prop="formColNum">
-          <span slot="label">
-            表单布局
-            <el-tooltip content="选择表单的栅格布局方式" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-select v-model="info.formColNum">
-            <el-option label="单列" :value="1" />
-            <el-option label="双列" :value="2" />
-            <el-option label="三列" :value="3" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="12">
-        <el-form-item prop="genView">
-          <span slot="label">扩展功能</span>
-          <el-checkbox v-model="info.view">生成详情页</el-checkbox>
-        </el-form-item>
-      </el-col>
-
       <el-col :span="12">
         <el-form-item prop="genType">
           <span slot="label">
@@ -316,7 +293,7 @@ export default {
     },
     /** 选择生成模板触发 */
     tplSelectChange(value) {
-      if (value !== 'sub') {
+      if(value !== 'sub') {
         this.info.subTableName = ''
         this.info.subTableFkName = ''
       }

ruoyi-ui/src/views/tool/gen/index.vue

@@ -262,7 +262,7 @@ export default {
         this.$modal.msgError("请选择要生成的数据")
         return
       }
-      if (row.genType === "1") {
+      if(row.genType === "1") {
         genCode(row.tableName).then(() => {
           this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath)
         })

sql/ry_20260320.sql

@@ -553,7 +553,6 @@ insert into sys_config values(5, '账号自助-是否开启用户注册功能',
 insert into sys_config values(6, '用户登录-黑名单列表',           'sys.login.blackIPList',            '',              'Y', 'admin', sysdate(), '', null, '设置登录IP黑名单限制，多个匹配项以;分隔，支持匹配（*通配、网段）');
 insert into sys_config values(7, '用户管理-初始密码修改策略',     'sys.account.initPasswordModify',   '1',             'Y', 'admin', sysdate(), '', null, '0：初始密码修改策略关闭，没有任何提示，1：提醒用户，如果未修改初始密码，则在登录时就会提醒修改密码对话框');
 insert into sys_config values(8, '用户管理-账号密码更新周期',     'sys.account.passwordValidateDays', '0',             'Y', 'admin', sysdate(), '', null, '密码更新周期（填写数字，数据初始化值为0不限制，若修改必须为大于0小于365的正整数），如果超过这个周期登录系统时，则在登录时就会提醒修改密码对话框');
-insert into sys_config values(9, '用户管理-密码字符范围',         'sys.account.chrtype',              '0',             'Y', 'admin', sysdate(), '', null, '默认任意字符范围，0任意（密码可以输入任意字符），1数字（密码只能为0-9数字），2英文字母（密码只能为a-z和A-Z字母），3字母和数字（密码必须包含字母，数字）,4字母数字和特殊字符（目前支持的特殊字符包括：~!@#$%^&*()-=_+）');
 
 
 -- ----------------------------
@@ -679,7 +678,6 @@ create table gen_table (
   business_name     varchar(30)                                comment '生成业务名',
   function_name     varchar(50)                                comment '生成功能名',
   function_author   varchar(50)                                comment '生成功能作者',
-  form_col_num      int(1)          default 1                  comment '表单布局（单列 双列 三列）',
   gen_type          char(1)         default '0'                comment '生成代码方式（0zip压缩包 1自定义路径）',
   gen_path          varchar(200)    default '/'                comment '生成路径（不填默认项目路径）',
   options           varchar(1000)                              comment '其它生成选项',