SVN r520
SVN-Revision: r520
This commit is contained in:
@@ -174,6 +174,10 @@ namespace Lskj.Control.Model
|
||||
/// 主表点击搜索按钮,查询内容为0行时,清空明细
|
||||
/// </summary>
|
||||
public event EventHandler ClearDetails;
|
||||
/// <summary>
|
||||
/// 执行最后次查询后触发
|
||||
/// </summary>
|
||||
public event EventHandler OnLastQueryTriggered;
|
||||
|
||||
/// <summary>
|
||||
/// <para>说明:键盘按下时触发</para>
|
||||
@@ -3131,6 +3135,8 @@ namespace Lskj.Control.Model
|
||||
SetFocusedRowHandle(oldRowHandle);
|
||||
//SetTopRowHandle(oldTopRowHandle);
|
||||
}
|
||||
//执行删除或者右键后,主表没有数据时清空明细表格数据
|
||||
if (this.GridRowCount ==0&& OnLastQueryTriggered != null) OnLastQueryTriggered(null, null);
|
||||
|
||||
}
|
||||
}
|
||||
@@ -3750,6 +3756,16 @@ namespace Lskj.Control.Model
|
||||
model.IsSave = true;
|
||||
model.Visible = item.Table.Columns.Contains("visible") ? "1".Equals(item["visible"] + "") : false;
|
||||
model.FieldType = string.IsNullOrEmpty(item["fieldTypeId"] + "") ? 0 : Convert.ToInt32(item["fieldTypeId"] + "");
|
||||
if (model.FieldType==42)
|
||||
{
|
||||
model.FieldType = 116;
|
||||
}
|
||||
if (model.FieldType == 43)
|
||||
{
|
||||
model.FieldType = 117;
|
||||
}
|
||||
|
||||
|
||||
model.FieldName = item["fieldName"] + "";
|
||||
model.Name = "txt_" + item["fieldName"] + "";
|
||||
model.LabelText = item["userName"] + "";
|
||||
@@ -5739,30 +5755,4 @@ namespace Lskj.Control.Model
|
||||
LabelDateEdit dateEdit = controlObj as LabelDateEdit;
|
||||
value = dateEdit.TextEdit.EditValue == null ? dateEdit.EditText : dateEdit.TextEdit.DateTime.ToString("yyyy-MM-dd");
|
||||
}
|
||||
else if (controlObj is LabelCheckEdit)
|
||||
{
|
||||
LabelCheckEdit checkEdit = controlObj as LabelCheckEdit;
|
||||
value = checkEdit.EditText;
|
||||
}
|
||||
else if (controlObj is LabelComboxEdit)
|
||||
{
|
||||
LabelComboxEdit autoEdit = controlObj as LabelComboxEdit;
|
||||
value = autoEdit.EditValue;
|
||||
}
|
||||
else if (controlObj is LabelTextEdit)
|
||||
{
|
||||
LabelTextEdit textIntEdit = controlObj as LabelTextEdit;
|
||||
if (textIntEdit != null) value = string.IsNullOrEmpty(textIntEdit.EditText) ? "0" : textIntEdit.EditText;
|
||||
}
|
||||
|
||||
defaultValue = defaultValue.Replace(item, value);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
else if
|
||||
Reference in New Issue
Block a user