admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
疯狂的狮子li 2023-03-16 18:11:00 +08:00
parent 7b8747c831
commit 51a558d690
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
View File

@ -26,18 +26,18 @@ import java.util.Date;
public class ${ClassName}Bo extends BaseEntity { public class ${ClassName}Bo extends BaseEntity {
#foreach ($column in $columns) #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 * $column.columnComment
*/ */
#if($column.isInsert && $column.isEdit) #if($column.insert && $column.edit)
#set($Group="AddGroup.class, EditGroup.class") #set($Group="AddGroup.class, EditGroup.class")
#elseif($column.isInsert) #elseif($column.insert)
#set($Group="AddGroup.class") #set($Group="AddGroup.class")
#elseif($column.isEdit) #elseif($column.edit)
#set($Group="EditGroup.class") #set($Group="EditGroup.class")
#end #end
#if($column.isRequired == 1) #if($column.required)
#if($column.javaType == 'String') #if($column.javaType == 'String')
@NotBlank(message = "$column.columnComment不能为空", groups = { $Group }) @NotBlank(message = "$column.columnComment不能为空", groups = { $Group })
#else #else

2
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
View File

@ -32,7 +32,7 @@ public class ${ClassName}Vo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.isList) #if($column.list)
/** /**
* $column.columnComment * $column.columnComment
*/ */

4
ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
View File

@ -334,7 +334,7 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.isInsert || $column.isEdit) #if($column.insert || $column.edit)
#if($column.required) #if($column.required)
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
@ -407,7 +407,7 @@ export default {
reset() { reset() {
this.form = { this.form = {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.isInsert || $column.isEdit) #if($column.insert || $column.edit)
#if($column.htmlType == "checkbox") #if($column.htmlType == "checkbox")
$column.javaField: []#if($foreach.count != $columns.size()),#end $column.javaField: []#if($foreach.count != $columns.size()),#end
#else #else

4
ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View File

@ -344,7 +344,7 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.isInsert || $column.isEdit) #if($column.insert || $column.edit)
#if($column.required) #if($column.required)
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
@ -398,7 +398,7 @@ export default {
reset() { reset() {
this.form = { this.form = {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.isInsert || $column.isEdit) #if($column.insert || $column.edit)
#if($column.htmlType == "checkbox") #if($column.htmlType == "checkbox")
$column.javaField: []#if($foreach.count != $columns.size()),#end $column.javaField: []#if($foreach.count != $columns.size()),#end
#else #else

4
ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
View File

@ -305,7 +305,7 @@ const data = reactive({
}, },
rules: { rules: {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.isInsert || $column.isEdit) #if($column.insert || $column.edit)
#if($column.required) #if($column.required)
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
@ -368,7 +368,7 @@ function cancel() {
function reset() { function reset() {
form.value = { form.value = {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.isInsert || $column.isEdit) #if($column.insert || $column.edit)
#if($column.htmlType == "checkbox") #if($column.htmlType == "checkbox")
$column.javaField: []#if($foreach.count != $columns.size()),#end $column.javaField: []#if($foreach.count != $columns.size()),#end
#else #else

4
ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
View File

@ -316,7 +316,7 @@ const data = reactive({
}, },
rules: { rules: {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.isInsert || $column.isEdit) #if($column.insert || $column.edit)
#if($column.required) #if($column.required)
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
@ -370,7 +370,7 @@ function cancel() {
function reset() { function reset() {
form.value = { form.value = {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.isInsert || $column.isEdit) #if($column.insert || $column.edit)
#if($column.htmlType == "checkbox") #if($column.htmlType == "checkbox")
$column.javaField: []#if($foreach.count != $columns.size()),#end $column.javaField: []#if($foreach.count != $columns.size()),#end
#else #else