SVN-Revision: r505
This commit is contained in:
wyf
2025-04-22 02:25:23 +00:00
parent 9b814c7d3c
commit 8889f01e9e
+29 -2
View File
@@ -3108,7 +3108,7 @@ namespace Lskj.Control.Model
int oldRowHandle = GetFocusedRowHandle(); int oldRowHandle = GetFocusedRowHandle();
//int oldTopRowHandle = GetTopRowHandle(); //int oldTopRowHandle = GetTopRowHandle();
if (_mainGridEx.IsHandleCreated) if (_mainGridEx.IsHandleCreated)
{ {
// 窗口加载完成搜索,采用异步加载 // 窗口加载完成搜索,采用异步加载
_mainGridEx.Invoke((EventHandler)delegate _mainGridEx.Invoke((EventHandler)delegate
{ {
@@ -4880,6 +4880,7 @@ namespace Lskj.Control.Model
BaseUserControl control = FindControl(item); BaseUserControl control = FindControl(item);
//control.Enabled = ("true".Equals(EvalHelper.Eval(ReplaceHelper.ReplaceEvalCond(disableCond)) + "", StringComparison.OrdinalIgnoreCase)); //control.Enabled = ("true".Equals(EvalHelper.Eval(ReplaceHelper.ReplaceEvalCond(disableCond)) + "", StringComparison.OrdinalIgnoreCase));
control.Enabled = ("true".Equals(ValidateCond(disableCond, null) + "", StringComparison.OrdinalIgnoreCase)); control.Enabled = ("true".Equals(ValidateCond(disableCond, null) + "", StringComparison.OrdinalIgnoreCase));
control.ReadOnly = !("true".Equals(ValidateCond(disableCond, null) + "", StringComparison.OrdinalIgnoreCase));
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -5738,4 +5739,30 @@ namespace Lskj.Control.Model
LabelDateEdit dateEdit = controlObj as LabelDateEdit; LabelDateEdit dateEdit = controlObj as LabelDateEdit;
value = dateEdit.TextEdit.EditValue == null ? dateEdit.EditText : dateEdit.TextEdit.DateTime.ToString("yyyy-MM-dd"); value = dateEdit.TextEdit.EditValue == null ? dateEdit.EditText : dateEdit.TextEdit.DateTime.ToString("yyyy-MM-dd");
} }
else if 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;
}
}
}