diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 6e5d687..1d79e43 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -103,8 +103,7 @@ namespace ZR.CodeGenerator
/// 替换实体
private static void GenerateModels(ReplaceDto replaceDto, GenerateDto generateDto)
{
- // ../ZR.Model/Models/User.cs
- var fullPath = Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Models", replaceDto.ModelTypeName + ".cs");
+ var fullPath = Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Models", generateDto.GenTable.ModuleName, replaceDto.ModelTypeName + ".cs");
var tpl = FileHelper.ReadJtTemplate("TplModel.txt");
var result = tpl.Render();
@@ -119,7 +118,7 @@ namespace ZR.CodeGenerator
/// 替换实体
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");
@@ -413,7 +412,7 @@ namespace ZR.CodeGenerator
///
private static void InitJntTemplate(GenerateDto dto, ReplaceDto replaceDto)
{
- Engine.Current.Clean();
+ //Engine.Current.Clean();
//jnt模板引擎全局变量
Engine.Configure((options) =>
diff --git a/ZR.Vue/src/views/tool/gen/genInfoForm.vue b/ZR.Vue/src/views/tool/gen/genInfoForm.vue
index 54ff5f5..c6ef96e 100644
--- a/ZR.Vue/src/views/tool/gen/genInfoForm.vue
+++ b/ZR.Vue/src/views/tool/gen/genInfoForm.vue
@@ -28,7 +28,7 @@
生成模块名
-
+
@@ -237,10 +237,10 @@ export default {
{ required: true, message: "请选择生成模板", trigger: "blur" },
],
moduleName: [
- { required: true, message: "请输入生成模块名", trigger: "blur" },
+ { required: true, message: "请输入生成模块名", trigger: "blur", pattern:/^[A-Za-z]+$/ },
],
businessName: [
- { required: true, message: "请输入生成业务名", trigger: "blur" },
+ { required: true, message: "请输入生成业务名", trigger: "blur", pattern:/^[A-Za-z]+$/},
],
functionName: [
{ required: true, message: "请输入生成功能名", trigger: "blur" },