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); } /// 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") +$elseif(column.HtmlType == "switch") + + + + + $else @@ -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 +$elseif(column.HtmlType == "switch") + +