From 08598bef9f749e8f4050bb37a35f9b2db7f49149 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, 6 Dec 2021 21:02:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E3=80=81?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CodeGenTemplate/TplControllers.txt        |  6 +++---
 .../wwwroot/CodeGenTemplate/TplVue.txt        |  4 ++++
 .../wwwroot/CodeGenTemplate/TplVueApi.txt     |  2 +-
 ZR.CodeGenerator/CodeGenerateTemplate.cs      | 20 +++++++++++++++++++
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
index a5ffedf..b99d464 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
@@ -167,9 +167,9 @@ $if(genTable.SortField != "")
         ////// <param name="id"></param>
         ////// <param name="orderNum"></param>
         ////// <returns></returns>
-        ///[ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:update")]
-        ///[HttpGet("ChangeSort")]
-        //[Log(Title = "保存排序", BusinessType = BusinessType.UPDATE)]
+        /////[ActionPermissionFilter(Permission = "${replaceDto.PermissionPrefix}:update")]
+        //////[HttpGet("ChangeSort")]
+        /////[Log(Title = "保存排序", BusinessType = BusinessType.UPDATE)]
         //public IActionResult ChangeSort(int id = 0, int orderNum = 0)
         //{
         //    if (id <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index 49fc6e6..d058190 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -20,6 +20,9 @@ ${vueQueryFormHtml}
       <el-col :span="1.5">
         <el-button type="danger" :disabled="multiple" v-hasPermi="['${replaceDto.PermissionPrefix}:delete']" plain icon="el-icon-delete" size="mini" @click="handleDelete">删除</el-button>
       </el-col>
+      <el-col :span="1.5" style="display:none">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['${replaceDto.PermissionPrefix}:export']">导出</el-button>
+      </el-col>
 $if(genTable.SortField != "" && 1 == 2)
       <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-edit" size="mini" @click="handleShowSort" v-hasPermi="['${replaceDto.PermissionPrefix}:update']">修改排序</el-button>
@@ -266,6 +269,7 @@ $end
         }
       });
     },
+    handleExport() {},
   },
 };
 </script>
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
index c70b678..ec612d3 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueApi.txt
@@ -57,6 +57,7 @@ export function del${genTable.BusinessName}(pid) {
     method: 'delete'
   })
 }
+
 // 导出${genTable.functionName}
 export function export${replaceDto.ModelTypeName}(query) {
   return request({
@@ -75,5 +76,4 @@ export function changeSort(data) {
     params: data
   })
 }
-
 $end
\ No newline at end of file
diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs
index 38db3e1..605277d 100644
--- a/ZR.CodeGenerator/CodeGenerateTemplate.cs
+++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs
@@ -162,6 +162,17 @@ namespace ZR.CodeGenerator
                 sb.AppendLine("      </el-form-item>");
                 sb.AppendLine("    </el-col>");
             }
+            else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT)
+            {
+                string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue";
+                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 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
             {
                 string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
@@ -201,6 +212,15 @@ 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}\" :label-width=\"labelWidth\" prop=\"{dbFieldInfo.ColumnName}\">");
+                sb.AppendLine($"        <el-select v-model=\"queryParams.{dbFieldInfo.ColumnName}\">");
+                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
             {
                 string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";