From 34332c21cefbe630f049d775e8ded884f0eeba8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 8 Dec 2021 14:09:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AD=97=E5=85=B8=E5=9B=9E=E6=98=BE=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9ECheckBox=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/TplVue.txt        | 13 +++----
 ZR.CodeGenerator/CodeGenerateTemplate.cs      | 35 ++++++++-----------
 ZR.Vue/src/views/tool/gen/editTable.vue       |  2 +-
 3 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index 2606a9c..a709bcd 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -102,7 +102,7 @@ export default {
       // 时间范围数组
       timeRange: [],
 $foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select"))
+$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox"))
       // ${item.ColumnComment}选项列表
       ${item.ColumnName}Options: [],
 $elseif(item.HtmlType == "datetime" && item.IsQuery == true)
@@ -138,7 +138,7 @@ $end
     this.getList();
 
 $foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select") && item.DictType != "")
+$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox") && item.DictType != "")
     this.getDicts("${item.DictType}").then((response) => {
       this.${item.ColumnName}Options = response.data;
     })
@@ -257,7 +257,7 @@ $if(replaceDto.UploadFile == 1)
     },
 $end
 $foreach(item in genTable.Columns)
-$if((item.HtmlType == "radio" || item.HtmlType == "select") && item.DictType != "")
+$if((item.HtmlType == "radio" || item.HtmlType == "select" || item.HtmlType == "checkbox") && item.DictType != "")
     // ${item.ColumnComment}字典翻译
     ${item.ColumnName}Format(row, column) {
       return this.selectDictLabel(this.${item.ColumnName}Options, row.${item.ColumnName});
@@ -311,9 +311,4 @@ $end
     },
   },
 };
-</script>
-<style scoped>
-.table-td-thumb {
-  width: 80px;
-}
-</style>
+</script>
\ No newline at end of file
diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs
index 57394a1..9af2ce8 100644
--- a/ZR.CodeGenerator/CodeGenerateTemplate.cs
+++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs
@@ -42,26 +42,6 @@ namespace ZR.CodeGenerator
 
         #region vue 模板
 
-        ///// <summary>
-        ///// Vue rules
-        ///// </summary>
-        ///// <param name="dbFieldInfo"></param>
-        ///// <returns></returns>
-        //public static string TplFormRules(GenTableColumn dbFieldInfo)
-        //{
-        //    StringBuilder sbRule = new StringBuilder();
-        //    //Rule 规则验证
-        //    if (!dbFieldInfo.IsPk && !dbFieldInfo.IsIncrement && dbFieldInfo.IsRequired)
-        //    {
-        //        sbRule.AppendLine($"        {dbFieldInfo.ColumnName}: [{{ required: true, message: '请输入{dbFieldInfo.ColumnComment}', trigger: \"blur\"}}],");
-        //    }
-        //    else if (CodeGeneratorTool.IsNumber(dbFieldInfo.ColumnType) && dbFieldInfo.IsRequired)
-        //    {
-        //        sbRule.AppendLine($"        {dbFieldInfo.ColumnName}: [{{ type: 'number', message: '{dbFieldInfo.ColumnName}必须为数字值', trigger: \"blur\"}}],");
-        //    }
-        //    return sbRule.ToString();
-        //}
-
         /// <summary>
         /// Vue 添加修改表单
         /// </summary>
@@ -256,6 +236,21 @@ namespace ZR.CodeGenerator
                 sb.AppendLine("         </template>");
                 sb.AppendLine("       </el-table-column>");
             }
+            else if (dbFieldInfo.IsList && !string.IsNullOrEmpty(dbFieldInfo.DictType))
+            {
+                sb.AppendLine($@"      <el-table-column label=""{label}"" align=""center"" prop=""{columnName}"">");
+                sb.AppendLine(@"        <template slot-scope=""scope"">");
+                if (dbFieldInfo.HtmlType == "checkbox")
+                {
+                    sb.AppendLine($@"          <dict-tag :options=""{dbFieldInfo.ColumnName}Options"" :value=""scope.row.{dbFieldInfo.ColumnName} ? scope.row.{dbFieldInfo.ColumnName}.split(',') : []""/>");
+                }
+                else
+                {
+                    sb.AppendLine($@"          <dict-tag :options=""{dbFieldInfo.ColumnName}Options"" :value=""scope.row.{dbFieldInfo.ColumnName}""/>");
+                }
+                sb.AppendLine(@"        </template>");
+                sb.AppendLine(@"      </el-table-column>");
+            }
             else if (dbFieldInfo.IsList)
             {
                 sb.AppendLine($"      <el-table-column prop=\"{columnName}\" label=\"{label}\" align=\"center\" {showToolTip}{formatter}/>");
diff --git a/ZR.Vue/src/views/tool/gen/editTable.vue b/ZR.Vue/src/views/tool/gen/editTable.vue
index 93c22cf..663e7d6 100644
--- a/ZR.Vue/src/views/tool/gen/editTable.vue
+++ b/ZR.Vue/src/views/tool/gen/editTable.vue
@@ -79,7 +79,7 @@
                 <el-option label="文本域" value="textarea" />
                 <el-option label="下拉框" value="select" />
                 <el-option label="单选框" value="radio" />
-                <!-- <el-option label="复选框" value="checkbox" /> -->
+                <el-option label="复选框" value="checkbox" />
                 <el-option label="日期控件" value="datetime" />
                 <el-option label="图片上传" value="imageUpload" />
                 <el-option label="文件上传" value="fileUpload" />