Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fgqyxxlr
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
yaru
fgqyxxlr
Commits
c920d3ec
Commit
c920d3ec
authored
Sep 05, 2019
by
deng-cc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修复树形类型的代码生成的部分必要属性无法显示
parent
ac5f45d1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
2 deletions
+17
-2
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
+11
-0
ruoyi-generator/src/main/resources/vm/html/add.html.vm
+3
-1
ruoyi-generator/src/main/resources/vm/html/edit.html.vm
+3
-1
No files found.
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
View file @
c920d3ec
...
...
@@ -332,6 +332,17 @@ public class GenTableColumn extends BaseEntity
"parentName"
,
"parentId"
,
"orderNum"
,
"ancestors"
);
}
public
boolean
isUsableColumn
()
{
return
isUsableColumn
(
javaField
);
}
public
static
boolean
isUsableColumn
(
String
javaField
)
{
//isSuperColumn()中的名单用于避免生成多余Domain属性,若某些属性在生成页面时需要用到不能忽略,则放在此处白名单
return
StringUtils
.
equalsAnyIgnoreCase
(
javaField
,
"parentId"
,
"orderNum"
);
}
public
String
readConverterExp
()
{
String
remarks
=
StringUtils
.
substringBetween
(
this
.
columnComment
,
"("
,
")"
);
...
...
ruoyi-generator/src/main/resources/vm/html/add.html.vm
View file @
c920d3ec
...
...
@@ -14,7 +14,8 @@
<form
class=
"form-horizontal m"
id=
"form-${businessName}-add"
>
#foreach($column in $columns)
#set($field=$column.javaField)
#if($column.insert
&&
!$column.superColumn
&&
!$column.pk)
#if($column.insert
&&
!$column.pk)
#if(($column.usableColumn) || (!$column.superColumn))
#set($parentheseIndex=$column.columnComment.indexOf("("))
#if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex))
...
...
@@ -102,6 +103,7 @@
#end
#end
#end
#end
</form>
</div>
<th:block
th:include=
"include :: footer"
/>
...
...
ruoyi-generator/src/main/resources/vm/html/edit.html.vm
View file @
c920d3ec
...
...
@@ -14,7 +14,8 @@
<form
class=
"form-horizontal m"
id=
"form-${businessName}-edit"
th:object=
"${${className}}"
>
<input
name=
"${pkColumn.javaField}"
th:field=
"*{${pkColumn.javaField}}"
type=
"hidden"
>
#foreach($column in $columns)
#if($column.edit
&&
!$column.superColumn
&&
!$column.pk)
#if($column.edit
&&
!$column.pk)
#if(($column.usableColumn) || (!$column.superColumn))
#set($parentheseIndex=$column.columnComment.indexOf("("))
#if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex))
...
...
@@ -102,6 +103,7 @@
#end
#end
#end
#end
</form>
</div>
<th:block
th:include=
"include :: footer"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment