cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r267

Browse Source 
SVN-Revision: r267
This commit is contained in:
tdx
2025-02-13 06:13:04 +00:00
parent af0f77e361
commit ac704870be
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/Model/MyControl.cs
+5 -6
View File
@@ -1406,7 +1406,7 @@ namespace Lskj.Control.Model
model.SourceSql += "and 1<>1";
}
DataTable table = new DataTable();
if (!ControlType.IsNotLoadData(model.FieldType))
if (!ControlType.IsNotLoadData(model.FieldType) && model.FieldType != ControlType.LabTreeType)
{
if (mControlSourceDic.ContainsKey(model))
{
@@ -2804,9 +2804,9 @@ namespace Lskj.Control.Model
valueBuilder.AppendFormat("N'{0}',", ParentKey);
}
if (ModuleResultDic!=null&& ModuleResultDic.Count>0)
if (ModuleResultDic != null && ModuleResultDic.Count > 0)
{
foreach (string resultKey in ModuleResultDic.Keys)
foreach (string resultKey in ModuleResultDic.Keys)
{
fieldBuilder.Append(resultKey + ",");
valueBuilder.AppendFormat("N'{0}',", ModuleResultDic[resultKey].Replace("'", "''"));
@@ -3759,8 +3759,7 @@ namespace Lskj.Control.Model
/// <returns>System.Windows.Forms.Control.</returns>
private System.Windows.Forms.Control InitControl(ControlModel model, bool isLoadBorder = true)
{
if (!string.IsNullOrEmpty(model.SourceSql)&& !ControlType.IsNotLoadData(model.FieldType))
if (!string.IsNullOrEmpty(model.SourceSql) && !ControlType.IsNotLoadData(model.FieldType) && model.FieldType != ControlType.LabTreeType)
{
Task<DataTable> sourceTask = null;
if (StaticControl.AddParentGrid.Key != null && Model != null && StaticControl.AddParentGrid.Key.Equals(Model.ModuleCode))
@@ -4235,7 +4234,7 @@ namespace Lskj.Control.Model
moduleReturnsIdNew.IsRadio = model.IsRadio;
moduleReturnsIdNew.ConfigureColumnMode = model.ConfigureColumnMode;
moduleReturnsIdNew.InitialFrame();
// DataTable dataSource = new DataTable();
//moduleReturnsIdNew.SetDataSource(dataSource);
moduleReturnsIdNew.TextEdit.KeyDown += new KeyEventHandler(OnTextEditKeyDown);