From c4003e5ca414b68708fff7dd3f5025bb32f3b21b 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: Fri, 11 Feb 2022 21:51:14 +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=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/QueryForm.txt     | 36 ++++++++++
 .../wwwroot/CodeGenTemplate/TplTreeVue.txt    |  3 +-
 .../wwwroot/CodeGenTemplate/TplVue.txt        |  3 +-
 .../wwwroot/CodeGenTemplate/TplVueSelect.txt  |  3 +-
 ZR.CodeGenerator/CodeGenerateTemplate.cs      | 70 +++++++++----------
 ZR.CodeGenerator/CodeGeneratorTool.cs         | 15 +++-
 6 files changed, 91 insertions(+), 39 deletions(-)
 create mode 100644 ZR.Admin.WebApi/wwwroot/CodeGenTemplate/QueryForm.txt

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/QueryForm.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/QueryForm.txt
new file mode 100644
index 0000000..0aa2df4
--- /dev/null
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/QueryForm.txt
@@ -0,0 +1,36 @@
+$foreach(column in genTable.Columns)
+$set(labelName = "")
+$set(columnName = "")
+$set(numLabel = "")
+
+$if(column.IsQuery == true)
+    $set(columnName = column.CsharpFieldFl)
+
+	$if(column.ColumnComment != "")
+		$set(labelName = column.ColumnComment)
+	$else
+		$set(labelName = column.CsharpFieldFl)
+	$end
+    $if(column.CsharpType == "int" || column.CsharpType == "long")
+        $set(numLabel = ".number")
+    $end
+
+$if(column.HtmlType == "datetime")
+      <el-form-item label="$labelName">
+        <el-date-picker v-model="dateRange${column.CsharpField}" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
+          start-placeholder="开始日期" end-placeholder="结束日期" placeholder="请选择$labelName" :picker-options="{ firstDayOfWeek: 1}"></el-date-picker>
+      </el-form-item>
+$elseif(column.HtmlType == "select" || column.HtmlType == "radio")
+      <el-form-item label="${labelName}" prop="${columnName}">
+        <el-select v-model="queryParams.${columnName}" placeholder="请选择${labelName}">
+          <el-option v-for="item in ${columnName}Options" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+        </el-select>
+      </el-form-item>
+$else
+      <el-form-item label="${labelName}" prop="${columnName}">
+        <el-input v-model${numLabel}="queryParams.${columnName}" placeholder="请输入${labelName}" />
+      </el-form-item>
+$end
+
+$end
+$end
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt
index 316d5bb..a335b5b 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt
@@ -1,7 +1,8 @@
 <template>
   <div class="app-container">
     <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
-    <el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
+    <el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" 
+      @submit.native.prevent>
 ${vueQueryFormHtml}
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index c9f3803..fafd738 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -1,7 +1,8 @@
 <template>
   <div class="app-container">
     <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
-    <el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
+    <el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" 
+      @submit.native.prevent>
 ${vueQueryFormHtml}
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt
index 8234798..ec7beb4 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVueSelect.txt
@@ -1,7 +1,8 @@
 <template>
   <div class="app-container">
     <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
-    <el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
+    <el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" 
+      @submit.native.prevent>
 ${vueQueryFormHtml}
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs
index 80bb41a..3354a19 100644
--- a/ZR.CodeGenerator/CodeGenerateTemplate.cs
+++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs
@@ -166,42 +166,42 @@ namespace ZR.CodeGenerator
             return sb.ToString();
         }
 
-        /// <summary>
-        /// Vue 查询表单
-        /// </summary>
-        /// <param name="dbFieldInfo"></param>
-        /// <returns></returns>
-        public static string TplQueryFormHtml(GenTableColumn dbFieldInfo)
-        {
-            StringBuilder sb = new();
-            string columnName = dbFieldInfo.CsharpFieldFl;
-            string labelName = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, dbFieldInfo.CsharpField);
-            if (!dbFieldInfo.IsQuery) return sb.ToString();
-            if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
-            {
-                sb.AppendLine($"      <el-form-item label=\"{labelName}\">");
-                sb.AppendLine($"        <el-date-picker v-model=\"dateRange{dbFieldInfo.CsharpField}\" style=\"width: 240px\" value-format=\"yyyy-MM-dd\" type=\"daterange\" range-separator=\"-\" start-placeholder=\"开始日期\"");
-                sb.AppendLine($"          end-placeholder=\"结束日期\" placeholder=\"请选择{dbFieldInfo.ColumnComment}\" :picker-options=\"{{ firstDayOfWeek: 1}}\"></el-date-picker>");
-                sb.AppendLine("      </el-form-item>");
-            }
-            else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT || dbFieldInfo.HtmlType == GenConstants.HTML_RADIO)
-            {
-                sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
-                sb.AppendLine($"        <el-select v-model=\"queryParams.{columnName}\" placeholder=\"请选择{dbFieldInfo.ColumnComment}\" >");
-                sb.AppendLine($"          <el-option v-for=\"item in {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" : "";
-                sb.AppendLine($"      <el-form-item label=\"{ labelName}\" prop=\"{columnName}\">");
-                sb.AppendLine($"        <el-input v-model{inputNumTxt}=\"queryParams.{columnName}\" placeholder=\"请输入{dbFieldInfo.ColumnComment}\" />");
-                sb.AppendLine("      </el-form-item>");
-            }
+        ///// <summary>
+        ///// Vue 查询表单
+        ///// </summary>
+        ///// <param name="dbFieldInfo"></param>
+        ///// <returns></returns>
+        //public static string TplQueryFormHtml(GenTableColumn dbFieldInfo)
+        //{
+        //    StringBuilder sb = new();
+        //    string columnName = dbFieldInfo.CsharpFieldFl;
+        //    string labelName = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, dbFieldInfo.CsharpField);
+        //    if (!dbFieldInfo.IsQuery) return sb.ToString();
+        //    if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
+        //    {
+        //        sb.AppendLine($"      <el-form-item label=\"{labelName}\">");
+        //        sb.AppendLine($"        <el-date-picker v-model=\"dateRange{dbFieldInfo.CsharpField}\" style=\"width: 240px\" value-format=\"yyyy-MM-dd\" type=\"daterange\" range-separator=\"-\" start-placeholder=\"开始日期\"");
+        //        sb.AppendLine($"          end-placeholder=\"结束日期\" placeholder=\"请选择{dbFieldInfo.ColumnComment}\" :picker-options=\"{{ firstDayOfWeek: 1}}\"></el-date-picker>");
+        //        sb.AppendLine("      </el-form-item>");
+        //    }
+        //    else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT || dbFieldInfo.HtmlType == GenConstants.HTML_RADIO)
+        //    {
+        //        sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
+        //        sb.AppendLine($"        <el-select v-model=\"queryParams.{columnName}\" placeholder=\"请选择{dbFieldInfo.ColumnComment}\" >");
+        //        sb.AppendLine($"          <el-option v-for=\"item in {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" : "";
+        //        sb.AppendLine($"      <el-form-item label=\"{ labelName}\" prop=\"{columnName}\">");
+        //        sb.AppendLine($"        <el-input v-model{inputNumTxt}=\"queryParams.{columnName}\" placeholder=\"请输入{dbFieldInfo.ColumnComment}\" />");
+        //        sb.AppendLine("      </el-form-item>");
+        //    }
 
-            return sb.ToString();
-        }
+        //    return sb.ToString();
+        //}
 
         /// <summary>
         /// Vue 查询列表
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index 427823d..4c02410 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -68,7 +68,7 @@ namespace ZR.CodeGenerator
 
                 replaceDto.VueViewFormHtml += CodeGenerateTemplate.TplVueFormContent(dbFieldInfo, dto.GenTable);
                 replaceDto.VueViewListHtml += CodeGenerateTemplate.TplTableColumn(dbFieldInfo, dto.GenTable);
-                replaceDto.VueQueryFormHtml += CodeGenerateTemplate.TplQueryFormHtml(dbFieldInfo);
+                //replaceDto.VueQueryFormHtml += CodeGenerateTemplate.TplQueryFormHtml(dbFieldInfo);
             }
 
             replaceDto.PKName = PKName;
@@ -76,6 +76,7 @@ namespace ZR.CodeGenerator
             replaceDto.FistLowerPk = PKName.FirstLowerCase();
             InitJntTemplate(dto, replaceDto);
 
+            replaceDto.VueQueryFormHtml = GenerateVueQueryForm();
             GenerateModels(replaceDto, dto);
             GenerateInputDto(replaceDto, dto);
             GenerateRepository(replaceDto, dto);
@@ -241,6 +242,18 @@ namespace ZR.CodeGenerator
             generateDto.GenCodes.Add(new GenCode(8, "sql", fullPath, result));
         }
 
+        /// <summary>
+        /// 生成vue页面查询form
+        /// </summary>
+        /// <param name="replaceDto"></param>
+        /// <param name="generateDto"></param>
+        /// <returns></returns>
+        public static string GenerateVueQueryForm()
+        {
+            var tpl = FileHelper.ReadJtTemplate("QueryForm.txt");
+            var result = tpl.Render();
+            return result;
+        }
         #endregion
 
         #region 帮助方法