From 95e272c450efef9f33ce64c103bfbe8af227bf1c 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: Wed, 1 Dec 2021 21:28:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/VueTemplate.txt   |   5 +-
 ZR.CodeGenerator/CodeGeneratorTool.cs         |   5 +-
 ZR.CodeGenerator/Model/ReplaceDto.cs          |  19 +----
 ZR.Vue/src/api/gendemo.js                     |  67 ------------------
 document/admin-sqlserver.sql                  | Bin 115836 -> 115860 bytes
 5 files changed, 4 insertions(+), 92 deletions(-)
 delete mode 100644 ZR.Vue/src/api/gendemo.js

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt
index 59dfa9f..1c604e5 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt
+++ b/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",
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index a9a8e02..94f721a 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/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");
 
diff --git a/ZR.CodeGenerator/Model/ReplaceDto.cs b/ZR.CodeGenerator/Model/ReplaceDto.cs
index 2fcea95..d3cd383 100644
--- a/ZR.CodeGenerator/Model/ReplaceDto.cs
+++ b/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>
diff --git a/ZR.Vue/src/api/gendemo.js b/ZR.Vue/src/api/gendemo.js
deleted file mode 100644
index 2f20714..0000000
--- a/ZR.Vue/src/api/gendemo.js
+++ /dev/null
@@ -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
-  })
-}
\ No newline at end of file
diff --git a/document/admin-sqlserver.sql b/document/admin-sqlserver.sql
index 49a0cff3f728c581c6d50d76ee77faae7752e771..5487c3c24ff38de17431989ef94f10e6505a8be4 100644
GIT binary patch
delta 26
icmey<!9Jyvy<rPu(dOwJA{Zs6>r^pvEw9<kC<p+SU<vX7

delta 22
ecmbQz$^NH<y<rPu(dOwkTNrt^PutA+PXGXMvI(sK