zhaoyushun1999/SunnyUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* UIPieChart：更改Tips显示不正确的Bug

Browse Source
This commit is contained in:
Sunny 2020-07-05 23:26:49 +08:00
parent 3b285175b6
commit 2ca8303735
6 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/SunnyUI.dll
View File

Binary file not shown.

BIN
Bin/SunnyUI.pdb
View File

Binary file not shown.

BIN
SunnyUI.Demo/Bin/SunnyUI.dll
View File

Binary file not shown.

11
SunnyUI/Charts/UIDoughnutChart.cs
View File

@ -53,11 +53,6 @@ namespace Sunny.UI
Angles.Clear();
UIDoughnutOption o = (UIDoughnutOption)option;
if (o == null || o.Series == null || o.Series.Count == 0) return;
UITemplate template = null;
if (o.ToolTip != null)
{
template = new UITemplate(o.ToolTip.Formatter);
}
for (int pieIndex = 0; pieIndex < o.Series.Count; pieIndex++)
{
@ -81,15 +76,13 @@ namespace Sunny.UI
{
try
{
if (template != null)
{
UITemplate template = new UITemplate(o.ToolTip.Formatter);
template.Set("a", pie.Name);
template.Set("b", pie.Data[i].Name);
template.Set("c", pie.Data[i].Value.ToString(o.ToolTip.ValueFormat));
template.Set("d", percent.ToString("F2"));
text = template.Render();
}
}
catch
{
text = pie.Data[i].Name + " : " + pie.Data[i].Value.ToString("F2") + "(" + percent.ToString("F2") + "%)";
@ -134,8 +127,6 @@ namespace Sunny.UI
}
}
}
}
}

11
SunnyUI/Charts/UIPieChart.cs
View File

@ -73,11 +73,6 @@ namespace Sunny.UI
Angles.Clear();
UIPieOption o = (UIPieOption)option;
if (o == null || o.Series == null || o.Series.Count == 0) return;
UITemplate template = null;
if (o.ToolTip != null)
{
template = new UITemplate(o.ToolTip.Formatter);
}
for (int pieIndex = 0; pieIndex < o.Series.Count; pieIndex++)
{
@ -101,15 +96,13 @@ namespace Sunny.UI
{
try
{
if (template != null)
{
UITemplate template = new UITemplate(o.ToolTip.Formatter);
template.Set("a", pie.Name);
template.Set("b", pie.Data[i].Name);
template.Set("c", pie.Data[i].Value.ToString(o.ToolTip.ValueFormat));
template.Set("d", percent.ToString("F2"));
text = template.Render();
}
}
catch
{
text = pie.Data[i].Name + " : " + pie.Data[i].Value.ToString("F2") + "(" + percent.ToString("F2") + "%)";
@ -143,8 +136,6 @@ namespace Sunny.UI
private readonly ConcurrentDictionary<int, ConcurrentDictionary<int, Angle>> Angles = new ConcurrentDictionary<int, ConcurrentDictionary<int, Angle>>();
[Browsable(false)]
private UIPieOption PieOption
{

20
Updates.txt
View File

@ -1,5 +1,25 @@
+ 增加； - 删除； * 修改
2020-07-04
* UICheckBoxGroup,UIRadioButtonGroup：可以设置初始选中值
* UILedBulb：边缘平滑
* UIRichTextBox：增加一些函数
2020-07-03
* UIRadioButtonGroup,UICheckBoxGroup：修正调整ItemSize无效的Bug
2020-07-02
* UIForm：修正控件位置在标题栏下方
2020-07-01
* UIForm：修改标题栏按钮背景色刷新
* UIForm：仿照QQ，重绘标题栏按钮。
* UINavMenu：OnAfterSelect增加判断，解决引发事件所有结点重绘导致闪烁；设置FullRowSelect ShowLin…
* OnAfterSelect增加判断，解决引发事件所有结点重绘导致闪烁；设置FullRowSelect ShowLines 属性，解决滚轮失效问题。
* UIForm：修改不显示标题时的控件在顶部的位置Bug
* 修改最大化全屏时消息窗体弹出在窗体后的BUG
* 修改最大化全屏时消息窗体弹出在窗体后的BUG
2020.06.29 V2.2.5->V2.2.6
+ UIDoughnutChart：环状图
+ UILoginForm：登录窗体