Explorar el Código

fix 修复 代码生成 点选按钮不生效问题

疯狂的狮子li hace 2 años
padre
commit
51a558d690

+ 5 - 5
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

+ 1 - 1
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
      */

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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