自动导入配置

docker/copy.sh

@@ -9,7 +9,7 @@ usage() {
 
 # copy sql
 echo "begin copy sql "
-cp ../sql/ry_20260321.sql ./mysql/db
+cp ../sql/ry_20260402.sql ./mysql/db
 cp ../sql/ry_config_20260311.sql ./mysql/db
 
 # copy html

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.api.domain;
 import java.util.Date;
 import java.util.List;
 import jakarta.validation.constraints.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -68,6 +69,7 @@ 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/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java

@@ -142,4 +142,35 @@ 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.core.utils.file" };
+
+    /**
+     * 部门相关常量
+     */
+    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/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelSheet.java

@@ -0,0 +1,85 @@
+package com.ruoyi.common.core.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/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java

@@ -502,6 +502,82 @@ 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 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/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java

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

ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java

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

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java

@@ -64,6 +64,9 @@ public class GenTable extends BaseEntity
     @NotBlank(message = "作者不能为空")
     private String functionAuthor;
 
+    /** 表单布局（单列 双列 三列） */
+    private Integer formColNum;
+
     /** 生成代码方式（0zip压缩包 1自定义路径） */
     private String genType;
 
@@ -228,6 +231,16 @@ 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;

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java

@@ -60,6 +60,7 @@ 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));
@@ -434,4 +435,23 @@ 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-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -18,6 +18,7 @@ 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"           />
@@ -55,7 +56,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, 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, form_col_num, 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">
@@ -112,7 +113,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.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.form_col_num, 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
@@ -120,7 +121,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.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.form_col_num, 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
@@ -128,7 +129,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.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.form_col_num, 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
@@ -147,6 +148,7 @@ 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>
@@ -163,6 +165,7 @@ 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>
@@ -180,6 +183,7 @@ 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-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm

@@ -165,8 +165,16 @@
     </el-table>
 
     <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+#if($table.formColNum == 2)
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+#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>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -179,26 +187,37 @@
 #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>
 #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>
 #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>
 #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>
 #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>
 #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
@@ -213,13 +232,17 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+          </el-col>
 #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>
 #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
@@ -230,13 +253,17 @@
                 </el-checkbox>
               </el-checkbox-group>
             </el-form-item>
+          </el-col>
 #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>
 #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
@@ -250,13 +277,17 @@
                 >{{dict.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
+          </el-col>
 #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>
 #elseif($column.htmlType == "datetime")
+          <el-col :span="${colSpan}">
             <el-form-item label="${comment}" prop="${field}">
               <el-date-picker clearable
                 v-model="form.${field}"
@@ -265,14 +296,18 @@
                 placeholder="选择${comment}">
               </el-date-picker>
             </el-form-item>
+          </el-col>
 #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>
 #end
 #end
 #end
 #end
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm

@@ -180,8 +180,16 @@
     />
 
     <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+#if($table.formColNum == 2)
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+#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>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -194,22 +202,31 @@
 #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>
 #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>
 #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>
 #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>
 #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
@@ -224,13 +241,17 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+          </el-col>
 #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>
 #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
@@ -241,13 +262,17 @@
                 </el-checkbox>
               </el-checkbox-group>
             </el-form-item>
+          </el-col>
 #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>
 #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
@@ -261,13 +286,17 @@
                 >{{dict.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
+          </el-col>
 #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>
 #elseif($column.htmlType == "datetime")
+          <el-col :span="${colSpan}">
             <el-form-item label="${comment}" prop="${field}">
               <el-date-picker clearable
                 v-model="form.${field}"
@@ -276,14 +305,18 @@
                 placeholder="请选择${comment}">
               </el-date-picker>
             </el-form-item>
+          </el-col>
 #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>
 #end
 #end
 #end
 #end
+        </el-row>
 #if($table.sub)
         <el-divider content-position="center">${subTable.functionName}信息</el-divider>
         <el-row :gutter="10" class="mb8">
@@ -493,7 +526,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
     },
     /** 新增按钮操作 */

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

@@ -144,8 +144,16 @@
     </el-table>
 
     <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+#if($table.formColNum == 2)
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
+#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>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -158,6 +166,7 @@
 #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}"
@@ -168,23 +177,33 @@
                 check-strictly
               />
             </el-form-item>
+          </el-col>
 #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>
 #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>
 #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>
 #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>
 #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
@@ -199,13 +218,17 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+          </el-col>
 #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>
 #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
@@ -216,13 +239,17 @@
                 </el-checkbox>
               </el-checkbox-group>
             </el-form-item>
+          </el-col>
 #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>
 #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
@@ -236,13 +263,17 @@
                 >{{dict.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
+          </el-col>
 #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>
 #elseif($column.htmlType == "datetime")
+          <el-col :span="${colSpan}">
             <el-form-item label="${comment}" prop="${field}">
               <el-date-picker clearable
                 v-model="form.${field}"
@@ -251,14 +282,18 @@
                 placeholder="选择${comment}">
               </el-date-picker>
             </el-form-item>
+          </el-col>
 #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>
 #end
 #end
 #end
 #end
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -276,7 +311,7 @@ import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${Busin
 const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
+const { ${dictsNoSymbol} } = useDict(${dicts})
 #end
 
 const ${businessName}List = ref([])
@@ -444,13 +479,13 @@ function submitForm() {
 #end
 #end
       if (form.value.${pkColumn.javaField} != null) {
-        update${BusinessName}(form.value).then(response => {
+        update${BusinessName}(form.value).then(() => {
           proxy.#[[$modal]]#.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        add${BusinessName}(form.value).then(response => {
+        add${BusinessName}(form.value).then(() => {
           proxy.#[[$modal]]#.msgSuccess("新增成功")
           open.value = false
           getList()

ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm

@@ -163,8 +163,16 @@
     />
 
     <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+#if($table.formColNum == 2)
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
+#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>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -177,22 +185,31 @@
 #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>
 #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>
 #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>
 #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>
 #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
@@ -207,13 +224,17 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+          </el-col>
 #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>
 #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
@@ -224,13 +245,17 @@
                 </el-checkbox>
               </el-checkbox-group>
             </el-form-item>
+          </el-col>
 #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>
 #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
@@ -244,13 +269,17 @@
                 >{{dict.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
+          </el-col>
 #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>
 #elseif($column.htmlType == "datetime")
+          <el-col :span="${colSpan}">
             <el-form-item label="${comment}" prop="${field}">
               <el-date-picker clearable
                 v-model="form.${field}"
@@ -259,14 +288,18 @@
                 placeholder="请选择${comment}">
               </el-date-picker>
             </el-form-item>
+          </el-col>
 #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>
 #end
 #end
 #end
 #end
+        </el-row>
 #if($table.sub)
         <el-divider content-position="center">${subTable.functionName}信息</el-divider>
         <el-row :gutter="10" class="mb8">
@@ -277,9 +310,13 @@
             <el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">删除</el-button>
           </el-col>
         </el-row>
-        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
+        <el-table :data="${subclassName}List" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="序号" align="center" prop="index" width="50"/>
+          <el-table-column label="序号" width="60">
+            <template #default="{ $index }">
+              {{ $index + 1 }}
+            </template>
+          </el-table-column>
 #foreach($column in $subTable.columns)
 #set($javaField=$column.javaField)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -348,7 +385,7 @@ import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${Busin
 const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
+const { ${dictsNoSymbol} } = useDict(${dicts})
 #end
 
 const ${businessName}List = ref([])
@@ -515,13 +552,13 @@ function submitForm() {
       form.value.${subclassName}List = ${subclassName}List.value
 #end
       if (form.value.${pkColumn.javaField} != null) {
-        update${BusinessName}(form.value).then(response => {
+        update${BusinessName}(form.value).then(() => {
           proxy.#[[$modal]]#.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        add${BusinessName}(form.value).then(response => {
+        add${BusinessName}(form.value).then(() => {
           proxy.#[[$modal]]#.msgSuccess("新增成功")
           open.value = false
           getList()
@@ -543,11 +580,6 @@ 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 = {}

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

@@ -144,8 +144,16 @@
     </el-table>
 
     <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+#if($table.formColNum == 2)
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
+#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>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -158,6 +166,7 @@
 #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}"
@@ -168,23 +177,33 @@
                 check-strictly
               />
             </el-form-item>
+          </el-col>
 #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>
 #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>
 #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>
 #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>
 #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
@@ -199,13 +218,17 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+          </el-col>
 #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>
 #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
@@ -216,13 +239,17 @@
                 </el-checkbox>
               </el-checkbox-group>
             </el-form-item>
+          </el-col>
 #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>
 #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
@@ -236,13 +263,17 @@
                 >{{dict.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
+          </el-col>
 #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>
 #elseif($column.htmlType == "datetime")
+          <el-col :span="${colSpan}">
             <el-form-item label="${comment}" prop="${field}">
               <el-date-picker clearable
                 v-model="form.${field}"
@@ -251,14 +282,18 @@
                 placeholder="选择${comment}">
               </el-date-picker>
             </el-form-item>
+          </el-col>
 #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>
 #end
 #end
 #end
 #end
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -278,7 +313,7 @@ import type { TreeSelect } from '@/types/api/common'
 const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
+const { ${dictsNoSymbol} } = useDict(${dicts})
 #end
 
 const ${businessName}List = ref<any[]>([])

ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3ts/index.vue.vm

@@ -163,8 +163,16 @@
     />
 
     <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+#if($table.formColNum == 2)
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
+#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>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -177,22 +185,31 @@
 #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>
 #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>
 #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>
 #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>
 #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
@@ -207,13 +224,17 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+          </el-col>
 #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>
 #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
@@ -224,13 +245,17 @@
                 </el-checkbox>
               </el-checkbox-group>
             </el-form-item>
+          </el-col>
 #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>
 #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
@@ -244,13 +269,17 @@
                 >{{dict.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
+          </el-col>
 #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>
 #elseif($column.htmlType == "datetime")
+          <el-col :span="${colSpan}">
             <el-form-item label="${comment}" prop="${field}">
               <el-date-picker clearable
                 v-model="form.${field}"
@@ -259,14 +288,18 @@
                 placeholder="请选择${comment}">
               </el-date-picker>
             </el-form-item>
+          </el-col>
 #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>
 #end
 #end
 #end
 #end
+        </el-row>
 #if($table.sub)
         <el-divider content-position="center">${subTable.functionName}信息</el-divider>
         <el-row :gutter="10" class="mb8">
@@ -357,7 +390,7 @@ import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${Busin
 const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
+const { ${dictsNoSymbol} } = useDict(${dicts})
 #end
 
 const ${businessName}List = ref<${ClassName}[]>([])

ruoyi-modules/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.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.update_by, u.update_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,7 +40,6 @@
     "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/assets/styles/ruoyi.scss

@@ -233,6 +233,55 @@
 }
 
 /** 详细卡片样式 */
+.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 {
@@ -324,6 +373,28 @@
   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; }
@@ -398,6 +469,9 @@
 }
 
 /* 拖拽列样式 */
+.allowDrag { cursor: grab; }
+.allowDrag:active { cursor: grabbing; }
+
 .sortable-ghost {
   opacity: .8;
   color: #fff !important;
@@ -408,8 +482,3 @@
   position: relative;
   float: right;
 }
-
-/* 分割面板样式 */
-.splitpanes.default-theme .splitpanes__pane {
-  background-color: #fff!important;
-}

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

@@ -0,0 +1,126 @@
+<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,6 +38,8 @@
 </template>
 
 <script>
+import cache from '@/plugins/cache'
+
 export default {
   name: "RightToolbar",
   data() {
@@ -76,6 +78,11 @@ export default {
       type: Number,
       default: 10
     },
+    /* 列显隐状态记忆的 localStorage key（传入则启用记忆，不传则不记忆） */
+    storageKey: {
+      type: String,
+      default: ""
+    }
   },
   computed: {
     style() {
@@ -103,6 +110,23 @@ 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)) {
@@ -168,6 +192,7 @@ export default {
           this.columns[key].visible = !data.includes(index)
         })
       }
+      this.saveStorage()
     },
     // 打开显隐列dialog
     showColumn() {
@@ -180,6 +205,7 @@ export default {
       } else {
         this.columns[key].visible = event
       }
+      this.saveStorage()
     },
     // 切换全选/反选
     toggleCheckAll() {
@@ -189,6 +215,20 @@ 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/TreePanel/index.vue

@@ -0,0 +1,709 @@
+<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/layout/components/Navbar.vue

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

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

@@ -546,6 +546,8 @@ export default {
   width: 100vw;
   height: 100vh;
   overflow: hidden;
+  margin-left: 0 !important;
+  transition: none !important;
 }
 
 .main-container.fullscreen-mode .fixed-header {
@@ -556,6 +558,7 @@ export default {
   right: 0;
   width: 100% !important;
   z-index: 1000;
+  transition: none !important;
 }
 
 .main-container.fullscreen-mode .fixed-header .navbar {

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

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

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: function() {
+    submitForm() {
       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: function() {
+    submitForm() {
       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: function() {
+    submitForm() {
       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: function() {
+    submitForm() {
       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: function() {
+    submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.menuId != undefined) {

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

@@ -258,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
     },
     /** 新增按钮操作 */
@@ -278,7 +278,7 @@ export default {
       })
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.noticeId != undefined) {

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: function() {
+    submitForm() {
       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
     },
     // 更多操作触发
@@ -547,12 +547,12 @@ export default {
       this.title = "分配数据权限"
     },
     /** 分配用户操作 */
-    handleAuthUser: function(row) {
+    handleAuthUser(row) {
       const roleId = row.roleId
       this.$router.push("/system/role-auth/user/" + roleId)
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.roleId != undefined) {
@@ -574,7 +574,7 @@ export default {
       })
     },
     /** 提交按钮（数据权限） */
-    submitDataScope: function() {
+    submitDataScope() {
       if (this.form.roleId != undefined) {
         this.form.deptIds = this.getDeptAllCheckedKeys()
         dataScope(this.form).then(() => {

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

@@ -1,21 +1,8 @@
 <template>
-  <div class="app-container">
+  <div class="app-container tree-sidebar-manage-wrap">
-    <el-row :gutter="20">
+    <tree-panel title="组织机构" :tree-data="deptOptions" search-placeholder="请输入部门名称" storage-key="dept-sidebar-width" :defaultExpandAll="true" @node-click="handleNodeClick" @refresh="getDeptTree" ref="deptTreeRef" />
-      <splitpanes :horizontal="this.$store.getters.device === 'mobile'" class="default-theme">
+    <div class="tree-sidebar-content">
-        <!--部门数据-->
+      <div class="content-inner">
-        <pane size="16">
-          <el-col>
-            <div class="head-container">
-              <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" />
-            </div>
-            <div class="head-container">
-              <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />
-            </div>
-          </el-col>
-        </pane>
-        <!--用户数据-->
-        <pane size="84">
-          <el-col>
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="用户名称" prop="userName">
             <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
@@ -59,7 +46,11 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns.userId.visible" />
-              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true" />
+          <el-table-column label="用户名称" align="center" key="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <a class="link-type" style="cursor:pointer" @click="handleViewData(scope.row)">{{ scope.row.userName }}</a>
+            </template>
+          </el-table-column>
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns.nickName.visible" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
@@ -87,12 +78,9 @@
             </template>
           </el-table-column>
         </el-table>
-
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-          </el-col>
+      </div>
-        </pane>
+    </div>
-      </splitpanes>
-    </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
@@ -179,39 +167,25 @@
       </div>
     </el-dialog>
 
+    <!-- 用户详情抽屉 -->
+    <user-view-drawer ref="userViewRef" />
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+    <excel-import-dialog ref="importUserRef" title="用户导入" action="/system/user/importData" template-action="/system/user/importTemplate" template-file-name="user_template" update-support-label="是否更新已经存在的用户数据" @success="getList" />
-      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :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="upload.updateSupport" />是否更新已经存在的用户数据
-          </div>
-          <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
-        </div>
-      </el-upload>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="upload.open = false">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user"
-import { getToken } from "@/utils/auth"
 import Treeselect from "@riophae/vue-treeselect"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"
-import { Splitpanes, Pane } from "splitpanes"
+import TreePanel from "@/components/TreePanel"
-import "splitpanes/dist/splitpanes.css"
+import ExcelImportDialog from "@/components/ExcelImportDialog"
+import UserViewDrawer from "./view"
 
 export default {
   name: "User",
   dicts: ['sys_normal_disable', 'sys_user_sex'],
-  components: { Treeselect, Splitpanes, Pane },
+  components: { Treeselect, TreePanel, ExcelImportDialog, UserViewDrawer },
   data() {
     return {
       // 遮罩层
@@ -236,8 +210,6 @@ export default {
       enabledDeptOptions: undefined,
       // 是否显示弹出层
       open: false,
-      // 部门名称
-      deptName: undefined,
       // 默认密码
       initPassword: undefined,
       // 日期范围
@@ -248,25 +220,6 @@ export default {
       roleOptions: [],
       // 表单参数
       form: {},
-      defaultProps: {
-        children: "children",
-        label: "label"
-      },
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
-      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -317,12 +270,6 @@ export default {
       }
     }
   },
-  watch: {
-    // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
   created() {
     this.getList()
     this.getDeptTree()
@@ -338,8 +285,7 @@ export default {
         this.userList = response.rows
         this.total = response.total
         this.loading = false
-        }
+      })
-      )
     },
     /** 查询部门下拉树结构 */
     getDeptTree() {
@@ -360,11 +306,6 @@ export default {
         return true
       })
     },
-    // 筛选节点
-    filterNode(value, data) {
-      if (!value) return true
-      return data.label.indexOf(value) !== -1
-    },
     // 节点单击事件
     handleNodeClick(data) {
       this.queryParams.deptId = data.id
@@ -414,7 +355,7 @@ export default {
       this.dateRange = []
       this.resetForm("queryForm")
       this.queryParams.deptId = undefined
-      this.$refs.tree.setCurrentKey(null)
+      this.$refs.deptTreeRef.setCurrentKey(null)
       this.handleQuery()
     },
     // 多选框选中数据
@@ -482,12 +423,12 @@ export default {
       }).catch(() => {})
     },
     /** 分配角色操作 */
-    handleAuthRole: function(row) {
+    handleAuthRole(row) {
       const userId = row.userId
       this.$router.push("/system/user-auth/role/" + userId)
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
@@ -522,36 +463,13 @@ export default {
         ...this.queryParams
       }, `user_${new Date().getTime()}.xlsx`)
     },
+    /** 详情按钮操作 */
+    handleViewData(row) {
+      this.$refs.userViewRef.open(row.userId)
+    },
     /** 导入按钮操作 */
     handleImport() {
-      this.upload.title = "用户导入"
+      this.$refs.importUserRef.open()
-      this.upload.open = true
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.download('system/user/importTemplate', {
-      }, `user_template_${new Date().getTime()}.xlsx`)
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.upload.open = false
-      this.upload.isUploading = false
-      this.$refs.upload.clearFiles()
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
-      this.getList()
-    },
-    // 提交上传文件
-    submitFileForm() {
-      const file = this.$refs.upload.uploadFiles
-      if (!file || file.length === 0 || !file[0].name.toLowerCase().endsWith('.xls') && !file[0].name.toLowerCase().endsWith('.xlsx')) {
-        this.$modal.msgError("请选择后缀为 “xls”或“xlsx”的文件。")
-        return
-      }
-      this.$refs.upload.submit()
     }
   }
 }

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

@@ -0,0 +1,177 @@
+<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/genInfoForm.vue

@@ -69,6 +69,22 @@
         </el-form-item>
       </el-col>
 
+      <el-col :span="24">
+        <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="genType">
           <span slot="label">

sql/ry_20260402.sql

@@ -674,6 +674,7 @@ 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 '其它生成选项',