diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm index 653cce173..e4bba0176 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm @@ -26,18 +26,18 @@ import java.util.Date; public class ${ClassName}Bo extends BaseEntity { #foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.isInsert || $column.isEdit)) +#if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit)) /** * $column.columnComment */ -#if($column.isInsert && $column.isEdit) +#if($column.insert && $column.edit) #set($Group="AddGroup.class, EditGroup.class") -#elseif($column.isInsert) +#elseif($column.insert) #set($Group="AddGroup.class") -#elseif($column.isEdit) +#elseif($column.edit) #set($Group="EditGroup.class") #end -#if($column.isRequired == 1) +#if($column.required) #if($column.javaType == 'String') @NotBlank(message = "$column.columnComment不能为空", groups = { $Group }) #else diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm index 39280c5cf..25b2bad81 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm @@ -32,7 +32,7 @@ public class ${ClassName}Vo implements Serializable { private static final long serialVersionUID = 1L; #foreach ($column in $columns) -#if($column.isList) +#if($column.list) /** * $column.columnComment */ diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm index 28f65f965..2f5380e30 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -334,7 +334,7 @@ export default { // 表单校验 rules: { #foreach ($column in $columns) -#if($column.isInsert || $column.isEdit) +#if($column.insert || $column.edit) #if($column.required) #set($parentheseIndex=$column.columnComment.indexOf("(")) #if($parentheseIndex != -1) @@ -407,7 +407,7 @@ export default { reset() { this.form = { #foreach ($column in $columns) -#if($column.isInsert || $column.isEdit) +#if($column.insert || $column.edit) #if($column.htmlType == "checkbox") $column.javaField: []#if($foreach.count != $columns.size()),#end #else diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index 644f38948..7eb0212c8 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -344,7 +344,7 @@ export default { // 表单校验 rules: { #foreach ($column in $columns) -#if($column.isInsert || $column.isEdit) +#if($column.insert || $column.edit) #if($column.required) #set($parentheseIndex=$column.columnComment.indexOf("(")) #if($parentheseIndex != -1) @@ -398,7 +398,7 @@ export default { reset() { this.form = { #foreach ($column in $columns) -#if($column.isInsert || $column.isEdit) +#if($column.insert || $column.edit) #if($column.htmlType == "checkbox") $column.javaField: []#if($foreach.count != $columns.size()),#end #else diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm index dfc55ae99..8f4113e0f 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm @@ -305,7 +305,7 @@ const data = reactive({ }, rules: { #foreach ($column in $columns) -#if($column.isInsert || $column.isEdit) +#if($column.insert || $column.edit) #if($column.required) #set($parentheseIndex=$column.columnComment.indexOf("(")) #if($parentheseIndex != -1) @@ -368,7 +368,7 @@ function cancel() { function reset() { form.value = { #foreach ($column in $columns) -#if($column.isInsert || $column.isEdit) +#if($column.insert || $column.edit) #if($column.htmlType == "checkbox") $column.javaField: []#if($foreach.count != $columns.size()),#end #else diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm index 438332c0b..808e3e6f5 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm @@ -316,7 +316,7 @@ const data = reactive({ }, rules: { #foreach ($column in $columns) -#if($column.isInsert || $column.isEdit) +#if($column.insert || $column.edit) #if($column.required) #set($parentheseIndex=$column.columnComment.indexOf("(")) #if($parentheseIndex != -1) @@ -370,7 +370,7 @@ function cancel() { function reset() { form.value = { #foreach ($column in $columns) -#if($column.isInsert || $column.isEdit) +#if($column.insert || $column.edit) #if($column.htmlType == "checkbox") $column.javaField: []#if($foreach.count != $columns.size()),#end #else