From 380534dfd54284d5b81d5d5aafe7779fc1dbf7e8 Mon Sep 17 00:00:00 2001
From: 28810 <28810@YEXIANGQIN>
Date: Thu, 25 Jul 2019 17:14:44 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20CodeFirst=20=E8=BF=81?=
=?UTF-8?q?=E7=A7=BB=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A=E5=88=B0=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E5=BA=93=EF=BC=8C=E7=BB=A7=E6=89=BF=E7=9A=84=E5=9F=BA?=
=?UTF-8?q?=E7=B1=BB=E6=9C=AA=E7=94=9F=E6=95=88=E7=9A=84=20bug=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Examples/base_entity/base_entity.csproj | 4 +
Examples/base_entity/base_entity.xml | 101 ++++++++++++++++++++++++
FreeSql/Internal/CommonUtils.cs | 2 +-
3 files changed, 106 insertions(+), 1 deletion(-)
create mode 100644 Examples/base_entity/base_entity.xml
diff --git a/Examples/base_entity/base_entity.csproj b/Examples/base_entity/base_entity.csproj
index f5ecc34b..55a58ed3 100644
--- a/Examples/base_entity/base_entity.csproj
+++ b/Examples/base_entity/base_entity.csproj
@@ -5,6 +5,10 @@
netcoreapp2.2
+
+ C:\Users\28810\Desktop\github\FreeSql\Examples\base_entity\base_entity.xml
+
+
diff --git a/Examples/base_entity/base_entity.xml b/Examples/base_entity/base_entity.xml
new file mode 100644
index 00000000..90fc0a20
--- /dev/null
+++ b/Examples/base_entity/base_entity.xml
@@ -0,0 +1,101 @@
+
+
+
+ base_entity
+
+
+
+
+ 创建时间
+
+
+
+
+ 更新时间
+
+
+
+
+ 逻辑删除
+
+
+
+
+ 开启工作单元事务
+
+
+
+
+
+
+ 删除数据
+
+
+
+
+
+ 恢复删除的数据
+
+
+
+
+
+ 附加实体，在更新数据时，只更新变化的部分
+
+
+
+
+ 更新数据
+
+
+
+
+
+ 插入数据
+
+
+
+
+ 更新或插入
+
+
+
+
+
+ 主键
+
+
+
+
+ 根据主键值获取数据
+
+
+
+
+
+
+ 组名
+
+
+
+
+ 登陆名
+
+
+
+
+ 昵称
+
+
+
+
+ 头像
+
+
+
+
+ 描述
+
+
+
+
diff --git a/FreeSql/Internal/CommonUtils.cs b/FreeSql/Internal/CommonUtils.cs
index d3ab7304..39aa7f7a 100644
--- a/FreeSql/Internal/CommonUtils.cs
+++ b/FreeSql/Internal/CommonUtils.cs
@@ -286,7 +286,6 @@ namespace FreeSql.Internal
if (File.Exists(xmlPath) == false) return null;
var dic = new Dictionary();
- var className = type.IsNested ? $"{type.Namespace}.{type.DeclaringType.Name}.{type.Name}" : $"{type.Namespace}.{type.Name}";
var sReader = new StringReader(File.ReadAllText(xmlPath));
using (var xmlReader = XmlReader.Create(sReader))
{
@@ -304,6 +303,7 @@ namespace FreeSql.Internal
var props = type.GetProperties();
foreach (var prop in props)
{
+ var className = (prop.DeclaringType.IsNested ? $"{prop.DeclaringType.Namespace}.{prop.DeclaringType.DeclaringType.Name}.{prop.DeclaringType.Name}" : $"{prop.DeclaringType.Namespace}.{prop.DeclaringType.Name}").Trim('.');
var node = xmlNav.SelectSingleNode($"/doc/members/member[@name='P:{className}.{prop.Name}']/summary");
if (node == null) continue;
var comment = node.InnerXml.Trim(' ', '\r', '\n', '\t');