diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe index 5ec7be43..1c33e5b0 100644 Binary files a/Bin/net40/SunnyUI.Demo.exe and b/Bin/net40/SunnyUI.Demo.exe differ diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll index 2e8d3fc0..be165073 100644 Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ diff --git a/SunnyUI.Demo/Charts/FLineChart.cs b/SunnyUI.Demo/Charts/FLineChart.cs index cda57e91..c592d90e 100644 --- a/SunnyUI.Demo/Charts/FLineChart.cs +++ b/SunnyUI.Demo/Charts/FLineChart.cs @@ -64,9 +64,11 @@ namespace Sunny.UI.Demo option.YAxis.AxisLabel.DecimalCount = 1; option.YAxis.AxisLabel.AutoFormat = false; - option.XAxisScaleLines.Add(new UIScaleLine() { Color = Color.Red, Name = dt.AddHours(3).DateTimeString(), Value = new DateTimeInt64(dt.AddHours(3)) }); - option.XAxisScaleLines.Add(new UIScaleLine() { Color = Color.Red, Name = dt.AddHours(6).DateTimeString(), Value = new DateTimeInt64(dt.AddHours(6)) }); + option.XAxisScaleLines.Add(new UIScaleLine(dt.AddHours(3).DateTimeString(), dt.AddHours(3), Color.Red)); + option.XAxisScaleLines.Add(new UIScaleLine(dt.AddHours(6).DateTimeString(), dt.AddHours(6), Color.Red)); + //设置X轴显示范围 + option.XAxis.SetRange(dt, dt.AddHours(8)); LineChart.SetOption(option); } @@ -225,6 +227,7 @@ namespace Sunny.UI.Demo option.XAxisScaleLines.Add(new UIScaleLine() { Color = Color.Lime, Name = "3", Value = 3 }); option.XAxisScaleLines.Add(new UIScaleLine() { Color = Color.Gold, Name = "6", Value = 6 }); + //设置坐标轴为自定义标签 option.XAxis.CustomLabels = new CustomLabels(1, 1, 11); for (int i = 1; i <= 12; i++) { diff --git a/SunnyUI/Charts/UIBarChartOption.cs b/SunnyUI/Charts/UIBarChartOption.cs index 8b278154..8a19fa47 100644 --- a/SunnyUI/Charts/UIBarChartOption.cs +++ b/SunnyUI/Charts/UIBarChartOption.cs @@ -168,6 +168,42 @@ namespace Sunny.UI { get => CustomLabels != null && CustomLabels.Count > 0; } + + public void SetMinValue(double min) + { + Min = min; + MinAuto = false; + } + + public void SetMaxValue(double max) + { + Max = max; + MaxAuto = false; + } + + public void SetRange(double min, double max) + { + SetMinValue(min); + SetMaxValue(max); + } + + public void SetMinValue(DateTime min) + { + Min = new DateTimeInt64(min); + MinAuto = false; + } + + public void SetMaxValue(DateTime max) + { + Max = new DateTimeInt64(max); + MaxAuto = false; + } + + public void SetRange(DateTime min, DateTime max) + { + SetMinValue(min); + SetMaxValue(max); + } } public class CustomLabels