From 26566300cc4055603b5f8dd238d375d19dbdf95e 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: Thu, 26 May 2022 10:38:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Vue3=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=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/v3/Vue.txt        | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index 4c4f917..8380270 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -7,7 +7,7 @@
  * @LastEditTime: (${replaceDto.AddTime})
 -->
 <template>
-  <div class="app-container">
+  <div>
     <!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
     <el-form :model="queryParams" label-position="right" inline ref="queryRef" v-show="showSearch" @submit.prevent>
 $foreach(column in genTable.Columns)
@@ -17,12 +17,12 @@ $set(numLabel = "")
 $if(column.IsQuery == true)
 $set(columnName = column.CsharpFieldFl)
 $if(column.ColumnComment != "")
-	$set(labelName = column.ColumnComment)
+$set(labelName = column.ColumnComment)
 $else
-	$set(labelName = column.CsharpFieldFl)
+$set(labelName = column.CsharpFieldFl)
 $end
 $if(column.CsharpType == "int" || column.CsharpType == "long")
-    $set(numLabel = ".number")
+$set(numLabel = ".number")
 $end
 $if(column.HtmlType == "datetime")
       <el-form-item label="$labelName">
@@ -35,16 +35,21 @@ $if(column.HtmlType == "datetime")
           end-placeholder="结束日期" 
           placeholder="请选择$labelName"
           value-format="YYYY-MM-DD HH:mm:ss"
-          :shortcuts="dateOptions"
-        >
+          :shortcuts="dateOptions">
         </el-date-picker>
       </el-form-item>
-$elseif(column.HtmlType == "select" || column.HtmlType == "radio")
+$elseif(column.HtmlType == "select")
       <el-form-item label="${labelName}" prop="${columnName}">
         <el-select v-model="queryParams.${columnName}" placeholder="请选择${labelName}">
           <el-option v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
         </el-select>
       </el-form-item>
+$elseif(column.HtmlType == "radio")
+      <el-form-item label="${labelName}" prop="${columnName}">
+        <el-radio-group v-model="queryParams.${columnName}">
+          <el-radio v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictValue">{{item.dictLabel}}</el-radio>
+        </el-radio-group>
+      </el-form-item>
 $else
       <el-form-item label="${labelName}" prop="${columnName}">
         <el-input v-model${numLabel}="queryParams.${columnName}" placeholder="请输入${labelName}" />
@@ -181,7 +186,7 @@ $end
             </el-form-item>
           </el-col>
 $else
-$if(column.HtmlType == "inputNumber")
+$if(column.HtmlType == "inputNumber" || column.HtmlType == "customInput")
           <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
               <el-input-number v-model.number="form.${columnName}" controls-position="right" placeholder="请输入${labelName}" ${column.DisabledStr}/>
@@ -393,6 +398,16 @@ function cancel(){
 
 // 重置表单
 function reset() {
+  form.value = {
+$foreach(item in genTable.Columns)
+$if((item.IsEdit || item.IsInsert))
+    $item.CsharpFieldFl: undefined,
+$end
+$if((item.HtmlType == "checkbox"))
+    ${item.CsharpFieldFl}Checked: [],
+$end
+$end
+  };
   proxy.resetForm("formRef")
 }