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-10 09:11:41 +08:00
parent 092892e885
commit 2c259f390e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@ -103,8 +103,7 @@ namespace ZR.CodeGenerator
/// <param name="replaceDto">替换实体</param> /// <param name="replaceDto">替换实体</param>
private static void GenerateModels(ReplaceDto replaceDto, GenerateDto generateDto) private static void GenerateModels(ReplaceDto replaceDto, GenerateDto generateDto)
{ {
// ../ZR.Model/Models/User.cs var fullPath = Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Models", generateDto.GenTable.ModuleName, replaceDto.ModelTypeName + ".cs");
var fullPath = Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Models", replaceDto.ModelTypeName + ".cs");
var tpl = FileHelper.ReadJtTemplate("TplModel.txt"); var tpl = FileHelper.ReadJtTemplate("TplModel.txt");
var result = tpl.Render(); var result = tpl.Render();
@ -119,7 +118,7 @@ namespace ZR.CodeGenerator
/// <param name="replaceDto">替换实体</param> /// <param name="replaceDto">替换实体</param>
private static void GenerateInputDto(ReplaceDto replaceDto, GenerateDto generateDto) private static void GenerateInputDto(ReplaceDto replaceDto, GenerateDto generateDto)
{ {
var fullPath = Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Dto", $"{replaceDto.ModelTypeName}Dto.cs"); var fullPath = Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Dto", generateDto.GenTable.ModuleName, $"{replaceDto.ModelTypeName}Dto.cs");
var tpl = FileHelper.ReadJtTemplate("TplDto.txt"); var tpl = FileHelper.ReadJtTemplate("TplDto.txt");
@ -413,7 +412,7 @@ namespace ZR.CodeGenerator
/// <param name="replaceDto"></param> /// <param name="replaceDto"></param>
private static void InitJntTemplate(GenerateDto dto, ReplaceDto replaceDto) private static void InitJntTemplate(GenerateDto dto, ReplaceDto replaceDto)
{ {
Engine.Current.Clean(); //Engine.Current.Clean();
//jnt模板引擎全局变量 //jnt模板引擎全局变量
Engine.Configure((options) => Engine.Configure((options) =>

6
ZR.Vue/src/views/tool/gen/genInfoForm.vue
View File

@ -28,7 +28,7 @@
<el-form-item prop="moduleName"> <el-form-item prop="moduleName">
<span slot="label"> <span slot="label">
生成模块名 生成模块名
<el-tooltip content="可理解为子系统名，例如 system、user、tool" placement="top"> <el-tooltip content="可理解为子系统名，例如 system、user、tool（一般文件夹归类）" placement="top">
<i class="el-icon-question"></i> <i class="el-icon-question"></i>
</el-tooltip> </el-tooltip>
</span> </span>
@ -237,10 +237,10 @@ export default {
{ required: true, message: "请选择生成模板", trigger: "blur" }, { required: true, message: "请选择生成模板", trigger: "blur" },
], ],
moduleName: [ moduleName: [
{ required: true, message: "请输入生成模块名", trigger: "blur" }, { required: true, message: "请输入生成模块名", trigger: "blur", pattern:/^[A-Za-z]+$/ },
], ],
businessName: [ businessName: [
{ required: true, message: "请输入生成业务名", trigger: "blur" }, { required: true, message: "请输入生成业务名", trigger: "blur", pattern:/^[A-Za-z]+$/},
], ],
functionName: [ functionName: [
{ required: true, message: "请输入生成功能名", trigger: "blur" }, { required: true, message: "请输入生成功能名", trigger: "blur" },