diff --git a/Bin/SunnyUI.dll b/Bin/SunnyUI.dll index 36b67429..4f35623f 100644 Binary files a/Bin/SunnyUI.dll and b/Bin/SunnyUI.dll differ diff --git a/Bin/SunnyUI.pdb b/Bin/SunnyUI.pdb index 943ca4cb..69bba6da 100644 Binary files a/Bin/SunnyUI.pdb and b/Bin/SunnyUI.pdb differ diff --git a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe index 0fb5a993..8ee2b818 100644 Binary files a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe and b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe differ diff --git a/SunnyUI.Demo/Bin/SunnyUI.dll b/SunnyUI.Demo/Bin/SunnyUI.dll index 36b67429..4f35623f 100644 Binary files a/SunnyUI.Demo/Bin/SunnyUI.dll and b/SunnyUI.Demo/Bin/SunnyUI.dll differ diff --git a/SunnyUI.Demo/FMain.Designer.cs b/SunnyUI.Demo/FMain.Designer.cs index bab7a18e..2a9585ad 100644 --- a/SunnyUI.Demo/FMain.Designer.cs +++ b/SunnyUI.Demo/FMain.Designer.cs @@ -44,6 +44,7 @@ // this.Aside.ItemHeight = 36; this.Aside.LineColor = System.Drawing.Color.Black; + this.Aside.ShowOneNode = true; this.Aside.Size = new System.Drawing.Size(250, 575); // // Header @@ -76,6 +77,7 @@ this.uiLogo1.MinimumSize = new System.Drawing.Size(300, 80); this.uiLogo1.Name = "uiLogo1"; this.uiLogo1.Size = new System.Drawing.Size(300, 80); + this.uiLogo1.Style = Sunny.UI.UIStyle.Custom; this.uiLogo1.TabIndex = 3; this.uiLogo1.Text = "uiLogo1"; // diff --git a/SunnyUI.Demo/FMain.cs b/SunnyUI.Demo/FMain.cs index f429fb8a..755e8c7a 100644 --- a/SunnyUI.Demo/FMain.cs +++ b/SunnyUI.Demo/FMain.cs @@ -47,7 +47,7 @@ namespace Sunny.UI.Demo pageIndex = 3000; Header.SetNodePageIndex(Header.Nodes[2], pageIndex); Header.SetNodeSymbol(Header.Nodes[2], 61950); - parent = Aside.CreateNode("Forms", 61950, 24, pageIndex); + parent = Aside.CreateNode("Charts", 61950, 24, pageIndex); //直接关联(默认自动生成GUID) Aside.CreateChildNode(parent, 61952, 24, AddPage(new FPieChart())); diff --git a/SunnyUI/Controls/UINavMenu.cs b/SunnyUI/Controls/UINavMenu.cs index 659ee970..ff49e86d 100644 --- a/SunnyUI/Controls/UINavMenu.cs +++ b/SunnyUI/Controls/UINavMenu.cs @@ -70,6 +70,9 @@ namespace Sunny.UI SetScrollInfo(); } + [DefaultValue(false)] + public bool ShowOneNode { get; set; } + [DefaultValue(null)] public string TagString { get; set; } @@ -597,6 +600,23 @@ namespace Sunny.UI { base.OnAfterSelect(e); + if (ShowOneNode) + { + TreeNode node = e.Node.PrevNode; + while (node != null) + { + node.Collapse(); + node = node.PrevNode; + } + + node = e.Node.NextNode; + while (node != null) + { + node.Collapse(); + node = node.NextNode; + } + } + if (e.Node != null && ExpandSelectFirst && e.Node.Nodes.Count > 0) { e.Node.Expand(); diff --git a/Updates.txt b/Updates.txt index 57c7606e..6fd99210 100644 --- a/Updates.txt +++ b/Updates.txt @@ -1,6 +1,9 @@ + ӣ - ɾ * ޸ -2020.06.08 +2020.06.10 ++ UINaveMenuShowOneNodeͬһֻʾһ򿪵Ľڵ + +2020.06.09 * ҳ֧ͨPageIndexPageGuid 2020.06.08