cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r396

Browse Source 
SVN-Revision: r396
This commit is contained in:
wyf
2025-03-26 03:44:09 +00:00
parent a9438b900a
commit 980d0cb2ee
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/GridControlEx.cs
+4
View File
@@ -360,6 +360,10 @@ namespace Lskj.Control
/// 禁显列不加载数据源 /// 禁显列不加载数据源
/// </summary> /// </summary>
public bool DisableFieldSources; public bool DisableFieldSources;
/// <summary>
/// 聚合多表头控件
/// </summary>
public BandedGridControlEx CustomGroupBandEx;
public GridControlEx() public GridControlEx()
{ {
插件库/Lskj.Control/ModuleGridEx.cs
+18 -8
View File
@@ -851,6 +851,17 @@ namespace Lskj.Control
this.gcMain.Dock = DockStyle.Fill; this.gcMain.Dock = DockStyle.Fill;
this.panelControl1.Controls.Add(this.gcMain); 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) if (this.Model is DynamicReportModel)
{ {
@@ -888,7 +899,6 @@ namespace Lskj.Control
ButtonModeRightMenus = dt.Rows.Cast<DataRow>().Where(x => "1".Equals(x["ButtonMode"] + "")).ToList(); ButtonModeRightMenus = dt.Rows.Cast<DataRow>().Where(x => "1".Equals(x["ButtonMode"] + "")).ToList();
} }
if (this.gcMain is BandedGridControlEx) if (this.gcMain is BandedGridControlEx)
{ {
BandedGridControlEx banGridControlEx = (this.gcMain as BandedGridControlEx); BandedGridControlEx banGridControlEx = (this.gcMain as BandedGridControlEx);
@@ -3052,11 +3062,11 @@ namespace Lskj.Control
leftValue = this.ParentKeyValue; leftValue = this.ParentKeyValue;
} }
string ImportReturnName= this.SearchObj.getImportReturnValueControl(); string ImportReturnName = this.SearchObj.getImportReturnValueControl();
string ImportReturnValue = string.Empty; 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); ImportReturnValue = BaseImpl.GetDefaultValue(baseUserControl.Model.Default);
this.SearchObj.SetControlValue(ImportReturnName, ImportReturnValue); this.SearchObj.SetControlValue(ImportReturnName, ImportReturnValue);
} }
@@ -3074,11 +3084,11 @@ namespace Lskj.Control
{ {
this.SearchObj.SearchGrid(); this.SearchObj.SearchGrid();
} }
else else
{ {
this.SearchObj.SearchLastGrid(); this.SearchObj.SearchLastGrid();
} }
if (!string.IsNullOrWhiteSpace(this.SysModel.afterimportSql)) if (!string.IsNullOrWhiteSpace(this.SysModel.afterimportSql))
{ {
@@ -4152,7 +4162,7 @@ namespace Lskj.Control
{ {
LogUtil.WriteError("基础档案明细保存失败", ex); LogUtil.WriteError("基础档案明细保存失败", ex);
} }
IsApi: if (isExec) IsApi: if (isExec)
{ {
this.SaveGridRecord(); this.SaveGridRecord();
if (OnSaveGridCallBack != null) if (OnSaveGridCallBack != null)
@@ -5083,4 +5093,4 @@ namespace Lskj.Control
int focusedRowHandle = this.gcMain.GridView.FocusedRowHandle; int focusedRowHandle = this.gcMain.GridView.FocusedRowHandle;
GridColumn[] Columns = this.gcMain.GridView.GetSelectedCells(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