SVN r396

SVN-Revision: r396

插件库/Lskj.Control/GridControlEx.cs

@@ -360,6 +360,10 @@ namespace Lskj.Control
         /// 禁显列不加载数据源
         /// </summary>
         public bool DisableFieldSources;
+        /// <summary>
+        /// 聚合多表头控件
+        /// </summary>
+        public BandedGridControlEx CustomGroupBandEx;
 
         public GridControlEx()
         {

插件库/Lskj.Control/ModuleGridEx.cs

@@ -851,6 +851,17 @@ namespace Lskj.Control
                 this.gcMain.Dock = DockStyle.Fill;
                 this.panelControl1.Controls.Add(this.gcMain);
             }
+            //如果配置了聚合模式则构建多表头覆盖当前表格
+            if (SysModel.IsCustomGroup == 1)
+            {
+                BandedGridControlEx bandedGridControlEx = new BandedGridControlEx();
+                bandedGridControlEx.moduleModel = this.SysModel;
+                bandedGridControlEx.Model = this.Model;
+                bandedGridControlEx.Dock = DockStyle.Fill;
+                gcMain.CustomGroupBandEx = bandedGridControlEx;
+                this.panelControl1.Controls.Add(bandedGridControlEx);
+                bandedGridControlEx.BringToFront();
+            }
             // 报表类型创建只读列
             if (this.Model is DynamicReportModel)
             {
@@ -888,7 +899,6 @@ namespace Lskj.Control
                 ButtonModeRightMenus = dt.Rows.Cast<DataRow>().Where(x => "1".Equals(x["ButtonMode"] + "")).ToList();
             }
 
-
             if (this.gcMain is BandedGridControlEx)
             {
                 BandedGridControlEx banGridControlEx = (this.gcMain as BandedGridControlEx);
@@ -3052,11 +3062,11 @@ namespace Lskj.Control
                     leftValue = this.ParentKeyValue;
                 }
 
-                string ImportReturnName= this.SearchObj.getImportReturnValueControl();
+                string ImportReturnName = this.SearchObj.getImportReturnValueControl();
                 string ImportReturnValue = string.Empty;
-                if (!string.IsNullOrWhiteSpace(ImportReturnName)) 
+                if (!string.IsNullOrWhiteSpace(ImportReturnName))
                 {
-                    BaseUserControl baseUserControl=this.SearchObj.FindControl(ImportReturnName);
+                    BaseUserControl baseUserControl = this.SearchObj.FindControl(ImportReturnName);
                     ImportReturnValue = BaseImpl.GetDefaultValue(baseUserControl.Model.Default);
                     this.SearchObj.SetControlValue(ImportReturnName, ImportReturnValue);
                 }
@@ -3074,11 +3084,11 @@ namespace Lskj.Control
                     {
                         this.SearchObj.SearchGrid();
                     }
-                    else 
+                    else
                     {
                         this.SearchObj.SearchLastGrid();
                     }
-                    
+
 
                     if (!string.IsNullOrWhiteSpace(this.SysModel.afterimportSql))
                     {
@@ -4152,7 +4162,7 @@ namespace Lskj.Control
                     {
                         LogUtil.WriteError("基础档案明细保存失败", ex);
                     }
-                IsApi: if (isExec)
+                    IsApi: if (isExec)
                     {
                         this.SaveGridRecord();
                         if (OnSaveGridCallBack != null)
@@ -5083,4 +5093,4 @@ namespace Lskj.Control
                         int focusedRowHandle = this.gcMain.GridView.FocusedRowHandle;
                         GridColumn[] Columns = this.gcMain.GridView.GetSelectedCells(focusedRowHandle);//当前选中的单元格
                                                                                                        //判断是否为最后一行，最后一列
-                        if (Columns.Length > 0 && Columns[0].VisibleIndex == this.gcMain.GridView.Columns.C
+                        if (Columns.Length > 0 && Columns[0].VisibleIndex == this.gcMain.GridView.Columns.Co