优化代码生成功能

ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs

@@ -67,22 +67,6 @@ namespace ZR.Admin.WebApi.Controllers
             return SUCCESS(vm);
         }
 
-        ///// <summary>
-        ///// 获取表格列
-        ///// </summary>
-        ///// <param name="dbName"></param>
-        ///// <param name="tableName"></param>
-        ///// <returns></returns>
-        //[HttpGet("getColumnInfo")]
-        //[ActionPermissionFilter(Permission = "tool:gen:list")]
-        //public IActionResult QueryColumnInfo(string dbName, string tableName)
-        //{
-        //    if (string.IsNullOrEmpty(dbName) || string.IsNullOrEmpty(tableName))
-        //        return ToRespose(ResultCode.PARAM_ERROR);
-
-        //    return SUCCESS(_CodeGeneraterService.GetColumnInfo(dbName, tableName));
-        //}
-
         /// <summary>
         /// 代码生成器
         /// </summary>
@@ -207,7 +191,7 @@ namespace ZR.Admin.WebApi.Controllers
                                 TableName = tableName,
                                 CsharpType = TableMappingHelper.GetPropertyDatatype(column.DataType),
                                 CsharpField = column.DbColumnName.Substring(0, 1).ToUpper() + column.DbColumnName[1..],
-                                IsRequired = column.IsNullable,
+                                IsRequired = !column.IsNullable,
                                 IsIncrement = column.IsIdentity,
                                 Create_by = userName,
                                 Create_time = DateTime.Now,
@@ -222,15 +206,19 @@ namespace ZR.Admin.WebApi.Controllers
                             {
                                 genTableColumn.HtmlType = GenConstants.HTML_IMAGE_UPLOAD;
                             }
-                            if (genTableColumn.CsharpType.ToLower().Contains("datetime"))
+                            else if (genTableColumn.CsharpType.ToLower().Contains("datetime"))
                             {
                                 genTableColumn.HtmlType = GenConstants.HTML_DATETIME;
                             }
-                            if (CodeGeneratorTool.radioFiled.Any(f => column.DbColumnName.Contains(f)))
+                            else if (CodeGeneratorTool.radioFiled.Any(f => column.DbColumnName.Contains(f)))
                             {
                                 genTableColumn.HtmlType = GenConstants.HTML_RADIO;
                             }
-                            if (column.Length > 200)
+                            else if (CodeGeneratorTool.selectFiled.Any(f => column.DbColumnName.Contains(f)))
+                            {
+                                genTableColumn.HtmlType = GenConstants.HTML_SELECT;
+                            }
+                            else if (column.Length > 300)
                             {
                                 genTableColumn.HtmlType = GenConstants.HTML_TEXTAREA;
                             }
@@ -251,13 +239,13 @@ namespace ZR.Admin.WebApi.Controllers
         /// 代码生成保存
         /// </summary>
         /// <returns></returns>
-        [HttpPut()]
+        [HttpPut]
         //[Log(Title = "代码生成", BusinessType = BusinessType.UPDATE)]
         [ActionPermissionFilter(Permission = "tool:gen:edit")]
-        public IActionResult EditSave([FromBody]GenTableDto genTableDto)
+        public IActionResult EditSave([FromBody] GenTableDto genTableDto)
         {
             if (genTableDto == null) throw new CustomException("请求参数错误");
-            var genTable = genTableDto.Adapt<GenTable>().ToUpdate();
+            var genTable = genTableDto.Adapt<GenTable>().ToUpdate(HttpContext);
 
             int rows = GenTableService.UpdateGenTable(genTable);
             if (rows > 0)

ZR.Admin.WebApi/Extensions/EntityExtension.cs

@@ -57,7 +57,10 @@ namespace ZR.Admin.WebApi.Extensions
             {
                 types.GetProperty("UpdateTime").SetValue(source, DateTime.Now, null);
             }
-
+            if (types.GetProperty("Update_Time") != null)
+            {
+                types.GetProperty("Update_Time").SetValue(source, DateTime.Now, null);
+            }
             //if (types.GetProperty("UpdateID") != null)
             //{
             //    types.GetProperty("UpdateID").SetValue(source, userSession.UserID, null);
@@ -67,6 +70,10 @@ namespace ZR.Admin.WebApi.Extensions
             {
                 types.GetProperty("UpdateBy").SetValue(source,context.GetName(), null);
             }
+            if (types.GetProperty("Update_by") != null)
+            {
+                types.GetProperty("Update_by").SetValue(source, context.GetName(), null);
+            }
 
             return source;
         }

ZR.Admin.WebApi/Extensions/HttpContextExtension.cs

@@ -71,7 +71,7 @@ namespace ZR.Admin.WebApi.Extensions
         }
         public static string GetName(this HttpContext context)
         {
-            var uid = context.User.Identity.Name;
+            var uid = context.User?.Identity?.Name;
 
             return uid;
         }

ZR.Admin.WebApi/Template/ControllersTemplate.txt

@@ -80,9 +80,12 @@ namespace {ApiControllerNamespace}.Controllers
                 throw new CustomException("请求参数错误");
             }
             //从 Dto 映射到 实体
-            var addModel = parm.Adapt<{ModelName}>().ToCreate();
+            var model = parm.Adapt<{ModelName}>().ToCreate();
 
-            return SUCCESS(_{ModelName}Service.Add(addModel));
+            return SUCCESS(_{ModelName}Service.Add(model, it => new
+            {
+                {InsertColumn}
+            }));
         }
 
         /// <summary>
@@ -99,9 +102,9 @@ namespace {ApiControllerNamespace}.Controllers
                 throw new CustomException("请求实体不能为空");
             }
             //从 Dto 映射到 实体
-            var updateModel = parm.Adapt<{ModelName}>().ToUpdate();
+            var model = parm.Adapt<{ModelName}>().ToUpdate();
 
-            var response = _{ModelName}Service.Update(w => w.{PrimaryKey} == updateModel.{PrimaryKey}, it => new {ModelName}()
+            var response = _{ModelName}Service.Update(w => w.{PrimaryKey} == model.{PrimaryKey}, it => new {ModelName}()
             {
                 //Update 字段映射
                 {UpdateColumn}

ZR.Admin.WebApi/Template/InputDtoTemplate.txt

@@ -13,8 +13,12 @@ namespace {DtosNamespace}.Dto
 {PropertyName}
     }
 
+    /// <summary>
+    /// {TableNameDesc}查询对象模型
+    /// </summary>
     public class {ModelTypeName}QueryDto: PagerInfo 
     {
+{QueryProperty}
         public DateTime? BeginTime { get; set; }
         public DateTime? EndTime { get; set; }
     }

ZR.Admin.WebApi/Template/VueTemplate.txt

@@ -2,23 +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>
-      <el-form-item label="文本文字">
+      {vueQueryFormHtml}
-        <el-input v-model="queryParams.xxx" placeholder="" />
-      </el-form-item>
-      <el-form-item label="数字">
-        <el-input v-model.number="queryParams.xxx" placeholder="" />
-      </el-form-item>
-      
-      <el-form-item label="下拉框">
-        <el-select v-model="queryParams.xxx" placeholder="">
-          <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
-        </el-select>
-      </el-form-item>
-      
-      <el-form-item label="时间范围">
-        <el-date-picker size="small" style="width: 240px" v-model="timeRange" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
-        </el-date-picker>
-      </el-form-item>
 
       <el-row class="mb8" style="text-align:center">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -47,7 +31,7 @@
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="scope">
           <el-button size="mini"  v-hasPermi="['{Permission}:update']" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button>
-          <el-popconfirm title="确定删除吗？" @onConfirm="handleDelete(scope.row)" style="margin-left:10px">
+          <el-popconfirm title="确定删除吗？" @confirm="handleDelete(scope.row)" style="margin-left:10px">
             <el-button slot="reference"  v-hasPermi="['{Permission}:delete']" size="mini" type="text" icon="el-icon-delete">删除</el-button>
           </el-popconfirm>
         </template>
@@ -103,8 +87,7 @@ export default {
       form: {},
       // 时间范围数组
       timeRange: [],
-      // xxx下拉框
+      {VueDataContent}
-      statusOptions: [],
       // 数据列表
       dataList: [],
       // 总记录数

ZR.CodeGenerator/CodeGenerateTemplate.cs

@@ -1,9 +1,4 @@
-using SqlSugar;
+using System.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using ZR.CodeGenerator.CodeGenerator;
 using ZR.Model.System.Generate;
 
@@ -14,8 +9,6 @@ namespace ZR.CodeGenerator
     /// </summary>
     public class CodeGenerateTemplate
     {
-        #region Template
-
         /// <summary>
         /// 生成vuejs模板，目前只有上传文件方法
         /// </summary>
@@ -27,10 +20,10 @@ namespace ZR.CodeGenerator
             string js = "";
             if (dbColumnInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD))
             {
-                js += $"handleUpload{columnName}Success(res, file) {{\n";
+                js += $"handleUpload{columnName}Success(res, file) {{\r\n";
-                js += $"     this.form.{columnName} = URL.createObjectURL(file.raw);\n";
+                js += $"      this.form.{columnName} = URL.createObjectURL(file.raw);\r\n";
-                js += "     // this.$refs.upload.clearFiles();\n";
+                js += "      // this.$refs.upload.clearFiles();\r\n";
-                js += "},\n";
+                js += "    },\r";
             }
             return js;
         }
@@ -40,17 +33,17 @@ namespace ZR.CodeGenerator
         {
             string vueViewEditFromRuleContent = "";
             //Rule 规则验证
-            if (!dbFieldInfo.IsPk && !dbFieldInfo.IsIncrement)
+            if ((!dbFieldInfo.IsPk && !dbFieldInfo.IsIncrement) && dbFieldInfo.IsRequired)
             {
-                vueViewEditFromRuleContent += $"        {dbFieldInfo.ColumnName}: [\n";
+                vueViewEditFromRuleContent += $"        {dbFieldInfo.ColumnName}: [\r\n";
-                vueViewEditFromRuleContent += $"        {{ required: true, message: '请输入{dbFieldInfo.ColumnComment}', trigger: \"blur\"}},\n";
+                vueViewEditFromRuleContent += $"        {{ required: true, message: '请输入{dbFieldInfo.ColumnComment}', trigger: \"blur\"}},\r\n";
-                vueViewEditFromRuleContent += "        ],\n";
+                vueViewEditFromRuleContent += "        ],\r\n";
             }
             else if (TableMappingHelper.IsNumber(dbFieldInfo.ColumnType) && dbFieldInfo.IsRequired)
             {
-                vueViewEditFromRuleContent += $"        {dbFieldInfo.ColumnName}: [\n";
+                vueViewEditFromRuleContent += $"        {dbFieldInfo.ColumnName}: [\r\n";
-                vueViewEditFromRuleContent += $"        {{ type: 'number', message: '{dbFieldInfo.ColumnName}必须为数字值', trigger: \"blur\"}},\n";
+                vueViewEditFromRuleContent += $"        {{ type: 'number', message: '{dbFieldInfo.ColumnName}必须为数字值', trigger: \"blur\"}},\r\n";
-                vueViewEditFromRuleContent += "        ],\n";
+                vueViewEditFromRuleContent += "        ],\r\n";
             }
 
             return vueViewEditFromRuleContent;
@@ -60,28 +53,57 @@ namespace ZR.CodeGenerator
         public static string GetModelTemplate(GenTableColumn dbFieldInfo)
         {
             var modelcontent = "";
-            modelcontent += "        /// <summary>\n";
+            modelcontent += "        /// <summary>\r\n";
-            modelcontent += $"        /// 描述 :{dbFieldInfo.ColumnComment}\n";
+            modelcontent += $"        /// 描述 :{dbFieldInfo.ColumnComment}\r\n";
-            modelcontent += $"        /// 空值 :{dbFieldInfo.IsRequired}\n";
+            modelcontent += $"        /// 空值 :{!dbFieldInfo.IsRequired}\r\n";
-            modelcontent += "        /// </summary>\n";
+            modelcontent += "        /// </summary>\r\n";
             if (dbFieldInfo.IsPk || dbFieldInfo.IsIncrement)
             {
-                modelcontent += $"[SqlSugar.SugarColumn(IsPrimaryKey = {dbFieldInfo.IsPk.ToString().ToLower()}, IsIdentity = {dbFieldInfo.IsIncrement.ToString().ToLower()})]\n";
+                modelcontent += $"        [SqlSugar.SugarColumn(IsPrimaryKey = {dbFieldInfo.IsPk.ToString().ToLower()}, IsIdentity = {dbFieldInfo.IsIncrement.ToString().ToLower()})]\r\n";
             }
-            modelcontent += $"public {dbFieldInfo.CsharpType} {dbFieldInfo.CsharpField} {{ get; set; }}\n\r";
+            modelcontent += $"        public {dbFieldInfo.CsharpType}{(GetModelRequired(dbFieldInfo))} {dbFieldInfo.CsharpField} {{ get; set; }}\r\n";
             return modelcontent;
         }
+        public static string GetModelRequired(GenTableColumn dbFieldInfo)
+        {
+            string str = "";
+            if (!dbFieldInfo.IsRequired && (dbFieldInfo.CsharpType == "int" || dbFieldInfo.CsharpType == "long" || dbFieldInfo.CsharpType == "DateTime"))
+            {
+                str = "?";
+            }
+
+            return str;
+        }
         //DTO model
-        public static string GetDtoContent(GenTableColumn dbFieldInfo)
+        public static string GetDtoProperty(GenTableColumn dbFieldInfo)
         {
             string InputDtoContent = "";
-            if (dbFieldInfo.IsInsert || dbFieldInfo.IsEdit)
+            if (CodeGeneratorTool.inputDtoNoField.Any(f => f.Replace("_", "").ToLower().Contains(dbFieldInfo.CsharpField.ToLower().Replace("_", ""))))
             {
-                InputDtoContent += $"        public {dbFieldInfo.CsharpType} {dbFieldInfo.CsharpField} {{ get; set; }}\n\r";
+                return InputDtoContent;
+            }
+            else if (dbFieldInfo.IsInsert || dbFieldInfo.IsEdit || dbFieldInfo.IsPk || dbFieldInfo.IsIncrement)
+            {
+                InputDtoContent += $"        public {dbFieldInfo.CsharpType}{GetModelRequired(dbFieldInfo)} {dbFieldInfo.CsharpField} {{ get; set; }}\r\n";
             }
 
             return InputDtoContent;
         }
+        /// <summary>
+        /// 查询Dto属性
+        /// </summary>
+        /// <param name="dbFieldInfo"></param>
+        /// <returns></returns>
+        public static string GetQueryDtoProperty(GenTableColumn dbFieldInfo)
+        {
+            string QueryDtoContent = "";
+            if (dbFieldInfo.IsQuery && !CodeGeneratorTool.inputDtoNoField.Any(f => f.Replace("_", "").ToLower().Contains(dbFieldInfo.CsharpField.ToLower().Replace("_", ""))))
+            {
+                QueryDtoContent += $"        public {dbFieldInfo.CsharpType} {dbFieldInfo.CsharpField} {{ get; set; }}\r\n";
+            }
+
+            return QueryDtoContent;
+        }
 
         //form-item
         public static string GetVueViewFormContent(GenTableColumn dbFieldInfo)
@@ -91,6 +113,10 @@ namespace ZR.CodeGenerator
             string vueViewFromContent = "";
             string labelDisabled = dbFieldInfo.IsPk ? ":disabled=\"true\"" : "";
             string placeHolder = dbFieldInfo.IsIncrement ? "" : $"请输入{labelName}";
+            if (CodeGeneratorTool.inputDtoNoField.Any(f => f.Replace("_", "").ToLower().Contains(dbFieldInfo.CsharpField.ToLower().Replace("_", ""))))
+            {
+                return vueViewFromContent;
+            }
             if (!dbFieldInfo.IsInsert || !dbFieldInfo.IsEdit)
             {
                 return vueViewFromContent;
@@ -98,47 +124,83 @@ namespace ZR.CodeGenerator
             if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
             {
                 //时间
-                vueViewFromContent += $"       <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">\n";
+                vueViewFromContent += $"        <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">\r\n";
-                vueViewFromContent += $"         <el-date-picker v-model=\"form.{columnName}\"  type=\"datetime\"  placeholder=\"选择日期时间\"  default-time=\"12:00:00\"> </el-date-picker>\n";
+                vueViewFromContent += $"           <el-date-picker v-model=\"form.{columnName}\"  type=\"datetime\"  placeholder=\"选择日期时间\"  default-time=\"12:00:00\"> </el-date-picker>\r\n";
-                vueViewFromContent += "        </el-form-item>\n";
+                vueViewFromContent += "         </el-form-item>\r\n";
             }
             else if (dbFieldInfo.HtmlType == GenConstants.HTML_IMAGE_UPLOAD)
             {
                 //图片
-                vueViewFromContent += $"       <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">\n";
+                vueViewFromContent += $"       <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">\r\n";
-                vueViewFromContent += $"         <el-upload class=\"avatar-uploader\" name=\"file\" action=\"/api/upload/saveFile/\" :show-file-list=\"false\" :on-success=\"handleUpload{columnName}Success\" :before-upload=\"beforeFileUpload\">\n";
+                vueViewFromContent += $"         <el-upload class=\"avatar-uploader\" name=\"file\" action=\"/api/upload/saveFile/\" :show-file-list=\"false\" :on-success=\"handleUpload{columnName}Success\" :before-upload=\"beforeFileUpload\">\r\n";
-                vueViewFromContent += $"            <img v-if=\"form.{columnName}\" :src=\"form.{columnName}\" class=\"icon\">\n";
+                vueViewFromContent += $"            <img v-if=\"form.{columnName}\" :src=\"form.{columnName}\" class=\"icon\">\r\n";
-                vueViewFromContent += "             <i v-else class=\"el-icon-plus uploader-icon\"></i>\n";
+                vueViewFromContent += "             <i v-else class=\"el-icon-plus uploader-icon\"></i>\r\n";
-                vueViewFromContent += "          </el-upload>\n";
+                vueViewFromContent += "          </el-upload>\r\n";
-                vueViewFromContent += $"         <el-input v-model=\"form.{columnName}\" placeholder=\"请上传文件或手动输入文件地址\"></el-input>\n";
+                vueViewFromContent += $"         <el-input v-model=\"form.{columnName}\" placeholder=\"请上传文件或手动输入文件地址\"></el-input>\r\n";
-                vueViewFromContent += "        </el-form-item>\n";
+                vueViewFromContent += "        </el-form-item>\r\n";
             }
             else if (dbFieldInfo.HtmlType == GenConstants.HTML_RADIO)
             {
-                vueViewFromContent += $"       <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">\n";
+                vueViewFromContent += $"       <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">\r\n";
-                vueViewFromContent += $"         <el-radio-group v-model=\"form.{columnName}\">\n";
+                vueViewFromContent += $"         <el-radio-group v-model=\"form.{columnName}\">\r\n";
-                vueViewFromContent += "           <el-radio :key=\"1\" :label=\"1\">是</el-radio>\n";
+                vueViewFromContent += "           <el-radio :key=\"1\" :label=\"1\">是</el-radio>\r\n";
-                vueViewFromContent += "           <el-radio :key=\"0\" :label=\"0\">否</el-radio>\n";
+                vueViewFromContent += "           <el-radio :key=\"0\" :label=\"0\">否</el-radio>\r\n";
-                vueViewFromContent += "          </el-radio-group>\n";
+                vueViewFromContent += "          </el-radio-group>\r\n";
-                vueViewFromContent += "        </el-form-item>\n";
+                vueViewFromContent += "        </el-form-item>\r\n";
             }
             else if (dbFieldInfo.HtmlType == GenConstants.HTML_TEXTAREA)
             {
-                vueViewFromContent += $"        <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">\n";
+                vueViewFromContent += $"        <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">\r\n";
-                vueViewFromContent += $"           <el-input type=\"textarea\" v-model=\"form.{columnName}\" placeholder=\"请输入内容\"/>\n";
+                vueViewFromContent += $"           <el-input type=\"textarea\" v-model=\"form.{columnName}\" placeholder=\"请输入内容\"/>\r\n";
-                vueViewFromContent += "        </el-form-item>\n";
+                vueViewFromContent += "         </el-form-item>\r\n";
+            }
+            else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT && !string.IsNullOrEmpty(dbFieldInfo.DictType))
+            {
+                vueViewFromContent += $"        <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">\r\n";
+                vueViewFromContent += $"           <el-select v-model=\"form.{columnName}\" > ";
+                vueViewFromContent += $"            <el-option v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictLabel\" :value=\"item.dictValue\"></el-option>\r\n";
+                vueViewFromContent += "           </el-select>\r\n";
+                vueViewFromContent += "        </el-form-item>\r\n";
             }
             else
             {
                 string inputNumTxt = TableMappingHelper.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
-                vueViewFromContent += $"        <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\" prop=\"{CodeGeneratorTool.FirstLowerCase(columnName)}\">\n";
+                vueViewFromContent += $"        <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\" prop=\"{CodeGeneratorTool.FirstLowerCase(columnName)}\">\r\n";
-                vueViewFromContent += $"           <el-input v-model{inputNumTxt}=\"form.{CodeGeneratorTool.FirstLowerCase(columnName)}\" placeholder=\"{placeHolder}\" {labelDisabled}/>\n";
+                vueViewFromContent += $"           <el-input v-model{inputNumTxt}=\"form.{CodeGeneratorTool.FirstLowerCase(columnName)}\" placeholder=\"{placeHolder}\" {labelDisabled}/>\r\n";
-                vueViewFromContent += "        </el-form-item>\n";
+                vueViewFromContent += "         </el-form-item>\r\n";
             }
 
             return vueViewFromContent;
         }
 
+        /// <summary>
+        /// 查询表单
+        /// </summary>
+        /// <param name="dbFieldInfo"></param>
+        /// <returns></returns>
+        public static string GetQueryFormHtml(GenTableColumn dbFieldInfo)
+        {
+            string queryFormHtml = "";
+            string labelName = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, dbFieldInfo.ColumnName);
+            if (!dbFieldInfo.IsQuery || dbFieldInfo.HtmlType == GenConstants.HTML_FILE_UPLOAD) return queryFormHtml;
+
+            if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
+            {
+                queryFormHtml += "<el-form-item label=\"时间\">\r\n";
+                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";
+                queryFormHtml += "</el-form-item>\r\n";
+            }
+            else
+            {
+                string inputNumTxt = TableMappingHelper.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
+                queryFormHtml += $"        <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\">\r\n";
+                queryFormHtml += $"           <el-input v-model{inputNumTxt}=\"queryParams.{CodeGeneratorTool.FirstLowerCase(dbFieldInfo.CsharpField)}\"/>\r\n";
+                queryFormHtml += "        </el-form-item>\r\n";
+            }
+
+            return queryFormHtml;
+        }
+
         //table-column
         public static string GetTableColumn(GenTableColumn dbFieldInfo)
         {
@@ -152,28 +214,26 @@ namespace ZR.CodeGenerator
             }
             else if (dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD))
             {
-                vueViewListContent += $"      <el-table-column prop=\"{ columnName}\" label=\"图片\">\n";
+                vueViewListContent += $"      <el-table-column prop=\"{ columnName}\" label=\"图片\">\r\n";
-                vueViewListContent += "         <template slot-scope=\"scope\">\n";
+                vueViewListContent += "         <template slot-scope=\"scope\">\r\n";
-                vueViewListContent += $"            <el-image class=\"table-td-thumb\" :src=\"scope.row.{columnName}\" :preview-src-list=\"[scope.row.{columnName}]\"></el-image>\n";
+                vueViewListContent += $"            <el-image class=\"table-td-thumb\" :src=\"scope.row.{columnName}\" :preview-src-list=\"[scope.row.{columnName}]\"></el-image>\r\n";
-                vueViewListContent += "         </template>\n";
+                vueViewListContent += "         </template>\r\n";
-                vueViewListContent += "       </el-table-column>\n";
+                vueViewListContent += "       </el-table-column>\r\n";
             }
             //else if (dbFieldInfo.HtmlType.Equals(GenConstants.HTML_RADIO))
             //{
-            //    vueViewListContent += $"        <el-table-column prop=\"{columnName}\" label=\"{label}\" width=\"120\" >\n";
+            //    vueViewListContent += $"        <el-table-column prop=\"{columnName}\" label=\"{label}\" width=\"120\" >\r\n";
-            //    vueViewListContent += "          <template slot-scope=\"scope\">\n";
+            //    vueViewListContent += "          <template slot-scope=\"scope\">\r\n";
             //    vueViewListContent += $"            <el-tag :type=\"scope.row.{columnName} === true ? 'success' : 'info'\"  disable-transitions >";
-            //    vueViewListContent += $"                {{scope.row.{columnName}===true?'启用':'禁用'}} </el-tag>\n";
+            //    vueViewListContent += $"                {{scope.row.{columnName}===true?'启用':'禁用'}} </el-tag>\r\n";
-            //    vueViewListContent += "          </template>\n";
+            //    vueViewListContent += "          </template>\r\n";
-            //    vueViewListContent += "        </el-table-column>\n";
+            //    vueViewListContent += "        </el-table-column>\r\n";
             //}
             else
             {
-                vueViewListContent += $"      <el-table-column prop=\"{columnName}\" label=\"{label}\" align=\"center\" width=\"100\" {showToolTip} />\n";
+                vueViewListContent += $"      <el-table-column prop=\"{columnName}\" label=\"{label}\" align=\"center\" width=\"100\" {showToolTip} />\r\n";
             }
             return vueViewListContent;
         }
-        #endregion
-
     }
 }

ZR.CodeGenerator/CodeGeneratorTool.cs

@@ -23,7 +23,7 @@ namespace ZR.CodeGenerator
         /// <summary>
         /// InputDto输入实体是不包含字段
         /// </summary>
-        public static readonly string[] inputDtoNoField = new string[] { "DeleteMark", "CreateTime", "updateTime", "addtime" };
+        public static readonly string[] inputDtoNoField = new string[] { "createTime", "updateTime", "addtime" };
         public static readonly string[] imageFiled = new string[] { "icon", "img", "image", "url", "pic", "photo" };
         public static readonly string[] selectFiled = new string[] { "status", "type", "state", "sex", "gender" };
         public static readonly string[] radioFiled = new string[] { "status", "state", "isShow", "isHidden", "ishide" };
@@ -46,11 +46,7 @@ namespace ZR.CodeGenerator
             _option.ServicesNamespace = _option.BaseNamespace + "Service";
             _option.ApiControllerNamespace = _option.BaseNamespace + "Admin.WebApi";
 
-            //CodeGeneraterService codeGeneraterService = new();
-            //List<DbColumnInfo> listField = codeGeneraterService.GetColumnInfo(dto.dbName, dbTableInfo.TableName);
             GenerateSingle(dbTableInfo?.Columns, dbTableInfo, dto);
-
-            //GenerateDtoProfile(_option.ModelsNamespace, profileContent, ifExsitedCovered);
         }
 
         /// <summary>
@@ -61,19 +57,12 @@ namespace ZR.CodeGenerator
         /// <param name="dto"></param>
         public static void GenerateSingle(List<GenTableColumn> listField, GenTable tableInfo, GenerateDto dto)
         {
-            var modelTypeName = tableInfo.ClassName;//表名对应C# 实体类名
-
             string PKName = "id";
             string PKType = "int";
-            string modelContent = "";//数据库模型字段
+            ReplaceDto replaceDto = new();
-            string InputDtoContent = "";//输入模型
+            replaceDto.ModelTypeName = tableInfo.ClassName;//表名对应C# 实体类名
-            //string outputDtoContent = "";//输出模型
+            replaceDto.TableName = tableInfo.TableName;
-            string updateColumn = "";//修改数据映射字段
+            replaceDto.TableDesc = tableInfo.TableComment;
-            string vueViewListContent = string.Empty;//Vue列表输出内容
-            string vueViewFormContent = string.Empty;//Vue表单输出内容 
-            string vueViewEditFromContent = string.Empty;//Vue变量输出内容
-            string vueViewEditFromRuleContent = string.Empty;//Vue数据校验
-            string vueJsMethod = string.Empty;//Vue js自定义方法
 
             //循环表字段信息
             foreach (GenTableColumn dbFieldInfo in listField)
@@ -82,7 +71,7 @@ namespace ZR.CodeGenerator
 
                 if (dbFieldInfo.IsInsert || dbFieldInfo.IsEdit)
                 {
-                    vueViewEditFromContent += $"        {columnName}: undefined,\n";
+                    replaceDto.VueViewEditFormHtml += $"{columnName}: undefined,\r\n";
                 }
                 if (dbFieldInfo.IsPk || dbFieldInfo.IsIncrement)
                 {
@@ -92,30 +81,35 @@ namespace ZR.CodeGenerator
                 //编辑字段
                 if (dbFieldInfo.IsEdit)
                 {
-                    updateColumn += $"              {dbFieldInfo.CsharpField} = parm.{dbFieldInfo.CsharpField},\n";
+                    replaceDto.UpdateColumn += $"{dbFieldInfo.CsharpField} = model.{dbFieldInfo.CsharpField}, ";
+                }
+                //新增字段
+                if (dbFieldInfo.IsInsert)
+                {
+                    replaceDto.InsertColumn += $"it.{dbFieldInfo.CsharpField}, ";
+                }
+                //查询
+                //if (dbFieldInfo.IsQuery)
+                //{
+                //    replaceDto.Querycondition += $"predicate = predicate.And(m => m.{dbFieldInfo.CsharpField}.Contains(parm.Name));";
+                //}
+                if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT && !string.IsNullOrEmpty(dbFieldInfo.DictType))
+                {
+                    replaceDto.VueDataContent += $"// {dbFieldInfo.ColumnComment}选项列表\n";
+                    replaceDto.VueDataContent += $"{FirstLowerCase(dbFieldInfo.CsharpField)}Options: [],";
                 }
 
-                modelContent += CodeGenerateTemplate.GetModelTemplate(dbFieldInfo);
+                replaceDto.QueryProperty += CodeGenerateTemplate.GetQueryDtoProperty(dbFieldInfo);
-                vueViewFormContent += CodeGenerateTemplate.GetVueViewFormContent(dbFieldInfo);
+                replaceDto.ModelProperty += CodeGenerateTemplate.GetModelTemplate(dbFieldInfo);
-                vueJsMethod += CodeGenerateTemplate.GetVueJsMethod(dbFieldInfo);
+                replaceDto.VueViewFormHtml += CodeGenerateTemplate.GetVueViewFormContent(dbFieldInfo);
-                vueViewListContent += CodeGenerateTemplate.GetTableColumn(dbFieldInfo);
+                replaceDto.VueJsMethod += CodeGenerateTemplate.GetVueJsMethod(dbFieldInfo);
-                vueViewEditFromRuleContent += CodeGenerateTemplate.GetFormRules(dbFieldInfo);
+                replaceDto.VueViewListHtml += CodeGenerateTemplate.GetTableColumn(dbFieldInfo);
-                InputDtoContent += CodeGenerateTemplate.GetDtoContent(dbFieldInfo);
+                replaceDto.VueViewEditFormRuleContent += CodeGenerateTemplate.GetFormRules(dbFieldInfo);
+                replaceDto.InputDtoProperty += CodeGenerateTemplate.GetDtoProperty(dbFieldInfo);
+                replaceDto.VueQueryFormHtml += CodeGenerateTemplate.GetQueryFormHtml(dbFieldInfo);
             }
-            ReplaceDto replaceDto = new();
             replaceDto.PKName = PKName;
             replaceDto.PKType = PKType;
-            replaceDto.ModelTypeName = modelTypeName;
-            replaceDto.ModelProperty = modelContent;
-            replaceDto.TableName = tableInfo.TableName;
-            replaceDto.TableDesc = tableInfo.TableComment;
-            replaceDto.InputDtoProperty = InputDtoContent;
-            replaceDto.updateColumn = updateColumn;
-            replaceDto.VueJsMethod = vueJsMethod;
-            replaceDto.VueViewEditFormHtml = vueViewEditFromContent;
-            replaceDto.VueViewFormHtml = vueViewFormContent;
-            replaceDto.VueViewEditFormRuleContent = vueViewEditFromRuleContent;
-            replaceDto.VueViewListHtml = vueViewListContent;
 
             if (dto.genFiles.Contains(1))
             {
@@ -205,6 +199,7 @@ namespace ZR.CodeGenerator
                 .Replace("{ModelsNamespace}", _option.ModelsNamespace)
                 .Replace("{TableNameDesc}", replaceDto.TableDesc)
                 .Replace("{PropertyName}", replaceDto.InputDtoProperty)
+                .Replace("{QueryProperty}", replaceDto.QueryProperty)
                 .Replace("{ModelTypeName}", replaceDto.ModelTypeName);
             WriteAndSave(fullPath, content);
             return Tuple.Create(fullPath, content);
@@ -330,7 +325,8 @@ namespace ZR.CodeGenerator
                 .Replace("{ModelName}", replaceDto.ModelTypeName)
                 .Replace("{Permission}", replaceDto.ModelTypeName.ToLower())
                 .Replace("{PrimaryKey}", replaceDto.PKName)
-                .Replace("{UpdateColumn}", replaceDto.updateColumn)
+                .Replace("{UpdateColumn}", replaceDto.UpdateColumn)
+                .Replace("{InsertColumn}", replaceDto.InsertColumn)
                 .Replace("{KeyTypeName}", replaceDto.PKType);
             WriteAndSave(fullPath, content);
             return Tuple.Create(fullPath, content);
@@ -362,7 +358,8 @@ namespace ZR.CodeGenerator
                 .Replace("{Permission}", replaceDto.ModelTypeName.ToLower())
                 .Replace("{VueViewEditFormContent}", replaceDto.VueViewEditFormHtml)
                 .Replace("{vueJsMethod}", replaceDto.VueJsMethod)
-                //.Replace("{VueViewEditFromBindContent}", vueViewEditFromBindContent)
+                .Replace("{vueQueryFormHtml}", replaceDto.VueQueryFormHtml)
+                .Replace("{VueDataContent}", replaceDto.VueDataContent)
                 //.Replace("{VueViewSaveBindContent}", vueViewSaveBindContent)
                 .Replace("{primaryKey}", FirstLowerCase(replaceDto.PKName))
                 .Replace("{VueViewEditFormRuleContent}", replaceDto.VueViewEditFormRuleContent);//添加、修改表单验证规则
@@ -458,7 +455,6 @@ namespace ZR.CodeGenerator
             sr?.Close();
             sr?.Dispose();
             return str;
-
         }
 
         /// <summary>

ZR.CodeGenerator/Model/ReplaceDto.cs

@@ -39,7 +39,14 @@ namespace ZR.CodeGenerator.Model
         /// 表描述、说明
         /// </summary>
         public string TableDesc { get; set; }
-        public string updateColumn { get; set; }
+        /// <summary>
+        /// 修改列
+        /// </summary>
+        public string UpdateColumn { get; set; }
+        /// <summary>
+        /// 插入列
+        /// </summary>
+        public string InsertColumn { get; set; }
 
 
         /// <summary>
@@ -65,7 +72,25 @@ namespace ZR.CodeGenerator.Model
         /// 前端搜索表单html
         /// </summary>
         public string VueQueryFormHtml { get; set; }
+        /// <summary>
+        /// vue js方法
+        /// </summary>
         public string VueJsMethod { get; set; }
+        /// <summary>
+        /// vue 添加、编辑表单规则
+        /// </summary>
         public string VueViewEditFormRuleContent { get; set; }
+        /// <summary>
+        /// 查询条件
+        /// </summary>
+        public string QueryCondition { get; set; }
+        /// <summary>
+        /// 查询属性
+        /// </summary>
+        public string QueryProperty { get; set; }
+        /// <summary>
+        /// vue data内容
+        /// </summary>
+        public string VueDataContent { get; set; }
     }
 }

ZR.Model/System/Dto/GenTableDto.cs

@@ -27,27 +27,27 @@ namespace ZR.Model.System.Dto
     public class GenTableColumnDto
     {
         public int ColumnId { get; set; }
-        public string ColumnName { get; set; }
         public int TableId { get; set; }
-
-        public string TableName { get; set; }
         public string ColumnComment { get; set; }
-
-        public string ColumnType { get; set; }
         public string CsharpType { get; set; }
         public string CsharpField { get; set; }
-        public bool IsPk { get; set; }
         public bool IsInsert { get; set; }
+        public bool IsEdit { get; set; }
         public bool IsList { get; set; }
-        //public bool IsQuery { get; set; }
+        public bool IsQuery { get; set; }
-        ///// <summary>
+        public bool IsRequired { get; set; }
-        ///// 显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）
+        /// <summary>
-        ///// </summary>
+        /// 显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）
+        /// </summary>
         public string HtmlType { get; set; }
-        ///// <summary>
+        /// <summary>
-        ///// 查询类型（等于、不等于、大于、小于、范围）
+        /// 查询类型（等于、不等于、大于、小于、范围）
-        ///// </summary>
+        /// </summary>
-        //public string QueryType { get; set; } = "EQ";
+        public string QueryType { get; set; } = "EQ";
-        //public int Sort { get; set; }
+        public int Sort { get; set; }
+        /// <summary>
+        /// 字典类型
+        /// </summary>
+        public string DictType { get; set; }
     }
 }

ZR.Model/System/Generate/GenTableColumn.cs

@@ -58,5 +58,9 @@ namespace ZR.Model.System.Generate
         /// </summary>
         public string QueryType { get; set; } = "EQ";
         public int Sort { get; set; }
+        /// <summary>
+        /// 字典类型
+        /// </summary>
+        public string DictType { get; set; }
     }
 }

ZR.Model/System/SysBase.cs

@@ -22,10 +22,10 @@ namespace ZR.Model.System
         [SugarColumn(IsOnlyIgnoreInsert = true)]
         public string Update_by { get; set; }
 
+        //[JsonIgnore]
         [SugarColumn(IsOnlyIgnoreInsert = true)]//设置后插入数据不会有此字段
-        [JsonIgnore]
         [JsonProperty(propertyName: "UpdateTime")]
-        public DateTime Update_time { get; set; } = DateTime.Now;
+        public DateTime Update_time { get; set; }
 
         public string Remark { get; set; }
 

ZR.Service/BaseService.cs

@@ -54,6 +54,18 @@ namespace ZR.Service
             return Db.Insertable(parm).RemoveDataCache().ExecuteCommand();
         }
 
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <param name="iClumns">插入列</param>
+        /// <param name="ignoreNull">忽略null列</param>
+        /// <returns></returns>
+        public int Add(T parm, Expression<Func<T, object>> iClumns = null, bool ignoreNull = true)
+        {
+            return Db.Insertable(parm).InsertColumns(iClumns).IgnoreColumns(ignoreNullColumn: ignoreNull).ExecuteCommand();
+        }
+
         /// <summary>
         /// 批量添加数据
         /// </summary>

ZR.Service/IBaseService.cs

@@ -42,6 +42,8 @@ namespace ZR.Service
         /// <returns></returns>
         int Add(T parm);
 
+        int Add(T parm, Expression<Func<T, object>> iClumns = null, bool ignoreNull = false);
+
         /// <summary>
         /// 批量添加数据
         /// </summary>

ZR.Service/System/GenTableService.cs

@@ -153,7 +153,7 @@ namespace ZR.Service.System
         /// <returns></returns>
         public int InsertGenTableColumn(List<GenTableColumn> tableColumn)
         {
-            return Db.Insertable(tableColumn).IgnoreColumns(x => new { x.Remark}).ExecuteCommand();
+            return Db.Insertable(tableColumn).IgnoreColumns(x => new { x.Remark }).ExecuteCommand();
         }
 
         /// <summary>
@@ -163,7 +163,31 @@ namespace ZR.Service.System
         /// <returns></returns>
         public int UpdateGenTableColumn(List<GenTableColumn> tableColumn)
         {
-            return Db.Updateable(tableColumn).IgnoreColumns(x => new { x.Remark }).ExecuteCommand();
+            foreach (var item in tableColumn)
+            {
+                Db.Updateable<GenTableColumn>()
+                    .Where(f => f.TableId == item.TableId)
+                    .SetColumns(it => new GenTableColumn()
+                    {
+                        ColumnComment = item.ColumnComment,
+                        CsharpField = item.CsharpField,
+                        CsharpType = item.CsharpType,
+                        IsQuery = item.IsQuery,
+                        IsEdit = item.IsEdit,
+                        IsInsert = item.IsInsert,
+                        IsList = item.IsList,
+                        QueryType = item.QueryType,
+                        HtmlType = item.HtmlType,
+                        IsRequired = item.IsRequired,
+                        Sort = item.Sort,
+                        Update_time = DateTime.Now,
+                        DictType = item.DictType
+                    })
+                    .Where(f => f.ColumnId == item.ColumnId)
+                    .ExecuteCommand();
+            }
+
+            return 1;
         }
     }
 }

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

@@ -1,23 +1,23 @@
 <template>
-  <el-form ref="basicInfoForm" :model="info" :rules="rules" label-width="150px">
+  <el-form ref="basicInfoForm" :model="info" :rules="rules" label-width="100px">
     <el-row>
-      <el-col :span="12">
+      <el-col :span="6">
         <el-form-item label="表名称" prop="tableName">
           <el-input placeholder="请输入仓库名称" v-model="info.tableName" />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="6">
         <el-form-item label="表描述" prop="tableComment">
           <el-input placeholder="请输入" v-model="info.tableComment" />
         </el-form-item>
       </el-col>
 
-      <el-col :span="12">
+      <el-col :span="6">
         <el-form-item label="实体类名称" prop="className">
           <el-input placeholder="请输入" v-model="info.className" />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="6">
         <el-form-item label="作者" prop="functionAuthor">
           <el-input placeholder="请输入" v-model="info.functionAuthor" />
         </el-form-item>

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

@@ -22,7 +22,7 @@
                 <el-option label="string" value="string" />
                 <el-option label="double" value="double" />
                 <el-option label="decimal" value="decimal" />
-                <el-option label="dateTime" value="DateTime" />
+                <el-option label="DateTime" value="DateTime" />
               </el-select>
             </template>
           </el-table-column>
@@ -31,25 +31,29 @@
               <el-input v-model="scope.row.csharpField"></el-input>
             </template>
           </el-table-column>
-
+          <el-table-column label="必填" min-width="5%">
+            <template slot-scope="scope">
+              <el-checkbox v-model="scope.row.isRequired"></el-checkbox>
+            </template>
+          </el-table-column>
           <el-table-column label="插入" min-width="5%">
             <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isInsert"></el-checkbox>
+              <el-checkbox v-model="scope.row.isInsert" :disabled="scope.row.isPk"></el-checkbox>
             </template>
           </el-table-column>
           <el-table-column label="编辑" min-width="5%">
             <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isEdit"></el-checkbox>
+              <el-checkbox v-model="scope.row.isEdit" :disabled="scope.row.isPk"></el-checkbox>
             </template>
           </el-table-column>
           <el-table-column label="列表" min-width="5%">
             <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isList"></el-checkbox>
+              <el-checkbox v-model="scope.row.isList"></el-checkbox>
             </template>
           </el-table-column>
           <el-table-column label="查询" min-width="5%">
             <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isQuery"></el-checkbox>
+              <el-checkbox v-model="scope.row.isQuery"></el-checkbox>
             </template>
           </el-table-column>
           <el-table-column label="查询方式" min-width="10%">
@@ -66,11 +70,6 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="必填" min-width="5%">
-            <template slot-scope="scope">
-              <el-checkbox true-label="1" v-model="scope.row.isRequired"></el-checkbox>
-            </template>
-          </el-table-column>
           <el-table-column label="显示类型" min-width="12%">
             <template slot-scope="scope">
               <el-select v-model="scope.row.htmlType">
@@ -114,7 +113,7 @@
 <script>
 import { updateGenTable, queryColumnInfo } from "@/api/tool/gen";
 import { listType } from "@/api/system/dict/type";
-import { listMenu as getMenuTreeselect } from "@/api/system/menu";
+// import { listMenu as getMenuTreeselect } from "@/api/system/menu";
 import basicInfoForm from "./basicInfoForm";
 import genInfoForm from "./genInfoForm";
 import Sortable from "sortablejs";
@@ -176,13 +175,13 @@ export default {
         if (validateResult) {
           const genTable = Object.assign({}, basicForm.model, genForm.model);
           genTable.columns = this.cloumns;
-          genTable.params = {
+          // genTable.params = {
-            treeCode: genTable.treeCode,
+          //   treeCode: genTable.treeCode,
-            treeName: genTable.treeName,
+          //   treeName: genTable.treeName,
-            treeParentCode: genTable.treeParentCode,
+          //   treeParentCode: genTable.treeParentCode,
-            parentMenuId: genTable.parentMenuId,
+          //   parentMenuId: genTable.parentMenuId,
-          };
+          // };
-          console.log(genTable)
+          console.log(JSON.stringify(genTable))
           updateGenTable(genTable).then((res) => {
             this.msgSuccess(res.msg);
             if (res.code === 200) {

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

@@ -2,24 +2,9 @@
   <div class="app-container">
 
     <el-form ref="codeform" :inline="true" :rules="rules" :model="queryParams" size="small">
-      <!-- <el-form-item label="数据库" prop="dbName">
-        <el-select v-model="queryParams.dbName" clearable placeholder="请选择" @change="handleShowTable">
-          <el-option v-for="item in selectedDataBase" :key="item" :label="item" :value="item" />
-        </el-select>
-      </el-form-item> -->
       <el-form-item label="表名">
         <el-input v-model="queryParams.tableName" clearable placeholder="输入要查询的表名" />
       </el-form-item>
-      <!-- <el-form-item label="项目命名空间：" prop="baseSpace">
-            <el-tooltip class="item" effect="dark" content="系统会根据项目命名空间自动生成IService、Service、Models等子命名空间" placement="bottom">
-              <el-input v-model="queryParams.baseSpace" clearable placeholder="如Zr" />
-            </el-tooltip>
-          </el-form-item>
-      <el-form-item label="去掉表名前缀：">
-        <el-tooltip class="item" effect="dark" content="表名直接变为类名，去掉表名前缀。" placement="bottom">
-          <el-input v-model="queryParams.replaceTableNameStr" clearable width="300" placeholder="例如：sys_" />
-        </el-tooltip>
-      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" @click="handleSearch()">查询</el-button>
         <el-button type="default" icon="el-icon-refresh" size="small" @click="loadTableData()">刷新</el-button>
@@ -30,7 +15,6 @@
       <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-upload" size="mini" @click="openImportTable" v-hasPermi="['tool:gen:import']">导入</el-button>
       </el-col>
-
       <el-col :span="1.5">
         <el-button type="danger" :disabled="multiple" plain icon="el-icon-delete" @click="handleDelete" size="mini" v-hasPermi="['tool:gen:delete']">删除</el-button>
       </el-col>
@@ -47,12 +31,12 @@
       <el-table-column prop="className" label="实体" />
       <el-table-column prop="createTime" label="创建时间" />
       <el-table-column prop="updateTime" label="更新时间" />
-      <el-table-column label="操作" align="center" width="340">
+      <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-edit" @click="handleEditTable(scope.row)">编辑</el-button>
 
-          <el-popconfirm title="确定删除吗？" @onConfirm="handleDelete(scope.row)" style="margin-left:10px">
+          <el-popconfirm title="确定删除吗？" @confirm="handleDelete(scope.row)" style="margin-left:10px">
             <el-button slot="reference" v-hasPermi="['tool:gen:delete']" size="mini" type="text" icon="el-icon-delete">删除</el-button>
           </el-popconfirm>
 

ZRAdmin.xml

@@ -27,6 +27,47 @@
             <param name="data"></param>
             <returns></returns>
         </member>
+        <member name="T:ZR.Admin.WebApi.Controllers.GendemoController">
+            <summary>
+            代码自动生成
+            </summary>
+        </member>
+        <member name="F:ZR.Admin.WebApi.Controllers.GendemoController._GendemoService">
+            <summary>
+            测试接口
+            </summary>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.GendemoController.QueryGendemo(ZR.Model.Dto.GendemoQueryDto)">
+            <summary>
+            查询测试列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.GendemoController.GetGendemo(System.Int32)">
+            <summary>
+            查询测试详情
+            </summary>
+            <param name="Id"></param>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.GendemoController.AddGendemo(ZR.Model.Dto.GendemoDto)">
+            <summary>
+            添加测试
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.GendemoController.UpdateGendemo(ZR.Model.Dto.GendemoDto)">
+            <summary>
+            更新测试
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:ZR.Admin.WebApi.Controllers.GendemoController.DeleteGendemo(System.Int32)">
+            <summary>
+            删除测试
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:ZR.Admin.WebApi.Controllers.CodeGeneratorController">
             <summary>
             代码生成