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

优化查询、表单代码生成功能

Browse Source
This commit is contained in:
不做码农 2021-12-06 21:02:29 +08:00
parent 75dd2a1be7
commit 08598bef9f
4 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
View File

@ -167,9 +167,9 @@ $if(genTable.SortField != "")
////// <param name="id"></param> ////// <param name="id"></param>
////// <param name="orderNum"></param> ////// <param name="orderNum"></param>
////// <returns></returns> ////// <returns></returns>
///[ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:update")] /////[ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:update")]
///[HttpGet("ChangeSort")] //////[HttpGet("ChangeSort")]
//[Log(Title = "保存排序", BusinessType = BusinessType.UPDATE)] /////[Log(Title = "保存排序", BusinessType = BusinessType.UPDATE)]
//public IActionResult ChangeSort(int id = 0, int orderNum = 0) //public IActionResult ChangeSort(int id = 0, int orderNum = 0)
//{ //{
// if (id <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); } // if (id <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }

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

@ -20,6 +20,9 @@ ${vueQueryFormHtml}
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="danger" :disabled="multiple" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button> <el-button type="danger" :disabled="multiple" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
</el-col> </el-col>
<el-col :span="1.5" style="display:none">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['${replaceDto.PermissionPrefix}:export']">导出</el-button>
</el-col>
$if(genTable.SortField != "" && 1 == 2) $if(genTable.SortField != "" && 1 == 2)
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="info" plain icon="el-icon-edit" size="mini" @click="handleShowSort" v-hasPermi="['${replaceDto.PermissionPrefix}:update']">修改排序</el-button> <el-button type="info" plain icon="el-icon-edit" size="mini" @click="handleShowSort" v-hasPermi="['${replaceDto.PermissionPrefix}:update']">修改排序</el-button>
@ -266,6 +269,7 @@ $end
} }
}); });
}, },
handleExport() {},
}, },
}; };
</script> </script>

2
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
View File

@ -57,6 +57,7 @@ export function del${genTable.BusinessName}(pid) {
method: 'delete' method: 'delete'
}) })
} }
// 导出${genTable.functionName} // 导出${genTable.functionName}
export function export${replaceDto.ModelTypeName}(query) { export function export${replaceDto.ModelTypeName}(query) {
return request({ return request({
@ -75,5 +76,4 @@ export function changeSort(data) {
params: data params: data
}) })
} }
$end $end

20
ZR.CodeGenerator/CodeGenerateTemplate.cs
View File

@ -162,6 +162,17 @@ namespace ZR.CodeGenerator
sb.AppendLine(" </el-form-item>"); sb.AppendLine(" </el-form-item>");
sb.AppendLine(" </el-col>"); sb.AppendLine(" </el-col>");
} }
else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT)
{
string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue";
sb.AppendLine(" <el-col :span=\"12\">");
sb.AppendLine($" <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
sb.AppendLine($" <el-select v-model=\"form.{columnName}\">");
sb.AppendLine($" <el-option v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictLabel\" :value=\"{value}\"></el-option>");
sb.AppendLine(" </el-select>");
sb.AppendLine(" </el-form-item>");
sb.AppendLine(" </el-col>");
}
else else
{ {
string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : ""; string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
@ -201,6 +212,15 @@ namespace ZR.CodeGenerator
sb.AppendLine(" </el-select>"); sb.AppendLine(" </el-select>");
sb.AppendLine(" </el-form-item>"); sb.AppendLine(" </el-form-item>");
} }
else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT)
{
//string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue";
sb.AppendLine($" <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\" prop=\"{dbFieldInfo.ColumnName}\">");
sb.AppendLine($" <el-select v-model=\"queryParams.{dbFieldInfo.ColumnName}\">");
sb.AppendLine($" <el-option v-for=\"item in {dbFieldInfo.ColumnName}Options\" :key=\"item.dictValue\" :label=\"item.dictLabel\" :value=\"item.dictValue\"></el-option>");
sb.AppendLine(" </el-select>");
sb.AppendLine(" </el-form-item>");
}
else else
{ {
string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : ""; string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";