From ed703e77701f8d8ac0112680750e76aa465a91c6 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: Sun, 19 Dec 2021 11:12:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E4=B8=BB=E9=94=AE=E3=80=81=E8=87=AA=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5form=E8=A1=A8=E5=8D=95=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/TplVue.txt        |  6 ++--
 ZR.CodeGenerator/CodeGenerateTemplate.cs      | 29 +++++++++++++++----
 ZR.CodeGenerator/CodeGeneratorTool.cs         | 10 +++++--
 ZR.Vue/src/views/tool/gen/editTable.vue       |  2 +-
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index 8fbc649..7690413 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -134,7 +134,7 @@ $end
       // 表单校验
       rules: {
 $foreach(column in genTable.Columns)
-$if(column.IsRequired)
+$if(column.IsRequired && column.IsIncrement == false)
         ${column.CsharpFieldFl}: [
           { required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end
 $if(column.CsharpType == "int" || column.CsharpType == "long"), type: "number"$end }
@@ -284,8 +284,8 @@ $if(genTable.SortField != "" && genTable.SortField != null)
 $end
 $if(replaceDto.UploadFile == 1)
     //图片上传成功方法
-    handleUploadSuccess(CsharpFieldFl, filelist) {
-      this.form[CsharpFieldFl] = filelist;
+    handleUploadSuccess(column, filelist) {
+      this.form[column] = filelist;
     },
 $end
 $foreach(item in genTable.Columns)
diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs
index bd052a6..8e94696 100644
--- a/ZR.CodeGenerator/CodeGenerateTemplate.cs
+++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs
@@ -30,10 +30,29 @@ namespace ZR.CodeGenerator
             {
                 return sb.ToString();
             }
-            if (!dbFieldInfo.IsInsert && !dbFieldInfo.IsEdit && !dbFieldInfo.IsPk)
+            if (!dbFieldInfo.IsInsert && !dbFieldInfo.IsEdit && !dbFieldInfo.IsPk && !dbFieldInfo.IsIncrement)
             {
                 return sb.ToString();
             }
+            //主键、非自增要插入，不能编辑
+            if (dbFieldInfo.IsPk || dbFieldInfo.IsIncrement)
+            {
+                sb.AppendLine("    <el-col :lg=\"12\">");
+                sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
+                //主键非自增 显示input
+                if (dbFieldInfo.IsPk && !dbFieldInfo.IsIncrement)
+                {
+                    sb.AppendLine($"        <el-input-number v-model.number=\"form.{columnName}\" placeholder=\"请输入{labelName}\" :disabled=\"title=='修改数据'\"/>");
+                }
+                else if (dbFieldInfo.IsIncrement)  //只有是 自增 就显示label
+                {
+                    sb.AppendLine($"        <span v-html=\"form.{columnName}\"/>");
+                }
+
+                sb.AppendLine("      </el-form-item>");
+                sb.AppendLine("    </el-col>");
+                return sb.ToString();
+            }
             if (dbFieldInfo.HtmlType == GenConstants.HTML_INPUT_NUMBER)
             {
                 //数字框
@@ -118,7 +137,7 @@ namespace ZR.CodeGenerator
                 sb.AppendLine("      </el-form-item>");
                 sb.AppendLine("    </el-col>");
             }
-            else if( dbFieldInfo.HtmlType == GenConstants.HTML_CHECKBOX)
+            else if (dbFieldInfo.HtmlType == GenConstants.HTML_CHECKBOX)
             {
                 //多选框
                 sb.AppendLine("    <el-col :lg=\"24\">");
@@ -173,7 +192,7 @@ namespace ZR.CodeGenerator
                 sb.AppendLine("        </el-select>");
                 sb.AppendLine("      </el-form-item>");
             }
-            else if(dbFieldInfo.IsQuery)
+            else if (dbFieldInfo.IsQuery)
             {
                 string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
                 sb.AppendLine($"      <el-form-item label=\"{ labelName}\" prop=\"{dbFieldInfo.ColumnName}\">");
@@ -279,8 +298,8 @@ namespace ZR.CodeGenerator
         /// <returns></returns>
         public static string GetFormatter(string htmlType, string columnName)
         {
-            if (htmlType.Equals(GenConstants.HTML_CHECKBOX) || 
-                htmlType.Equals(GenConstants.HTML_SELECT) || 
+            if (htmlType.Equals(GenConstants.HTML_CHECKBOX) ||
+                htmlType.Equals(GenConstants.HTML_SELECT) ||
                 htmlType.Equals(GenConstants.HTML_RADIO))
             {
                 return $" :formatter=\"{columnName}Format\"";
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index fcbf78f..157fca1 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -275,7 +275,7 @@ namespace ZR.CodeGenerator
         }
 
         /// <summary>
-        /// 首字母转大写，输出前端
+        /// 首字母转大写
         /// </summary>
         /// <param name="str"></param>
         /// <returns></returns>
@@ -367,6 +367,12 @@ namespace ZR.CodeGenerator
             return genTableColumns;
         }
 
+        /// <summary>
+        /// 初始化表字段数据
+        /// </summary>
+        /// <param name="genTable"></param>
+        /// <param name="column"></param>
+        /// <returns></returns>
         private static GenTableColumn InitColumnField(GenTable genTable, DbColumnInfo column)
         {
             GenTableColumn genTableColumn = new()
@@ -378,7 +384,7 @@ namespace ZR.CodeGenerator
                 TableId = genTable.TableId,
                 TableName = genTable.TableName,
                 CsharpType = GetCSharpDatatype(column.DataType),
-                CsharpField = column.DbColumnName.Substring(0, 1).ToUpper() + column.DbColumnName[1..],
+                CsharpField = FirstUpperCase(column.DbColumnName),//TODO 优化下划线处理
                 IsRequired = !column.IsNullable,
                 IsIncrement = column.IsIdentity,
                 Create_by = genTable.Create_by,
diff --git a/ZR.Vue/src/views/tool/gen/editTable.vue b/ZR.Vue/src/views/tool/gen/editTable.vue
index 604c765..1ba35e9 100644
--- a/ZR.Vue/src/views/tool/gen/editTable.vue
+++ b/ZR.Vue/src/views/tool/gen/editTable.vue
@@ -33,7 +33,7 @@
           </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>
+              <el-checkbox v-model="scope.row.isInsert" :disabled="scope.row.isIncrement"></el-checkbox>
             </template>
           </el-table-column>
           <el-table-column label="编辑" min-width="5%">