diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index 2606a9c..a709bcd 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -102,7 +102,7 @@ export default {
// 时间范围数组
timeRange: [],
$foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select"))
+$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox"))
// ${item.ColumnComment}选项列表
${item.ColumnName}Options: [],
$elseif(item.HtmlType == "datetime" && item.IsQuery == true)
@@ -138,7 +138,7 @@ $end
this.getList();
$foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select") && item.DictType != "")
+$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox") && item.DictType != "")
this.getDicts("${item.DictType}").then((response) => {
this.${item.ColumnName}Options = response.data;
})
@@ -257,7 +257,7 @@ $if(replaceDto.UploadFile == 1)
},
$end
$foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select") && item.DictType != "")
+$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox") && item.DictType != "")
// ${item.ColumnComment}字典翻译
${item.ColumnName}Format(row, column) {
return this.selectDictLabel(this.${item.ColumnName}Options, row.${item.ColumnName});
@@ -311,9 +311,4 @@ $end
},
},
};
-
-
+
\ No newline at end of file
diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs
index 57394a1..9af2ce8 100644
--- a/ZR.CodeGenerator/CodeGenerateTemplate.cs
+++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs
@@ -42,26 +42,6 @@ namespace ZR.CodeGenerator
#region vue 模板
- /////
- ///// Vue rules
- /////
- /////
- /////
- //public static string TplFormRules(GenTableColumn dbFieldInfo)
- //{
- // StringBuilder sbRule = new StringBuilder();
- // //Rule 规则验证
- // if (!dbFieldInfo.IsPk && !dbFieldInfo.IsIncrement && dbFieldInfo.IsRequired)
- // {
- // sbRule.AppendLine($" {dbFieldInfo.ColumnName}: [{{ required: true, message: '请输入{dbFieldInfo.ColumnComment}', trigger: \"blur\"}}],");
- // }
- // else if (CodeGeneratorTool.IsNumber(dbFieldInfo.ColumnType) && dbFieldInfo.IsRequired)
- // {
- // sbRule.AppendLine($" {dbFieldInfo.ColumnName}: [{{ type: 'number', message: '{dbFieldInfo.ColumnName}必须为数字值', trigger: \"blur\"}}],");
- // }
- // return sbRule.ToString();
- //}
-
///
/// Vue 添加修改表单
///
@@ -256,6 +236,21 @@ namespace ZR.CodeGenerator
sb.AppendLine(" ");
sb.AppendLine(" ");
}
+ else if (dbFieldInfo.IsList && !string.IsNullOrEmpty(dbFieldInfo.DictType))
+ {
+ sb.AppendLine($@" ");
+ sb.AppendLine(@" ");
+ if (dbFieldInfo.HtmlType == "checkbox")
+ {
+ sb.AppendLine($@" ");
+ }
+ else
+ {
+ sb.AppendLine($@" ");
+ }
+ sb.AppendLine(@" ");
+ sb.AppendLine(@" ");
+ }
else if (dbFieldInfo.IsList)
{
sb.AppendLine($" ");
diff --git a/ZR.Vue/src/views/tool/gen/editTable.vue b/ZR.Vue/src/views/tool/gen/editTable.vue
index 93c22cf..663e7d6 100644
--- a/ZR.Vue/src/views/tool/gen/editTable.vue
+++ b/ZR.Vue/src/views/tool/gen/editTable.vue
@@ -79,7 +79,7 @@
-
+