wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码生成新增字典回显样式、新增CheckBox回显

Browse Source
This commit is contained in:
不做码农 2021-12-08 14:09:52 +08:00
parent ca9fadaef6
commit 34332c21ce
3 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
View File

@ -102,7 +102,7 @@ export default {
// 时间范围数组 // 时间范围数组
timeRange: [], timeRange: [],
$foreach(item in genTable.Columns) $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.ColumnComment}选项列表
${item.ColumnName}Options: [], ${item.ColumnName}Options: [],
$elseif(item.HtmlType == "datetime" && item.IsQuery == true) $elseif(item.HtmlType == "datetime" && item.IsQuery == true)
@ -138,7 +138,7 @@ $end
this.getList(); this.getList();
$foreach(item in genTable.Columns) $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.getDicts("${item.DictType}").then((response) => {
this.${item.ColumnName}Options = response.data; this.${item.ColumnName}Options = response.data;
}) })
@ -257,7 +257,7 @@ $if(replaceDto.UploadFile == 1)
}, },
$end $end
$foreach(item in genTable.Columns) $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.ColumnComment}字典翻译
${item.ColumnName}Format(row, column) { ${item.ColumnName}Format(row, column) {
return this.selectDictLabel(this.${item.ColumnName}Options, row.${item.ColumnName}); return this.selectDictLabel(this.${item.ColumnName}Options, row.${item.ColumnName});
@ -311,9 +311,4 @@ $end
}, },
}, },
}; };
</script> </script>
<style scoped>
.table-td-thumb {
width: 80px;
}
</style>

35
ZR.CodeGenerator/CodeGenerateTemplate.cs
View File

@ -42,26 +42,6 @@ namespace ZR.CodeGenerator
#region vue 模板 #region vue 模板
///// <summary>
///// Vue rules
///// </summary>
///// <param name="dbFieldInfo"></param>
///// <returns></returns>
//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();
//}
/// <summary> /// <summary>
/// Vue 添加修改表单 /// Vue 添加修改表单
/// </summary> /// </summary>
@ -256,6 +236,21 @@ namespace ZR.CodeGenerator
sb.AppendLine(" </template>"); sb.AppendLine(" </template>");
sb.AppendLine(" </el-table-column>"); sb.AppendLine(" </el-table-column>");
} }
else if (dbFieldInfo.IsList && !string.IsNullOrEmpty(dbFieldInfo.DictType))
{
sb.AppendLine($@" <el-table-column label=""{label}"" align=""center"" prop=""{columnName}"">");
sb.AppendLine(@" <template slot-scope=""scope"">");
if (dbFieldInfo.HtmlType == "checkbox")
{
sb.AppendLine($@" <dict-tag :options=""{dbFieldInfo.ColumnName}Options"" :value=""scope.row.{dbFieldInfo.ColumnName} ? scope.row.{dbFieldInfo.ColumnName}.split(',') : []""/>");
}
else
{
sb.AppendLine($@" <dict-tag :options=""{dbFieldInfo.ColumnName}Options"" :value=""scope.row.{dbFieldInfo.ColumnName}""/>");
}
sb.AppendLine(@" </template>");
sb.AppendLine(@" </el-table-column>");
}
else if (dbFieldInfo.IsList) else if (dbFieldInfo.IsList)
{ {
sb.AppendLine($" <el-table-column prop=\"{columnName}\" label=\"{label}\" align=\"center\" {showToolTip}{formatter}/>"); sb.AppendLine($" <el-table-column prop=\"{columnName}\" label=\"{label}\" align=\"center\" {showToolTip}{formatter}/>");

2
ZR.Vue/src/views/tool/gen/editTable.vue
View File

@ -79,7 +79,7 @@
<el-option label="文本域" value="textarea" /> <el-option label="文本域" value="textarea" />
<el-option label="下拉框" value="select" /> <el-option label="下拉框" value="select" />
<el-option label="单选框" value="radio" /> <el-option label="单选框" value="radio" />
<!-- <el-option label="复选框" value="checkbox" /> --> <el-option label="复选框" value="checkbox" />
<el-option label="日期控件" value="datetime" /> <el-option label="日期控件" value="datetime" />
<el-option label="图片上传" value="imageUpload" /> <el-option label="图片上传" value="imageUpload" />
<el-option label="文件上传" value="fileUpload" /> <el-option label="文件上传" value="fileUpload" />