diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index a6240f3..4c9d7c6 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/ZR.CodeGenerator/CodeGeneratorTool.cs @@ -2,12 +2,16 @@ using Infrastructure.Extensions; using Infrastructure.Helper; using Infrastructure.Model; + using JinianNet.JNTemplate; + using SqlSugar; + using System; using System.Collections.Generic; using System.IO; using System.Linq; + using ZR.CodeGenerator.Model; using ZR.Model.System.Generate; @@ -113,8 +117,10 @@ namespace ZR.CodeGenerator BaseNamespace = genTable.BaseNameSpace, SubNamespace = genTable.ModuleName.FirstUpperCase() }; - _option.DtosNamespace = _option.BaseNamespace + "Model"; - _option.ModelsNamespace = _option.BaseNamespace + "Model"; + _option.DtosNamespace = !string.IsNullOrEmpty(genTable.ModelNameSpace) + ? genTable.ModelNameSpace : (_option.BaseNamespace); + _option.DtosNamespace += "Model"; + _option.ModelsNamespace = _option.DtosNamespace; _option.RepositoriesNamespace = _option.BaseNamespace + "Repository"; //_option.IRepositoriesNamespace = _option.BaseNamespace + "Repository"; _option.IServicsNamespace = _option.BaseNamespace + "Service"; @@ -446,6 +452,7 @@ namespace ZR.CodeGenerator { DbName = dto.DbName, BaseNameSpace = "ZR.",//导入默认命名空间前缀 + ModelNameSpace = "", // 默认为空,使用 BaseNameSpace + "Model" ModuleName = dto.CodeGen.ModuleName,//导入默认模块名 ClassName = className, BusinessName = className, diff --git a/ZR.Model/System/Model/Dto/GenTableDto.cs b/ZR.Model/System/Model/Dto/GenTableDto.cs index 0151bbb..f2b1a42 100644 --- a/ZR.Model/System/Model/Dto/GenTableDto.cs +++ b/ZR.Model/System/Model/Dto/GenTableDto.cs @@ -12,6 +12,7 @@ namespace ZR.Model.System.Dto public string ClassName { get; set; } public string TplCategory { get; set; } public string BaseNameSpace { get; set; } + public string ModelNameSpace { get; set; } public string ModuleName { get; set; } public string BusinessName { get; set; } public string FunctionName { get; set; } diff --git a/ZR.Model/System/Model/Generate/GenTable.cs b/ZR.Model/System/Model/Generate/GenTable.cs index ee519b5..08e5242 100644 --- a/ZR.Model/System/Model/Generate/GenTable.cs +++ b/ZR.Model/System/Model/Generate/GenTable.cs @@ -52,6 +52,11 @@ [SugarColumn(Length = 100)] public string BaseNameSpace { get; set; } /// + /// 生成实体命名空间前缀 + /// + [SugarColumn(Length = 100)] + public string ModelNameSpace { get; set; } + /// /// 生成模块名 /// [SugarColumn(Length = 50)] diff --git a/ZR.Vue/src/views/tool/gen/genInfoForm.vue b/ZR.Vue/src/views/tool/gen/genInfoForm.vue index d6f58e3..a93bf53 100644 --- a/ZR.Vue/src/views/tool/gen/genInfoForm.vue +++ b/ZR.Vue/src/views/tool/gen/genInfoForm.vue @@ -39,6 +39,21 @@ + + + + + +