SVN r307

SVN-Revision: r307

插件库/Lskj.Control/BandedGridControlEx.cs

@@ -131,7 +131,15 @@ namespace Lskj.Control
             {
                 GridColumn column = e.Column;
                 GridColumnModel model = column.Tag as GridColumnModel;
-                if (string.IsNullOrEmpty(model.MergeGroup)) return;
+                if (model == null)
+                {
+                    e.Handled = true;
+                    return;
+                }
+                if (string.IsNullOrEmpty(model.MergeGroup))
+                {
+                    return;
+                }
                 string[] fields = model.MergeGroup.Trim(',').Split(',');
                 for (int i = 0; i < fields.Length; i++)
                 {
@@ -932,7 +940,6 @@ namespace Lskj.Control
         protected override void OnGridViewSummaryCalculate(object sender, CustomSummaryEventArgs e)
         {
             bool isSum = false;
-
             var gridView = sender as DevExpress.XtraGrid.Views.BandedGrid.BandedGridView;
             GridSummaryItem gridSummaryItem = e.Item as GridSummaryItem;
             GridColumn gridColumn = gridView.Columns[gridSummaryItem.FieldName] as GridColumn;
@@ -1253,8 +1260,7 @@ namespace Lskj.Control
             {
                 if (e.Column.Tag == null) return;
                 GridColumnModel model = e.Column.Tag as GridColumnModel;
-
-
+                if (model == null) return;
                 //值改变时，如果是验证是否重复的列报错就清除
                 if (RepeatedVerificationNames.Count > 0)
                 {
@@ -1268,8 +1274,6 @@ namespace Lskj.Control
                         }
                     }
                 }
-
-
                 GridView gridView = this.gridControl.MainView as GridView;
                 int rowHandle = gridView.GetDataSourceRowIndex(e.RowHandle);
                 DataTable dataTable = this.gridControl.DataSourceTable();
@@ -1339,34 +1343,6 @@ namespace Lskj.Control
             }
 
         }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
         /// <summary>
         /// <para>说明：重写BandedGridViewKeyDown</para>
         /// <para>创建人：龚宇超</para>