优化代码生成

ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt

@@ -60,13 +60,10 @@ import {
   del{ModelTypeName},
   update{ModelTypeName},
   get{ModelTypeName} 
-} from '@/api/{fileClassName}.js';
-
-{VueComponentImport}
+} from '@/api/{ModuleName}/{fileClassName}.js';
 
 export default {
   name: "{ModelTypeName}",
-  components: { {VueComponent} },
   data() {
     return {
       labelWidth: "100px",

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>

ZR.Vue/src/api/gendemo.js

@@ -1,67 +0,0 @@
-import request from '@/utils/request'
-
-/**
-* 代码生成演示分页查询
-* @param {查询条件} data
-*/
-export function listGendemo(query) {
-  return request({
-    url: 'business/Gendemo/list',
-    method: 'get',
-    params: query,
-  })
-}
-
-/**
-* 新增代码生成演示
-* @param data
-*/
-export function addGendemo(data) {
-  return request({
-    url: 'business/Gendemo',
-    method: 'post',
-    data: data,
-  })
-}
-
-/**
-* 修改代码生成演示
-* @param data
-*/
-export function updateGendemo(data) {
-  return request({
-    url: 'business/Gendemo',
-    method: 'PUT',
-    data: data,
-  })
-}
-
-/**
-* 获取代码生成演示详情
-* @param {Id} 代码生成演示Id
-*/
-export function getGendemo(id) {
-  return request({
-    url: 'business/Gendemo/' + id,
-    method: 'get'
-  })
-}
-
-/**
-* 删除
-* @param {主键} pid
-*/
-export function delGendemo(pid) {
-  return request({
-    url: 'business/Gendemo/' + pid,
-    method: 'delete'
-  })
-}
-// 导出
-export function exportGendemo(query) {
-  return request({
-    url: 'business/Gendemo/export',
-    method: 'get',
-    params: query
-  })
-}