test/MiniExcel
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/MiniExcel.git synced 2024-11-29 18:38:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #624 from jiaguangli/master

Browse Source 
add all type nullable support
This commit is contained in:
Gary Jia 2024-07-08 10:06:12 +08:00 committed by GitHub
commit 273fe9756f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/MiniExcel/Utils/TypeHelper.cs
View File

@ -75,7 +75,11 @@
private static object TypeMappingImpl<T>(T v, ExcelColumnInfo pInfo, ref object newValue, object itemValue, Configuration _config) where T : class, new()
{
if (pInfo.ExcludeNullableType == typeof(Guid))
if (pInfo.Nullable && string.IsNullOrWhiteSpace(itemValue?.ToString()))
{
newValue = null;
}
else if (pInfo.ExcludeNullableType == typeof(Guid))
{
newValue = Guid.Parse(itemValue.ToString());
}
@ -122,8 +126,6 @@
newValue = _v2;
else if (double.TryParse(vs, NumberStyles.None, CultureInfo.InvariantCulture, out var _d))
newValue = DateTimeHelper.FromOADate(_d);
else if (pInfo.Nullable && string.IsNullOrWhiteSpace(vs))
newValue = null;
else
throw new InvalidCastException($"{vs} can't cast to datetime");
}
@ -151,15 +153,8 @@
}
else
{
if (pInfo.Nullable && string.IsNullOrWhiteSpace(itemValue?.ToString()))
{
newValue = null;
}
else
{
// Use pInfo.ExcludeNullableType to resolve : https://github.com/shps951023/MiniExcel/issues/138
newValue = Convert.ChangeType(itemValue, pInfo.ExcludeNullableType, _config.Culture);
}
// Use pInfo.ExcludeNullableType to resolve : https://github.com/shps951023/MiniExcel/issues/138
newValue = Convert.ChangeType(itemValue, pInfo.ExcludeNullableType, _config.Culture);
}
pInfo.Property.SetValue(v, newValue);