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

!9 可从Enum的[Description]特性读取对应的值

Browse Source 
Merge pull request !9 from KaneLeung/master
This commit is contained in:
阿翰 2022-12-27 07:27:12 +00:00 committed by Gitee
commit 596bfd827e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/MiniExcel/Attributes/QueryFromDescriptionAttribute.cs Normal file
View File

@ -0,0 +1,9 @@
using System;
namespace MiniExcelLibs.Attributes
{
[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false)]
public class QueryFromDescriptionAttribute : Attribute
{
}
}

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

@ -4,16 +4,15 @@
using MiniExcelLibs.Exceptions;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Dynamic;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
internal static partial class TypeHelper
{
public static IEnumerable<IDictionary<string, object>> ConvertToEnumerableDictionary(IDataReader reader)
public static IEnumerable<IDictionary<string, object>> ConvertToEnumerableDictionary(IDataReader reader)
{
while (reader.Read())
{
@ -109,7 +108,7 @@
var vs = itemValue?.ToString();
if (pInfo.ExcelFormat != null)
{
if( pInfo.Property.PropertyType == typeof(DateTimeOffset) && DateTimeOffset.TryParseExact(vs, pInfo.ExcelFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out var _v2))
if (pInfo.Property.PropertyType == typeof(DateTimeOffset) && DateTimeOffset.TryParseExact(vs, pInfo.ExcelFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out var _v2))
{
newValue = _v2;
}
@ -143,7 +142,14 @@
}
else if (pInfo.Property.PropertyType.IsEnum)
{
newValue = Enum.Parse(pInfo.Property.PropertyType, itemValue?.ToString(), true);
var enumFromDesc = pInfo.Property.GetAttribute<QueryFromDescriptionAttribute>();
if (enumFromDesc != null)
{
var fieldInfo = pInfo.Property.PropertyType.GetFields().FirstOrDefault(e => e.GetCustomAttribute<DescriptionAttribute>(false)?.Description == itemValue?.ToString());
if (fieldInfo != null) newValue = Enum.Parse(pInfo.Property.PropertyType, fieldInfo.Name, true);
else Enum.Parse(pInfo.Property.PropertyType, itemValue?.ToString(), true);
}
else newValue = Enum.Parse(pInfo.Property.PropertyType, itemValue?.ToString(), true);
}
else
{