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

SVN r270

Browse Source 
SVN-Revision: r270
This commit is contained in:
cyf
2025-02-14 09:58:05 +00:00
parent b2f0adf417
commit 2a3c098028
2 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/Model/ControlModel.cs
+6 -1
View File
@@ -276,4 +276,9 @@ namespace Lskj.Control.Model
/// </summary>
/// <value>The name.</value>
public string DisplayPermissions { get; set; }
/// <s
/// <summary>
///下拉总宽度
/// </summary>
/// <value>The LookUpWidth.</value>
public int LookUpWidth { get; set; }
插件库/Lskj.Control/Model/MyControl.cs
+34 -11
View File
@@ -3673,16 +3673,6 @@ 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 == 116)
//{
// model.FieldType = 160;
//}
//if (model.FieldType == 117)
//{
// model.FieldType = 161;
//}
model.FieldName = item["fieldName"] + "";
model.Name = "txt_" + item["fieldName"] + "";
model.LabelText = item["userName"] + "";
@@ -3745,6 +3735,7 @@ namespace Lskj.Control.Model
model.ConfigureColumnMode = item.Table.Columns.Contains("ConfigureColumnMode") && !string.IsNullOrWhiteSpace(item["ConfigureColumnMode"] + "") ? "1".Equals(item["ConfigureColumnMode"] + "") : false;
model.SplicingConditions = item.Table.Columns.Contains("SplicingConditions") ? item["SplicingConditions"] + "" : "";
model.IsRadio = item.Table.Columns.Contains("IsRadio") && !string.IsNullOrWhiteSpace(item["IsRadio"] + "") ? "1".Equals(item["IsRadio"] + "") : false;
model.ScanAfterEmpty = item.Table.Columns.Contains("ScanAfterEmpty") && !string.IsNullOrWhiteSpace(item["ScanAfterEmpty"] + "") ? "1".Equals(item["ScanAfterEmpty"] + "") : false;
return model;
}
/// <summary>
@@ -5084,6 +5075,7 @@ namespace Lskj.Control.Model
OnSourceRefrshCallBack(sender, null);
}
}
/// <summary>
/// <para>说明：</para>
/// <para>创建人：龚宇超</para>
@@ -5118,6 +5110,11 @@ namespace Lskj.Control.Model
// 查询之后
if (OnSearchAfterCallBack != null) OnSearchAfterCallBack(sender, e);
if (baseControl.Model.ScanAfterEmpty)
{
baseControl.EditText = string.Empty;
}
}
else if (baseControl.Model.IsAddControl)
{
@@ -5556,4 +5553,30 @@ 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
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;
}
}
}