NewLife
/
Cube
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

v6.4.2025.0401

This commit is contained in:
智能大石头 2025-04-01 17:49:13 +08:00
parent 2086b1baf6
commit 30d0d82a51
10 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CubeDemo/CubeDemo.csproj
View File

@ -23,7 +23,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NewLife.Stardust.Extensions" Version="3.3.2025.301" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="3.3.2025.401" />
</ItemGroup>
<ItemGroup>

4
CubeDemoNC/CubeDemoNC.csproj
View File

@ -38,8 +38,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="9.0.0" />
<PackageReference Include="NewLife.Redis.Extensions" Version="6.1.2025.301" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="3.3.2025.301" />
<PackageReference Include="NewLife.Redis.Extensions" Version="6.1.2025.401" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="3.3.2025.401" />
</ItemGroup>
<ItemGroup>

4
CubeSSO/CubeSSO.csproj
View File

@ -23,8 +23,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="11.4.2025.301" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="3.3.2025.301" />
<PackageReference Include="NewLife.Core" Version="11.4.2025.401" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="3.3.2025.401" />
</ItemGroup>
<ItemGroup>

2
NewLife.Cube.Blazor/NewLife.Cube.Blazor.csproj
View File

@ -49,7 +49,7 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="BootstrapBlazor" Version="9.4.2" />
<PackageReference Include="BootstrapBlazor" Version="9.5.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

4
NewLife.Cube.Swagger/NewLife.Cube.Swagger.csproj
View File

@ -49,8 +49,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Stardust.Extensions" Version="3.3.2025.301" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="3.3.2025.401" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.20" />

6
NewLife.Cube/Controllers/CubeController.cs
View File

@ -205,7 +205,7 @@ public class CubeController : ControllerBaseX
r.ParentID,
r.Level,
r.Path,
IdPath = r.AllParents.Where(e => e.ID > 0).Select(e => e.ID).Join("/"),
IdPath = r.GetAllParents().Where(e => e.ID > 0).Select(e => e.ID).Join("/"),
r.ParentPath
});
}
@ -238,7 +238,7 @@ public class CubeController : ControllerBaseX
if (r == null) return Json(500, null, "找不到地区");
var list = new List<Object>();
foreach (var e in r.AllParents)
foreach (var e in r.GetAllParents())
{
if (e.ID == 0) continue;
if (r.ID == 0)
@ -263,7 +263,7 @@ public class CubeController : ControllerBaseX
if (r == null) return Json(500, null, "找不到地区");
var rs = new List<AreaX>();
foreach (var item in r.AllParents)
foreach (var item in r.GetAllParents())
{
rs.AddRange(item.Parent.Childs.Where(e => e.Enable));
}

6
NewLife.Cube/NewLife.Cube.csproj
View File

@ -99,10 +99,10 @@
<Compile Include="..\NewLife.CubeNC\WebMiddleware\TracerMiddleware.cs" Link="WebMiddleware\TracerMiddleware.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="11.4.2025.301" />
<PackageReference Include="NewLife.Core" Version="11.4.2025.401" />
<PackageReference Include="NewLife.IP" Version="2.3.2025.202" />
<PackageReference Include="NewLife.Stardust" Version="3.3.2025.301" />
<PackageReference Include="NewLife.XCode" Version="11.18.2025.301" />
<PackageReference Include="NewLife.Stardust" Version="3.3.2025.401" />
<PackageReference Include="NewLife.XCode" Version="11.18.2025.401" />
</ItemGroup>
<ItemGroup>

6
NewLife.CubeNC/Controllers/CubeController.cs
View File

@ -216,7 +216,7 @@ public class CubeController : ControllerBaseX
r.ParentID,
r.Level,
r.Path,
IdPath = r.AllParents.Where(e => e.ID > 0).Select(e => e.ID).Join("/"),
IdPath = r.GetAllParents().Where(e => e.ID > 0).Select(e => e.ID).Join("/"),
r.ParentPath
});
}
@ -249,7 +249,7 @@ public class CubeController : ControllerBaseX
if (r == null) return Json(500, null, "找不到地区");
var list = new List<Object>();
foreach (var e in r.AllParents)
foreach (var e in r.GetAllParents())
{
if (e.ID == 0) continue;
if (r.ID == 0)
@ -273,7 +273,7 @@ public class CubeController : ControllerBaseX
if (r == null) return Json(500, null, "找不到地区");
var rs = new List<AreaX>();
foreach (var item in r.AllParents)
foreach (var item in r.GetAllParents())
{
rs.AddRange(item.Parent.Childs.Where(e => e.Enable));
}

6
NewLife.CubeNC/NewLife.CubeNC.csproj
View File

@ -50,10 +50,10 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="11.4.2025.301" />
<PackageReference Include="NewLife.Core" Version="11.4.2025.401" />
<PackageReference Include="NewLife.IP" Version="2.3.2025.202" />
<PackageReference Include="NewLife.Stardust" Version="3.3.2025.301" />
<PackageReference Include="NewLife.XCode" Version="11.18.2025.301" />
<PackageReference Include="NewLife.Stardust" Version="3.3.2025.401" />
<PackageReference Include="NewLife.XCode" Version="11.18.2025.401" />
</ItemGroup>
<ItemGroup>

2
Test/Test.csproj
View File

@ -17,6 +17,6 @@
<None Remove="Entity\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.XCode" Version="11.18.2025.301" />
<PackageReference Include="NewLife.XCode" Version="11.18.2025.401" />
</ItemGroup>
</Project>