diff --git a/ruoyi-generator/src/main/resources/vm/html/add.html.vm b/ruoyi-generator/src/main/resources/vm/html/add.html.vm index 68ed8dbb..77dd7142 100644 --- a/ruoyi-generator/src/main/resources/vm/html/add.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/add.html.vm @@ -65,6 +65,25 @@ 代码生成请选择字典属性 +#elseif($column.htmlType == "checkbox" && "" != $dictType) +
+ +
+ +
+
+#elseif($column.htmlType == "checkbox" && $dictType) +
+ +
+ + 代码生成请选择字典属性 +
+
#elseif($column.htmlType == "radio" && "" != $dictType)
diff --git a/ruoyi-generator/src/main/resources/vm/html/edit.html.vm b/ruoyi-generator/src/main/resources/vm/html/edit.html.vm index 60a24e99..af31dd0f 100644 --- a/ruoyi-generator/src/main/resources/vm/html/edit.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/edit.html.vm @@ -65,6 +65,25 @@ 代码生成请选择字典属性
+#elseif($column.htmlType == "checkbox" && "" != $dictType) +
+ +
+ +
+
+#elseif($column.htmlType == "checkbox" && $dictType) +
+ +
+ + 代码生成请选择字典属性 +
+
#elseif($column.htmlType == "radio" && "" != $dictType)
diff --git a/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm b/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm index 6def5ffa..59510d3d 100644 --- a/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm @@ -120,7 +120,7 @@ title: '${comment}', align: 'left', formatter: function(value, row, index) { - return $.table.selectDictLabel(${javaField}Datas, value); + return $.table.selectDictLabel#if($column.htmlType == "checkbox")s#end(${javaField}Datas, value); } }, #elseif($column.list && "" != $javaField) diff --git a/ruoyi-generator/src/main/resources/vm/html/list.html.vm b/ruoyi-generator/src/main/resources/vm/html/list.html.vm index 252b983b..16b0ce51 100644 --- a/ruoyi-generator/src/main/resources/vm/html/list.html.vm +++ b/ruoyi-generator/src/main/resources/vm/html/list.html.vm @@ -121,7 +121,7 @@ field: '${javaField}', title: '${comment}', formatter: function(value, row, index) { - return $.table.selectDictLabel(${javaField}Datas, value); + return $.table.selectDictLabel#if($column.htmlType == "checkbox")s#end(${javaField}Datas, value); } }, #elseif($column.list && "" != $javaField)