SVN r1167
SVN-Revision: r1167
This commit is contained in:
@@ -250,6 +250,10 @@ namespace Lskj.Control.Model
|
||||
/// </summary>
|
||||
public event EventHandler OpenDocumentSource;
|
||||
/// <summary>
|
||||
///特殊左侧表
|
||||
/// </summary>
|
||||
public GridControlEx SpecialLeftTable;
|
||||
/// <summary>
|
||||
/// 控件Panel对象
|
||||
/// </summary>
|
||||
public XtraScrollableControl ParentPanel
|
||||
@@ -3458,14 +3462,14 @@ namespace Lskj.Control.Model
|
||||
this.GridRowCount = this._mainGridEx.SetGridViewDataSource(MainImpl.GetAdapterResult(sqlValue));
|
||||
}
|
||||
}
|
||||
//if (RememberRow)
|
||||
//{
|
||||
// if (this.GridRowCount <= oldRowHandle && SystemInfo.Instance.DeleteSelectedEndOf)
|
||||
// {
|
||||
// oldRowHandle = this.GridRowCount - 1;
|
||||
// }
|
||||
// SetFocusedRowHandle(oldRowHandle);
|
||||
//}
|
||||
if (RememberRow)
|
||||
{
|
||||
if (this.GridRowCount <= oldRowHandle && SystemInfo.Instance.DeleteSelectedEndOf)
|
||||
{
|
||||
oldRowHandle = this.GridRowCount - 1;
|
||||
}
|
||||
SetFocusedRowHandle(oldRowHandle);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -4091,6 +4095,7 @@ namespace Lskj.Control.Model
|
||||
model.AdditionalAssociations = item.Table.Columns.Contains("AdditionalAssociations") && !string.IsNullOrWhiteSpace(item["AdditionalAssociations"] + "") ? "1".Equals(item["AdditionalAssociations"] + "") : false;
|
||||
model.AuditControlTitleColor = item.Table.Columns.Contains("AuditControlTitleColor") ? item["AuditControlTitleColor"] + "" : "";
|
||||
model.ModuleFrameDisplayText = item.Table.Columns.Contains("ModuleFrameDisplayText") ? "1".Equals(item["ModuleFrameDisplayText"] + "") : false;
|
||||
model.InputBoxFontSize = item.Table.Columns.Contains("InputBoxFontSize") && !string.IsNullOrEmpty(item["InputBoxFontSize"] + "") ? Convert.ToInt32(item["InputBoxFontSize"] + "") : 0;
|
||||
//为了和工具里和bs里统一
|
||||
if (model.FieldType == 42)
|
||||
{
|
||||
@@ -4366,6 +4371,7 @@ namespace Lskj.Control.Model
|
||||
remarkEdit.TextEdit.ForeColor = Color.Red;
|
||||
|
||||
}
|
||||
|
||||
remarkEdit.TextEdit.KeyDown += new KeyEventHandler(OnTextEditKeyDown);
|
||||
remarkEdit.TextEdit.TextChanged += new EventHandler(OnTextEditTextChanged);
|
||||
if (!isLoadBorder) remarkEdit.TextEdit.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
|
||||
@@ -4384,6 +4390,11 @@ namespace Lskj.Control.Model
|
||||
case ControlType.LabMemoEdit:
|
||||
// 备注框A
|
||||
LabelMemoEdit memoEdit = new LabelMemoEdit();
|
||||
if (model.InputBoxFontSize > 0)
|
||||
{
|
||||
//memoEdit.TextEdit.Properties.Appearance.Font = new Font(memoEdit.TextEdit.Properties.Appearance.Font.FontFamily, model.RemarkBoxFontSize);
|
||||
memoEdit.TextEdit.Properties.AppearanceDropDown.Font = new Font(memoEdit.TextEdit.Properties.Appearance.Font.FontFamily, model.InputBoxFontSize);
|
||||
}
|
||||
memoEdit.TextEdit.KeyDown += new KeyEventHandler(OnTextEditKeyDown);
|
||||
memoEdit.TextEdit.TextChanged += new EventHandler(OnTextEditTextChanged);
|
||||
if (!isLoadBorder) memoEdit.TextEdit.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
|
||||
@@ -4392,6 +4403,11 @@ namespace Lskj.Control.Model
|
||||
case ControlType.LabMemoSpaceEdit:
|
||||
// 备注框A
|
||||
LabelMemoSpaceEdit memoSpacEdit = new LabelMemoSpaceEdit();
|
||||
if (model.InputBoxFontSize > 0)
|
||||
{
|
||||
//memoSpacEdit.TextEdit.Properties.Appearance.Font = new Font(memoSpacEdit.TextEdit.Properties.Appearance.Font.FontFamily, model.RemarkBoxFontSize);
|
||||
memoSpacEdit.TextEdit.Properties.AppearanceDropDown.Font = new Font(memoSpacEdit.TextEdit.Properties.Appearance.Font.FontFamily, model.InputBoxFontSize);
|
||||
}
|
||||
memoSpacEdit.TextEdit.KeyDown += new KeyEventHandler(OnTextEditKeyDown);
|
||||
memoSpacEdit.TextEdit.TextChanged += new EventHandler(OnTextEditTextChanged);
|
||||
if (!isLoadBorder) memoSpacEdit.TextEdit.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
|
||||
@@ -6183,30 +6199,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