From 64f6a69d9a71d54e768e0e677aede973034a4026 Mon Sep 17 00:00:00 2001
From: Ricky <hk_ricky@163.com>
Date: 星期四, 25 十一月 2021 13:54:49 +0800
Subject: [PATCH] 修复代码生成复选框字典遗漏问题
---
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm | 4 ++++
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java | 3 ++-
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 4 ++++
3 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index 2683ec8..1dadf2c 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -274,7 +274,8 @@
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() + "'");
}
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
index a1c9ecf..fb9cef7 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -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)
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index 729a9da..10a1b91 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -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)
--
Gitblit v1.9.2