tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-20 04:48:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 增加 实体备注从 Description/Display/DisplayName 等特性兼容读取；

Browse Source
This commit is contained in:
2881099
2023-03-02 18:25:40 +08:00
parent 7c12b546b3
commit 4a4751708a
3 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
FreeSql/Internal/CommonUtils.cs
View File

@ -1,6 +1,5 @@
using FreeSql.DataAnnotations;
using FreeSql.DatabaseModel;
using FreeSql.Extensions.EntityUtil;
using FreeSql.Internal.Model;
using FreeSql.Internal.ObjectPool;
using System;
@ -10,7 +9,6 @@ using System.Collections.Generic;
using System.Data.Common;
using System.IO;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using System.Text;
using System.Text.RegularExpressions;
@ -607,6 +605,21 @@ namespace FreeSql.Internal
return dic;
string GetByAttribute(object[] attrs, string attributeName)
{
var dyattr = attrs?.Where(a => {
return ((a as Attribute)?.TypeId as Type)?.Name == attributeName;
}).FirstOrDefault();
if (dyattr == null) return null;
var dyattrProps = dyattr.GetType().GetProperties();
return dyattrProps.Where(a => a.PropertyType == typeof(string) && a.Name == "Description").FirstOrDefault()?.GetValue(dyattr, null)?.ToString() ??
dyattrProps.Where(a => a.PropertyType == typeof(string) && a.Name == "Name").FirstOrDefault()?.GetValue(dyattr, null)?.ToString() ??
dyattrProps.Where(a => a.PropertyType == typeof(string) && a.Name == "ShortName").FirstOrDefault()?.GetValue(dyattr, null)?.ToString() ??
dyattrProps.Where(a => a.PropertyType == typeof(string))
.Select(a => a?.GetValue(dyattr, null)?.ToString())
.Where(a => !string.IsNullOrWhiteSpace(a))
.FirstOrDefault();
}
void GetDydesc(PropertyInfo prop)
{
object[] attrs = null;
@ -617,19 +630,12 @@ namespace FreeSql.Internal
prop.GetCustomAttributes(false).ToArray(); //.net core 反射存在版本冲突问题，导致该方法异常
}
catch { }
var dyattr = attrs?.Where(a => {
return ((a as Attribute)?.TypeId as Type)?.Name == "DescriptionAttribute";
}).FirstOrDefault();
if (dyattr != null)
{
var valueProp = dyattr.GetType().GetProperties().Where(a => a.PropertyType == typeof(string)).FirstOrDefault();
var comment = valueProp?.GetValue(dyattr, null)?.ToString();
if (string.IsNullOrEmpty(comment) == false)
dic.Add(prop == null ?
"" :
prop.Name, comment);
}
var comment = GetByAttribute(attrs, "DescriptionAttribute");
if (string.IsNullOrEmpty(comment)) comment = GetByAttribute(attrs, "DisplayNameAttribute");
if (string.IsNullOrEmpty(comment)) comment = GetByAttribute(attrs, "DisplayAttribute");
if (string.IsNullOrEmpty(comment)) comment = GetByAttribute(attrs, "DisplayColumnAttribute");
if (string.IsNullOrEmpty(comment) == false)
dic.Add(prop == null ? "" : prop.Name, comment);
}
}