From 167d5439d58fa78fe4a1ab2fe6282c7c557b90b0 Mon Sep 17 00:00:00 2001
From: wyf <wyf@local>
Date: Thu, 17 Jul 2025 09:19:25 +0000
Subject: [PATCH] SVN r870

SVN-Revision: r870
---
 .../Lskj.Main/Control/MainPanelControlEx.cs   | 42 ++++++++-----------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/插件库/Lskj.Main/Control/MainPanelControlEx.cs b/插件库/Lskj.Main/Control/MainPanelControlEx.cs
index 04d1aed..e68b6f0 100644
--- a/插件库/Lskj.Main/Control/MainPanelControlEx.cs
+++ b/插件库/Lskj.Main/Control/MainPanelControlEx.cs
@@ -679,13 +679,14 @@ namespace Lskj.Main.Control
                     //添加我的收藏快捷菜单
                     GroupControl baseGroupControl = new GroupControl();
                     GroupControl reportGroupControl = new GroupControl();
+                    FlowLayoutPanel baseFlowPanel = new FlowLayoutPanel();
+                    FlowLayoutPanel reportFlowPanel = new FlowLayoutPanel();
                     if (baseTable.Count() > 0)
                     {
                         baseGroupControl.Dock = DockStyle.Top;
-                        FlowLayoutPanel flowLayoutPanel = new FlowLayoutPanel();
-                        flowLayoutPanel.Dock = DockStyle.Fill;
-                        flowLayoutPanel.FlowDirection = FlowDirection.LeftToRight;
-                        baseGroupControl.MenuPanel.Controls.Add(flowLayoutPanel);
+                        baseFlowPanel.Dock = DockStyle.Fill;
+                        baseFlowPanel.FlowDirection = FlowDirection.LeftToRight;
+                        baseGroupControl.MenuPanel.Controls.Add(baseFlowPanel);
                         foreach (DataRow dataRow in baseTable)
                         {
                             string groupMenuId = dataRow["LMenuId"] + "";
@@ -700,7 +701,7 @@ namespace Lskj.Main.Control
                             menu.GetButton().Click += OnMenuItemClick;
                             menu.SetMenuImg(File.Exists(defaultImg) ? Image.FromFile(defaultImg) : Resources.default_icon);
                             menu.SetMenuHoverImg(File.Exists(hoverImg) ? Image.FromFile(hoverImg) : Resources.default_icon);
-                            flowLayoutPanel.Controls.Add(menu);
+                            baseFlowPanel.Controls.Add(menu);
                             this._menuItemList.Add(menu);
                             //DataRow modelRow = MainImpl.GetSystemdllTab(item["PurviewId"] + "");
                             //string countSql = modelRow != null && modelRow.Table.Columns.Contains("countSql") ? modelRow["countSql"] + "" : "";
@@ -712,22 +713,13 @@ namespace Lskj.Main.Control
                         }
                         collectMenuPanel.Controls.Add(baseGroupControl);
                         baseGroupControl.TipsText = $"快捷操作通道（{baseTable.Count()}）";
-                        flowLayoutPanel.SizeChanged += (s, e) =>
-                        {
-                            FlowLayoutPanel panel = s as FlowLayoutPanel;
-                            baseGroupControl.Height = panel.Controls[panel.Controls.Count - 1].Location.Y + menuHeight + 28;
-                            collectPanel.Height = baseGroupControl.Height + reportGroupControl.Height + 26;
-                        };
                     }
                     if (reportTable.Count() > 0)
                     {
                         reportGroupControl.Dock = DockStyle.Top;
-                        FlowLayoutPanel flowLayoutPanel = new FlowLayoutPanel();
-                        flowLayoutPanel.Dock = DockStyle.Fill;
-                        flowLayoutPanel.FlowDirection = FlowDirection.LeftToRight;
-                        flowLayoutPanel.AutoSize = true;
-                        flowLayoutPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink;
-                        reportGroupControl.MenuPanel.Controls.Add(flowLayoutPanel);
+                        reportFlowPanel.Dock = DockStyle.Fill;
+                        reportFlowPanel.FlowDirection = FlowDirection.LeftToRight;
+                        reportGroupControl.MenuPanel.Controls.Add(reportFlowPanel);
                         foreach (DataRow dataRow in reportTable)
                         {
                             string groupMenuId = dataRow["LMenuId"] + "";
@@ -742,7 +734,7 @@ namespace Lskj.Main.Control
                             menu.GetButton().Click += OnMenuItemClick;
                             menu.SetMenuImg(File.Exists(defaultImg) ? Image.FromFile(defaultImg) : Resources.default_icon);
                             menu.SetMenuHoverImg(File.Exists(hoverImg) ? Image.FromFile(hoverImg) : Resources.default_icon);
-                            flowLayoutPanel.Controls.Add(menu);
+                            reportFlowPanel.Controls.Add(menu);
                             this._menuItemList.Add(menu);
                             //DataRow modelRow = MainImpl.GetSystemdllTab(item["PurviewId"] + "");
                             //string countSql = modelRow != null && modelRow.Table.Columns.Contains("countSql") ? modelRow["countSql"] + "" : "";
@@ -753,14 +745,14 @@ namespace Lskj.Main.Control
                             }
                         }
                         collectMenuPanel.Controls.Add(reportGroupControl);
-                        reportGroupControl.TipsText = $"快捷报表通道（{baseTable.Count()}）";
-                        flowLayoutPanel.SizeChanged += (s, e) =>
-                        {
-                            FlowLayoutPanel panel = s as FlowLayoutPanel;
-                            reportGroupControl.Height = panel.Controls[panel.Controls.Count - 1].Location.Y + menuHeight + 28;
-                            collectPanel.Height = baseGroupControl.Height + reportGroupControl.Height + 26;
-                        };
+                        reportGroupControl.TipsText = $"快捷报表通道（{reportTable.Count()}）";
                     }
+                    collectPanel.SizeChanged += (s, e) =>
+                    {
+                        reportGroupControl.Height = reportFlowPanel.Controls[reportFlowPanel.Controls.Count - 1].Location.Y + menuHeight + 28;
+                        baseGroupControl.Height = baseFlowPanel.Controls[baseFlowPanel.Controls.Count - 1].Location.Y + menuHeight + 28;
+                        collectPanel.Height = baseGroupControl.Height + reportGroupControl.Height + 26;
+                    };
                 }
                 foreach (DataRow item in rows)
                 {