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)

插件库/Lskj.Main/Control/Menu_Item.Designer.cs

@@ -31,7 +31,6 @@
             this.toolTip1 = new System.Windows.Forms.ToolTip();
             this.btn_item_title = new System.Windows.Forms.Label();
             this.btn_item_img = new System.Windows.Forms.Button();
-            this.lbl_mark_num = new System.Windows.Forms.Label();
             this.cb_mark = new Lskj.Control.CircleButton();
             this.SuspendLayout();
             // 
@@ -62,19 +61,6 @@
             this.btn_item_img.MouseLeave += new System.EventHandler(this.btn_item_img_MouseLeave);
             this.btn_item_img.MouseMove += new System.Windows.Forms.MouseEventHandler(this.btn_item_img_MouseMove);
             // 
-            // lbl_mark_num
-            // 
-            this.lbl_mark_num.AutoSize = true;
-            this.lbl_mark_num.BackColor = System.Drawing.Color.Red;
-            this.lbl_mark_num.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lbl_mark_num.ForeColor = System.Drawing.Color.White;
-            this.lbl_mark_num.Location = new System.Drawing.Point(81, 6);
-            this.lbl_mark_num.Name = "lbl_mark_num";
-            this.lbl_mark_num.Size = new System.Drawing.Size(19, 12);
-            this.lbl_mark_num.TabIndex = 5;
-            this.lbl_mark_num.Text = "99";
-            this.lbl_mark_num.Visible = false;
-            // 
             // cb_mark
             // 
             this.cb_mark.BackColor = System.Drawing.Color.Red;
@@ -87,8 +73,4 @@
             this.cb_mark.ForeColor = System.Drawing.Color.White;
             this.cb_mark.ImageHover = null;
             this.cb_mark.ImageNormal = null;
-            this.cb_mark.Location = new System.Drawing.Point(77, 0);
+            this.cb_mark.Location = new System.Drawing.Point(75
-            this.cb_mark.Name = "cb_mark";
-            this.cb_mark.Number = 0;
-            this.cb_mark.Radius = 24;
-            this

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

@@ -104,28 +104,17 @@ namespace Lskj.Main.Control
             if (Business.SystemInfo.Instance.DisableShowNotify)//角标禁显
             {
                 this.cb_mark.Visible = false;
-                this.lbl_mark_num.Visible = false;
             }
             else
             {
                 if (num < 1)
                 {
                     this.cb_mark.Visible = false;
-                    this.lbl_mark_num.Visible = false;
                 }
                 else
                 {
                     this.cb_mark.Visible = true;
-                    this.lbl_mark_num.Visible = true;
+                    this.cb_mark.SetMenuNum(num);
-                    this.lbl_mark_num.BringToFront();
-
-                    if (num < 10)
-                    {
-                        this.lbl_mark_num.Location = new Point(84, 6);
-                    }
-                    if (num > 99)
-                        num = 99;
-                    this.lbl_mark_num.Text = num + "";
                 }
             }
         }

插件库/Lskj.Main/Control/Menu_Item.resx

@@ -126,9 +126,6 @@
   <metadata name="btn_item_img.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="lbl_mark_num.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="cb_mark.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>