wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/izhaorui/ZrAdmin.NET

Browse Source
This commit is contained in:
不做码农 2021-11-24 10:27:16 +08:00
commit 0dfb1e0414
3 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ZR.Admin.WebApi/Framework/JsonConverterUtil.cs Normal file
View File

@ -0,0 +1,37 @@
using System;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace ZR.Admin.WebApi.Framework
{
public class JsonConverterUtil
{
public class DateTimeNullConverter : JsonConverter<DateTime?>
{
public override DateTime? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
=> string.IsNullOrEmpty(reader.GetString()) ? default(DateTime?) : ParseDateTime(reader.GetString());
public override void Write(Utf8JsonWriter writer, DateTime? value, JsonSerializerOptions options)
=> writer.WriteStringValue(value?.ToString("yyyy-MM-dd HH:mm:ss"));
}
public class DateTimeConverter : JsonConverter<DateTime>
{
public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
var dateTime = ParseDateTime(reader.GetString());
return dateTime == null ? DateTime.MinValue : dateTime.Value;
}
public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
=> writer.WriteStringValue(value.ToString("yyyy-MM-dd HH:mm:ss"));
}
public static DateTime? ParseDateTime(string dateStr)
{
if (System.Text.RegularExpressions.Regex.IsMatch(dateStr, @"^\d{4}[/-]") && DateTime.TryParse(dateStr, null,System.Globalization.DateTimeStyles.AssumeLocal, out var dateVal))
return dateVal;
return null;
}
}
}

8
ZR.Admin.WebApi/Startup.cs
View File

@ -18,6 +18,7 @@ using System.IO;
using System.Linq;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Admin.WebApi.Framework;
using ZR.Admin.WebApi.Middleware;
namespace ZR.Admin.WebApi
@ -67,7 +68,12 @@ namespace ZR.Admin.WebApi
options.Filters.Add(typeof(GlobalActionMonitor));//全局注册异常
})
.AddMvcLocalization()
.AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix);
.AddViewLocalization(LanguageViewLocationExpanderFormat.Suffix)
.AddJsonOptions(options =>
{
options.JsonSerializerOptions.Converters.Add(new JsonConverterUtil.DateTimeConverter());
options.JsonSerializerOptions.Converters.Add(new JsonConverterUtil.DateTimeNullConverter());
});
services.AddSwaggerGen(c =>
{

8
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/VueTemplate.txt
View File

@ -189,12 +189,20 @@ export default {
if (this.form.{PrimaryKey} != undefined || this.title === '修改数据') {
update{ModelTypeName}(this.form).then((res) => {
if (!res.data) {
this.msgError("修改失败");
return;
}
this.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
add{ModelTypeName}(this.form).then((res) => {
if (!res.data) {
this.msgError("新增失败");
return;
}
this.msgSuccess("新增成功");
this.open = false;
this.getList();