diff --git a/Bin/SunnyUI.dll b/Bin/SunnyUI.dll index f08bb2a2..475edc96 100644 Binary files a/Bin/SunnyUI.dll and b/Bin/SunnyUI.dll differ diff --git a/Bin/SunnyUI.pdb b/Bin/SunnyUI.pdb index 456bc8d6..699687f5 100644 Binary files a/Bin/SunnyUI.pdb and b/Bin/SunnyUI.pdb differ diff --git a/SunnyUI.Demo/Bin/SunnyUI.dll b/SunnyUI.Demo/Bin/SunnyUI.dll index f08bb2a2..475edc96 100644 Binary files a/SunnyUI.Demo/Bin/SunnyUI.dll and b/SunnyUI.Demo/Bin/SunnyUI.dll differ diff --git a/SunnyUI/Charts/UIPieChartOption.cs b/SunnyUI/Charts/UIPieChartOption.cs index ae470c00..062311e4 100644 --- a/SunnyUI/Charts/UIPieChartOption.cs +++ b/SunnyUI/Charts/UIPieChartOption.cs @@ -75,9 +75,21 @@ namespace Sunny.UI public UIPieSeriesLabel Label = new UIPieSeriesLabel(); + public delegate Color OnDataColorChangeEventHandler(double data); + + public event OnDataColorChangeEventHandler DataColorChange; + public void AddData(string name, double value) { - Data.Add(new UIPieSeriesData(name, value)); + if (DataColorChange != null) + { + Color color = DataColorChange.Invoke(value); + Data.Add(new UIPieSeriesData(name, value,color)); + } + else + { + Data.Add(new UIPieSeriesData(name, value)); + } } public void AddData(string name, double value, Color color) diff --git a/SunnyUI/Controls/UIPagination.cs b/SunnyUI/Controls/UIPagination.cs index 4d0be90f..e43a8849 100644 --- a/SunnyUI/Controls/UIPagination.cs +++ b/SunnyUI/Controls/UIPagination.cs @@ -65,7 +65,11 @@ namespace Sunny.UI private bool inSetDataConnection; private UIPanel p1; - private int PageCount; + /// + /// 总页数 + /// + [Browsable(false)] + public int PageCount { get; private set; } private int pagerCount = 7; @@ -215,6 +219,8 @@ namespace Sunny.UI set => p1.Visible = value; } + public event EventHandler DataSourceChanged; + [DefaultValue(null)] [RefreshProperties(RefreshProperties.Repaint)] [AttributeProvider(typeof(IListSource))] @@ -235,6 +241,7 @@ namespace Sunny.UI dataSource = value; activePage = 1; TotalCount = dataManager?.List.Count ?? 0; + DataSourceChanged?.Invoke(this,null); } }