From 51a558d690e6092a9e48801a6f83e50e3d6b7ce3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 16 三月 2023 18:11:00 +0800
Subject: [PATCH] fix 修复 代码生成 点选按钮不生效问题

---
 ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm |    4 ++--
 ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm         |    4 ++--
 ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm          |   10 +++++-----
 ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm    |    4 ++--
 ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm          |    2 +-
 ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm      |    4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

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 653cce1..e4bba01 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 @@
 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 39280c5..25b2bad 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 @@
     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 28f65f9..2f5380e 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 @@
       // 琛ㄥ崟鏍￠獙
       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 @@
     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 644f389..7eb0212 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 @@
       // 琛ㄥ崟鏍￠獙
       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 @@
     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 dfc55ae..8f4113e 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 @@
   },
   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 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 438332c..808e3e6 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 @@
   },
   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 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

--
Gitblit v1.9.3