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

升级魔方，改进Echarts图表

This commit is contained in:
大石头 2025-06-22 22:43:10 +08:00
parent d87ba5eb33
commit aaa370c394
17 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ClientTest/ClientTest.csproj
View File

@ -20,11 +20,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="NewLife.Redis" Version="6.2.2025.601" />
<PackageReference Include="NewLife.UnitTest" Version="1.0.2025.101" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

2
Plugins/MySqlAgent/MySqlAgent.csproj
View File

@ -20,7 +20,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NewLife.XCode" Version="11.19.2025.601" />
<PackageReference Include="NewLife.XCode" Version="11.19.2025.618-beta0934" />
</ItemGroup>
<ItemGroup>

2
Samples/TestA/TestA.csproj
View File

@ -18,7 +18,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="11.5.2025.601" />
<PackageReference Include="NewLife.Core" Version="11.5.2025.618-beta0602" />
</ItemGroup>
</Project>

2
Samples/TestB/TestB.csproj
View File

@ -18,7 +18,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="11.5.2025.601" />
<PackageReference Include="NewLife.Core" Version="11.5.2025.618-beta0602" />
</ItemGroup>
</Project>

2
StarAgent/StarAgent.csproj
View File

@ -48,7 +48,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Agent" Version="10.12.2025.401" />
<PackageReference Include="NewLife.Agent" Version="10.13.2025.604" />
</ItemGroup>
<ItemGroup>

2
Stardust.Data/Stardust.Data.csproj
View File

@ -41,7 +41,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.XCode" Version="11.19.2025.601" />
<PackageReference Include="NewLife.XCode" Version="11.19.2025.618-beta0934" />
</ItemGroup>
<ItemGroup>

2
Stardust.Server/Stardust.Server.csproj
View File

@ -47,7 +47,7 @@
<ItemGroup>
<PackageReference Include="NewLife.IP" Version="2.3.2025.601" />
<PackageReference Include="NewLife.Redis" Version="6.2.2025.601" />
<PackageReference Include="NewLife.Remoting.Extensions" Version="3.3.2025.601" />
<PackageReference Include="NewLife.Remoting.Extensions" Version="3.3.2025.616-beta1415" />
</ItemGroup>
<ItemGroup>

6
Stardust.ServerTests/Stardust.ServerTests.csproj
View File

@ -20,11 +20,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.5" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.0">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

8
Stardust.Web/Areas/Monitors/Controllers/AppDayStatController.cs
View File

@ -101,10 +101,10 @@ public class AppDayStatController : ReadOnlyEntityController<AppDayStat>
};
chart.SetX(list2, _.StatDate);
//chart.SetY("耗时");
chart.YAxis = new[] {
new { name = "耗时（ms）", type = "value" },
new { name = "最大耗时（ms）", type = "value" }
};
chart.YAxis = [
new YAxis{ Name = "耗时（ms）", Type = "value" },
new YAxis{ Name = "最大耗时（ms）", Type = "value" }
];
chart.AddDataZoom();
chart.AddLine(list2, _.Cost, null, true);
chart.Add(list2, _.MinCost);

26
Stardust.Web/Areas/Monitors/Controllers/AppMinuteStatController.cs
View File

@ -87,10 +87,10 @@ public class AppMinuteStatController : ReadOnlyEntityController<AppMinuteStat>
};
chart.SetX(list2, _.StatTime);
//chart.SetY("耗时");
chart.YAxis = new[] {
new { name = "耗时（ms）", type = "value" },
new { name = "最大耗时（ms）", type = "value" }
};
chart.YAxis = [
new YAxis{ Name = "耗时（ms）", Type = "value" },
new YAxis{ Name = "最大耗时（ms）", Type = "value" }
];
chart.AddLine(list2, _.Cost, null, true);
chart.Add(list2, _.MinCost);
@ -123,14 +123,14 @@ public class AppMinuteStatController : ReadOnlyEntityController<AppMinuteStat>
chart.Legend = new { data = new[] { "总数", "错误数" } };
chart["grid"] = new { left = "3%", right = "4%", bottom = "3%", containLabel = true };
chart.XAxis = new[] { new { type = "value" } };
chart.YAxis = new[] {
new {
type = "category",
axisTick = new { show = false },
data = list2.Select(e => e.AppName).ToArray()
chart.XAxis = [new XAxis { Type = "value" }];
chart.YAxis = [
new YAxis{
Type = "category",
AxisTick = new { show = false },
Data = list2.Select(e => e.AppName).ToArray()
}
};
];
//chart.Add(list2, _.Total, "bar");
//chart.Add(list2, _.Errors, "bar");
@ -141,7 +141,7 @@ public class AppMinuteStatController : ReadOnlyEntityController<AppMinuteStat>
["stack"] = "总量",
["label"] = new { show = true, position = "left" },
["itemStyle"] = new { color = "rgba(255, 0, 0, 0.5)", },
Data = list2.Select(e => -e.Errors).ToArray(),
Data = list2.Select(e => (Object)(-e.Errors)).ToArray(),
});
chart.Add(new Series
{
@ -149,7 +149,7 @@ public class AppMinuteStatController : ReadOnlyEntityController<AppMinuteStat>
Type = "bar",
["stack"] = "总量",
["label"] = new { show = true },
Data = list2.Select(e => e.Total).ToArray(),
Data = list2.Select(e => (Object)e.Total).ToArray(),
});
ViewBag.Charts = new[] { chart };

16
Stardust.Web/Areas/Monitors/Controllers/TraceDataController.cs
View File

@ -68,10 +68,10 @@ public class TraceDataController : ReadOnlyEntityController<TraceData>
};
chart.SetX(list2, _.StartTime, e => e.StartTime.ToDateTime().ToLocalTime().ToFullString());
//chart.SetY("次数");
chart.YAxis = new[] {
new { name = "调用次数", type = "value" },
new { name = "错误数", type = "value" }
};
chart.YAxis = [
new YAxis{ Name = "调用次数", Type = "value" },
new YAxis{ Name = "错误数", Type = "value" }
];
chart.AddLine(list2, _.Total, null, true);
var line = chart.Add(list2, _.Errors);
@ -90,10 +90,10 @@ public class TraceDataController : ReadOnlyEntityController<TraceData>
};
chart.SetX(list2, _.StartTime, e => e.StartTime.ToDateTime().ToLocalTime().ToFullString());
//chart.SetY("耗时");
chart.YAxis = new[] {
new { name = "耗时（ms）", type = "value" },
new { name = "最大耗时（ms）", type = "value" }
};
chart.YAxis = [
new YAxis{ Name = "耗时（ms）", Type = "value" },
new YAxis{ Name = "最大耗时（ms）", Type = "value" }
];
chart.AddLine(list2, _.Cost, null, true);
chart.Add(list2, _.MinCost);

8
Stardust.Web/Areas/Nodes/Controllers/NodeDataController.cs
View File

@ -69,10 +69,10 @@ public class NodeDataController : ReadOnlyEntityController<NodeData>
};
chart.SetX(list2, _.LocalTime);
//chart.SetY("指标");
chart.YAxis = new[] {
new { name = "指标", type = "value" },
new { name = "网络", type = "value" }
};
chart.YAxis = [
new YAxis{ Name = "指标", Type = "value" },
new YAxis{ Name = "网络", Type = "value" }
];
chart.AddDataZoom();
chart.AddLine(list2, _.CpuRate, e => Math.Round(e.CpuRate * 100), true);

8
Stardust.Web/Areas/Nodes/Controllers/NodeStatController.cs
View File

@ -132,10 +132,10 @@ public class NodeStatController : ReadOnlyEntityController<NodeStat>
var list2 = list.OrderBy(e => e.StatDate).ToList();
var chart = new ECharts { Height = 400, };
chart.SetX(list2, _.StatDate);
chart.YAxis = new[] {
new { name = "数值", type = "value" },
new { name = "总数", type = "value" }
};
chart.YAxis = [
new YAxis{ Name = "数值", Type = "value" },
new YAxis{ Name = "总数", Type = "value" }
];
chart.AddDataZoom();
var line = chart.AddLine(list2, _.Total, null, true);

8
Stardust.Web/Areas/Registry/Controllers/AppMeterController.cs
View File

@ -114,10 +114,10 @@ public class AppMeterController : EntityController<AppMeter>
};
chart.SetX(list2, _.Time, e => (e.Time.Year > 2000 ? e.Time : e.CreateTime).ToFullString());
//chart.SetY("指标");
chart.YAxis = new[] {
new { name = "指标", type = "value" },
new { name = "百分比（%）", type = "value" }
};
chart.YAxis = [
new YAxis{ Name = "指标", Type = "value" },
new YAxis{ Name = "百分比（%）", Type = "value" }
];
chart.AddDataZoom();
chart.AddLine(list2, _.Memory, null, true);

4
Stardust.Web/Stardust.Web.csproj
View File

@ -50,10 +50,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Cube.Core" Version="6.5.2025.601" />
<PackageReference Include="NewLife.Cube.Core" Version="6.5.2025.622-beta0245" />
<PackageReference Include="NewLife.IP" Version="2.3.2025.601" />
<PackageReference Include="NewLife.Redis" Version="6.2.2025.601" />
<PackageReference Include="NewLife.Remoting.Extensions" Version="3.3.2025.601" />
<PackageReference Include="NewLife.Remoting.Extensions" Version="3.3.2025.616-beta1415" />
</ItemGroup>
<ItemGroup>

4
Stardust/Stardust.csproj
View File

@ -119,10 +119,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Remoting" Version="3.3.2025.601" />
<PackageReference Include="NewLife.Remoting" Version="3.3.2025.616-beta1415" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="11.5.2025.601" />
<PackageReference Include="NewLife.Core" Version="11.5.2025.618-beta0602" />
</ItemGroup>
</Project>

2
Test/Test.csproj
View File

@ -33,7 +33,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="11.5.2025.601" />
<PackageReference Include="NewLife.Core" Version="11.5.2025.618-beta0602" />
</ItemGroup>
<ItemGroup>