hhyykk/RuoYi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

若依 4.2

Browse Source
This commit is contained in:
RuoYi
2020-03-23 09:02:04 +08:00
parent 5c736e96c9
commit d066539616
60 changed files with 745 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-generator/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>ruoyi</artifactId>
<groupId>com.ruoyi</groupId>
<version>4.1.0</version>
<version>4.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

8
ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm
View File

@ -115,8 +115,8 @@
#if($column.pk)
#elseif($column.list && "" != $dictType)
{
field : '${javaField}',
title : '${comment}',
field: '${javaField}',
title: '${comment}',
align: 'left',
formatter: function(value, row, index) {
return $.table.selectDictLabel(${javaField}Datas, value);
@ -124,8 +124,8 @@
},
#elseif($column.list && "" != $javaField)
{
field : '${javaField}',
title : '${comment}',
field: '${javaField}',
title: '${comment}',
align: 'left'
},
#end

12
ruoyi-generator/src/main/resources/vm/html/list.html.vm
View File

@ -111,22 +111,22 @@
#end
#if($column.pk)
{
field : '${javaField}',
title : '${comment}',
field: '${javaField}',
title: '${comment}',
visible: false
},
#elseif($column.list && "" != $dictType)
{
field : '${javaField}',
title : '${comment}',
field: '${javaField}',
title: '${comment}',
formatter: function(value, row, index) {
return $.table.selectDictLabel(${javaField}Datas, value);
}
},
#elseif($column.list && "" != $javaField)
{
field : '${javaField}',
title : '${comment}'
field: '${javaField}',
title: '${comment}'
},
#end
#end