diff --git a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs index 2b7e903..0f6c42c 100644 --- a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs +++ b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs @@ -159,7 +159,8 @@ namespace ZR.Admin.WebApi.Controllers UserName = HttpContext.GetName(), TableName = table.Name, Desc = table.Description, - CodeGen = OptionsSetting.CodeGen + CodeGen = OptionsSetting.CodeGen, + FrontTpl = dto.FrontTpl, }; GenTable genTable = CodeGeneratorTool.InitTable(initTableDto); diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json index 691d1ba..2e52bf4 100644 --- a/ZR.Admin.WebApi/appsettings.json +++ b/ZR.Admin.WebApi/appsettings.json @@ -101,7 +101,6 @@ "moduleName": "business", "author": "admin", "tablePrefix": "sys_", //"表前缀(生成类名不会包含表前缀,多个用逗号分隔)", - "vuePath": "", //前端代码存储路径eg:D:\Work\ZRAdmin-Vue3 - "frontTpl": 2//默认前端模板 1、element ui 2、element plus + "vuePath": "" //前端代码存储路径eg:D:\Work\ZRAdmin-Vue3 } } diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index 618d12f..86bfea9 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/ZR.CodeGenerator/CodeGeneratorTool.cs @@ -452,7 +452,7 @@ namespace ZR.CodeGenerator SortType = "asc", CheckedBtn = new int[] { 1, 2, 3 }, PermissionPrefix = className.ToLower(), - FrontTpl = dto.CodeGen.FrontTpl, + FrontTpl = dto.FrontTpl } }; diff --git a/ZR.CodeGenerator/Model/ImportCodeGenTableDto.cs b/ZR.CodeGenerator/Model/ImportCodeGenTableDto.cs index ac395f3..df6950f 100644 --- a/ZR.CodeGenerator/Model/ImportCodeGenTableDto.cs +++ b/ZR.CodeGenerator/Model/ImportCodeGenTableDto.cs @@ -4,6 +4,7 @@ namespace ZR.CodeGenerator.Model { public class ImportCodeGenTableDto { + public int FrontTpl { get; set; } public string DbName { get; set; } public List Tables { get; set; } } diff --git a/ZR.CodeGenerator/Model/InitTableDto.cs b/ZR.CodeGenerator/Model/InitTableDto.cs index a1bf45a..e43833c 100644 --- a/ZR.CodeGenerator/Model/InitTableDto.cs +++ b/ZR.CodeGenerator/Model/InitTableDto.cs @@ -4,6 +4,7 @@ namespace ZR.CodeGenerator.Model { public class InitTableDto { + public int FrontTpl { get; set; } public string DbName { get; set; } public string UserName { get; set; } public string TableName { get; set; } diff --git a/ZR.Vue/src/views/tool/gen/importTable.vue b/ZR.Vue/src/views/tool/gen/importTable.vue index 73d8e55..c215601 100644 --- a/ZR.Vue/src/views/tool/gen/importTable.vue +++ b/ZR.Vue/src/views/tool/gen/importTable.vue @@ -16,13 +16,26 @@ - + - - +