SVN r897

SVN-Revision: r897

插件库/Lskj.Main/Control/MainPanelControlEx.cs

@@ -651,6 +651,7 @@ namespace Lskj.Main.Control
         /// </summary>
         private void SetMenus()
         {
+            this._menus.Clear();
             var groupMenus = this._allMenus.AsEnumerable().Where(n => n.Table.Columns.Contains("groupcaption") && !string.IsNullOrEmpty(n["groupcaption"] + ""));
             if (groupMenus.Count() == 0 && this._allMenus.Columns.Contains("groupcaption"))
             {
@@ -699,15 +700,20 @@ namespace Lskj.Main.Control
                 }
                 #region 添加我的收藏快捷菜单
                 isShowGrallyInTop = SystemInfo.Instance.ShowGrallyInTop;
-                if (!isShowGrallyInTop)
-                {
-                    collectPanel.Visible = false;
-                    panelSplit.Visible = false;
-                    botTipsPanel.Visible = false;
-                }
                 if (groupMenus.Count() == 0)
                 {
-                    allPanel.Visible = false;
+                    isShowGrallyInTop = false;
+                    this.pl_center_main_middle.Controls.Clear();
+                }
+                else
+                {
+                    if (!isShowGrallyInTop)
+                    {
+                        collectPanel.Visible = false;
+                        panelSplit.Visible = false;
+                        botTipsPanel.Visible = false;
+                    }
+                    this.allMenuPanel.Controls.Clear();
                 }
                 if (this._allMenus.Columns.Contains("groupcaption") && !isFlowLayout && isShowGrallyInTop)
                 {
@@ -2484,10 +2490,14 @@ namespace Lskj.Main.Control
                 if (isFlowLayout)
                 {
                     pl_center_main_middle_FlowLayout.Show();
+                    this.pl_center_main_middle_FlowLayout.Invalidate();
+                    this.pl_center_main_middle_FlowLayout.Update();
                 }
                 else
                 {
                     this.pl_center_main_middle.Show();
+                    this.pl_center_main_middle.Invalidate();
+                    this.pl_center_main_middle.Update();
                 }
                 //我的桌面特殊展示，鼠标点击切换模块，当前页签为我的桌面
                 if (SystemInfo.Instance.DesktopFormat && this.tabMain.SelectedTabPage == this.xtpDesktop)