SVN-Revision: r823
This commit is contained in:
cyf
2025-07-01 09:39:16 +00:00
parent 6d619955c6
commit ed0b4e5195
7 changed files with 137 additions and 20 deletions
+12 -8
View File
@@ -357,6 +357,10 @@ namespace Lskj.Control
{
(this.ModuleGridObj.GridControlObj as TreeGridControlEx).TreeListObj.FocusedNodeChanged += OnFocusedNodeChanged;
}
if (this.ModuleGridObj.GridControlObj is TreeBandedGridControlEx)
{
(this.ModuleGridObj.GridControlObj as TreeBandedGridControlEx).TreeListObj.FocusedNodeChanged += OnFocusedNodeChanged;
}
if (this.SysModel.DoubleClickDetail)
{
//双击刷新的话,和行改变事件冲突。
@@ -390,6 +394,10 @@ namespace Lskj.Control
{
(this.ModuleGridObj.GridControlObj as TreeGridControlEx).TreeListObj.FocusedNodeChanged += OnFocusedNodeChanged;
}
if (this.ModuleGridObj.GridControlObj is TreeBandedGridControlEx)
{
(this.ModuleGridObj.GridControlObj as TreeBandedGridControlEx).TreeListObj.FocusedNodeChanged += OnFocusedNodeChanged;
}
if (SystemInfo.Instance.ReportMainTabClickRefresh)
{
if (this.SysModel.DoubleClickDetail)
@@ -614,11 +622,11 @@ namespace Lskj.Control
GridDetailModel model = this.tcButtom.GetGridDetailModel(tabPage);
if (isNull)
{
DataRow leftrow = _leftGridSearchObj!=null?_leftGridSearchObj.MainGridEx.GetViewFocusedDataRow():null;
if (model.IsUnionleft&& leftrow!=null)//为空状态下若明细关联左侧则去替换数据源
DataRow leftrow = _leftGridSearchObj != null ? _leftGridSearchObj.MainGridEx.GetViewFocusedDataRow() : null;
if (model != null && model.IsUnionleft && leftrow != null)//为空状态下若明细关联左侧则去替换数据源
{
string sqlValue = model.IsReadOnly || model.IsChart ? model.DetailSql : model.SystemModel.MenuSql;
if (ReplaceHelper.IsSelect(sqlValue) && !string.IsNullOrEmpty(model.UnionValue))
{
string Conditions = string.Empty;
@@ -866,7 +874,7 @@ namespace Lskj.Control
{
string fieldName = !string.IsNullOrEmpty(model.UnionParentField) && rowItem.Table.Columns.Contains(model.UnionParentField) ? model.UnionParentField : ModuleGridObj.ParmaryKey;
string sqlValue = model.IsReadOnly || model.IsChart ? model.DetailSql : model.SystemModel.MenuSql;
if (model.IsUnionleft&& _leftGridSearchObj!=null)
if (model.IsUnionleft && _leftGridSearchObj != null)
{
DataRow leftrow = _leftGridSearchObj.MainGridEx.GetViewFocusedDataRow();
sqlValue = ReplaceHelper.ReplaceRowParam(leftrow, sqlValue);
@@ -1087,10 +1095,6 @@ namespace Lskj.Control
}
}