ly
/
Stwzhj-Cloud-Plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

2.X
疯狂的狮子li 2023-03-16 18:09:28 +08:00
parent a2e79a5a18
commit 1a6d7c0794
7 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,18 +34,18 @@ import com.ruoyi.common.core.web.domain.TreeEntity;
public class ${ClassName}Bo extends ${Entity} { public class ${ClassName}Bo extends ${Entity} {
#foreach ($column in $columns) #foreach ($column in $columns)
#if(!$table.isSuperColumn($column.javaField) && ($column.query == 1 || $column.isInsert == 1 || $column.isEdit == 1)) #if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit))
/** /**
* $column.columnComment * $column.columnComment
*/ */
#if($column.isInsert == 1 && $column.isEdit == 1) #if($column.insert && $column.edit)
#set($Group="AddGroup.class, EditGroup.class") #set($Group="AddGroup.class, EditGroup.class")
#elseif($column.isInsert == 1) #elseif($column.insert)
#set($Group="AddGroup.class") #set($Group="AddGroup.class")
#elseif($column.isEdit == 1) #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-gen/src/main/resources/vm/java/serviceImpl.java.vm
View File

@ -66,7 +66,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
#foreach($column in $columns) #foreach($column in $columns)
#if($column.query == 1) #if($column.query)
#set($queryType=$column.queryType) #set($queryType=$column.queryType)
#set($javaField=$column.javaField) #set($javaField=$column.javaField)
#set($javaType=$column.javaType) #set($javaType=$column.javaType)

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

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

10
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
View File

@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
#foreach($column in $columns) #foreach($column in $columns)
#if($column.query == 1) #if($column.query)
#set($dictType=$column.dictType) #set($dictType=$column.dictType)
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
@ -107,7 +107,7 @@
#else #else
#set($comment=$column.columnComment) #set($comment=$column.columnComment)
#end #end
#if($column.pk == 1) #if($column.pk)
#elseif($column.list && $column.htmlType == "datetime") #elseif($column.list && $column.htmlType == "datetime")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="180"> <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
@ -170,7 +170,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
#if($column.insert == 1 && !$column.pk == 1) #if($column.insert && !$column.pk)
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex)) #set($comment=$column.columnComment.substring(0, $parentheseIndex))
@ -324,7 +324,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.query == 1) #if($column.query)
$column.javaField: undefined#if($foreach.count != $columns.size()),#end $column.javaField: undefined#if($foreach.count != $columns.size()),#end
#end #end
#end #end
@ -334,7 +334,7 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.required == 1) #if($column.required)
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex)) #set($comment=$column.columnComment.substring(0, $parentheseIndex))

12
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
View File

@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
#foreach($column in $columns) #foreach($column in $columns)
#if($column.query == 1) #if($column.query)
#set($dictType=$column.dictType) #set($dictType=$column.dictType)
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
@ -124,7 +124,7 @@
#else #else
#set($comment=$column.columnComment) #set($comment=$column.columnComment)
#end #end
#if($column.pk == 1) #if($column.pk)
<el-table-column label="${comment}" align="center" prop="${javaField}" v-if="${column.list}"/> <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="${column.list}"/>
#elseif($column.list && $column.htmlType == "datetime") #elseif($column.list && $column.htmlType == "datetime")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="180"> <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
@ -185,7 +185,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
#if($column.insert == 1 && !$column.pk == 1) #if($column.insert && !$column.pk)
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex)) #set($comment=$column.columnComment.substring(0, $parentheseIndex))
@ -304,7 +304,7 @@
#else #else
#set($comment=$column.columnComment) #set($comment=$column.columnComment)
#end #end
#if($column.pk == 1 || $javaField == ${subTableFkclassName}) #if($column.pk || $javaField == ${subTableFkclassName})
#elseif($column.list && $column.htmlType == "input") #elseif($column.list && $column.htmlType == "input")
<el-table-column label="$comment" prop="${javaField}" width="150"> <el-table-column label="$comment" prop="${javaField}" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
@ -401,7 +401,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.query == 1) #if($column.query)
$column.javaField: undefined#if($foreach.count != $columns.size()),#end $column.javaField: undefined#if($foreach.count != $columns.size()),#end
#end #end
#end #end
@ -411,7 +411,7 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.required == 1) #if($column.required)
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex)) #set($comment=$column.columnComment.substring(0, $parentheseIndex))

10
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm
View File

@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
#foreach($column in $columns) #foreach($column in $columns)
#if($column.query == 1) #if($column.query)
#set($dictType=$column.dictType) #set($dictType=$column.dictType)
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
@ -104,7 +104,7 @@
#else #else
#set($comment=$column.columnComment) #set($comment=$column.columnComment)
#end #end
#if($column.pk == 1) #if($column.pk)
#elseif($column.list && $column.htmlType == "datetime") #elseif($column.list && $column.htmlType == "datetime")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="180"> <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
<template #default="scope"> <template #default="scope">
@ -149,7 +149,7 @@
<el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px"> <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
#if($column.insert == 1 && !$column.pk == 1) #if($column.insert && !$column.pk)
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex)) #set($comment=$column.columnComment.substring(0, $parentheseIndex))
@ -298,14 +298,14 @@ const data = reactive({
form: {}, form: {},
queryParams: { queryParams: {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.query == 1) #if($column.query)
$column.javaField: undefined#if($foreach.count != $columns.size()),#end $column.javaField: undefined#if($foreach.count != $columns.size()),#end
#end #end
#end #end
}, },
rules: { rules: {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.required == 1) #if($column.required)
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex)) #set($comment=$column.columnComment.substring(0, $parentheseIndex))

12
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
View File

@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
#foreach($column in $columns) #foreach($column in $columns)
#if($column.query == 1) #if($column.query)
#set($dictType=$column.dictType) #set($dictType=$column.dictType)
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
@ -119,7 +119,7 @@
#else #else
#set($comment=$column.columnComment) #set($comment=$column.columnComment)
#end #end
#if($column.pk == 1) #if($column.pk)
<el-table-column label="${comment}" align="center" prop="${javaField}" v-if="${column.list}"/> <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="${column.list}"/>
#elseif($column.list && $column.htmlType == "datetime") #elseif($column.list && $column.htmlType == "datetime")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="180"> <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
@ -168,7 +168,7 @@
<el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px"> <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
#if($column.insert == 1 && !$column.pk == 1) #if($column.insert && !$column.pk)
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex)) #set($comment=$column.columnComment.substring(0, $parentheseIndex))
@ -287,7 +287,7 @@
#else #else
#set($comment=$column.columnComment) #set($comment=$column.columnComment)
#end #end
#if($column.pk == 1 || $javaField == ${subTableFkclassName}) #if($column.pk || $javaField == ${subTableFkclassName})
#elseif($column.list && $column.htmlType == "input") #elseif($column.list && $column.htmlType == "input")
<el-table-column label="$comment" prop="${javaField}" width="150"> <el-table-column label="$comment" prop="${javaField}" width="150">
<template #default="scope"> <template #default="scope">
@ -379,14 +379,14 @@ const data = reactive({
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.query == 1) #if($column.query)
$column.javaField: undefined#if($foreach.count != $columns.size()),#end $column.javaField: undefined#if($foreach.count != $columns.size()),#end
#end #end
#end #end
}, },
rules: { rules: {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.required == 1) #if($column.required)
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex)) #set($comment=$column.columnComment.substring(0, $parentheseIndex))