Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
RuoYi Vue
Commits
64f6a69d
Commit
64f6a69d
authored
Nov 25, 2021
by
Ricky
Browse files
修复代码生成复选框字典遗漏问题
parent
16734b1d
Changes
3
Hide whitespace changes
Inline
Side-by-side
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
View file @
64f6a69d
...
...
@@ -274,7 +274,8 @@ public class VelocityUtils
for
(
GenTableColumn
column
:
columns
)
{
if
(!
column
.
isSuperColumn
()
&&
StringUtils
.
isNotEmpty
(
column
.
getDictType
())
&&
StringUtils
.
equalsAny
(
column
.
getHtmlType
(),
new
String
[]
{
GenConstants
.
HTML_SELECT
,
GenConstants
.
HTML_RADIO
}))
column
.
getHtmlType
(),
new
String
[]
{
GenConstants
.
HTML_SELECT
,
GenConstants
.
HTML_RADIO
,
GenConstants
.
HTML_CHECKBOX
}))
{
dicts
.
add
(
"'"
+
column
.
getDictType
()
+
"'"
);
}
...
...
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
View file @
64f6a69d
...
...
@@ -108,7 +108,11 @@
#
elseif
($
column
.
list
&&
""
!=
$
column
.
dictType
)
<el-table-column
label=
"
${
comment
}
"
align=
"center"
prop=
"
${
javaField
}
"
>
<template
slot-scope=
"scope"
>
#
if
($
column
.
htmlType
==
"checkbox"
)
<dict-tag
:options=
"dict.type.
${
column
.
dictType
}
"
:value=
"scope.row.
${
javaField
}
? scope.row.
${
javaField
}
.split(',') : []"
/>
#
else
<dict-tag
:options=
"dict.type.
${
column
.
dictType
}
"
:value=
"scope.row.
${
javaField
}
"
/>
#
end
</template>
</el-table-column>
#
elseif
($
column
.
list
&&
""
!=
$
javaField
)
...
...
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View file @
64f6a69d
...
...
@@ -136,7 +136,11 @@
#
elseif
($
column
.
list
&&
""
!=
$
column
.
dictType
)
<el-table-column
label=
"
${
comment
}
"
align=
"center"
prop=
"
${
javaField
}
"
>
<template
slot-scope=
"scope"
>
#
if
($
column
.
htmlType
==
"checkbox"
)
<dict-tag
:options=
"dict.type.
${
column
.
dictType
}
"
:value=
"scope.row.
${
javaField
}
? scope.row.
${
javaField
}
.split(',') : []"
/>
#
else
<dict-tag
:options=
"dict.type.
${
column
.
dictType
}
"
:value=
"scope.row.
${
javaField
}
"
/>
#
end
</template>
</el-table-column>
#
elseif
($
column
.
list
&&
""
!=
$
javaField
)
...
...
Write
Preview
Supports
Markdown
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