diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt index d51dee7..832e1be 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt @@ -195,6 +195,9 @@ $foreach(item in genTable.Columns) $if((item.IsEdit || item.IsInsert)) $item.ColumnName: undefined, $end +$if((item.HtmlType == "checkbox")) + ${item.ColumnName}Checked: [], +$end $end }; this.resetForm("form"); @@ -247,10 +250,19 @@ $end this.reset(); const id = row.${replaceDto.FistLowerPk} || this.ids; get${genTable.BusinessName}(id).then((res) => { - if (res.code == 200) { - this.form = res.data; - this.open = true; - this.title = "修改数据"; + const { code, data } = res; + if (code == 200) { + this.open = true; + this.title = "修改数据"; + + this.form = { + ...data, +$foreach(item in genTable.Columns) +$if(item.HtmlType == "checkbox") + ${item.ColumnName}Checked: data.${item.columnName} ? data.${item.columnName}.split(',') : [], +$end +$end + }; } }); }, @@ -288,6 +300,11 @@ $end submitForm: function () { this.${refs}refs["form"].validate((valid) => { if (valid) { +$foreach(item in genTable.Columns) +$if(item.HtmlType == "checkbox") + this.form.${item.ColumnName} = this.form.${item.columnName}Checked.toString(); +$end +$end console.log(JSON.stringify(this.form)); if (this.form.${replaceDto.FistLowerPk} != undefined || this.title === "修改数据") { diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs index 57ce232..d1549be 100644 --- a/ZR.CodeGenerator/CodeGenerateTemplate.cs +++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs @@ -118,6 +118,21 @@ namespace ZR.CodeGenerator sb.AppendLine(" "); sb.AppendLine(" "); } + else if( dbFieldInfo.HtmlType == GenConstants.HTML_CHECKBOX) + { + //多选框 + sb.AppendLine(" "); + sb.AppendLine($" "); + sb.AppendLine($" "); + if (string.IsNullOrEmpty(dbFieldInfo.DictType)) + { + sb.AppendLine($" 请选择字典生成"); + } + sb.AppendLine($" {{{{item.dictLabel}}}}"); + sb.AppendLine(" "); + sb.AppendLine(" "); + sb.AppendLine(" "); + } else { string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : ""; diff --git a/document/admin-mysql.sql b/document/admin-mysql.sql index d3dfecf..ab61158 100644 --- a/document/admin-mysql.sql +++ b/document/admin-mysql.sql @@ -717,6 +717,7 @@ CREATE TABLE `gen_demo` ( `remark` VARCHAR(200) COMMENT '备注', `beginTime` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', `endTime` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', + `feature` varchar(100) NULL COMMENT '特征' PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; diff --git a/document/admin-sqlserver-表字段说明导入.sql b/document/admin-sqlserver-表字段说明导入.sql index f6784ae..537002d 100644 Binary files a/document/admin-sqlserver-表字段说明导入.sql and b/document/admin-sqlserver-表字段说明导入.sql differ diff --git a/document/admin-sqlserver.sql b/document/admin-sqlserver.sql index 8e3e93b..009bed2 100644 Binary files a/document/admin-sqlserver.sql and b/document/admin-sqlserver.sql differ