tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-04-22 10:42:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 修复 CodeFirst 迁移代码注释到数据库，继承的基类未生效的 bug；

Browse Source
This commit is contained in:
28810 2019-07-25 17:14:44 +08:00
parent fc84f68f3a
commit 380534dfd5
3 changed files with 106 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Examples/base_entity/base_entity.csproj
View File

@ -5,6 +5,10 @@
<TargetFramework>netcoreapp2.2</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile>C:\Users\28810\Desktop\github\FreeSql\Examples\base_entity\base_entity.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
</ItemGroup> </ItemGroup>

101
Examples/base_entity/base_entity.xml Normal file
View File

@ -0,0 +1,101 @@
<?xml version="1.0"?>
<doc>
<assembly>
<name>base_entity</name>
</assembly>
<members>
<member name="P:BaseEntity.CreateTime">
<summary>
创建时间
</summary>
</member>
<member name="P:BaseEntity.UpdateTime">
<summary>
更新时间
</summary>
</member>
<member name="P:BaseEntity.IsDeleted">
<summary>
逻辑删除
</summary>
</member>
<member name="M:BaseEntity.Begin">
<summary>
开启工作单元事务
</summary>
<param name="level"></param>
<returns></returns>
</member>
<member name="M:BaseEntity`1.Delete">
<summary>
删除数据
</summary>
<returns></returns>
</member>
<member name="M:BaseEntity`1.Restore">
<summary>
恢复删除的数据
</summary>
<returns></returns>
</member>
<member name="M:BaseEntity`1.Attach">
<summary>
附加实体，在更新数据时，只更新变化的部分
</summary>
</member>
<member name="M:BaseEntity`1.Update">
<summary>
更新数据
</summary>
<returns></returns>
</member>
<member name="M:BaseEntity`1.Insert">
<summary>
插入数据
</summary>
</member>
<member name="M:BaseEntity`1.Save">
<summary>
更新或插入
</summary>
<returns></returns>
</member>
<member name="P:BaseEntity`2.Id">
<summary>
主键
</summary>
</member>
<member name="M:BaseEntity`2.Find(`1)">
<summary>
根据主键值获取数据
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="P:UserGroup.GroupName">
<summary>
组名
</summary>
</member>
<member name="P:User1.Username">
<summary>
登陆名
</summary>
</member>
<member name="P:User1.Nickname">
<summary>
昵称
</summary>
</member>
<member name="P:User1.Avatar">
<summary>
头像
</summary>
</member>
<member name="P:User1.Description">
<summary>
描述
</summary>
</member>
</members>
</doc>

2
FreeSql/Internal/CommonUtils.cs
View File

@ -286,7 +286,6 @@ namespace FreeSql.Internal
if (File.Exists(xmlPath) == false) return null; if (File.Exists(xmlPath) == false) return null;
var dic = new Dictionary<string, string>(); var dic = new Dictionary<string, string>();
var className = type.IsNested ? $"{type.Namespace}.{type.DeclaringType.Name}.{type.Name}" : $"{type.Namespace}.{type.Name}";
var sReader = new StringReader(File.ReadAllText(xmlPath)); var sReader = new StringReader(File.ReadAllText(xmlPath));
using (var xmlReader = XmlReader.Create(sReader)) using (var xmlReader = XmlReader.Create(sReader))
{ {
@ -304,6 +303,7 @@ namespace FreeSql.Internal
var props = type.GetProperties(); var props = type.GetProperties();
foreach (var prop in props) 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"); var node = xmlNav.SelectSingleNode($"/doc/members/member[@name='P:{className}.{prop.Name}']/summary");
if (node == null) continue; if (node == null) continue;
var comment = node.InnerXml.Trim(' ', '\r', '\n', '\t'); var comment = node.InnerXml.Trim(' ', '\r', '\n', '\t');