diff --git a/插件库/Lskj.Control/GridControlEx.cs b/插件库/Lskj.Control/GridControlEx.cs
index f1d9203..e4cc2bb 100644
--- a/插件库/Lskj.Control/GridControlEx.cs
+++ b/插件库/Lskj.Control/GridControlEx.cs
@@ -369,6 +369,8 @@ namespace Lskj.Control
{
SetStyle(ControlStyles.OptimizedDoubleBuffer | ControlStyles.ResizeRedraw | ControlStyles.Selectable | ControlStyles.AllPaintingInWmPaint | ControlStyles.UserPaint | ControlStyles.SupportsTransparentBackColor, true);
InitializeComponent();
+
+ // 自定义选中区域方式
this.gridView.CustomDrawRowIndicator += new RowIndicatorCustomDrawEventHandler(OnGridViewCustomDrawRowIndicator);
this.gridView.SelectionChanged += new SelectionChangedEventHandler(OnGridViewSelectionChanged);
this.gridView.FocusedRowObjectChanged += new FocusedRowObjectChangedEventHandler(OnGridViewFocusedRowObjectChanged);
@@ -412,6 +414,8 @@ namespace Lskj.Control
this.gridView.DoubleClick += OnShowImageDoubleClick; ;
#endregion
}
+
+
///
/// 保存前反写多表头数据源
///
@@ -6676,7 +6680,7 @@ namespace Lskj.Control
bandedGridControlEx.BandedView.Columns.Clear();
// 保留其他非聚合列
- List normalColumns = ColumnList.Where(o => !o.IsCustomGroupPrimary && o.IsCustomGroupField == 0).ToList();
+ List normalColumns = ColumnList.Where(o => o.IsCustomGroupField == 0).ToList();
// 创建正常列的Band
GridBand normalBand = new GridBand() { Caption = "基本信息" };
@@ -8193,36 +8197,4 @@ namespace Lskj.Control
{
int returnIndex = 0;
isContain = false;
- DataRow dragEndRow = sourceTab.Rows[dragEndRowIndex];
- if (selectRows.Contains(dragEndRow))
- {
- isContain = true;
- dragEndRowIndex = dragEndRowIndex - 1;
- if (dragEndRowIndex >= 0)
- {
- dragEndRow = sourceTab.Rows[dragEndRowIndex];
- if (selectRows.Contains(dragEndRow))
- {
- bool iscontain = false;
- returnIndex = GetDragEndRowIndex(sourceTab, dragEndRowIndex, selectRows, out iscontain);
- }
- else
- {
- returnIndex = dragEndRowIndex;
- }
- }
- else
- {
- returnIndex = -1;
- }
- }
- else
- {
- returnIndex = dragEndRowIndex;
- }
- return returnIndex;
- }
- #endregion
-
- }
-}
\ No newline at end of file
+ DataRow dragEn
\ No newline at end of file