From cfc8eee2a368ea13d9dd08e018a706f309a0399e 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: Mon, 17 Oct 2022 17:59:52 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E6=A8=A1=E6=9D=BF=E6=96=B0=E5=A2=9E=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt | 8 ++++----
 ZR.CodeGenerator/CodeGeneratorTool.cs              | 8 ++++++--
 ZR.CodeGenerator/GenConstants.cs                   | 4 ++++
 ZR.CodeGenerator/Model/ReplaceDto.cs               | 4 ++++
 ZR.Model/System/Generate/GenTableColumn.cs         | 2 +-
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index f302ce1..97c928c 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -37,7 +37,7 @@ $if(column.HtmlType == "datetime")
           :shortcuts="dateOptions">
         </el-date-picker>
       </el-form-item>
-$elseif(column.HtmlType == "select" || column.HtmlType == "radio")
+$elseif(column.HtmlType == "select" || column.HtmlType == "radio" || column.HtmlType == "selectMulti")
       <el-form-item label="${labelName}" prop="${columnName}">
         <el-select clearable $if(column.HtmlType == "selectMulti")multiple$end v-model="queryParams.${columnName}" placeholder="请选择${labelName}">
           <el-option v-for="item in $if(column.DictType != "") options.${column.DictType} $else options.${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
@@ -140,7 +140,7 @@ $elseif(column.HtmlType == "imageUpload")
           </el-image>
         </template>
       </el-table-column>
-$elseif(column.HtmlType == "checkbox" || column.HtmlType == "select" || column.HtmlType == "radio")
+$elseif(column.HtmlType == "checkbox" || column.HtmlType == "select" || column.HtmlType == "radio" || column.HtmlType == "selectMulti")
       <el-table-column prop="${columnName}" label="${labelName}" align="center"${column.sortStr} v-if="columns.showColumn('${columnName}')">
         <template #default="scope">
 $if(column.HtmlType == "checkbox")
@@ -243,7 +243,7 @@ $elseif(column.HtmlType == "editor")
               <editor v-model="form.${columnName}" :min-height="200" />
             </el-form-item>
           </el-col>
-$elseif(column.HtmlType == "select")
+$elseif(column.HtmlType == "select" || column.HtmlType == "selectMulti")
           <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
               <el-select v-model="form.${columnName}" placeholder="请选择${labelName}"${column.DisabledStr}>
@@ -361,7 +361,7 @@ $end
 $set(index = 0)
 var dictParams = [
 $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 == "selectMulti" || item.HtmlType == "checkbox") && item.DictType != "")
   { dictType: "${item.DictType}" },
 $set(index = index + 1)
 $end
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 484408f..e35e003 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -75,6 +75,10 @@ namespace ZR.CodeGenerator
                 {
                     replaceDto.UploadFile = 1;
                 }
+                if (dbFieldInfo.HtmlType.Equals(GenConstants.HTML_SELECT_MULTI))
+                {
+                    replaceDto.SelectMulti = 1;
+                }
                 dbFieldInfo.CsharpFieldFl = dbFieldInfo.CsharpField.FirstLowerCase();
             }
 
@@ -238,6 +242,7 @@ namespace ZR.CodeGenerator
             var fullPath = Path.Combine(generateDto.VueParentPath, "src", "views", generateDto.GenTable.ModuleName.FirstLowerCase(), $"{generateDto.GenTable.BusinessName.FirstUpperCase()}.vue");
             generateDto.GenCodes.Add(new GenCode(16, "index.vue", fullPath, result));
         }
+
         /// <summary>
         /// 生成vue页面api
         /// </summary>
@@ -261,7 +266,6 @@ namespace ZR.CodeGenerator
             string fullPath = Path.Combine(generateDto.VueParentPath, "src", "api", generateDto.GenTable.ModuleName.FirstLowerCase(), fileName);
 
             generateDto.GenCodes.Add(new GenCode(7, "api.js", fullPath, result));
-
         }
 
         /// <summary>
@@ -534,7 +538,7 @@ namespace ZR.CodeGenerator
         /// <param name="replaceDto"></param>
         private static void InitJntTemplate(GenerateDto dto, ReplaceDto replaceDto)
         {
-            //Engine.Current.Clean();
+            Engine.Current.Clean();
             dto.GenTable.Columns = dto.GenTable.Columns.OrderBy(x => x.Sort).ToList();
             bool showCustomInput = dto.GenTable.Columns.Any(f => f.HtmlType.Equals(GenConstants.HTML_CUSTOM_INPUT, StringComparison.OrdinalIgnoreCase));
             //jnt模板引擎全局变量
diff --git a/ZR.CodeGenerator/GenConstants.cs b/ZR.CodeGenerator/GenConstants.cs
index 5384f8a..83a35e4 100644
--- a/ZR.CodeGenerator/GenConstants.cs
+++ b/ZR.CodeGenerator/GenConstants.cs
@@ -91,6 +91,10 @@ namespace ZR.CodeGenerator
 
         /** 下拉框 */
         public static string HTML_SELECT = "select";
+        /// <summary>
+        /// 下拉多选
+        /// </summary>
+        public static string HTML_SELECT_MULTI = "selectMulti";
 
         /** 单选框 */
         public static string HTML_RADIO = "radio";
diff --git a/ZR.CodeGenerator/Model/ReplaceDto.cs b/ZR.CodeGenerator/Model/ReplaceDto.cs
index 72c231c..4ff77db 100644
--- a/ZR.CodeGenerator/Model/ReplaceDto.cs
+++ b/ZR.CodeGenerator/Model/ReplaceDto.cs
@@ -54,6 +54,10 @@ namespace ZR.CodeGenerator.Model
         /// </summary>
         //public string VueUploadUrl { get; set; }
         public int UploadFile { get; set; } = 0;
+        /// <summary>
+        /// 是否有下拉多选框
+        /// </summary>
+        public int SelectMulti { get; set; }
         public string Author { get; set; }
         public string AddTime { get; set; } = DateTime.Now.ToString("yyyy-MM-dd");
     }
diff --git a/ZR.Model/System/Generate/GenTableColumn.cs b/ZR.Model/System/Generate/GenTableColumn.cs
index 8e8294c..804023c 100644
--- a/ZR.Model/System/Generate/GenTableColumn.cs
+++ b/ZR.Model/System/Generate/GenTableColumn.cs
@@ -99,7 +99,7 @@ namespace ZR.Model.System.Generate
             get
             {
                 string[] arr = new string[] { "int", "long" };
-                return (!IsRequired && (arr.Any(f => f.Contains(CsharpType))) || typeof(DateTime).Name == CsharpType) ? "?" : "";
+                return (!IsRequired && HtmlType != "selectMulti" && (arr.Any(f => f.Contains(CsharpType))) || typeof(DateTime).Name == CsharpType) ? "?" : "";
             }
         }
         /// <summary>