Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS_MES_NEW/CustomControl/AccordionMenu/NavagationBar.cs

@@ -92,7 +92,14 @@ namespace UAS_MES_NEW.CustomControl.AccordionMenu
                     }
                     catch (Exception)
                     {
-                        nbg.LargeImage = new Bitmap(@Application.StartupPath + "/Resources/defaulticon.png");
+                        try
+                        {
+                            nbg.LargeImage = new Bitmap(@Application.StartupPath + "/Resources/defaulticon.png");
+                        }
+                        catch (Exception)
+                        {
+                            nbg.ImageUri = null;
+                        }
                     }
                     Groups.Add(nbg);
                     nbg.ItemLinks.Add(nbi);

UAS_MES_NEW/DbFind.Designer.cs

@@ -74,7 +74,7 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.DbFind_FormClosing);
             this.Load += new System.EventHandler(this.DbFind_Load);
             ((System.ComponentModel.ISupportInitialize)(this.DbFindGridView)).EndInit();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
 
         }
 

UAS_MES_NEW/DbFind.cs

@@ -267,13 +267,8 @@ namespace UAS_MES_NEW
         //列宽发生变化的时候TextBox的宽度也发生变化
         private void DbFindGridView_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
         {
-            try
-            {
+            if (ctl != null)
                 ctl[DbFindGridView.Columns.IndexOf(e.Column)].Width = e.Column.Width;
-            }
-            catch (Exception)
-            {
-            }
         }
 
         private void DbFindGridView_Scroll(object sender, ScrollEventArgs e)