SVN-Revision: r570
This commit is contained in:
wyf
2025-05-09 09:34:24 +00:00
parent 65326b88c0
commit 5c91db4c03
+10 -6
View File
@@ -522,7 +522,7 @@ namespace Lskj.Control
/// <para>修改备注:</para> /// <para>修改备注:</para>
/// <para>版本:1.0</para> /// <para>版本:1.0</para>
/// </summary> /// </summary>
private void SetUpdateData(bool FirstLoading= true) private void SetUpdateData(bool FirstLoading = true)
{ {
//外面表格搜索条件赋值 //外面表格搜索条件赋值
if (!string.IsNullOrWhiteSpace(SearchObject) && SavaState) if (!string.IsNullOrWhiteSpace(SearchObject) && SavaState)
@@ -559,7 +559,7 @@ namespace Lskj.Control
this.ControlObj.SetControlValue(UnionKey, UnionValue); this.ControlObj.SetControlValue(UnionKey, UnionValue);
} }
//不如不是初始化时进入,就不加载配置数据源sql(添加或者修改后,执行赋值sql会导致保存的数据被覆盖) //不如不是初始化时进入,就不加载配置数据源sql(添加或者修改后,执行赋值sql会导致保存的数据被覆盖)
if (!string.IsNullOrWhiteSpace(this.ControlSql)&& FirstLoading) if (!string.IsNullOrWhiteSpace(this.ControlSql) && FirstLoading)
{ {
DataRow rowItem = BaseImpl.GetDataRowResult(this.ControlSql); DataRow rowItem = BaseImpl.GetDataRowResult(this.ControlSql);
this.ControlObj.CurrentData = rowItem; this.ControlObj.CurrentData = rowItem;
@@ -802,9 +802,9 @@ namespace Lskj.Control
{ {
tabPage = this.tcButtom.TabControlObj.SelectedTabPage; tabPage = this.tcButtom.TabControlObj.SelectedTabPage;
} }
else else
{ {
tabPage=e.Page; tabPage = e.Page;
} }
OperatePanelControlObj.Visible = true; OperatePanelControlObj.Visible = true;
@@ -859,6 +859,10 @@ namespace Lskj.Control
codeSql += string.Format(" '{0}' as {1}", this.PrimaryValue, this.PrimaryKey); codeSql += string.Format(" '{0}' as {1}", this.PrimaryValue, this.PrimaryKey);
gridEx.SetGridViewDataSource(SqlHelper.ExecuteDataTable(ReplaceHelper.ReplaceRowParam(BaseImpl.GetDataRowResult(codeSql), ReplaceHelper.ReplaceWhereCond(detailModel.DetailSql)))); gridEx.SetGridViewDataSource(SqlHelper.ExecuteDataTable(ReplaceHelper.ReplaceRowParam(BaseImpl.GetDataRowResult(codeSql), ReplaceHelper.ReplaceWhereCond(detailModel.DetailSql))));
} }
else if (this.ControlObj.CurrentData != null)
{
gridEx.SetGridViewDataSource(SqlHelper.ExecuteDataTable(ReplaceHelper.ReplaceRowParam(this.ControlObj.CurrentData, ReplaceHelper.ReplaceWhereCond(detailModel.DetailSql))));
}
// 自动刷新 // 自动刷新
} }
} }
@@ -1154,7 +1158,7 @@ namespace Lskj.Control
if (this.scc_container.PanelVisibility == SplitPanelVisibility.Both) if (this.scc_container.PanelVisibility == SplitPanelVisibility.Both)
{ {
this.tcButtom.TabControlObj.SelectedTabPageIndex = 0; this.tcButtom.TabControlObj.SelectedTabPageIndex = 0;
this.OnSelectedPageChanged(null,null); this.OnSelectedPageChanged(null, null);
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -2334,7 +2338,7 @@ namespace Lskj.Control
try try
{ {
string idValue = this.PrimaryValue; string idValue = this.PrimaryValue;
if (!string.IsNullOrWhiteSpace(this.SysModel.AttachmentAssociated)) if (!string.IsNullOrWhiteSpace(this.SysModel.AttachmentAssociated))
{ {
idValue = this.ControlObj.GetControlValue(this.SysModel.AttachmentAssociated); idValue = this.ControlObj.GetControlValue(this.SysModel.AttachmentAssociated);
} }