From 2c259f390e509a35b105b48c8ae7734a647f48b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Fri, 10 Dec 2021 09:11:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E7=BC=96=E8=BE=91=E6=96=B0=E5=A2=9E=E5=8A=A0=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.CodeGenerator/CodeGeneratorTool.cs     | 7 +++----
 ZR.Vue/src/views/tool/gen/genInfoForm.vue | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

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
         /// <param name="replaceDto">替换实体</param>
         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
         /// <param name="replaceDto">替换实体</param>
         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
         /// <param name="replaceDto"></param>
         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 @@
         <el-form-item prop="moduleName">
           <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>
             </el-tooltip>
           </span>
@@ -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" },