diff --git a/插件库/Lskj.Control/Model/ControlModel.cs b/插件库/Lskj.Control/Model/ControlModel.cs index 8a192ce..e088b81 100644 --- a/插件库/Lskj.Control/Model/ControlModel.cs +++ b/插件库/Lskj.Control/Model/ControlModel.cs @@ -276,4 +276,9 @@ namespace Lskj.Control.Model /// /// The name. public string DisplayPermissions { get; set; } - /// + ///下拉总宽度 + /// + /// The LookUpWidth. + public int LookUpWidth { get; set; } + \ No newline at end of file diff --git a/插件库/Lskj.Control/Model/MyControl.cs b/插件库/Lskj.Control/Model/MyControl.cs index 26b7c64..105c0b5 100644 --- a/插件库/Lskj.Control/Model/MyControl.cs +++ b/插件库/Lskj.Control/Model/MyControl.cs @@ -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; } /// @@ -5084,6 +5075,7 @@ namespace Lskj.Control.Model OnSourceRefrshCallBack(sender, null); } } + /// /// 说明: /// 创建人:龚宇超 @@ -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 \ No newline at end of file + 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; + } + + + } +} \ No newline at end of file