SVN r610

SVN-Revision: r610

插件库/Lskj.Control/GridControlEx.cs

@@ -8280,4 +8280,66 @@ namespace Lskj.Control
         {
             int returnIndex = 0;
             isContain = false;
-            DataRow dragEn
+            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
+
+
+
+        /// <summary>
+        /// 新建汇总
+        /// </summary>
+        /// <param name="dataRow"></param>
+        public void AddHeadquarters(DataRow dataRow=null)
+        {
+            try
+            {
+                this.gridControl.BeginUpdate();
+                foreach (GridColumn gridColumn in this.gridView.Columns)
+                {
+                    
+                    if (gridColumn.Summary.ActiveCount > 0)
+                    {
+                        if (gridColumn.Summary.ActiveCount == 1 && dataRow == null) continue;
+                        GridColumnSummaryItem sumItem = new GridColumnSummaryItem();
+                        if (gridColumn.Summary.ActiveCount == 1)
+                        {
+                            sumItem = gridColumn.Summary[0];
+                        }
+                        else
+                        {
+                            sumItem = gridColumn.Summary[1];
+                        }
+                        //清空所有汇总
+                        gridColumn.Summary.Clear();
+                        //新建汇总
+                        if (dataRow != null) 
+                        {
+