From a0e1276bdf24c2138c2f78c6fc7dcfd0fced8143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sat, 11 Dec 2021 16:37:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/appsettings.json              |   2 +-
 .../wwwroot/CodeGenTemplate/TplVue.txt        |   2 +-
 ZR.CodeGenerator/CodeGenerateTemplate.cs      | 130 +++++++-----------
 ZR.CodeGenerator/CodeGeneratorTool.cs         |  15 +-
 ZR.CodeGenerator/DbProvider.cs                |   6 +-
 ZR.CodeGenerator/FileHelper.cs                |   2 +-
 ZR.CodeGenerator/GenConstants.cs              |   6 +
 .../Service/CodeGeneraterService.cs           |   2 +-
 ZR.Vue/src/views/tool/gen/editTable.vue       |  10 +-
 9 files changed, 74 insertions(+), 101 deletions(-)

diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json
index 84d5bda..e062474 100644
--- a/ZR.Admin.WebApi/appsettings.json
+++ b/ZR.Admin.WebApi/appsettings.json
@@ -15,7 +15,7 @@
   "urls": "http://localhost:8888", //项目启动url
   "sysConfig": {
     "DBCommandTimeout": 10,
-    "cors": "http://localhost:8887" //跨域地址（前端启动项目），多个用","隔开
+    "cors": "http://localhost:8887" //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开
   },
   "JwtSettings": {
     "Issuer": "ZRAdmin.NET",
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index f4d6081..76d6a07 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -267,7 +267,7 @@ $if(replaceDto.UploadFile == 1)
     },
 $end
 $foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox") && item.DictType != "")
+$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox"))
     // ${item.ColumnComment}瀛楀吀缈昏瘧
     ${item.ColumnName}Format(row, column) {
       return this.selectDictLabel(this.${item.ColumnName}Options, row.${item.ColumnName});
diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs
index 7ddcb6e..57ce232 100644
--- a/ZR.CodeGenerator/CodeGenerateTemplate.cs
+++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs
@@ -11,35 +11,6 @@ namespace ZR.CodeGenerator
     /// </summary>
     public class CodeGenerateTemplate
     {
-        ///// <summary>
-        ///// 鏌ヨDto灞炴��
-        ///// </summary>
-        ///// <param name="tbColumn"></param>
-        ///// <param name="replaceDto">鏇挎崲瀛楃瀵硅薄</param>
-        ///// <returns></returns>
-        //public static void GetQueryDtoProperty(GenTableColumn tbColumn, ReplaceDto replaceDto)
-        //{
-        //    if (tbColumn.IsQuery)
-        //    {
-        //        //瀛楃涓茬被鍨嬭〃杈惧紡
-        //        if (tbColumn.CsharpType == GenConstants.TYPE_STRING)
-        //        {
-        //            replaceDto.QueryCondition += $"            predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.{tbColumn.CsharpField}), {QueryExp(tbColumn.CsharpField, tbColumn.QueryType)};\n";
-        //        }
-        //        //int绫诲瀷琛ㄨ揪寮�
-        //        if (CodeGeneratorTool.IsNumber(tbColumn.CsharpType))
-        //        {
-        //            replaceDto.QueryCondition += $"            predicate = predicate.AndIF(parm.{tbColumn.CsharpField} > 0, {QueryExp(tbColumn.CsharpField, tbColumn.QueryType)};\n";
-        //        }
-        //        //鏃堕棿绫诲瀷
-        //        if (tbColumn.CsharpType == GenConstants.TYPE_DATE)
-        //        {
-        //            replaceDto.QueryCondition += $"            predicate = predicate.AndIF(parm.Begin{tbColumn.CsharpField} != null, it => it.{tbColumn.CsharpField} >= parm.Begin{tbColumn.CsharpField});\n";
-        //            replaceDto.QueryCondition += $"            predicate = predicate.AndIF(parm.End{tbColumn.CsharpField} != null, it => it.{tbColumn.CsharpField} <= parm.End{tbColumn.CsharpField});\n";
-        //        }
-        //    }
-        //}
-
         #region vue 妯℃澘
 
         /// <summary>
@@ -65,8 +36,9 @@ namespace ZR.CodeGenerator
             }
             if (dbFieldInfo.HtmlType == GenConstants.HTML_INPUT_NUMBER)
             {
+                //鏁板瓧妗�
                 sb.AppendLine("    <el-col :span=\"12\">");
-                sb.AppendLine($"      <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
+                sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
                 sb.AppendLine($"        <el-input-number v-model.number=\"form.{columnName}\" placeholder=\"璇疯緭鍏labelName}\" {labelDisabled}/>");
                 sb.AppendLine("      </el-form-item>");
                 sb.AppendLine("    </el-col>");
@@ -75,7 +47,7 @@ namespace ZR.CodeGenerator
             {
                 //鏃堕棿
                 sb.AppendLine("      <el-col :span=\"12\">");
-                sb.AppendLine($"        <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
+                sb.AppendLine($"        <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
                 sb.AppendLine($"           <el-date-picker v-model=\"form.{columnName}\" format=\"yyyy-MM-dd HH:mm:ss\" value-format=\"yyyy-MM-dd HH:mm:ss\"  type=\"datetime\"  placeholder=\"閫夋嫨鏃ユ湡鏃堕棿\"> </el-date-picker>");
                 sb.AppendLine("         </el-form-item>");
                 sb.AppendLine("     </el-col>");
@@ -84,7 +56,7 @@ namespace ZR.CodeGenerator
             {
                 //鍥剧墖
                 sb.AppendLine("    <el-col :span=\"24\">");
-                sb.AppendLine($"      <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
+                sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
                 sb.AppendLine($@"        <UploadImage v-model=""form.{columnName}"" column=""{columnName}"" @input=""handleUploadSuccess"" />");
                 sb.AppendLine("      </el-form-item>");
                 sb.AppendLine("    </el-col>");
@@ -93,72 +65,64 @@ namespace ZR.CodeGenerator
             {
                 //鏂囦欢
                 sb.AppendLine("    <el-col :span=\"24\">");
-                sb.AppendLine($"      <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
+                sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
                 sb.AppendLine($@"        <UploadFile v-model=""form.{columnName}"" column=""{columnName}"" @input=""handleUploadSuccess"" />");
                 sb.AppendLine("      </el-form-item>");
                 sb.AppendLine("    </el-col>");
             }
-            else if (dbFieldInfo.HtmlType == GenConstants.HTML_RADIO && !string.IsNullOrEmpty(dbFieldInfo.DictType))
-            {
-                sb.AppendLine("    <el-col :span=\"12\">");
-                sb.AppendLine($"      <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
-                sb.AppendLine($"        <el-radio-group v-model=\"form.{columnName}\">");
-                sb.AppendLine($"          <el-radio v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"{value}\">{{{{item.dictLabel}}}}</el-radio>");
-                sb.AppendLine("        </el-radio-group>");
-                sb.AppendLine("      </el-form-item>");
-                sb.AppendLine("    </el-col>");
-            }
             else if (dbFieldInfo.HtmlType == GenConstants.HTML_RADIO)
             {
+                //鍗曢�夋寜閽�
                 sb.AppendLine("    <el-col :span=\"12\">");
-                sb.AppendLine($"      <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
+                sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
                 sb.AppendLine($"        <el-radio-group v-model=\"form.{columnName}\">");
-                sb.AppendLine("           <el-radio :label=\"1\">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>");
+                if (string.IsNullOrEmpty(dbFieldInfo.DictType))
+                {
+                    sb.AppendLine("           <el-radio :label=\"1\">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>");
+                }
+                sb.AppendLine($"          <el-radio v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"{value}\">{{{{item.dictLabel}}}}</el-radio>");
                 sb.AppendLine("        </el-radio-group>");
                 sb.AppendLine("      </el-form-item>");
                 sb.AppendLine("    </el-col>");
             }
             else if (dbFieldInfo.HtmlType == GenConstants.HTML_TEXTAREA)
             {
+                //鏂囨湰鍩�
                 sb.AppendLine("    <el-col :span=\"24\">");
-                sb.AppendLine($"      <el-form-item label=\"{ labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
+                sb.AppendLine($"      <el-form-item label=\"{ labelName}\" prop=\"{columnName}\">");
                 sb.AppendLine($"        <el-input type=\"textarea\" v-model=\"form.{columnName}\" placeholder=\"璇疯緭鍏labelName}\"/>");
                 sb.AppendLine("      </el-form-item>");
                 sb.AppendLine("    </el-col>");
             }
             else if (dbFieldInfo.HtmlType == GenConstants.HTML_EDITOR)
             {
+                //缂栬緫鍣�
                 sb.AppendLine("    <el-col :span=\"24\">");
-                sb.AppendLine($"      <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
+                sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
                 sb.AppendLine($"        <editor v-model=\"form.{columnName}\" :min-height=\"200\" />");
                 sb.AppendLine("      </el-form-item>");
                 sb.AppendLine("    </el-col>");
             }
-            else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT && !string.IsNullOrEmpty(dbFieldInfo.DictType))
+            else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT)
             {
+                //涓嬫媺妗�
                 sb.AppendLine("    <el-col :span=\"12\">");
-                sb.AppendLine($"      <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
+                sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
                 sb.AppendLine($"        <el-select v-model=\"form.{columnName}\" placeholder=\"璇烽�夋嫨{labelName}\"> ");
+                if (string.IsNullOrEmpty(dbFieldInfo.DictType))
+                {
+                    sb.AppendLine($"          <el-option label=\"璇烽�夋嫨瀛楀吀鐢熸垚\" value=\"\"></el-option>");
+                }
                 sb.AppendLine($"          <el-option v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictLabel\" :value=\"{value}\"></el-option>");
                 sb.AppendLine("        </el-select>");
                 sb.AppendLine("      </el-form-item>");
                 sb.AppendLine("    </el-col>");
             }
-            else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT && string.IsNullOrEmpty(dbFieldInfo.DictType))
-            {
-                sb.AppendLine("    <el-col :span=\"12\">");
-                sb.AppendLine($"      <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
-                sb.AppendLine($"        <el-select v-model=\"form.{columnName}\">");
-                sb.AppendLine($"          <el-option label=\"璇烽�夋嫨瀛楀吀鐢熸垚\" value=\"\"></el-option>");
-                sb.AppendLine("        </el-select>");
-                sb.AppendLine("      </el-form-item>");
-                sb.AppendLine("    </el-col>");
-            }
             else
             {
                 string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
                 sb.AppendLine("    <el-col :span=\"12\">");
-                sb.AppendLine($"      <el-form-item label=\"{labelName}\" :label-width=\"labelWidth\" prop=\"{columnName}\">");
+                sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
                 sb.AppendLine($"        <el-input v-model{inputNumTxt}=\"form.{columnName}\" placeholder=\"璇疯緭鍏labelName}\" {labelDisabled}/>");
                 sb.AppendLine("      </el-form-item>");
                 sb.AppendLine("    </el-col>");
@@ -176,7 +140,7 @@ namespace ZR.CodeGenerator
         {
             StringBuilder sb = new();
             string labelName = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, dbFieldInfo.ColumnName);
-            if (!dbFieldInfo.IsQuery || dbFieldInfo.HtmlType == GenConstants.HTML_FILE_UPLOAD) return sb.ToString();
+            if (!dbFieldInfo.IsQuery) return sb.ToString();
             if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
             {
                 sb.AppendLine($"      <el-form-item label=\"{labelName}\">");
@@ -184,7 +148,7 @@ namespace ZR.CodeGenerator
                 sb.AppendLine($"          end-placeholder=\"缁撴潫鏃ユ湡\" placeholder=\"璇烽�夋嫨{dbFieldInfo.ColumnComment}\" ></el-date-picker>");
                 sb.AppendLine("      </el-form-item>");
             }
-            else if ((dbFieldInfo.HtmlType == GenConstants.HTML_SELECT || dbFieldInfo.HtmlType == GenConstants.HTML_RADIO) && !string.IsNullOrEmpty(dbFieldInfo.DictType))
+            else if ((dbFieldInfo.HtmlType == GenConstants.HTML_SELECT || dbFieldInfo.HtmlType == GenConstants.HTML_RADIO))
             {
                 //string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue";
                 sb.AppendLine($"      <el-form-item label=\"{ labelName}\" prop=\"{dbFieldInfo.ColumnName}\">");
@@ -193,16 +157,7 @@ namespace ZR.CodeGenerator
                 sb.AppendLine("        </el-select>");
                 sb.AppendLine("      </el-form-item>");
             }
-            else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT)
-            {
-                //string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue";
-                sb.AppendLine($"      <el-form-item label=\"{ labelName}\" prop=\"{dbFieldInfo.ColumnName}\">");
-                sb.AppendLine($"        <el-select v-model=\"queryParams.{dbFieldInfo.ColumnName}\" placeholder=\"璇烽�夋嫨{dbFieldInfo.ColumnComment}\" size=\"small\">");
-                sb.AppendLine($"          <el-option v-for=\"item in {dbFieldInfo.ColumnName}Options\" :key=\"item.dictValue\" :label=\"item.dictLabel\" :value=\"item.dictValue\"></el-option>");
-                sb.AppendLine("        </el-select>");
-                sb.AppendLine("      </el-form-item>");
-            }
-            else
+            else if(dbFieldInfo.IsQuery)
             {
                 string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
                 sb.AppendLine($"      <el-form-item label=\"{ labelName}\" prop=\"{dbFieldInfo.ColumnName}\">");
@@ -224,11 +179,10 @@ namespace ZR.CodeGenerator
             string columnName = dbFieldInfo.ColumnName;
             string label = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName);
             string showToolTip = dbFieldInfo.CsharpType == "string" ? ":show-overflow-tooltip=\"true\"" : "";
-            string formatter = !string.IsNullOrEmpty(dbFieldInfo.DictType) ? $" :formatter=\"{columnName}Format\"" : "";
+            string formatter = GetFormatter(dbFieldInfo.HtmlType, columnName);
             StringBuilder sb = new StringBuilder();
-            var sortField = genTable?.SortField ?? "";
-            //鏈夋帓搴忓瓧娈�
-            if (!string.IsNullOrEmpty(sortField.ToString()) && sortField.ToString() == dbFieldInfo.CsharpField && !dbFieldInfo.IsPk && CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType))
+            //鑷畾涔夋帓搴忓瓧娈�
+            if (GenConstants.HTML_SORT.Equals(dbFieldInfo.HtmlType) && !dbFieldInfo.IsPk && CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType))
             {
                 sb.AppendLine($@"      <el-table-column prop=""{columnName}"" label=""{label}"" width=""90"" sortable align=""center"">");
                 sb.AppendLine(@"        <template slot-scope=""scope"">");
@@ -249,13 +203,13 @@ namespace ZR.CodeGenerator
             {
                 sb.AppendLine($@"      <el-table-column label=""{label}"" align=""center"" prop=""{columnName}"">");
                 sb.AppendLine(@"        <template slot-scope=""scope"">");
-                if (dbFieldInfo.HtmlType == "checkbox")
+                if (dbFieldInfo.HtmlType == GenConstants.HTML_CHECKBOX)
                 {
-                    sb.AppendLine($@"          <dict-tag :options=""{dbFieldInfo.ColumnName}Options"" :value=""scope.row.{dbFieldInfo.ColumnName} ? scope.row.{dbFieldInfo.ColumnName}.split(',') : []""/>");
+                    sb.AppendLine($@"          <dict-tag :options=""{columnName}Options"" :value=""scope.row.{columnName} ? scope.row.{columnName}.split(',') : []""/>");
                 }
                 else
                 {
-                    sb.AppendLine($@"          <dict-tag :options=""{dbFieldInfo.ColumnName}Options"" :value=""scope.row.{dbFieldInfo.ColumnName}""/>");
+                    sb.AppendLine($@"          <dict-tag :options=""{columnName}Options"" :value=""scope.row.{columnName}""/>");
                 }
                 sb.AppendLine(@"        </template>");
                 sb.AppendLine(@"      </el-table-column>");
@@ -268,7 +222,7 @@ namespace ZR.CodeGenerator
         }
 
         #endregion
-
+        //妯℃澘璋冪敤
         public static string QueryExp(string propertyName, string queryType)
         {
             if (queryType.Equals("EQ"))
@@ -301,5 +255,21 @@ namespace ZR.CodeGenerator
             }
             return "";
         }
+        /// <summary>
+        /// 鏍煎紡鍖栧瓧鍏告暟鎹樉绀哄埌table
+        /// </summary>
+        /// <param name="htmlType"></param>
+        /// <param name="columnName"></param>
+        /// <returns></returns>
+        public static string GetFormatter(string htmlType, string columnName)
+        {
+            if (htmlType.Equals(GenConstants.HTML_CHECKBOX) || 
+                htmlType.Equals(GenConstants.HTML_SELECT) || 
+                htmlType.Equals(GenConstants.HTML_RADIO))
+            {
+                return $" :formatter=\"{columnName}Format\"";
+            }
+            return "";
+        }
     }
 }
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index be03a5a..0a1b9e3 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -112,7 +112,7 @@ namespace ZR.CodeGenerator
             var tpl = FileHelper.ReadJtTemplate("TplModel.txt");
             var result = tpl.Render();
 
-            generateDto.GenCodes.Add(new GenCode(1, "Model", fullPath, result));
+            generateDto.GenCodes.Add(new GenCode(1, "Model.cs", fullPath, result));
         }
 
         /// <summary>
@@ -123,11 +123,10 @@ namespace ZR.CodeGenerator
         private static void GenerateInputDto(ReplaceDto replaceDto, GenerateDto generateDto)
         {
             var fullPath = Path.Combine(generateDto.GenCodePath, _option.ModelsNamespace, "Dto", generateDto.GenTable.ModuleName, $"{replaceDto.ModelTypeName}Dto.cs");
-
             var tpl = FileHelper.ReadJtTemplate("TplDto.txt");
 
             var result = tpl.Render();
-            generateDto.GenCodes.Add(new GenCode(2, "Dto", fullPath, result));
+            generateDto.GenCodes.Add(new GenCode(2, "Dto.cs", fullPath, result));
         }
         #endregion
 
@@ -144,7 +143,7 @@ namespace ZR.CodeGenerator
             var tpl = FileHelper.ReadJtTemplate("TplRepository.txt");
 
             var result = tpl.Render();
-            generateDto.GenCodes.Add(new GenCode(3, "Repository", fullPath, result));
+            generateDto.GenCodes.Add(new GenCode(3, "Repository.cs", fullPath, result));
         }
 
         #endregion
@@ -158,15 +157,13 @@ namespace ZR.CodeGenerator
         {
             var fullPath = Path.Combine(generateDto.GenCodePath, _option.ServicesNamespace, "Business", $"{replaceDto.ModelTypeName}Service.cs");
             var tpl = FileHelper.ReadJtTemplate("TplService.txt");
-
             var result = tpl.Render();
-            generateDto.GenCodes.Add(new GenCode(4, "Service", fullPath, result));
+            generateDto.GenCodes.Add(new GenCode(4, "Service.cs", fullPath, result));
 
             var fullPath2 = Path.Combine(generateDto.GenCodePath, _option.IServicsNamespace, "Business", "IBusService", $"I{replaceDto.ModelTypeName}Service.cs");
             var tpl2 = FileHelper.ReadJtTemplate("TplIService.txt");
-
             var result2 = tpl2.Render();
-            generateDto.GenCodes.Add(new GenCode(4, "IService", fullPath2, result2));
+            generateDto.GenCodes.Add(new GenCode(4, "IService.cs", fullPath2, result2));
         }
 
         #endregion
@@ -182,7 +179,7 @@ namespace ZR.CodeGenerator
 
             tpl.Set("QueryCondition", replaceDto.QueryCondition);
             var result = tpl.Render();
-            generateDto.GenCodes.Add(new GenCode(5, "Controller", fullPath, result));
+            generateDto.GenCodes.Add(new GenCode(5, "Controller.cs", fullPath, result));
         }
         #endregion
 
diff --git a/ZR.CodeGenerator/DbProvider.cs b/ZR.CodeGenerator/DbProvider.cs
index ee7a98f..9a6e711 100644
--- a/ZR.CodeGenerator/DbProvider.cs
+++ b/ZR.CodeGenerator/DbProvider.cs
@@ -14,14 +14,14 @@ namespace ZR.CodeGenerator
     /// </summary>
     public class DbProvider
     {
-        protected static SqlSugarScope CodeDb;
+        protected static SqlSugarClient CodeDb;
 
         /// <summary>
         /// 鑾峰彇鍔ㄦ�佽繛鎺ュ瓧绗︿覆
         /// </summary>
         /// <param name="dbName">鏁版嵁搴撳悕</param>
         /// <returns></returns>
-        public SqlSugarScope GetSugarDbContext(string dbName = "")
+        public SqlSugarClient GetSugarDbContext(string dbName = "")
         {
             string connStr = ConfigUtils.Instance.GetConfig(GenConstants.Gen_conn);
             int dbType = ConfigUtils.Instance.GetAppConfig(GenConstants.Gen_conn_dbType, 0);
@@ -31,7 +31,7 @@ namespace ZR.CodeGenerator
                 string replaceStr = GetValue(connStr, "database=", ";");
                 connStr = connStr.Replace(replaceStr, dbName);
             }
-            var db = new SqlSugarScope(new List<ConnectionConfig>()
+            var db = new SqlSugarClient(new List<ConnectionConfig>()
             {
                 new ConnectionConfig(){
                     ConnectionString = connStr,
diff --git a/ZR.CodeGenerator/FileHelper.cs b/ZR.CodeGenerator/FileHelper.cs
index 3da7f3b..549c45f 100644
--- a/ZR.CodeGenerator/FileHelper.cs
+++ b/ZR.CodeGenerator/FileHelper.cs
@@ -130,7 +130,7 @@ namespace ZR.CodeGenerator
             try
             {
                 //鐢熸垚鍘嬬缉鍖�
-                string zipReturnFileName = dto.GenTable.BaseNameSpace + DateTime.Now.ToString("yyyyMMddHHmmss") + ".zip";
+                string zipReturnFileName = "ZrAdmin.NET" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".zip";
 
                 CreateDirectory(dto.GenCodePath);
                 string zipFileName = Path.Combine(dto.ZipPath, zipReturnFileName);
diff --git a/ZR.CodeGenerator/GenConstants.cs b/ZR.CodeGenerator/GenConstants.cs
index a32f4dc..46a4dda 100644
--- a/ZR.CodeGenerator/GenConstants.cs
+++ b/ZR.CodeGenerator/GenConstants.cs
@@ -109,6 +109,12 @@ namespace ZR.CodeGenerator
 
         /** 瀵屾枃鏈帶浠� */
         public static string HTML_EDITOR = "editor";
+        // 鑷畾涔夋帓搴�
+        public static string HTML_SORT = "sort";
+        //棰滆壊閫夋嫨鍣�
+        public static string HTML_COLORPICKER = "colorPicker";
+        //switch寮�鍏�
+        public static string HTML_SWITCH { get; set; }
 
         /** 瀛楃涓茬被鍨� */
         public static string TYPE_STRING = "string";
diff --git a/ZR.CodeGenerator/Service/CodeGeneraterService.cs b/ZR.CodeGenerator/Service/CodeGeneraterService.cs
index b0fcbe7..fd0ae3b 100644
--- a/ZR.CodeGenerator/Service/CodeGeneraterService.cs
+++ b/ZR.CodeGenerator/Service/CodeGeneraterService.cs
@@ -14,7 +14,7 @@ namespace ZR.CodeGenerator.Service
         public List<string> GetAllDataBases()
         {
             var db = GetSugarDbContext();
-            var templist = db.DbMaintenance.GetDataBaseList(db.ScopedContext);
+            var templist = db.DbMaintenance.GetDataBaseList(db);
 
             return templist;
         }
diff --git a/ZR.Vue/src/views/tool/gen/editTable.vue b/ZR.Vue/src/views/tool/gen/editTable.vue
index 766e56a..e816f66 100644
--- a/ZR.Vue/src/views/tool/gen/editTable.vue
+++ b/ZR.Vue/src/views/tool/gen/editTable.vue
@@ -31,11 +31,6 @@
               <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 v-model="scope.row.isInsert" :disabled="scope.row.isPk || scope.row.isIncrement"></el-checkbox>
@@ -71,6 +66,11 @@
               </el-select>
             </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="12%">
             <template slot-scope="scope">
               <el-select v-model="scope.row.htmlType">