代码生成增加预览功能、其他功能优化

README.md

@@ -63,8 +63,6 @@ Vue版前端技术栈 ：基于vue、vuex、vue-router 、vue-cli 、axios 和 e
 
 ZRAdmin解决方案包含：
 
-Infrastructure[基础类库]：包框架的核心组件，包含一系列快速开发中经常用到的Utility辅助工具功能，部分核心功能的实现；
-
 ZR.Service[服务层类库]：提供WebApi接口调用；
 
 ZR.Tasks[定时任务类库]：提供项目定时任务实现功能；

ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs

@@ -94,7 +94,7 @@ namespace ZR.Admin.WebApi.Controllers
             //生成代码
             CodeGeneratorTool.Generate(genTableInfo, dto);
             //下载文件
-            CodeGeneratorTool.ZipGenCode(dto);
+            FileHelper.ZipGenCode(dto);
 
             //HttpContext.Response.Headers.Add("Content-disposition", $"attachment; filename={zipFileName}");
             return SUCCESS(new { zipPath = "/Generatecode/" + dto.ZipFileName, fileName = dto.ZipFileName });
@@ -145,7 +145,7 @@ namespace ZR.Admin.WebApi.Controllers
         }
 
         /// <summary>
-        /// 导入表
+        /// 导入表结构（保存）
         /// </summary>
         /// <param name="tables"></param>
         /// <param name="dbName"></param>
@@ -218,5 +218,32 @@ namespace ZR.Admin.WebApi.Controllers
             }
             return SUCCESS(rows);
         }
+
+        /// <summary>
+        /// 预览代码
+        /// </summary>
+        /// <param name="tableId"></param>
+        /// <returns></returns>
+        [HttpGet("preview/{tableId}")]
+        [ActionPermissionFilter(Permission = "tool:gen:preview")]
+        public IActionResult Preview(long tableId)
+        {
+            if (tableId <= 0)
+            {
+                throw new CustomException(ResultCode.CUSTOM_ERROR, "请求参数为空");
+            }
+            var genTableInfo = GenTableService.GetGenTableInfo(tableId);
+            genTableInfo.Columns = GenTableColumnService.GenTableColumns(tableId);
+            GenerateDto dto = new();
+            dto.GenTable = genTableInfo;
+            dto.ZipPath = Path.Combine(WebHostEnvironment.WebRootPath, "Generatecode");
+            dto.GenCodePath = Path.Combine(dto.ZipPath, DateTime.Now.ToString("yyyyMMdd"));
+            dto.IsPreview = 1;
+            dto.GenCodeFiles = new int[] { 1, 2, 3, 4, 5, 6, 7, 8 };
+            //生成代码
+            CodeGeneratorTool.Generate(genTableInfo, dto);
+
+            return SUCCESS(dto.GenCodes);
+        }
     }
 }

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

@@ -18,14 +18,17 @@ using ZR.Common;
 namespace {ApiControllerNamespace}.Controllers
 {
     /// <summary>
-    /// 代码自动生成
+    /// {FunctionName}Controller
+    ///
+    /// @author {Author}
+    /// @date {DateTime}
     /// </summary>
     [Verify]
     [Route("{ModuleName}/{ModelName}")]
     public class {ModelName}Controller: BaseController
     {
         /// <summary>
-        /// {TableDesc}接口
+        /// {FunctionName}接口
         /// </summary>
         private readonly I{ModelName}Service _{ModelName}Service;
 
@@ -35,7 +38,7 @@ namespace {ApiControllerNamespace}.Controllers
         }
 
         /// <summary>
-        /// 查询{TableDesc}列表
+        /// 查询{FunctionName}列表
         /// </summary>
         /// <returns></returns>
         [HttpGet("list")]
@@ -54,7 +57,7 @@ namespace {ApiControllerNamespace}.Controllers
         }
 
         /// <summary>
-        /// 查询{TableDesc}详情
+        /// 查询{FunctionName}详情
         /// </summary>
         /// <param name="{PrimaryKey}"></param>
         /// <returns></returns>
@@ -68,7 +71,7 @@ namespace {ApiControllerNamespace}.Controllers
         }
 
         /// <summary>
-        /// 添加{TableDesc}
+        /// 添加{FunctionName}
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -90,7 +93,7 @@ namespace {ApiControllerNamespace}.Controllers
         }
 
         /// <summary>
-        /// 更新{TableDesc}
+        /// 更新{FunctionName}
         /// </summary>
         /// <returns></returns>
         [HttpPut]
@@ -115,7 +118,7 @@ namespace {ApiControllerNamespace}.Controllers
         }
 
         /// <summary>
-        /// 删除{TableDesc}
+        /// 删除{FunctionName}
         /// </summary>
         /// <returns></returns>
         [HttpDelete("{ids}")]

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

@@ -4,7 +4,10 @@ using {ModelsNamespace}.Models;
 namespace {IServicsNamespace}.Business
 {
     /// <summary>
-    /// 定义{TableNameDesc}服务接口
+    /// {FunctionName}service接口
+    ///
+    /// @author {Author}
+    /// @date {DateTime}
     /// </summary>
     public interface I{ModelTypeName}Service: IBaseService<{ModelTypeName}>
     {

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

@@ -6,7 +6,7 @@ using {ModelsNamespace}.Models;
 namespace {DtosNamespace}.Dto
 {
     /// <summary>
-    /// {TableNameDesc}输入对象模型
+    /// {FunctionName}输入对象模型
     /// </summary>
     public class {ModelTypeName}Dto
     {
@@ -14,7 +14,7 @@ namespace {DtosNamespace}.Dto
     }
 
     /// <summary>
-    /// {TableNameDesc}查询对象模型
+    /// {FunctionName}查询对象模型
     /// </summary>
     public class {ModelTypeName}QueryDto: PagerInfo 
     {

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

@@ -4,7 +4,10 @@ using System.Collections.Generic;
 namespace {ModelsNamespace}.Models
 {
     /// <summary>
-    /// {TableNameDesc}，数据实体对象
+    /// {FunctionName}，数据实体对象
+    ///
+    /// @author {Author}
+    /// @date {DateTime}
     /// </summary>
     [SqlSugar.SugarTable("{TableName}")]
     public class {ModelTypeName}

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

@@ -6,20 +6,15 @@ using {ModelsNamespace}.Models;
 namespace {RepositoriesNamespace}
 {
     /// <summary>
-    /// 代码生成器生成
+    /// {FunctionName}仓储接口的实现
-    /// {TableNameDesc}仓储接口的实现
+    ///
+    /// @author {Author}
+    /// @date {DateTime}
     /// </summary>
     [AppService(ServiceLifetime = LifeTime.Transient)]
     public class {ModelTypeName}Repository : BaseRepository
     {
-		public {ModelTypeName}Repository()
-        {
-        }
-
         #region 业务逻辑代码
-
-        
-
         #endregion
     }
 }

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

@@ -13,7 +13,10 @@ using {IRepositoriesNamespace};
 namespace {ServicesNamespace}.Business
 {
     /// <summary>
-    /// 代码生成器生成
+    /// {FunctionName}Service业务层处理
+    ///
+    /// @author {Author}
+    /// @date {DateTime}
     /// </summary>
     [AppService(ServiceType = typeof(I{ModelTypeName}Service), ServiceLifetime = LifeTime.Transient)]
     public class {ModelTypeName}Service: BaseService<{ModelTypeName}>, I{ModelTypeName}Service

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

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 /**
-   * {ModelTypeDesc}分页查询
+   * {FunctionName}分页查询
    * @param {查询条件} data
    */
 export function list{ModelTypeName}(query) {
@@ -13,7 +13,7 @@ export function list{ModelTypeName}(query) {
 }
 
 /**
-   * 新增{ModelTypeDesc}
+   * 新增{FunctionName}
    * @param data
    */
 export function add{ModelTypeName}(data) {
@@ -25,7 +25,7 @@ export function add{ModelTypeName}(data) {
 }
 
 /**
-   * 修改{ModelTypeDesc}
+   * 修改{FunctionName}
    * @param data
    */
 export function update{ModelTypeName}(data) {
@@ -37,7 +37,7 @@ export function update{ModelTypeName}(data) {
 }
 
 /**
-   * 获取{ModelTypeDesc}详情
+   * 获取{FunctionName}详情
    * @param {Id} {ModelTypeDesc}Id
    */
 export function get{ModelTypeName}(id) {

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

@@ -2,8 +2,7 @@
   <div class="app-container">
     <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
     <el-form :model="queryParams" label-position="left" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
-      {vueQueryFormHtml}
+{vueQueryFormHtml}
-
       <el-row class="mb8" style="text-align:center">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -27,7 +26,7 @@
     <!-- 数据区域 -->
     <el-table :data="dataList" ref="table" border  @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50" />
-      {VueViewListContent}
+{VueViewListContent}
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="scope">
           <el-button v-hasPermi="['{Permission}:update']" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button>
@@ -42,7 +41,7 @@
     <!-- 添加或修改菜单对话框 -->
     <el-dialog :title="title" :lock-scroll="false" :visible.sync="open" >
       <el-form ref="form" :model="form" :rules="rules" :label-width="formLabelWidth">
-        {VueViewFormContent}
+{VueViewFormContent}
       </el-form>
       <div slot="footer" class="dialog-footer" v-if="btnSubmitVisible">
         <el-button @click="cancel">取 消</el-button>
@@ -67,7 +66,7 @@ export default {
     return {
       labelWidth: "100px",
       formLabelWidth:"100px",
-      // 选中{primaryKey}数组
+      // 选中{PrimaryKey}数组
       ids: [],
       // 非单个禁用
       single: true,
@@ -96,18 +95,15 @@ export default {
       btnSubmitVisible: true,
       // 表单校验
       rules: {
-        {VueViewEditFormRuleContent}
+{VueViewEditFormRuleContent}
       },
     };
   },
   mounted() {
     // 列表数据查询
     this.getList();
-    // 下拉框绑定
+
-    // this.getDicts("sys_normal_disable").then((response) => {
+{MountedMethod}
-    //   this.statusOptions = response.data;
-    // });
-    {MountedMethod}
   },
   methods: {
     // 查询数据
@@ -128,7 +124,7 @@ export default {
     // 重置数据表单
     reset() {
       this.form = {
-        {VueViewFormResetHtml}
+{VueViewFormResetHtml}
 		//TODO 根据实际内容调整
       };
       this.resetForm("form");
@@ -146,16 +142,10 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.{primaryKey});
+      this.ids = selection.map((item) => item.{PrimaryKey});
       this.single = selection.length!=1
       this.multiple = !selection.length;
     },
-    /** 选择每页显示数量*/
-    handleSizeChange(val) {
-      this.queryParams.pageSize = val;
-      this.queryParams.pageNum = 1;
-      this.handleQuery();
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.getList();
@@ -168,8 +158,8 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const {primaryKey}s = row.{primaryKey} || this.ids;
+      const {PrimaryKey}s = row.{PrimaryKey} || this.ids;
-      del{ModelTypeName}({primaryKey}s.toString()).then((res) => {
+      del{ModelTypeName}({PrimaryKey}s.toString()).then((res) => {
         this.msgSuccess("删除成功");
         this.handleQuery();
       });
@@ -177,8 +167,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const {primaryKey} = row.{primaryKey} || this.ids;
+      const {PrimaryKey} = row.{PrimaryKey} || this.ids;
-      get{ModelTypeName}({primaryKey}).then((res) => {
+      get{ModelTypeName}({PrimaryKey}).then((res) => {
         if(res.code == 200){
            this.form = res.data;
            this.open = true;
@@ -194,7 +184,7 @@ export default {
         if (valid) {
           console.log(JSON.stringify(this.form));
           
-          if (this.form.{primaryKey} != undefined || this.title === '修改数据') {
+          if (this.form.{PrimaryKey} != undefined || this.title === '修改数据') {
             update{ModelTypeName}(this.form).then((res) => {
                 this.msgSuccess("修改成功");
                 this.open = false;

ZR.CodeGenerator/CodeGenerateTemplate.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-using ZR.CodeGenerator.CodeGenerator;
+using System.Text;
 using ZR.Model.System.Generate;
 
 namespace ZR.CodeGenerator
@@ -13,68 +13,63 @@ namespace ZR.CodeGenerator
         /// <summary>
         /// 生成vuejs模板，目前只有上传文件方法
         /// </summary>
-        /// <param name="dbColumnInfo"></param>
+        /// <param name="dbFieldInfo"></param>
         /// <returns></returns>
         public static string GetVueJsMethod(GenTableColumn dbFieldInfo)
         {
             string columnName = dbFieldInfo.ColumnName;
-            string js = "";
+            var sb = new StringBuilder();
+
             if (dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD))
             {
-                js += "    //文件上传成功方法\r\n";
+                sb.AppendLine($"    //文件上传成功方法");
-                js += $"    handleUpload{dbFieldInfo.CsharpField}Success(res, file) {{\r\n";
+                sb.AppendLine($"    handleUpload{dbFieldInfo.CsharpField}Success(res, file) {{");
-                js += $"      this.form.{columnName} = URL.createObjectURL(file.raw);\r\n";
+                sb.AppendLine($"      this.form.{columnName} = URL.createObjectURL(file.raw);");
-                js += "      // this.$refs.upload.clearFiles();\r\n";
+                sb.AppendLine($"      // this.$refs.upload.clearFiles();");
-                js += "    },\r";
+                sb.AppendLine($"    }},");
             }
             //有下拉框选项初列表查询数据
             if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT && !string.IsNullOrEmpty(dbFieldInfo.DictType))
             {
-                var sb = new System.Text.StringBuilder(500);
                 sb.AppendLine(@$"    // {dbFieldInfo.ColumnComment}字典翻译");
                 sb.AppendLine($"    {columnName}Format(row, column) {{");
                 sb.AppendLine(@$"      return this.selectDictLabel(this.{columnName}Options, row.{columnName});");
-                sb.AppendLine(@"    },");
+                sb.Append(@"    },");
-                js += sb.ToString();
+
             }
-            return js;
+            return sb.ToString();
         }
 
         //rules
         public static string GetFormRules(GenTableColumn dbFieldInfo)
         {
-            string vueViewEditFromRuleContent = "";
+            StringBuilder sbRule = new StringBuilder();
             //Rule 规则验证
-            if ((!dbFieldInfo.IsPk && !dbFieldInfo.IsIncrement) && dbFieldInfo.IsRequired)
+            if (!dbFieldInfo.IsPk && !dbFieldInfo.IsIncrement && dbFieldInfo.IsRequired)
             {
-                vueViewEditFromRuleContent += $"        {dbFieldInfo.ColumnName}: [\r\n";
+                sbRule.AppendLine($"        {dbFieldInfo.ColumnName}: [{{ required: true, message: '请输入{dbFieldInfo.ColumnComment}', trigger: \"blur\"}}],");
-                vueViewEditFromRuleContent += $"        {{ required: true, message: '请输入{dbFieldInfo.ColumnComment}', trigger: \"blur\"}},\r\n";
-                vueViewEditFromRuleContent += "        ],\r\n";
             }
-            else if (TableMappingHelper.IsNumber(dbFieldInfo.ColumnType) && dbFieldInfo.IsRequired)
+            else if (CodeGeneratorTool.IsNumber(dbFieldInfo.ColumnType) && dbFieldInfo.IsRequired)
             {
-                vueViewEditFromRuleContent += $"        {dbFieldInfo.ColumnName}: [\r\n";
+                sbRule.AppendLine($"        {dbFieldInfo.ColumnName}: [{{ type: 'number', message: '{dbFieldInfo.ColumnName}必须为数字值', trigger: \"blur\"}}],");
-                vueViewEditFromRuleContent += $"        {{ type: 'number', message: '{dbFieldInfo.ColumnName}必须为数字值', trigger: \"blur\"}},\r\n";
-                vueViewEditFromRuleContent += "        ],\r\n";
             }
-
+            return sbRule.ToString();
-            return vueViewEditFromRuleContent;
         }
 
         //model 属性
         public static string GetModelTemplate(GenTableColumn dbFieldInfo)
         {
-            var modelcontent = "";
+            StringBuilder sbModel = new StringBuilder();
-            modelcontent += "        /// <summary>\r\n";
+            sbModel.AppendLine("        /// <summary>");
-            modelcontent += $"        /// 描述 :{dbFieldInfo.ColumnComment}\r\n";
+            sbModel.AppendLine($"        /// 描述 :{dbFieldInfo.ColumnComment}");
-            modelcontent += $"        /// 空值 :{!dbFieldInfo.IsRequired}\r\n";
+            sbModel.AppendLine($"        /// 空值 :{!dbFieldInfo.IsRequired}");
-            modelcontent += "        /// </summary>\r\n";
+            sbModel.AppendLine("        /// </summary>");
             if (dbFieldInfo.IsPk || dbFieldInfo.IsIncrement)
             {
-                modelcontent += $"        [SqlSugar.SugarColumn(IsPrimaryKey = {dbFieldInfo.IsPk.ToString().ToLower()}, IsIdentity = {dbFieldInfo.IsIncrement.ToString().ToLower()})]\r\n";
+                sbModel.AppendLine($"        [SqlSugar.SugarColumn(IsPrimaryKey = {dbFieldInfo.IsPk.ToString().ToLower()}, IsIdentity = {dbFieldInfo.IsIncrement.ToString().ToLower()})]");
             }
-            modelcontent += $"        public {dbFieldInfo.CsharpType}{(GetModelRequired(dbFieldInfo))} {dbFieldInfo.CsharpField} {{ get; set; }}\r\n";
+            sbModel.AppendLine($"        public {dbFieldInfo.CsharpType}{(GetModelRequired(dbFieldInfo))} {dbFieldInfo.CsharpField} {{ get; set; }}");
-            return modelcontent;
+            return sbModel.ToString();
         }
         public static string GetModelRequired(GenTableColumn dbFieldInfo)
         {
@@ -122,68 +117,68 @@ namespace ZR.CodeGenerator
         {
             string columnName = dbFieldInfo.ColumnName;
             string labelName = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName);
-            string vueViewFromContent = "";
             string labelDisabled = dbFieldInfo.IsPk ? ":disabled=\"true\"" : "";
             string placeHolder = dbFieldInfo.IsIncrement ? "" : $"请输入{labelName}";
+            StringBuilder sb = new StringBuilder();
             if (GenConstants.inputDtoNoField.Any(f => f.Replace("_", "").ToLower().Contains(dbFieldInfo.CsharpField.ToLower().Replace("_", ""))))
             {
-                return vueViewFromContent;
+                return sb.ToString();
             }
             if (!dbFieldInfo.IsInsert || !dbFieldInfo.IsEdit)
             {
-                return vueViewFromContent;
+                return sb.ToString();
             }
             if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
             {
                 //时间
-                vueViewFromContent += $"        <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">\r\n";
+                sb.AppendLine($"        <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
-                vueViewFromContent += $"           <el-date-picker v-model=\"form.{columnName}\"  type=\"datetime\"  placeholder=\"选择日期时间\"  default-time=\"12:00:00\"> </el-date-picker>\r\n";
+                sb.AppendLine($"           <el-date-picker v-model=\"form.{columnName}\"  type=\"datetime\"  placeholder=\"选择日期时间\"  default-time=\"12:00:00\"> </el-date-picker>");
-                vueViewFromContent += "         </el-form-item>\r\n";
+                sb.AppendLine("         </el-form-item>");
             }
             else if (dbFieldInfo.HtmlType == GenConstants.HTML_IMAGE_UPLOAD)
             {
                 //图片
-                vueViewFromContent += $"       <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">\r\n";
+                sb.AppendLine($"      <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
-                vueViewFromContent += $"         <el-upload class=\"avatar-uploader\" name=\"file\" action=\"/api/upload/saveFile/\" :show-file-list=\"false\" :on-success=\"handleUpload{dbFieldInfo.CsharpField}Success\" :before-upload=\"beforeFileUpload\">\r\n";
+                sb.AppendLine($"        <el-upload class=\"avatar-uploader\" name=\"file\" action=\"/api/upload/saveFile/\" :show-file-list=\"false\" :on-success=\"handleUpload{dbFieldInfo.CsharpField}Success\" :before-upload=\"beforeFileUpload\">");
-                vueViewFromContent += $"            <img v-if=\"form.{columnName}\" :src=\"form.{columnName}\" class=\"icon\">\r\n";
+                sb.AppendLine($"          <img v-if=\"form.{columnName}\" :src=\"form.{columnName}\" class=\"icon\">");
-                vueViewFromContent += "             <i v-else class=\"el-icon-plus uploader-icon\"></i>\r\n";
+                sb.AppendLine("          <i v-else class=\"el-icon-plus uploader-icon\"></i>");
-                vueViewFromContent += "          </el-upload>\r\n";
+                sb.AppendLine("        </el-upload>");
-                vueViewFromContent += $"         <el-input v-model=\"form.{columnName}\" placeholder=\"请上传文件或手动输入文件地址\"></el-input>\r\n";
+                sb.AppendLine($"        <el-input v-model=\"form.{columnName}\" placeholder=\"请上传文件或手动输入文件地址\"></el-input>");
-                vueViewFromContent += "        </el-form-item>\r\n";
+                sb.AppendLine("      </el-form-item>");
             }
             else if (dbFieldInfo.HtmlType == GenConstants.HTML_RADIO)
             {
-                vueViewFromContent += $"       <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">\r\n";
+                sb.AppendLine($"      <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
-                vueViewFromContent += $"         <el-radio-group v-model=\"form.{columnName}\">\r\n";
+                sb.AppendLine($"        <el-radio-group v-model=\"form.{columnName}\">");
-                vueViewFromContent += "           <el-radio :key=\"1\" :label=\"1\">是</el-radio>\r\n";
+                sb.AppendLine("           <el-radio :key=\"1\" :label=\"1\">是</el-radio>");
-                vueViewFromContent += "           <el-radio :key=\"0\" :label=\"0\">否</el-radio>\r\n";
+                sb.AppendLine("           <el-radio :key=\"0\" :label=\"0\">否</el-radio>");
-                vueViewFromContent += "          </el-radio-group>\r\n";
+                sb.AppendLine("        </el-radio-group>");
-                vueViewFromContent += "        </el-form-item>\r\n";
+                sb.AppendLine("      </el-form-item>");
             }
             else if (dbFieldInfo.HtmlType == GenConstants.HTML_TEXTAREA)
             {
-                vueViewFromContent += $"        <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">\r\n";
+                sb.AppendLine($"      <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
-                vueViewFromContent += $"           <el-input type=\"textarea\" v-model=\"form.{columnName}\" placeholder=\"请输入内容\"/>\r\n";
+                sb.AppendLine($"        <el-input type=\"textarea\" v-model=\"form.{columnName}\" placeholder=\"请输入内容\"/>");
-                vueViewFromContent += "         </el-form-item>\r\n";
+                sb.AppendLine("      </el-form-item>");
             }
             else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT && !string.IsNullOrEmpty(dbFieldInfo.DictType))
             {
-                string value = TableMappingHelper.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue";
+                string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue";
-                vueViewFromContent += $"        <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">\r\n";
+                sb.AppendLine($"      <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
-                vueViewFromContent += $"          <el-select v-model=\"form.{columnName}\">\r\n";
+                sb.AppendLine($"        <el-select v-model=\"form.{columnName}\">");
-                vueViewFromContent += $"            <el-option v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictLabel\" :value=\"{value}\"></el-option>\r\n";
+                sb.AppendLine($"          <el-option v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictLabel\" :value=\"{value}\"></el-option>");
-                vueViewFromContent += "          </el-select>\r\n";
+                sb.AppendLine("        </el-select>");
-                vueViewFromContent += "        </el-form-item>\r\n";
+                sb.AppendLine("      </el-form-item>");
             }
             else
             {
-                string inputNumTxt = TableMappingHelper.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
+                string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
-                vueViewFromContent += $"        <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{CodeGeneratorTool.FirstLowerCase(columnName)}\">\r\n";
+                sb.AppendLine($"      <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{CodeGeneratorTool.FirstLowerCase(columnName)}\">");
-                vueViewFromContent += $"           <el-input v-model{inputNumTxt}=\"form.{CodeGeneratorTool.FirstLowerCase(columnName)}\" placeholder=\"{placeHolder}\" {labelDisabled}/>\r\n";
+                sb.AppendLine($"        <el-input v-model{inputNumTxt}=\"form.{CodeGeneratorTool.FirstLowerCase(columnName)}\" placeholder=\"{placeHolder}\" {labelDisabled}/>");
-                vueViewFromContent += "         </el-form-item>\r\n";
+                sb.AppendLine("      </el-form-item>");
             }
 
-            return vueViewFromContent;
+            return sb.ToString();
         }
 
         /// <summary>
@@ -193,25 +188,24 @@ namespace ZR.CodeGenerator
         /// <returns></returns>
         public static string GetQueryFormHtml(GenTableColumn dbFieldInfo)
         {
-            string queryFormHtml = "";
+            StringBuilder sb = new();
             string labelName = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, dbFieldInfo.ColumnName);
-            if (!dbFieldInfo.IsQuery || dbFieldInfo.HtmlType == GenConstants.HTML_FILE_UPLOAD) return queryFormHtml;
+            if (!dbFieldInfo.IsQuery || dbFieldInfo.HtmlType == GenConstants.HTML_FILE_UPLOAD) return sb.ToString();
-
             if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
             {
-                queryFormHtml += "<el-form-item label=\"时间\">\r\n";
+                sb.AppendLine("      <el-form-item label=\"时间\">");
-                queryFormHtml += "    <el-date-picker v-model=\"dateRange\" size=\"small\" value-format=\"yyyy-MM-dd\" type=\"daterange\" range-separator=\"-\" start-placeholder=\"开始日期\" end-placeholder=\"结束日期\"></el-date-picker>\r\n";
+                sb.AppendLine("        <el-date-picker v-model=\"dateRange\" size=\"small\" value-format=\"yyyy-MM-dd\" type=\"daterange\" range-separator=\"-\" start-placeholder=\"开始日期\" end-placeholder=\"结束日期\"></el-date-picker>");
-                queryFormHtml += "</el-form-item>\r\n";
+                sb.AppendLine("      </el-form-item>");
             }
             else
             {
-                string inputNumTxt = TableMappingHelper.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
+                string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
-                queryFormHtml += $"        <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\">\r\n";
+                sb.AppendLine($"      <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\">");
-                queryFormHtml += $"           <el-input v-model{inputNumTxt}=\"queryParams.{CodeGeneratorTool.FirstLowerCase(dbFieldInfo.CsharpField)}\"/>\r\n";
+                sb.AppendLine($"        <el-input v-model{inputNumTxt}=\"queryParams.{CodeGeneratorTool.FirstLowerCase(dbFieldInfo.CsharpField)}\"/>");
-                queryFormHtml += "        </el-form-item>\r\n";
+                sb.AppendLine("      </el-form-item>");
             }
 
-            return queryFormHtml;
+            return sb.ToString();
         }
 
         //table-column
@@ -219,17 +213,16 @@ namespace ZR.CodeGenerator
         {
             string columnName = dbFieldInfo.ColumnName;
             string label = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName);
-            string vueViewListContent = "";
             string showToolTip = dbFieldInfo.CsharpType == "string" ? ":show-overflow-tooltip=\"true\"" : "";
             string formatter = !string.IsNullOrEmpty(dbFieldInfo.DictType) ? $" :formatter=\"{columnName}Format\"" : "";
-            
+            StringBuilder sb = new StringBuilder();
             if (dbFieldInfo.IsList && dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD))
             {
-                vueViewListContent += $"      <el-table-column prop=\"{columnName}\" label=\"图片\">\r\n";
+                sb.AppendLine($"      <el-table-column prop=\"{columnName}\" label=\"图片\">");
-                vueViewListContent += "         <template slot-scope=\"scope\">\r\n";
+                sb.AppendLine("         <template slot-scope=\"scope\">");
-                vueViewListContent += $"            <el-image class=\"table-td-thumb\" :src=\"scope.row.{columnName}\" :preview-src-list=\"[scope.row.{columnName}]\"></el-image>\r\n";
+                sb.AppendLine($"            <el-image class=\"table-td-thumb\" :src=\"scope.row.{columnName}\" :preview-src-list=\"[scope.row.{columnName}]\"></el-image>");
-                vueViewListContent += "         </template>\r\n";
+                sb.AppendLine("         </template>");
-                vueViewListContent += "       </el-table-column>\r\n";
+                sb.AppendLine("       </el-table-column>");
             }
             //else if (dbFieldInfo.HtmlType.Equals(GenConstants.HTML_RADIO))
             //{
@@ -240,11 +233,11 @@ namespace ZR.CodeGenerator
             //    vueViewListContent += "          </template>\r\n";
             //    vueViewListContent += "        </el-table-column>\r\n";
             //}
-            else if(dbFieldInfo.IsList)
+            else if (dbFieldInfo.IsList)
             {
-                vueViewListContent += $"      <el-table-column prop=\"{columnName}\" label=\"{label}\" align=\"center\" {showToolTip}{formatter}/>\r\n";
+                sb.AppendLine($"      <el-table-column prop=\"{columnName}\" label=\"{label}\" align=\"center\" {showToolTip}{formatter}/>");
             }
-            return vueViewListContent;
+            return sb.ToString();
         }
     }
 }

ZR.CodeGenerator/CodeGeneratorTool.cs

@@ -3,11 +3,7 @@ using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.IO.Compression;
 using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using ZR.CodeGenerator.CodeGenerator;
 using ZR.CodeGenerator.Model;
 using ZR.Model.System.Generate;
 
@@ -15,8 +11,6 @@ namespace ZR.CodeGenerator
 {
     /// <summary>
     /// 代码生成器。
-    /// <remarks>
-    /// 根据指定的实体域名空间生成Repositories和Services层的基础代码文件。
     /// </remarks>
     /// </summary>
     public class CodeGeneratorTool
@@ -31,7 +25,7 @@ namespace ZR.CodeGenerator
         /// </summary>
         /// <param name="dbTableInfo"></param>
         /// <param name="dto"></param>
-        public static List<string> Generate(GenTable dbTableInfo, GenerateDto dto)
+        public static void Generate(GenTable dbTableInfo, GenerateDto dto)
         {
             _option.BaseNamespace = dbTableInfo.BaseNameSpace;
             _option.DtosNamespace = _option.BaseNamespace + "Model";
@@ -42,9 +36,7 @@ namespace ZR.CodeGenerator
             _option.ServicesNamespace = _option.BaseNamespace + "Service";
             _option.ApiControllerNamespace = _option.BaseNamespace + "Admin.WebApi";
 
-            List<string> list = GenerateSingle(dbTableInfo?.Columns, dbTableInfo, dto);
+            GenerateSingle(dbTableInfo?.Columns, dbTableInfo, dto);
-
-            return list;
         }
 
         /// <summary>
@@ -53,17 +45,18 @@ namespace ZR.CodeGenerator
         /// <param name="listField">表字段集合</param>
         /// <param name="tableInfo">表信息</param>
         /// <param name="dto"></param>
-        public static List<string> GenerateSingle(List<GenTableColumn> listField, GenTable tableInfo, GenerateDto dto)
+        public static void GenerateSingle(List<GenTableColumn> listField, GenTable tableInfo, GenerateDto dto)
         {
             string PKName = "id";
             string PKType = "int";
-            List<string> genPathList = new();
             ReplaceDto replaceDto = new();
             replaceDto.ModelTypeName = tableInfo.ClassName;//表名对应C# 实体类名
             replaceDto.TableName = tableInfo.TableName;//表名
             replaceDto.TableDesc = tableInfo.TableComment;//表说明描述
             replaceDto.Permission = $"{tableInfo.ModuleName}:{tableInfo.ClassName.ToLower()}";//权限
             replaceDto.ViewsFileName = FirstLowerCase(replaceDto.ModelTypeName);
+            replaceDto.Author = tableInfo.FunctionAuthor;
+
             //循环表字段信息
             foreach (GenTableColumn dbFieldInfo in listField)
             {
@@ -96,7 +89,7 @@ namespace ZR.CodeGenerator
                 if ((dbFieldInfo.HtmlType == GenConstants.HTML_SELECT || dbFieldInfo.HtmlType == GenConstants.HTML_RADIO) && !string.IsNullOrEmpty(dbFieldInfo.DictType))
                 {
                     replaceDto.VueDataContent += $"      // {dbFieldInfo.ColumnComment}选项列表\n";
-                    replaceDto.VueDataContent += $"      {FirstLowerCase(dbFieldInfo.CsharpField)}Options: [],";
+                    replaceDto.VueDataContent += $"      {FirstLowerCase(dbFieldInfo.CsharpField)}Options: [],\n";
 
                     replaceDto.MountedMethod += $"    this.getDicts(\"{dbFieldInfo.DictType}\").then((response) => {{\n";
                     replaceDto.MountedMethod += $"      this.{FirstLowerCase(dbFieldInfo.CsharpField)}Options = response.data;\n";
@@ -115,110 +108,100 @@ namespace ZR.CodeGenerator
             replaceDto.PKName = PKName;
             replaceDto.PKType = PKType;
 
-            if (dto.genFiles.Contains(1))
+            if (dto.GenCodeFiles.Contains(1))
             {
-                Tuple<string, string> tuple = GenerateModels(replaceDto, dto);
+                GenerateModels(replaceDto, dto);
-                genPathList.Add(tuple.Item1);
-                WriteAndSave(tuple.Item1, tuple.Item2);
             }
-            if (dto.genFiles.Contains(2))
+            if (dto.GenCodeFiles.Contains(2))
             {
-                Tuple<string, string> tuple = GenerateInputDto(replaceDto, dto);
+                GenerateInputDto(replaceDto, dto);
-                genPathList.Add(tuple.Item1);
-                WriteAndSave(tuple.Item1, tuple.Item2);
             }
-            if (dto.genFiles.Contains(3))
+            if (dto.GenCodeFiles.Contains(3))
             {
-                Tuple<string, string> tuple = GenerateRepository(replaceDto, dto);
+                GenerateRepository(replaceDto, dto);
-                genPathList.Add(tuple.Item1);
-                WriteAndSave(tuple.Item1, tuple.Item2);
             }
-            if (dto.genFiles.Contains(4))
+            if (dto.GenCodeFiles.Contains(4))
             {
-                Tuple<string, string> tuple = GenerateIService(replaceDto, dto);
+                GenerateIService(replaceDto, dto);
-                Tuple<string, string> tuple_1 = GenerateService(replaceDto, dto);
+                GenerateService(replaceDto, dto);
-                genPathList.Add(tuple.Item1);
-                genPathList.Add(tuple_1.Item1);
-                WriteAndSave(tuple.Item1, tuple.Item2);
-                WriteAndSave(tuple_1.Item1, tuple_1.Item2);
             }
-            if (dto.genFiles.Contains(5))
+            if (dto.GenCodeFiles.Contains(5))
             {
-                Tuple<string, string> tuple = GenerateControllers(replaceDto, dto);
+                GenerateControllers(replaceDto, dto);
-                genPathList.Add(tuple.Item1);
-                WriteAndSave(tuple.Item1, tuple.Item2);
             }
-            if (dto.genFiles.Contains(6))
+            if (dto.GenCodeFiles.Contains(6))
             {
-                Tuple<string, string> tuple = GenerateVueViews(replaceDto, dto);
+                GenerateVueViews(replaceDto, dto);
-                Tuple<string, string> tuple_1 = GenerateVueJs(replaceDto, dto);
-                genPathList.Add(tuple.Item1);
-                genPathList.Add(tuple_1.Item1);
-                WriteAndSave(tuple.Item1, tuple.Item2);
-                WriteAndSave(tuple_1.Item1, tuple_1.Item2);
             }
-            if (dto.genFiles.Contains(7))
+            if (dto.GenCodeFiles.Contains(7))
             {
-                Tuple<string, string> tuple = GenerateSql(replaceDto, dto);
+                GenerateVueJs(replaceDto, dto);
-                WriteAndSave(tuple.Item1, tuple.Item2);
+            }
+            if (dto.GenCodeFiles.Contains(8))
+            {
+                GenerateSql(replaceDto, dto);
+            }
+            if (dto.IsPreview == 1)
+            {
+                return;
+            }
+            foreach (var item in dto.GenCodes)
+            {
+                FileHelper.WriteAndSave(item.Path, item.Content);
             }
-            return genPathList;
         }
 
         #region 生成Model
 
         /// <summary>
-        /// 生成Models文件
+        /// 生成实体类Model
         /// </summary>
         /// <param name="generateDto"></param>
         /// <param name="replaceDto">替换实体</param>
-        private static Tuple<string, string> GenerateModels(ReplaceDto replaceDto, GenerateDto generateDto)
+        private static void GenerateModels(ReplaceDto replaceDto, GenerateDto generateDto)
         {
-            //../ZR.Model
-            var servicesPath = Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Models");
-            Console.WriteLine("创建文件夹" + servicesPath);
-            CreateDirectory(servicesPath);
             // ../ZR.Model/Models/User.cs
-            var fullPath = Path.Combine(servicesPath, replaceDto.ModelTypeName + ".cs");
+            var fullPath = Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Models", replaceDto.ModelTypeName + ".cs");
 
-            if (File.Exists(fullPath) && !generateDto.coverd)
+            if (File.Exists(fullPath) && !generateDto.Coverd)
-                return Tuple.Create(fullPath, "");
+                return;
 
-            var content = ReadTemplate("ModelTemplate.txt")
+            var content = FileHelper.ReadTemplate("ModelTemplate.txt")
                 .Replace("{ModelsNamespace}", _option.ModelsNamespace)
                 .Replace("{ModelTypeName}", replaceDto.ModelTypeName)
-                .Replace("{TableNameDesc}", replaceDto.TableDesc)
+                .Replace("{FunctionName}", generateDto.GenTable.FunctionName)
                 .Replace("{KeyTypeName}", replaceDto.PKName)
                 .Replace("{PropertyName}", replaceDto.ModelProperty)
-                .Replace("{TableName}", replaceDto.TableName);
+                .Replace("{TableName}", replaceDto.TableName)
+                .Replace("{Author}", replaceDto.Author)
+                .Replace("{DateTime}", replaceDto.AddTime);
 
-            return Tuple.Create(fullPath, content);
+            generateDto.GenCodes.Add(new GenCode(1, "实体类", fullPath, content));
         }
 
         /// <summary>
-        /// 生成InputDto文件
+        /// 生成表单提交输入参数Dto
         /// </summary>
         /// <param name="generateDto"></param>
         /// <param name="replaceDto">替换实体</param>
-        private static Tuple<string, string> GenerateInputDto(ReplaceDto replaceDto, GenerateDto generateDto)
+        private static void GenerateInputDto(ReplaceDto replaceDto, GenerateDto generateDto)
         {
-            var servicesPath = Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Dto");
+            var fullPath = Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Dto", $"{replaceDto.ModelTypeName}Dto.cs");
-            CreateDirectory(servicesPath);
-            // ../ZR.Model/Dto/User.cs
-            var fullPath = Path.Combine(servicesPath, $"{replaceDto.ModelTypeName}Dto.cs");
 
-            if (File.Exists(fullPath) && !generateDto.coverd)
+            if (File.Exists(fullPath) && !generateDto.Coverd)
-                return Tuple.Create(fullPath, "");
+                return;
 
-            var content = ReadTemplate("InputDtoTemplate.txt")
+            var content = FileHelper.ReadTemplate("InputDtoTemplate.txt")
                 .Replace("{DtosNamespace}", _option.DtosNamespace)
                 .Replace("{ModelsNamespace}", _option.ModelsNamespace)
-                .Replace("{TableNameDesc}", replaceDto.TableDesc)
+                .Replace("{FunctionName}", generateDto.GenTable.FunctionName)
                 .Replace("{PropertyName}", replaceDto.InputDtoProperty)
                 .Replace("{QueryProperty}", replaceDto.QueryProperty)
-                .Replace("{ModelTypeName}", replaceDto.ModelTypeName);
+                .Replace("{ModelTypeName}", replaceDto.ModelTypeName)
+                .Replace("{Author}", replaceDto.Author)
+                .Replace("{DateTime}", replaceDto.AddTime);
 
-            return Tuple.Create(fullPath, content);
+            //generateDto.GenCodes.Add(new GenCode(2, "数据传输实体类", fullPath, content));
         }
         #endregion
 
@@ -229,24 +212,23 @@ namespace ZR.CodeGenerator
         /// </summary>
         /// <param name="generateDto"></param>
         /// <param name="replaceDto">替换实体</param>
-        private static Tuple<string, string> GenerateRepository(ReplaceDto replaceDto, GenerateDto generateDto)
+        private static void GenerateRepository(ReplaceDto replaceDto, GenerateDto generateDto)
         {
-            var repositoryPath = Path.Combine(generateDto.GenCodePath, _option.RepositoriesNamespace, "Repositories");
+            var fullPath = Path.Combine(generateDto.GenCodePath, _option.RepositoriesNamespace, "Repositories", $"{replaceDto.ModelTypeName}Repository.cs");
-            CreateDirectory(repositoryPath);
 
-            var fullPath = Path.Combine(repositoryPath, $"{replaceDto.ModelTypeName}Repository.cs");
+            if (File.Exists(fullPath) && !generateDto.Coverd)
+                return;
 
-            if (File.Exists(fullPath) && !generateDto.coverd)
+            var content = FileHelper.ReadTemplate("RepositoryTemplate.txt")
-                return Tuple.Create(fullPath, "");
-
-            var content = ReadTemplate("RepositoryTemplate.txt")
                 .Replace("{ModelsNamespace}", _option.ModelsNamespace)
                 .Replace("{RepositoriesNamespace}", _option.RepositoriesNamespace)
                 .Replace("{ModelTypeName}", replaceDto.ModelTypeName)
-                .Replace("{TableNameDesc}", replaceDto.TableDesc)
+                .Replace("{FunctionName}", generateDto.GenTable.FunctionName)
-                .Replace("{TableName}", replaceDto.TableName);
+                .Replace("{TableName}", replaceDto.TableName)
+                .Replace("{Author}", replaceDto.Author)
+                .Replace("{DateTime}", replaceDto.AddTime);
 
-            return Tuple.Create(fullPath, content);
+            generateDto.GenCodes.Add(new GenCode(3, "仓储层", fullPath, content));
         }
 
         #endregion
@@ -257,48 +239,47 @@ namespace ZR.CodeGenerator
         /// </summary>
         /// <param name="generateDto"></param>
         /// <param name="replaceDto">替换实体</param>
-        private static Tuple<string, string> GenerateIService(ReplaceDto replaceDto, GenerateDto generateDto)
+        private static void GenerateIService(ReplaceDto replaceDto, GenerateDto generateDto)
         {
-            var iServicesPath = Path.Combine(generateDto.GenCodePath, _option.IServicsNamespace, "Business", "IBusService");
+            var fullPath = Path.Combine(generateDto.GenCodePath, _option.IServicsNamespace, "Business", "IBusService", $"I{replaceDto.ModelTypeName}Service.cs");
-            CreateDirectory(iServicesPath);
 
-            var fullPath = Path.Combine(iServicesPath, $"I{replaceDto.ModelTypeName}Service.cs");
+            if (File.Exists(fullPath) && !generateDto.Coverd)
-            Console.WriteLine(fullPath);
+                return;
-            if (File.Exists(fullPath) && !generateDto.coverd)
+            var content = FileHelper.ReadTemplate("IServiceTemplate.txt")
-                return Tuple.Create(fullPath, "");
-            var content = ReadTemplate("IServiceTemplate.txt")
                 .Replace("{ModelsNamespace}", _option.ModelsNamespace)
-                .Replace("{TableNameDesc}", replaceDto.TableDesc)
+                .Replace("{FunctionName}", generateDto.GenTable.FunctionName)
                 .Replace("{DtosNamespace}", _option.DtosNamespace)
                 .Replace("{IServicsNamespace}", _option.IServicsNamespace)
                 .Replace("{RepositoriesNamespace}", _option.RepositoriesNamespace)
-                .Replace("{ModelTypeName}", replaceDto.ModelTypeName);
+                .Replace("{ModelTypeName}", replaceDto.ModelTypeName)
+                .Replace("{Author}", replaceDto.Author)
+                .Replace("{DateTime}", replaceDto.AddTime);
 
-            return Tuple.Create(fullPath, content);
+            //generateDto.GenCodes.Add(new GenCode(4, "接口层", fullPath, content));
         }
 
         /// <summary>
         /// 生成Service文件
         /// </summary>
-        private static Tuple<string, string> GenerateService(ReplaceDto replaceDto, GenerateDto generateDto)
+        private static void GenerateService(ReplaceDto replaceDto, GenerateDto generateDto)
         {
-            var servicesPath = Path.Combine(generateDto.GenCodePath, _option.ServicesNamespace, "Business");
+            var fullPath = Path.Combine(generateDto.GenCodePath, _option.ServicesNamespace, "Business", $"{replaceDto.ModelTypeName}Service.cs");
-            CreateDirectory(servicesPath);
-            var fullPath = Path.Combine(servicesPath, $"{replaceDto.ModelTypeName}Service.cs");
-            Console.WriteLine(fullPath);
-            if (File.Exists(fullPath) && !generateDto.coverd)
-                return Tuple.Create(fullPath, "");
 
-            var content = ReadTemplate("ServiceTemplate.txt")
+            if (File.Exists(fullPath) && !generateDto.Coverd)
+                return;
+
+            var content = FileHelper.ReadTemplate("ServiceTemplate.txt")
                 .Replace("{IRepositoriesNamespace}", _option.IRepositoriesNamespace)
                 .Replace("{DtosNamespace}", _option.DtosNamespace)
                 .Replace("{IServicsNamespace}", _option.IServicsNamespace)
-                .Replace("{TableNameDesc}", replaceDto.TableDesc)
+                .Replace("{FunctionName}", generateDto.GenTable.FunctionName)
                 .Replace("{ModelsNamespace}", _option.ModelsNamespace)
                 .Replace("{ServicesNamespace}", _option.ServicesNamespace)
-                .Replace("{ModelTypeName}", replaceDto.ModelTypeName);
+                .Replace("{ModelTypeName}", replaceDto.ModelTypeName)
+                .Replace("{Author}", replaceDto.Author)
+                .Replace("{DateTime}", replaceDto.AddTime);
 
-            return Tuple.Create(fullPath, content);
+            generateDto.GenCodes.Add(new GenCode(4, "服务层", fullPath, content));
         }
 
         #endregion
@@ -307,47 +288,42 @@ namespace ZR.CodeGenerator
         /// <summary>
         /// 生成控制器ApiControllers文件
         /// </summary>
-        private static Tuple<string, string> GenerateControllers(ReplaceDto replaceDto, GenerateDto generateDto)
+        private static void GenerateControllers(ReplaceDto replaceDto, GenerateDto generateDto)
         {
-            var servicesPath = Path.Combine(generateDto.GenCodePath, _option.ApiControllerNamespace, "Controllers", generateDto.GenTable.ModuleName);
+            var fullPath = Path.Combine(generateDto.GenCodePath, _option.ApiControllerNamespace, "Controllers", generateDto.GenTable.ModuleName, $"{replaceDto.ModelTypeName}Controller.cs");
-            CreateDirectory(servicesPath);
+            if (File.Exists(fullPath) && !generateDto.Coverd)
+                return;
 
-            var fullPath = Path.Combine(servicesPath, $"{replaceDto.ModelTypeName}Controller.cs");
+            var content = FileHelper.ReadTemplate("ControllersTemplate.txt")
-            if (File.Exists(fullPath) && !generateDto.coverd)
-                return Tuple.Create(fullPath, "");
-
-            var content = ReadTemplate("ControllersTemplate.txt")
                 .Replace("{ApiControllerNamespace}", _option.ApiControllerNamespace)
                 .Replace("{ServicesNamespace}", _option.ServicesNamespace)
                 .Replace("{ModelsNamespace}", _option.ModelsNamespace)
-                .Replace("{TableDesc}", replaceDto.TableDesc)
+                .Replace("{FunctionName}", generateDto.GenTable.FunctionName)
                 .Replace("{ModelName}", replaceDto.ModelTypeName)
                 .Replace("{Permission}", replaceDto.Permission)
                 .Replace("{PrimaryKey}", replaceDto.PKName)
                 .Replace("{UpdateColumn}", replaceDto.UpdateColumn)
                 .Replace("{InsertColumn}", replaceDto.InsertColumn)
                 .Replace("{ModuleName}", generateDto.GenTable.ModuleName)
-                .Replace("{PKCsharpType}", replaceDto.PKType);
+                .Replace("{PKCsharpType}", replaceDto.PKType)
+                .Replace("{Author}", replaceDto.Author)
+                .Replace("{DateTime}", replaceDto.AddTime);
 
-            return Tuple.Create(fullPath, content);
+            generateDto.GenCodes.Add(new GenCode(5, "控制器", fullPath, content));
         }
         #endregion
 
-        #region 生成Vue页面
+        #region 生成Vue页面 & api
         /// <summary>
-        /// 生成Vue页面
+        /// 6、生成Vue页面
-        private static Tuple<string, string> GenerateVueViews(ReplaceDto replaceDto, GenerateDto generateDto)
+        private static void GenerateVueViews(ReplaceDto replaceDto, GenerateDto generateDto)
         {
-            var parentPath = Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src");
+            var fullPath = Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src", "views", generateDto.GenTable.ModuleName, replaceDto.ViewsFileName, "index.vue");
-            var servicesPath = Path.Combine(parentPath, "views", generateDto.GenTable.ModuleName, replaceDto.ViewsFileName);
-            CreateDirectory(servicesPath);
 
-            var fullPath = Path.Combine(servicesPath, "index.vue");
+            if (File.Exists(fullPath) && !generateDto.Coverd)
+                return;
 
-            if (File.Exists(fullPath) && !generateDto.coverd)
+            var content = FileHelper.ReadTemplate("VueTemplate.txt")
-                return Tuple.Create(fullPath, "");
-
-            var content = ReadTemplate("VueTemplate.txt")
                 .Replace("{fileClassName}", replaceDto.ViewsFileName)
                 .Replace("{VueViewListContent}", replaceDto.VueViewListHtml)//查询 table列
                 .Replace("{VueViewFormContent}", replaceDto.VueViewFormHtml)//添加、修改表单
@@ -357,42 +333,43 @@ namespace ZR.CodeGenerator
                 .Replace("{vueJsMethod}", replaceDto.VueJsMethod)
                 .Replace("{vueQueryFormHtml}", replaceDto.VueQueryFormHtml)
                 .Replace("{VueDataContent}", replaceDto.VueDataContent)
-                .Replace("{primaryKey}", FirstLowerCase(replaceDto.PKName))
+                .Replace("{PrimaryKey}", FirstLowerCase(replaceDto.PKName))
                 .Replace("{MountedMethod}", replaceDto.MountedMethod)
                 .Replace("{VueViewEditFormRuleContent}", replaceDto.VueViewEditFormRuleContent);//添加、修改表单验证规则
 
-            return Tuple.Create(fullPath, content);
+            generateDto.GenCodes.Add(new GenCode(6, "index.vue", fullPath, content));
         }
-        public static Tuple<string, string> GenerateVueJs(ReplaceDto replaceDto, GenerateDto generateDto)
+        /// <summary>
+        /// 7、生成vue页面api
+        /// </summary>
+        /// <param name="replaceDto"></param>
+        /// <param name="generateDto"></param>
+        /// <returns></returns>
+        public static void GenerateVueJs(ReplaceDto replaceDto, GenerateDto generateDto)
         {
-            //api js
+            string fullPath = Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src", "api", replaceDto.ViewsFileName + ".js");
-            var parentPath = Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src");
-            string servicesPath = Path.Combine(parentPath, "api");
-            CreateDirectory(servicesPath);
 
-            string fullPath = Path.Combine(servicesPath, replaceDto.ViewsFileName + ".js");
+            if (File.Exists(fullPath) && !generateDto.Coverd)
+                return;
 
-            if (File.Exists(fullPath) && !generateDto.coverd)
+            var content = FileHelper.ReadTemplate("VueJsTemplate.txt")
-                return Tuple.Create(fullPath, "");
-
-            var content = ReadTemplate("VueJsTemplate.txt")
                 .Replace("{ModelTypeName}", replaceDto.ModelTypeName)
-                .Replace("{ModelTypeDesc}", replaceDto.TableDesc)
+                .Replace("{FunctionName}", generateDto.GenTable.FunctionName)
                 .Replace("{ModuleName}", generateDto.GenTable.ModuleName);
 
-            return Tuple.Create(fullPath, content);
+            generateDto.GenCodes.Add(new GenCode(7, "api.js", fullPath, content));
         }
 
         #endregion
 
-        #region 生成SQL
+        #region 8、生成SQL
 
-        public static Tuple<string, string> GenerateSql(ReplaceDto replaceDto, GenerateDto generateDto)
+        public static void GenerateSql(ReplaceDto replaceDto, GenerateDto generateDto)
         {
             string fullPath = Path.Combine(generateDto.GenCodePath, replaceDto.ViewsFileName + ".sql");
 
-            if (File.Exists(fullPath) && !generateDto.coverd)
+            if (File.Exists(fullPath) && !generateDto.Coverd)
-                return Tuple.Create(fullPath, "");
+                return;
             var tempName = "";
             switch (generateDto.DbType)
             {
@@ -405,7 +382,7 @@ namespace ZR.CodeGenerator
                 default:
                     break;
             }
-            var content = ReadTemplate($"{tempName}.txt")
+            var content = FileHelper.ReadTemplate($"{tempName}.txt")
                 .Replace("{ModelTypeName}", replaceDto.ModelTypeName)
                 .Replace("{Permission}", replaceDto.Permission)
                 .Replace("{ModelTypeDesc}", replaceDto.TableDesc)
@@ -413,7 +390,7 @@ namespace ZR.CodeGenerator
                 .Replace("{ViewsFileName}", replaceDto.ViewsFileName)
                 .Replace("{FunctionName}", generateDto.GenTable.FunctionName);
 
-            return Tuple.Create(fullPath, content);
+            generateDto.GenCodes.Add(new GenCode(8, "sql", fullPath, content));
         }
 
         #endregion
@@ -465,94 +442,6 @@ namespace ZR.CodeGenerator
         {
             return string.IsNullOrEmpty(columnDescription) ? columnName : columnDescription;
         }
-        /// <summary>
-        /// 从代码模板中读取内容
-        /// </summary>
-        /// <param name="templateName">模板名称，应包括文件扩展名称。比如：template.txt</param>
-        /// <returns></returns>
-        private static string ReadTemplate(string templateName)
-        {
-            string path = Environment.CurrentDirectory;
-            string fullName = $"{path}/wwwroot/CodeGenTemplate/{templateName}";
-
-            Console.WriteLine("开始读取模板=" + fullName);
-            string temp = fullName;
-            string str = "";
-            if (!File.Exists(temp))
-            {
-                return str;
-            }
-            StreamReader sr = null;
-            try
-            {
-                sr = new StreamReader(temp);
-                str = sr.ReadToEnd(); // 读取文件
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"读取模板出错了{ex.Message}");
-            }
-            sr?.Close();
-            sr?.Dispose();
-            return str;
-        }
-
-        /// <summary>
-        /// 写文件
-        /// </summary>
-        /// <param name="fileName"></param>
-        /// <param name="content"></param>
-        private static void WriteAndSave(string fileName, string content)
-        {
-            fileName = fileName.Replace("\\", "/").Replace("//", "/");
-            Console.WriteLine("写入文件：" + fileName);
-            try
-            {
-                //实例化一个文件流--->与写入文件相关联
-                using var fs = new FileStream(fileName, FileMode.Create, FileAccess.Write);
-                //实例化一个StreamWriter-->与fs相关联
-                using var sw = new StreamWriter(fs);
-                //开始写入
-                sw.Write(content);
-                //清空缓冲区
-                sw.Flush();
-                //关闭流
-                sw.Close();
-                fs.Close();
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("写入文件出错了:" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 创建文件夹
-        /// </summary>
-        /// <param name="path"></param>
-        /// <returns></returns>
-        public static bool CreateDirectory(string path)
-        {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-            {
-                path = path.Replace("\\", "/").Replace("//", "/");
-            }
-            try
-            {
-                if (!Directory.Exists(path))
-                {
-                    DirectoryInfo info = Directory.CreateDirectory(path);
-                    Console.WriteLine("不存在创建文件夹" + info);
-                }
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine($"创建文件夹出错了,{ex.Message}");
-                return false;
-            }
-            return true;
-        }
-
         #endregion
 
         /// <summary>
@@ -573,7 +462,7 @@ namespace ZR.CodeGenerator
                     ColumnType = column.DataType,
                     TableId = genTable.TableId,
                     TableName = genTable.TableName,
-                    CsharpType = TableMappingHelper.GetCSharpDatatype(column.DataType),
+                    CsharpType = GetCSharpDatatype(column.DataType),
                     CsharpField = column.DbColumnName.Substring(0, 1).ToUpper() + column.DbColumnName[1..],
                     IsRequired = !column.IsNullable,
                     IsIncrement = column.IsIdentity,
@@ -623,35 +512,32 @@ namespace ZR.CodeGenerator
         }
 
         /// <summary>
-        /// 压缩代码
+        /// 获取C# 类型
         /// </summary>
-        /// <param name="dto"></param>
+        /// <param name="sDatatype"></param>
         /// <returns></returns>
-        public static string ZipGenCode(GenerateDto dto)
+        public static string GetCSharpDatatype(string sDatatype)
         {
-            try
+            sDatatype = sDatatype.ToLower();
+            string sTempDatatype = sDatatype switch
             {
-                //生成压缩包
+                "int" or "number" or "integer" or "smallint" => "int",
-                string zipReturnFileName = dto.GenTable.BaseNameSpace + DateTime.Now.ToString("yyyyMMddHHmmss") + ".zip";
+                "bigint" => "long",
-
+                "tinyint" => "byte",
-                CreateDirectory(dto.GenCodePath);
+                "numeric" or "real" or "float" => "float",
-                string zipFileName = Path.Combine(dto.ZipPath, zipReturnFileName);
+                "decimal" or "numer(8,2)" => "decimal",
-                if (File.Exists(zipFileName))
+                "bit" => "bool",
-                {
+                "date" or "datetime" or "datetime2" or "smalldatetime" => "DateTime",
-                    File.Delete(zipFileName);
+                "money" or "smallmoney" => "double",
+                _ => "string",
+            };
+            return sTempDatatype;
         }
 
-                ZipFile.CreateFromDirectory(dto.GenCodePath, zipFileName);
+        public static bool IsNumber(string tableDataType)
-                FileHelper.DeleteDirectory(dto.GenCodePath);
-                dto.ZipFileName = zipReturnFileName;
-                return zipReturnFileName;
-            }
-            catch (Exception ex)
         {
-                Console.WriteLine("压缩文件出错。" + ex.Message);
+            string[] arr = new string[] { "int", "long" };
-                return "";
+            return arr.Any(f => f.Contains(GetCSharpDatatype(tableDataType)));
         }
     }
-
-    }
 }

ZR.CodeGenerator/FileHelper.cs

@@ -1,141 +1,142 @@
-using ICSharpCode.SharpZipLib.Checksum;
+using System;
-using ICSharpCode.SharpZipLib.Zip;
-using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using ZR.CodeGenerator.Model;
 
 namespace ZR.CodeGenerator
 {
     public class FileHelper
     {
         /// <summary>
-        /// 制作压缩包（多个文件压缩到一个压缩包，支持加密、注释）
+        /// 创建文件夹
         /// </summary>
-        /// <param name="fileNames">要压缩的文件</param>
+        /// <param name="path"></param>
-        /// <param name="topDirectoryName">压缩文件目录</param>
+        /// <returns></returns>
-        /// <param name="zipedFileName">压缩包文件名</param>
+        public static bool CreateDirectory(string path)
-        /// <param name="compresssionLevel">压缩级别 1-9</param>
-        /// <param name="password">密码</param>
-        /// <param name="comment">注释</param>
-        public static void ZipFiles(string[] fileNames, string topDirectoryName, string zipedFileName, int? compresssionLevel, string password = "", string comment = "")
         {
-            using (ZipOutputStream zos = new ZipOutputStream(File.Open(zipedFileName, FileMode.OpenOrCreate)))
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             {
-                if (compresssionLevel.HasValue)
+                path = path.Replace("\\", "/").Replace("//", "/");
-                {
-                    zos.SetLevel(compresssionLevel.Value);//设置压缩级别
             }
-
+            try
-                if (!string.IsNullOrEmpty(password))
             {
-                    zos.Password = password;//设置zip包加密密码
+                if (!Directory.Exists(path))
-                }
-
-                if (!string.IsNullOrEmpty(comment))
                 {
-                    zos.SetComment(comment);//设置zip包的注释
+                    DirectoryInfo info = Directory.CreateDirectory(path);
-                }
+                    Console.WriteLine("不存在创建文件夹" + info);
-
-                foreach (string file in fileNames)
-                {
-                    //string fileName = string.Format("{0}/{1}", topDirectoryName, file);
-                    string fileName =  file;
-                    
-                    if (File.Exists(fileName))
-                    {
-                        FileInfo item = new FileInfo(fileName);
-                        FileStream fs = File.OpenRead(item.FullName);
-                        byte[] buffer = new byte[fs.Length];
-                        fs.Read(buffer, 0, buffer.Length);
-
-                        ZipEntry entry = new ZipEntry(item.Name);
-                        zos.PutNextEntry(entry);
-                        zos.Write(buffer, 0, buffer.Length);
                 }
             }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"创建文件夹出错了,{ex.Message}");
+                return false;
             }
+            return true;
         }
 
         /// <summary>
-        /// 压缩多层目录
+        /// 写文件
         /// </summary>
-        /// <param name="topDirectoryName">压缩文件目录</param>
+        /// <param name="path">完整路径带扩展名的</param>
-        /// <param name="zipedFileName">压缩包文件名</param>
+        /// <param name="content"></param>
-        /// <param name="compresssionLevel">压缩级别 1-9 </param>
+        public static void WriteAndSave(string path, string content)
-        /// <param name="password">密码</param>
-        /// <param name="comment">注释</param>
-        /// <param name="filetype">文件类型</param>
-        public static void ZipFileDirectory(string topDirectoryName, string zipedFileName, int compresssionLevel, string password, string comment, string filetype)
         {
-            using (System.IO.FileStream ZipFile = File.Open(zipedFileName, FileMode.OpenOrCreate))
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             {
-                using (ZipOutputStream zos = new ZipOutputStream(ZipFile))
+                path = path.Replace("\\", "/").Replace("//", "/");
-                {
-                    if (compresssionLevel != 0)
-                    {
-                        zos.SetLevel(compresssionLevel);//设置压缩级别
             }
-                    if (!string.IsNullOrEmpty(password))
+            if (!Directory.Exists(Path.GetDirectoryName(path)))
             {
-                        zos.Password = password;//设置zip包加密密码
+                Directory.CreateDirectory(Path.GetDirectoryName(path));
             }
-                    if (!string.IsNullOrEmpty(comment))
+            Console.WriteLine("写入文件：" + path);
+            try
             {
-                        zos.SetComment(comment);//设置zip包的注释
+                //实例化一个文件流--->与写入文件相关联
-                    }
+                using var fs = new FileStream(path, FileMode.Create, FileAccess.Write);
-                    ZipSetp(topDirectoryName, zos, "", filetype);
+                //实例化一个StreamWriter-->与fs相关联
-                }
+                using var sw = new StreamWriter(fs);
-            }
+                //开始写入
-        }
+                sw.Write(content);
-
+                //清空缓冲区
-        /// <summary>
+                sw.Flush();
-        /// 递归遍历目录
+                //关闭流
-        /// </summary>
+                sw.Close();
-        /// <param name="strDirectory">The directory.</param>
-        /// <param name="s">The ZipOutputStream Object.</param>
-        /// <param name="parentPath">The parent path.</param>
-        private static void ZipSetp(string strDirectory, ZipOutputStream s, string parentPath, string filetype)
-        {
-            if (strDirectory[^1] != Path.DirectorySeparatorChar)
-            {
-                strDirectory += Path.DirectorySeparatorChar;
-            }
-            Console.WriteLine("strDirectory=" + strDirectory);
-            Crc32 crc = new Crc32();
-
-            string[] filenames = Directory.GetFileSystemEntries(strDirectory, filetype);
-            foreach (string file in filenames)// 遍历所有的文件和目录
-            {
-                if (Directory.Exists(file))// 先当作目录处理如果存在这个目录就递归Copy该目录下面的文件
-                {
-                    string pPath = parentPath;
-                    pPath += file[(file.LastIndexOf("/") + 1)..];
-                    pPath += "/";
-                    Console.WriteLine("递归路径" + pPath);
-                    ZipSetp(file, s, pPath, filetype);
-                }
-                else // 否则直接压缩文件
-                {
-                    //打开压缩文件
-                    using (FileStream fs = File.OpenRead(file))
-                    {
-                        byte[] buffer = new byte[fs.Length];
-                        fs.Read(buffer, 0, buffer.Length);
-                        string fileName = parentPath + file[(file.LastIndexOf("/") + 1)..];
-                        ZipEntry entry = new ZipEntry(fileName);
-                        entry.DateTime = DateTime.Now;
-                        entry.Size = fs.Length;
                 fs.Close();
-                        crc.Reset();
+            }
-                        crc.Update(buffer);
+            catch (Exception ex)
-                        entry.Crc = crc.Value;
+            {
-                        s.PutNextEntry(entry);
+                Console.WriteLine("写入文件出错了:" + ex.Message);
-                        s.Write(buffer, 0, buffer.Length);
             }
         }
+
+
+        /// <summary>
+        /// 从代码模板中读取内容
+        /// </summary>
+        /// <param name="templateName">模板名称，应包括文件扩展名称。比如：template.txt</param>
+        /// <returns></returns>
+        public static string ReadTemplate(string templateName)
+        {
+            string path = Environment.CurrentDirectory;
+            string fullName = $"{path}/wwwroot/CodeGenTemplate/{templateName}";
+
+            Console.WriteLine("开始读取模板=" + fullName);
+            string temp = fullName;
+            string str = "";
+            if (!File.Exists(temp))
+            {
+                return str;
+            }
+            StreamReader sr = null;
+            try
+            {
+                sr = new StreamReader(temp);
+                str = sr.ReadToEnd(); // 读取文件
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine($"读取模板出错了{ex.Message}");
+            }
+            sr?.Close();
+            sr?.Dispose();
+            return str;
+        }
+
+
+        /// <summary>
+        /// 压缩代码
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public static string ZipGenCode(GenerateDto dto)
+        {
+            try
+            {
+                //生成压缩包
+                string zipReturnFileName = dto.GenTable.BaseNameSpace + DateTime.Now.ToString("yyyyMMddHHmmss") + ".zip";
+
+                CreateDirectory(dto.GenCodePath);
+                string zipFileName = Path.Combine(dto.ZipPath, zipReturnFileName);
+                if (File.Exists(zipFileName))
+                {
+                    File.Delete(zipFileName);
+                }
+
+                ZipFile.CreateFromDirectory(dto.GenCodePath, zipFileName);
+                DeleteDirectory(dto.GenCodePath);
+                dto.ZipFileName = zipReturnFileName;
+                return zipReturnFileName;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("压缩文件出错。" + ex.Message);
+                return "";
             }
         }
 

ZR.CodeGenerator/Model/GenerateDto.cs

@@ -10,30 +10,29 @@ namespace ZR.CodeGenerator.Model
     public class GenerateDto
     {
         public long TableId { get; set; }
-        public string[] QueryColumn { get; set; }
+        //public string[] QueryColumn { get; set; }
-
+        /// <summary>
+        /// 是否预览代码
+        /// </summary>
+        public int IsPreview { get; set; }
         /// <summary>
         /// 要生成的文件
         /// </summary>
-        public int[] genFiles { get; set; }
+        public int[] GenCodeFiles { get; set; }
         /// <summary>
         /// 如果目标文件存在，是否覆盖。默认为false
         /// </summary>
-        public bool coverd { get; set; } = true;
+        public bool Coverd { get; set; } = true;
         /// <summary>
         /// 生成代码的数据库类型 0、mysql 1、sqlserver
         /// </summary>
         public int DbType { get; set; }
         public GenTable GenTable { get; set; }
         #region 存储路径
-        //public string ModelPath { get; set; }
+        /// <summary>
-        //public string ServicePath { get; set; }
+        /// 代码模板预览存储路径存放
-        //public string RepositoryPath { get; set; }
+        /// </summary>
-        //public string ApiPath { get; set; }
+        public List<GenCode> GenCodes { get; set; } = new List<GenCode>();
-        //public string VuePath { get; set; }
-        //public string VueApiPath { get; set; }
-
-        //public string ParentPath { get; set; } = "..";
         /// <summary>
         /// 代码生成路径
         /// </summary>
@@ -48,4 +47,20 @@ namespace ZR.CodeGenerator.Model
         public string ZipFileName { get; set; }
         #endregion
     }
+
+    public class GenCode
+    {
+        public int Type { get; set; }
+        public string Title { get; set; }
+        public string Path { get; set; }
+        public string Content { get; set; }
+
+        public GenCode(int type, string title, string path, string content)
+        {
+            Type = type;
+            Title = title;
+            Path = path;
+            Content = content;
+        }
+    }
 }

ZR.CodeGenerator/Model/ReplaceDto.cs

@@ -100,5 +100,7 @@ namespace ZR.CodeGenerator.Model
         /// views、js文件名
         /// </summary>
         public string ViewsFileName { get; set; }
+        public string Author { get; set; }
+        public string AddTime { get; set; } = DateTime.Now.ToString("yyyy-MM-dd");
     }
 }

ZR.CodeGenerator/TableMappingHelper.cs

@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Infrastructure.Extensions;
-using ZR.Common.Extension;
-
-namespace ZR.CodeGenerator.CodeGenerator
-{
-    public class TableMappingHelper
-    {
-        /// <summary>
-        /// UserService转成userService
-        /// </summary>
-        /// <param name="s"></param>
-        /// <returns></returns>
-        public static string FirstLetterLowercase(string instanceName)
-        {
-            instanceName = instanceName.ParseToString();
-            if (!instanceName.IsEmpty())
-            {
-                StringBuilder sb = new StringBuilder();
-                sb.Append(instanceName[0].ToString().ToLower() + instanceName.Substring(1));
-                return sb.ToString();
-            }
-            else
-            {
-                return instanceName;
-            }
-        }
-
-        /// <summary>
-        /// sys_menu_authorize变成MenuAuthorize
-        /// </summary>
-        public static string GetClassNamePrefix(string tableName)
-        {
-            string[] arr = tableName.Split('_');
-            if (arr.Length <= 0) return tableName;
-
-            StringBuilder sb = new StringBuilder();
-            for (int i = 1; i < arr.Length; i++)
-            {
-                sb.Append(arr[i][0].ToString().ToUpper() + arr[i].Substring(1));
-            }
-            return sb.ToString();
-        }
-
-        /// <summary>
-        /// 获取C# 类型
-        /// </summary>
-        /// <param name="sDatatype"></param>
-        /// <returns></returns>
-        public static string GetCSharpDatatype(string sDatatype)
-        {
-            sDatatype = sDatatype.ToLower();
-            string sTempDatatype = sDatatype switch
-            {
-                "int" or "number" or "integer" or "smallint" => "int",
-                "bigint" => "long",
-                "tinyint" => "byte",
-                "numeric" or "real" or "float" => "float",
-                "decimal" or "numer(8,2)" => "decimal",
-                "bit" => "bool",
-                "date" or "datetime" or "datetime2" or "smalldatetime" => "DateTime",
-                "money" or "smallmoney" => "double",
-                _ => "string",
-            };
-            return sTempDatatype;
-        }
-
-        public static bool IsNumber(string tableDataType)
-        {
-            string[] arr = new string[] { "int", "long" };
-            return arr.Any(f => f.Contains(GetCSharpDatatype(tableDataType)));
-        }
-    }
-}

ZR.Vue/package.json

@@ -28,6 +28,7 @@
     "element-ui": "2.15.6",
     "file-saver": "2.0.1",
     "fuse.js": "3.4.4",
+    "highlight.js": "^11.2.0",
     "js-beautify": "1.10.2",
     "js-cookie": "2.2.0",
     "jsencrypt": "3.0.0-rc.1",

ZR.Vue/src/api/gendemo.js

@@ -6,7 +6,7 @@ import request from '@/utils/request'
    */
 export function listGendemo(query) {
   return request({
-    url: 'bus/Gendemo/list',
+    url: 'business/Gendemo/list',
     method: 'get',
     params: query,
   })
@@ -18,7 +18,7 @@ export function listGendemo(query) {
    */
 export function addGendemo(data) {
   return request({
-    url: '/bus/Gendemo',
+    url: 'business/Gendemo',
     method: 'post',
     data: data,
   })
@@ -30,7 +30,7 @@ export function addGendemo(data) {
    */
 export function updateGendemo(data) {
   return request({
-    url: '/bus/Gendemo',
+    url: 'business/Gendemo',
     method: 'PUT',
     data: data,
   })
@@ -42,7 +42,7 @@ export function updateGendemo(data) {
    */
 export function getGendemo(id) {
   return request({
-    url: '/bus/Gendemo/' + id,
+    url: 'business/Gendemo/' + id,
     method: 'get'
   })
 }
@@ -53,7 +53,7 @@ export function getGendemo(id) {
    */
 export function delGendemo(pid) {
   return request({
-    url: '/bus/Gendemo/' + pid,
+    url: 'business/Gendemo/' + pid,
     method: 'delete'
   })
 }

ZR.Vue/src/api/tool/gen.js

@@ -94,6 +94,13 @@ export function updateGenTable(data) {
   })
 }
 
+// 预览生成代码
+export function previewTable(tableId) {
+  return request({
+    url: '/tool/gen/preview/' + tableId,
+    method: 'get'
+  })
+}
 
 // /**
 //  *

ZR.Vue/src/views/tool/gen/index.vue

@@ -33,7 +33,7 @@
       <el-table-column prop="updateTime" label="更新时间" />
       <el-table-column label="操作" align="center" width="300">
         <template slot-scope="scope">
-          <el-button type="text" icon="el-icon-view" @click="handlePreview()">预览</el-button>
+          <el-button type="text" icon="el-icon-view" @click="handlePreview(scope.row)">预览</el-button>
           <el-button type="text" icon="el-icon-edit" @click="handleEditTable(scope.row)">编辑</el-button>
           <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['tool:gen:delete']">删除</el-button>
           <el-button type="text" icon="el-icon-download" @click="handleShowDialog(scope.row)" v-hasPermi="['tool:gen:code']">生成代码</el-button>
@@ -42,19 +42,29 @@
     </el-table>
     <pagination :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" :total="total" @pagination="handleSearch" />
 
+    <!-- 预览界面 -->
+    <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body>
+      <el-tabs v-model="preview.activeName">
+        <el-tab-pane v-for="(item, key) in preview.data" :label="item.title" :name="item.type.toString()" :key="key">
+          <pre v-html="highlightedCode(item.content)">
+          </pre>
+        </el-tab-pane>
+      </el-tabs>
+    </el-dialog>
     <import-table ref="import" @ok="handleSearch" />
 
     <el-dialog :visible.sync="showGenerate" title="代码生成" width="800px">
       <el-form ref="codeGenerateForm" label-width="140px">
         <el-form-item label="要生成的文件">
           <el-checkbox-group v-model="checkedCodeGenerateForm">
-            <el-checkbox :label="1">生成Model</el-checkbox>
+            <el-checkbox :label="1">生成实体类Model</el-checkbox>
-            <el-checkbox :label="2">生成Dto</el-checkbox>
+            <el-checkbox :label="2">生成表单数据传输类Dto</el-checkbox>
-            <el-checkbox :label="3">生成Repository</el-checkbox>
+            <el-checkbox :label="3">生成仓储层Repository</el-checkbox>
-            <el-checkbox :label="4">生成Service</el-checkbox>
+            <el-checkbox :label="4">生成服务类Service和接口</el-checkbox>
-            <el-checkbox :label="5">生成Controller</el-checkbox>
+            <el-checkbox :label="5">生成控制器Controller</el-checkbox>
-            <el-checkbox :label="6">生成Vue和api</el-checkbox>
+            <el-checkbox :label="6">生成Vue页面</el-checkbox>
-            <el-checkbox :label="7">生成Sql文件</el-checkbox>
+            <el-checkbox :label="7">生成Vue页面数据访问api</el-checkbox>
+            <el-checkbox :label="8">生成Sql文件</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
 
@@ -78,15 +88,21 @@
 </template>
 
 <script>
-import { codeGenerator, getGenTable, delTable } from "@/api/tool/gen";
+import {
+  codeGenerator,
+  getGenTable,
+  delTable,
+  previewTable,
+} from "@/api/tool/gen";
 import { downloadFile } from "@/utils/zipdownload.js";
-
 import importTable from "./importTable";
 import { Loading } from "element-ui";
+import hljs from 'highlight.js'
+import 'highlight.js/styles/idea.css'  //这里有多个样式，自己可以根据需要切换
 
 export default {
   name: "CodeGenerator",
-  components: { importTable },
+  components: { importTable, hljs },
   data() {
     return {
       queryParams: {
@@ -94,8 +110,15 @@ export default {
         pageSize: 20,
         tableName: "",
       },
+      // 预览参数
+      preview: {
+        open: false,
+        title: "代码预览",
+        data: {},
+        activeName: "1",
+      },
       showGenerate: false,
-      checkedCodeGenerateForm: [1, 2, 3, 4, 5, 6, 7],
+      checkedCodeGenerateForm: [1, 2, 3, 4, 5, 6, 7, 8],
       rules: {},
       // 表数据
       tableData: [],
@@ -139,8 +162,16 @@ export default {
       console.log(row);
       this.$router.push("/tool/editTable?tableId=" + row.tableId);
     },
-    handlePreview() {
+    // 代码预览
-      this.msgError("敬请期待");
+    handlePreview(row) {
+      // this.msgError("敬请期待");
+      previewTable(row.tableId).then((res) => {
+        if (res.code === 200) {
+          this.preview.open = true;
+          this.preview.data = res.data;
+          console.log(res);
+        }
+      });
     },
     handleShowDialog(row) {
       this.showGenerate = true;
@@ -234,6 +265,12 @@ export default {
       this.multiple = !section.length;
       console.log(this.tableIds);
     },
+    /** 高亮显示 */
+    highlightedCode(code, key) {
+      // var language = vmName.substring(vmName.indexOf(".") + 1, vmName.length);
+      const result = hljs.highlightAuto(code || "");
+      return result.value || "&nbsp;";
+    },
   },
 };
 </script>

ZRAdmin.xml

@@ -119,7 +119,7 @@
         </member>
         <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.ImportTableSave(System.String,System.String)">
             <summary>
-            导入表
+            导入表结构（保存）
             </summary>
             <param name="tables"></param>
             <param name="dbName"></param>
@@ -131,6 +131,13 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.CodeGeneratorController.Preview(System.Int64)">
+            <summary>
+            预览代码
+            </summary>
+            <param name="tableId"></param>
+            <returns></returns>
+        </member>
         <member name="M:ZR.Admin.WebApi.Controllers.HomeController.Health">
             <summary>
             心跳