GithubStar/Masuit.Tools
1
0
Fork 0
mirror of https://github.com/ldqk/Masuit.Tools.git synced 2026-10-17 05:11:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正树实体的bug

Browse Source
This commit is contained in:
懒得勤快
2021-01-12 17:40:15 +08:00
parent 9ae744d911
commit 58bc571e67
8 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Masuit.Tools.Abstractions/Masuit.Tools.Abstractions.csproj
+3 -3
View File
@@ -7,7 +7,7 @@
<LangVersion>9.0</LangVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodeAnalysisRuleSet />
<Version>2.4.1.4</Version>
<Version>2.4.1.5</Version>
<Authors>懒得勤快</Authors>
<Description>Masuit.Tools基础公共库</Description>
<Copyright>懒得勤快，长空X</Copyright>
@@ -20,9 +20,9 @@
<RepositoryType>Github</RepositoryType>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
<FileVersion>2.4.1.4</FileVersion>
<FileVersion>2.4.1.5</FileVersion>
<Company>masuit.com</Company>
<AssemblyVersion>2.4.1.4</AssemblyVersion>
<AssemblyVersion>2.4.1.5</AssemblyVersion>
<PackageLicenseUrl>https://github.com/ldqk/Masuit.Tools/blob/master/LICENSE</PackageLicenseUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
Masuit.Tools.Core/Models/ITree.cs → Masuit.Tools.Abstractions/Models/ITree.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace Masuit.Tools.Core.Models
namespace Masuit.Tools.Models
{
/// <summary>
/// 树形实体接口
Masuit.Tools.Core/Models/TreeExtensions.cs → Masuit.Tools.Abstractions/Models/TreeExtensions.cs
+3 -3
View File
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
namespace Masuit.Tools.Core.Models
namespace Masuit.Tools.Models
{
/// <summary>
/// 树形数据扩展
@@ -80,9 +80,9 @@ namespace Masuit.Tools.Core.Models
public static bool IsLeaf<T>(this ITree<T> tree) where T : ITree<T> => tree.Children.Count == 0;
/// <summary>
/// 深度
/// 深度层级
/// </summary>
public static int Level<T>(this ITree<T> tree) where T : ITree<T> => IsRoot(tree) ? 0 : Level(tree.Parent) + 1;
public static int Level<T>(this ITree<T> tree) where T : ITree<T> => IsRoot(tree) ? 1 : Level(tree.Parent) + 1;
/// <summary>
/// 节点路径（UNIX路径格式，以“/”分隔）
Masuit.Tools.Core/Masuit.Tools.Core.csproj
+5 -3
View File
@@ -20,10 +20,10 @@
<UserSecretsId>830c282f-f7c1-42be-8651-4cd06ac8e73f</UserSecretsId>
<RepositoryType>Github</RepositoryType>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>2.4.1.4</Version>
<FileVersion>2.4.1.4</FileVersion>
<Version>2.4.1.5</Version>
<FileVersion>2.4.1.5</FileVersion>
<Company>masuit.com</Company>
<AssemblyVersion>2.4.1.4</AssemblyVersion>
<AssemblyVersion>2.4.1.5</AssemblyVersion>
<Authors>懒得勤快X</Authors>
<RepositoryUrl>https://github.com/ldqk/Masuit.Tools</RepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -201,6 +201,7 @@
<Compile Include="..\Masuit.Tools.Abstractions\Models\IspInfo.cs">
<Link>Models\IspInfo.cs</Link>
</Compile>
<Compile Include="..\Masuit.Tools.Abstractions\Models\ITree.cs" Link="Models\ITree.cs" />
<Compile Include="..\Masuit.Tools.Abstractions\Models\Location.cs">
<Link>Models\Location.cs</Link>
</Compile>
@@ -216,6 +217,7 @@
<Compile Include="..\Masuit.Tools.Abstractions\Models\TaobaoIP.cs">
<Link>Models\TaobaoIP.cs</Link>
</Compile>
<Compile Include="..\Masuit.Tools.Abstractions\Models\TreeExtensions.cs" Link="Models\TreeExtensions.cs" />
<Compile Include="..\Masuit.Tools.Abstractions\Net\FtpClient.cs">
<Link>Net\FtpClient.cs</Link>
</Compile>
Masuit.Tools/Masuit.Tools.csproj
+6
View File
@@ -215,6 +215,9 @@
<Compile Include="..\Masuit.Tools.Abstractions\Models\IspInfo.cs">
<Link>Models\IspInfo.cs</Link>
</Compile>
<Compile Include="..\Masuit.Tools.Abstractions\Models\ITree.cs">
<Link>Models\ITree.cs</Link>
</Compile>
<Compile Include="..\Masuit.Tools.Abstractions\Models\Location.cs">
<Link>Models\Location.cs</Link>
</Compile>
@@ -230,6 +233,9 @@
<Compile Include="..\Masuit.Tools.Abstractions\Models\TaobaoIP.cs">
<Link>Models\TaobaoIP.cs</Link>
</Compile>
<Compile Include="..\Masuit.Tools.Abstractions\Models\TreeExtensions.cs">
<Link>Models\TreeExtensions.cs</Link>
</Compile>
<Compile Include="..\Masuit.Tools.Abstractions\Net\FtpClient.cs">
<Link>Net\FtpClient.cs</Link>
</Compile>
Masuit.Tools/Properties/AssemblyInfo.cs
BIN
View File
Binary file not shown.
Masuit.Tools/package.nuspec
+1 -1
View File
@@ -4,7 +4,7 @@
<!--*-->
<id>Masuit.Tools.Net</id>
<!--*-->
<version>2.4.1.4</version>
<version>2.4.1.5</version>
<title>Masuit.Tools</title>
<!--*-->
<authors>masuit.com</authors>
NetCoreTest/Program.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using Masuit.Tools;
using Masuit.Tools.Core.Models;
using Masuit.Tools.Models;
using Masuit.Tools.Reflection;
using Masuit.Tools.Security;
using Microsoft.AspNetCore;