优化代码生成

ZR.CodeGenerator/CodeGeneratorTool.cs

@@ -278,8 +278,7 @@ namespace ZR.CodeGenerator
                 .Replace("{VueDataContent}", replaceDto.VueDataContent)
                 .Replace("{PrimaryKey}", FirstLowerCase(replaceDto.PKName))
                 .Replace("{MountedMethod}", replaceDto.MountedMethod)
-                .Replace("{VueComponent}", replaceDto.VueComponent.TrimEnd(','))
-                .Replace("{VueComponentImport}", replaceDto.VueComponentImport)
+                .Replace("{ModuleName}", generateDto.GenTable.ModuleName)
                 .Replace("{VueViewEditFormRuleContent}", replaceDto.VueViewEditFormRuleContent);//添加、修改表单验证规则
 
             generateDto.GenCodes.Add(new GenCode(6, "index.vue", fullPath, content));
@@ -292,7 +291,7 @@ namespace ZR.CodeGenerator
         /// <returns></returns>
         public static void GenerateVueJs(ReplaceDto replaceDto, GenerateDto generateDto)
         {
-            string fullPath = Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src", "api", replaceDto.ViewsFileName + ".js");
+            string fullPath = Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src", "api", generateDto.GenTable.ModuleName, replaceDto.ViewsFileName + ".js");
 
             var tpl = FileHelper.ReadJtTemplate("VueJsTemplate.txt");
 

ZR.CodeGenerator/Model/ReplaceDto.cs

@@ -38,16 +38,6 @@ namespace ZR.CodeGenerator.Model
         /// </summary>
         public string InsertColumn { get; set; }
 
-
-        ///// <summary>
-        ///// 实体属性模板
-        ///// </summary>
-        //public string ModelProperty { get; set; }
-        ///// <summary>
-        ///// 输入Dto模板
-        ///// </summary>
-        //public string InputDtoProperty { get; set; }
-
         //vue、api
         public string VueViewFormResetHtml { get; set; }
         /// <summary>
@@ -90,14 +80,7 @@ namespace ZR.CodeGenerator.Model
         /// views、js文件名
         /// </summary>
         public string ViewsFileName { get; set; }
-        /// <summary>
-        /// vue组件引用
-        /// </summary>
-        public string VueComponent { get; set; } = "";
-        /// <summary>
-        /// vue组件导入
-        /// </summary>
-        public string VueComponentImport { get; set; } = "";
+
         /// <summary>
         /// 上传前js
         /// </summary>