From c8738f6eb016d4400d0dfbbd8ad09b720ad00588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=A8=E6=9B=A6?= <635132977@qq.com> Date: Tue, 16 Apr 2024 15:21:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E7=9A=84=E5=88=97?= =?UTF-8?q?=E6=95=B0=E7=94=B1=E5=8E=9F=E5=85=881=E5=88=97=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=BA=E5=A4=9A=EF=BC=881-4=EF=BC=89=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/generator/domain/GenTable.java | 3 +++ .../src/main/java/com/ruoyi/generator/util/VelocityUtils.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java index 6c5d71f..5602538 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java @@ -156,6 +156,9 @@ public class GenTable implements Serializable /** 备注 */ private String remark; + /** 编辑页列数 */ + private Integer editColumns; + /** * 请求参数 */ diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java index a3a6cd7..09663da 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java @@ -70,6 +70,8 @@ public class VelocityUtils { velocityContext.put("columns", genTable.getColumns()); velocityContext.put("table", genTable); velocityContext.put("dicts", getDicts(genTable)); + /* 编辑页列数*/ + velocityContext.put("editColumns", genTable.getEditColumns()); setMenuVelocityContext(velocityContext, genTable); if (GenConstants.TPL_TREE.equals(tplCategory)) { setTreeVelocityContext(velocityContext, genTable);