From 5f063ad9d38580be2c8add3d66b301a4b3b1b699 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: Tue, 1 Aug 2023 11:44:34 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9Eswitch=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/SysUserController.cs        |  2 +-
 ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs
index e2ad166..78b8c81 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs
@@ -45,7 +45,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         {
             var list = UserService.SelectUserList(user, pager);
 
-            return SUCCESS(list, TIME_FORMAT_FULL);
+            return SUCCESS(list);
         }
 
         /// <summary>
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index 96eda45..88648aa 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -262,6 +262,7 @@ $set(labelName = column.ColumnComment)
 $if(column.CsharpType == "int" || column.CsharpType == "long")
     $set(value = "parseInt(item.dictValue)")
     $set(number = ".number")
+    $set(switchType = ":active-value='1' :inactive-value='0'")
 $end
 
 $if(column.IsPK || column.IsIncrement)
@@ -353,6 +354,12 @@ $elseif(column.HtmlType == "colorPicker")
               <el-color-picker v-model="form.${columnName}" />
             </el-form-item>
           </el-col>
+$elseif(column.HtmlType == "switch")
+          <el-col :lg="12">
+            <el-form-item label="${labelName}" prop="${columnName}">
+              <el-switch v-model="form.${columnName}" ${switchType} />
+            </el-form-item>
+          </el-col>
 $else
           <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
@@ -386,6 +393,7 @@ $set(columnName = column.CsharpFieldFl)
 $if(column.CsharpType == "int" || column.CsharpType == "long")
 $set(value = "parseInt(item.dictValue)")
 $set(number = ".number")
+$set(switchType = ":active-value='1' :inactive-value='0'")
 $end
 $if(column.IsList == true)
 $if(column.IsPk || column.CsharpField == genTable.SubTableFkName)
@@ -413,6 +421,12 @@ $elseif(column.HtmlType == "radio" || column.HtmlType == "selectRadio" || column
               </el-select>
             </template>
           </el-table-column>
+$elseif(column.HtmlType == "switch")
+          <el-table-column label="${labelName}" prop="${columnName}">
+            <template #default="scope">
+              <el-switch v-model="scope.row.${columnName}" ${switchType} />
+            <template #default="scope">
+          </el-table-column>
 $else
           <el-table-column label="${labelName}" align="center" prop="${columnName}">
             <template #default="scope">