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); diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/element.ts.index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/element.ts.index.vue.vm index 14d6229..5a7b54a 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/element.ts.index.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/element.ts.index.vue.vm @@ -1,706 +1,721 @@ - - - - -#foreach($column in $columns) -#if($column.query) -#set($dictType=$column.dictType) -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#set($parentheseIndex=$column.columnComment.indexOf("(")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($column.htmlType == "input" || $column.htmlType == "textarea") - - - -#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType) - - - - - -#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType) - - - - - -#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN") - - + + + + #foreach($column in $columns) + #if($column.query) + #set($dictType=$column.dictType) + #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + #set($parentheseIndex=$column.columnComment.indexOf("(")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #if($column.htmlType == "input" || $column.htmlType == "textarea") + + + + #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType) + + + + + + #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType) + + + + + + #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN") + + + + #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN") + + + + #end + #end + #end + + 搜索 + 重置 + + + + + + + + + + 新增 + + + 修改 + + + 删除 + + + 导入 + + + 导出 + + + + + + + + #foreach($column in $columns) + #set($javaField=$column.javaField) + #set($parentheseIndex=$column.columnComment.indexOf("(")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #if($column.pk) + + #elseif($column.list && $column.htmlType == "datetime") + + + {{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }} + + + #elseif($column.list && $column.htmlType == "imageUpload") + + + + + + #elseif($column.list && $column.dictType && "" != $column.dictType) + + + #if($column.htmlType == "checkbox") + + #else + + #end + + + #elseif($column.list && "" != $javaField) + + #end + #end + + + + + + + + + + + + + - -#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN") - - - -#end -#end -#end - - 搜索 - 重置 - - - - + + + + + + #foreach($column in $columns) + #set($field=$column.javaField) + #if(($column.insert || $column.edit) && !$column.pk) + #set($parentheseIndex=$column.columnComment.indexOf("(")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #set($dictType=$column.dictType) + #if(${editColumns}==1) + + #end + #if(${editColumns}==2) + + #end + #if(${editColumns}==3) + + #end + #if(${editColumns}==4) + + #end + #if($column.htmlType == "input") + #if(${field} == "version") + + + + #else + + + + #end + #elseif($column.htmlType == "imageUpload") + + + + #elseif($column.htmlType == "fileUpload") + + + + #elseif($column.htmlType == "editor") + + + + #elseif($column.htmlType == "select" && "" != $dictType) + + + + + + #elseif($column.htmlType == "select" && $dictType) + + + + + + #elseif($column.htmlType == "checkbox" && "" != $dictType) + + + + {{dict.label}} + + + + #elseif($column.htmlType == "checkbox" && $dictType) + + + 请选择字典生成 + + + #elseif($column.htmlType == "radio" && "" != $dictType) + + + {{dict.label}} + + + #elseif($column.htmlType == "radio" && $dictType) + + + 请选择字典生成 + + + #elseif($column.htmlType == "datetime") + + + + + #elseif($column.htmlType == "textarea") + + + + #end + + #end + #end + + #if($table.sub) + ${subTable.functionName}信息 + + + 添加 + + + 删除 + + + + + + #foreach($column in $subTable.columns) + #set($javaField=$column.javaField) + #set($parentheseIndex=$column.columnComment.indexOf("(")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #if($column.pk || $javaField == ${subTableFkclassName}) + #elseif($column.list && $column.htmlType == "input") + #if(${javaField} == "version") + + + + + + #else + + + + + + #end + #elseif($column.list && $column.htmlType == "datetime") + + + + + + + #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType) + + + + + + + + #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType) + + + + + + + + #end + #end + + #end + + + + + - - - - - 新增 - - - 修改 - - - 删除 - - - 导入 - - - 导出 - - - - - - - -#foreach($column in $columns) -#set($javaField=$column.javaField) -#set($parentheseIndex=$column.columnComment.indexOf("(")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($column.pk) - -#elseif($column.list && $column.htmlType == "datetime") - - - {{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }} - - -#elseif($column.list && $column.htmlType == "imageUpload") - - - - - -#elseif($column.list && $column.dictType && "" != $column.dictType) - - -#if($column.htmlType == "checkbox") - -#else - -#end - - -#elseif($column.list && "" != $javaField) - -#end -#end - - - - - - - - - - - - - - - - - -#foreach($column in $columns) -#set($field=$column.javaField) -#if(($column.insert || $column.edit) && !$column.pk) -#set($parentheseIndex=$column.columnComment.indexOf("(")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#set($dictType=$column.dictType) -#if($column.htmlType == "input") - #if(${field} == "version") - - - - #else - - - - #end -#elseif($column.htmlType == "imageUpload") - - - -#elseif($column.htmlType == "fileUpload") - - - -#elseif($column.htmlType == "editor") - - - -#elseif($column.htmlType == "select" && "" != $dictType) - - - - - -#elseif($column.htmlType == "select" && $dictType) - - - - - -#elseif($column.htmlType == "checkbox" && "" != $dictType) - - - - {{dict.label}} - - - -#elseif($column.htmlType == "checkbox" && $dictType) - - - 请选择字典生成 - - -#elseif($column.htmlType == "radio" && "" != $dictType) - - - {{dict.label}} - - -#elseif($column.htmlType == "radio" && $dictType) - - - 请选择字典生成 - - -#elseif($column.htmlType == "datetime") - - - - -#elseif($column.htmlType == "textarea") - - - -#end -#end -#end - #if($table.sub) - ${subTable.functionName}信息 - - - 添加 - - - 删除 - - - - - - #foreach($column in $subTable.columns) - #set($javaField=$column.javaField) - #set($parentheseIndex=$column.columnComment.indexOf("(")) - #if($parentheseIndex != -1) - #set($comment=$column.columnComment.substring(0, $parentheseIndex)) - #else - #set($comment=$column.columnComment) - #end - #if($column.pk || $javaField == ${subTableFkclassName}) - #elseif($column.list && $column.htmlType == "input") - #if(${javaField} == "version") - - - - - - #else - - - - - - #end - #elseif($column.list && $column.htmlType == "datetime") - - - - - - - #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType) - - - - - - - - #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType) - - - - - - - - #end - #end - - #end - - - - - - - - - - - - - 将文件拖到此处,或点击上传 - - - - - 是否更新已经存在的${functionName}数据 - - 仅允许导入xls、xlsx格式文件。 - 下载模板 - - - - - - - - + + + + + + + 将文件拖到此处,或点击上传 + + + + + 是否更新已经存在的${functionName}数据 + + 仅允许导入xls、xlsx格式文件。 + 下载模板 + + + + + + + + diff --git a/script/sql/mysql/update.sql b/script/sql/mysql/update.sql index b055636..bd7934e 100644 --- a/script/sql/mysql/update.sql +++ b/script/sql/mysql/update.sql @@ -72,3 +72,6 @@ insert into sys_menu values('130', 'EasyRetry控制台', '2', '6', 'easyret -- 增加ancestors字段 ALTER TABLE `mf_product` ADD COLUMN `ancestors` VARCHAR(760) NULL DEFAULT '' COMMENT '祖级列表' AFTER `parent_id`; ALTER TABLE `demo_product` ADD COLUMN `ancestors` VARCHAR(760) NULL DEFAULT '' COMMENT '祖级列表' AFTER `parent_id`; + +--增加edit_columns字段 +ALTER TABLE `gen_table` ADD COLUMN `edit_columns` TINYINT NULL DEFAULT 1 AFTER `remark`; diff --git a/script/sql/postgresql/update.sql b/script/sql/postgresql/update.sql index b3e2c5c..b0febc8 100644 --- a/script/sql/postgresql/update.sql +++ b/script/sql/postgresql/update.sql @@ -133,3 +133,6 @@ insert into sys_menu values('130', 'EasyRetry控制台', '2', '6', 'easyret -- 增加ancestors字段 ALTER TABLE "mf_product" ADD "ancestors" VARCHAR(760) NULL; COMMENT ON COLUMN "mf_product"."ancestors" IS '祖级列表'; + +--增加edit_columns字段 +ALTER TABLE `gen_table` ADD COLUMN `edit_columns` TINYINT NULL DEFAULT 1 AFTER `remark`;