提交当前本机最新程序

This commit is contained in:
cyf
2026-07-16 16:05:38 +08:00
parent 43ae774164
commit 6be6607a40
47 changed files with 7895 additions and 811 deletions
+63 -4
View File
@@ -1503,7 +1503,31 @@ namespace Lskj.Control.Model
// 下拉框
LabelComboxEdit comboxEdit = ctr as LabelComboxEdit;
comboxEdit.SetDataSource(table);
comboxEdit.TextEdit.SelectedIndex = 0;
if (comboxEdit.Isparameters)
{
List<string> condition = ReplaceHelper.GetParamFields(model.SourceSql);
foreach (string item in condition)
{
string filename = item.Trim('{', '}');
if (ParaContrlsDic.ContainsKey(filename))
{
if (!ParaContrlsDic[filename].Contains(model.FieldName))
{
ParaContrlsDic[filename].Add(model.FieldName);
}
}
else
{
ParaContrlsDic[filename] = new List<string>() { model.FieldName };
}
}
}
else
{
//默认选中第一个,如果设置了带参数,就不默认选中
comboxEdit.TextEdit.SelectedIndex = 0;
}
break;
case ControlType.LabAutoCompleteValue:
case ControlType.LabAutoCompleteText:
@@ -3829,6 +3853,7 @@ namespace Lskj.Control.Model
if (rowItem == null) return;
foreach (ControlModel model in this.ControlModels)
{
selectModel = model;
if (rowItem.Table.Columns.Contains(model.FieldName))
@@ -3859,6 +3884,8 @@ namespace Lskj.Control.Model
{
SetControlValue(model, "****");
}
}
}
catch (Exception ex)
@@ -4212,6 +4239,27 @@ namespace Lskj.Control.Model
model.FieldType = 161;
model.IsRadio = true;
}
//快速搜索框在控件中转成普通搜索框
if (model.FieldType == 181 || model.FieldType == 182 || model.FieldType == 183 || model.FieldType == 184)
{
switch (model.FieldType)
{
case ControlType.DictionarySearchBoxToId:
model.FieldType = 5;
break;
case ControlType.DictionarySearchBoxToText:
model.FieldType = 6;
break;
case ControlType.DictionarySearchBoxToIdParam:
model.FieldType = 15;
break;
case ControlType.DictionarySearchBoxToTextParam:
model.FieldType = 16;
break;
}
}
return model;
}
@@ -4340,6 +4388,13 @@ namespace Lskj.Control.Model
comboxEdit.ValueMember = ControlType.LabComboxValue == model.FieldType || ControlType.LabComboxValueParam == model.FieldType ? model.ValueMember : model.TextMember;
comboxEdit.ValueField = model.ValueMember;
comboxEdit.TextField = model.TextMember;
if (ControlType.LabComboxValueParam == model.FieldType || ControlType.LabComboxTextParam == model.FieldType)
{
comboxEdit.ControlObj = this;
comboxEdit.SourceSQL = model.SourceSql;
comboxEdit.Isparameters = true;
}
//comboxEdit.SetDataSource(dataSource);
// 假如为报表模式并且没有默认值,默认选择第一条记录
if (model.IsSearchControl && string.IsNullOrEmpty(model.DefaultValue))
@@ -5426,6 +5481,10 @@ namespace Lskj.Control.Model
{
labelAutoGridLook.HandPopupSqlValue(labelAutoGridLook.SourceSQL);
}
if (baseUserControl is LabelComboxEdit labelComboxEdit)
{
labelComboxEdit.RefreshData();
}
}
}
}
@@ -6415,10 +6474,10 @@ namespace Lskj.Control.Model
if (rowItem == null) return;
foreach (ControlModel model in this.ControlModels)
{
if (rowItem.Table.Columns.Contains(model.FieldName)&&!string.IsNullOrWhiteSpace(model.DefaultValue))
if (rowItem.Table.Columns.Contains(model.FieldName) && !string.IsNullOrWhiteSpace(model.DefaultValue))
{
string DefaultValue = ReplaceHelper.ReplaceUserInfo(model.DefaultValue);
if (!DefaultValue.Equals(rowItem[model.FieldName] + ""))
if (!DefaultValue.Equals(rowItem[model.FieldName] + ""))
{
BaseUserControl baseControl = FindControl(model.FieldName);
if (baseControl == null) continue;
@@ -6432,7 +6491,7 @@ namespace Lskj.Control.Model
// baseControl.ForeColor = ColorTranslator.FromHtml("#000000");
// baseControl.ContentBold = false;
//}
}
}
}
}
}