diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
index b66e8289ad..adf87a93be 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/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;
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index 627dbebac1..6466a9ef81 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/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";
+ }
}
diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
index 8d7dd8bf6e..9d5a967a71 100644
--- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -55,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- 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