SVN r569
SVN-Revision: r569
This commit is contained in:
@@ -129,7 +129,7 @@ namespace Lskj.PubAdd
|
||||
height = Convert.ToInt32(item["height"] + "") > height ? height : Convert.ToInt32(item["height"] + "");//如果控件高度小于设置高度,以实际高度为准
|
||||
if (ModuleAddControl.SplitContainerControl.PanelVisibility == SplitPanelVisibility.Both)
|
||||
{
|
||||
height += 200;
|
||||
height += 400;
|
||||
}
|
||||
this.Height = height + otherHeight;
|
||||
|
||||
@@ -458,7 +458,7 @@ namespace Lskj.PubAdd
|
||||
codeSql += string.Format(" '{0}' as {1}", this.ModuleAddControl.PrimaryValue, this.ModuleAddControl.PrimaryKey);
|
||||
gridEx.SetGridViewDataSource(SqlHelper.ExecuteDataTable(ReplaceHelper.ReplaceRowParam(BaseImpl.GetDataRowResult(codeSql), ReplaceHelper.ReplaceWhereCond(detailModel.DetailSql))));
|
||||
}
|
||||
else if(this.ModuleAddControl.ControlObj.CurrentData!=null)
|
||||
else if (this.ModuleAddControl.ControlObj.CurrentData != null)
|
||||
{
|
||||
gridEx.SetGridViewDataSource(SqlHelper.ExecuteDataTable(ReplaceHelper.ReplaceRowParam(this.ModuleAddControl.ControlObj.CurrentData, ReplaceHelper.ReplaceWhereCond(detailModel.DetailSql))));
|
||||
}
|
||||
@@ -578,33 +578,4 @@ namespace Lskj.PubAdd
|
||||
/// <para>修改日期:</para>
|
||||
/// <para>修改备注:</para>
|
||||
/// <para>版本:1.0</para>
|
||||
/// </summary>
|
||||
/// <param name="sender">The source of the event.</param>
|
||||
/// <param name="e">The <see cref="FormClosingEventArgs"/> instance containing the event data.</param>
|
||||
protected void OnFormClosing(object sender, FormClosingEventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (this.ModuleAddControl != null && this.ModuleAddControl.IsCard)
|
||||
{
|
||||
this.ModuleAddControl.CloseIDCardThread();
|
||||
}
|
||||
this.DialogResult = DialogResult.OK;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
string Message = ErrorMessage.PromptErrorMessage(ex);
|
||||
MessageUtil.Show(Message, ex.Message);
|
||||
}
|
||||
}
|
||||
protected override CreateParams CreateParams
|
||||
{
|
||||
get
|
||||
{
|
||||
CreateParams cp = base.CreateParams;
|
||||
cp.ExStyle |= 0x02000000;
|
||||
return cp;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/// </
|
||||
Reference in New Issue
Block a user