SVN r485
SVN-Revision: r485
This commit is contained in:
@@ -551,8 +551,10 @@ namespace Lskj.Control
|
||||
// this.cellHelper.AddAmountColumn(column, 11);
|
||||
// break;
|
||||
case ControlType.LabMultiSelectValue:
|
||||
case ControlType.LabMultiSelectValueNew:
|
||||
case ControlType.LabMultiSelectValueParam:
|
||||
case ControlType.LabMultiSelectText:
|
||||
case ControlType.LabMultiSelectTextNew:
|
||||
case ControlType.LabMultiSelectTextParam:
|
||||
InitMutilEdit(column, model);
|
||||
break;
|
||||
@@ -960,7 +962,7 @@ namespace Lskj.Control
|
||||
mutilLookUp.TextField = model.TextMember;
|
||||
mutilLookUp.SourceSQL = model.SqlSource;
|
||||
mutilLookUp.IsType = model.FieldType;
|
||||
mutilLookUp.ValueMember = model.FieldType == ControlType.LabMultiSelectValue ||
|
||||
mutilLookUp.ValueMember = model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew ||
|
||||
model.FieldType == ControlType.LabMultiSelectValueParam ? model.ValueMember : model.TextMember;
|
||||
mutilLookUp.Tag = model;
|
||||
RepositoryItemCheckedComboBoxEdit btnEdit = new RepositoryItemCheckedComboBoxEdit();
|
||||
@@ -974,7 +976,7 @@ namespace Lskj.Control
|
||||
btnEdit.AllowNullInput = DefaultBoolean.False;
|
||||
btnEdit.DisplayMember = model.TextMember;
|
||||
btnEdit.SeparatorChar = ',';
|
||||
btnEdit.ValueMember = model.FieldType == ControlType.LabMultiSelectValue ||
|
||||
btnEdit.ValueMember = model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew ||
|
||||
model.FieldType == ControlType.LabMultiSelectValueParam ? model.ValueMember : model.TextMember;
|
||||
btnEdit.DataSource = MainImpl.GetDataTableResult(model.SqlSource);
|
||||
btnEdit.Buttons[0].Visible = false; // 不能移除,移除后事件不起作用.
|
||||
@@ -2361,7 +2363,7 @@ namespace Lskj.Control
|
||||
GridColumnModel model = modelLookUp.Tag as GridColumnModel;
|
||||
modelLookUp.EditText = btnEdit.Text;
|
||||
modelLookUp.CurrentOperColumnKey = Model.ModuleCode + "_" + model.FieldName;
|
||||
if (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueParam)
|
||||
if (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew || model.FieldType == ControlType.LabMultiSelectValueParam)
|
||||
{
|
||||
modelLookUp.EditValue = btnEdit.EditValue + "";
|
||||
modelLookUp.EditText = string.Empty;
|
||||
@@ -2415,7 +2417,7 @@ namespace Lskj.Control
|
||||
GridColumnModel model = modelLookUp.Tag as GridColumnModel;
|
||||
modelLookUp.EditText = btnEdit.Text;
|
||||
modelLookUp.CurrentOperColumnKey = Model.ModuleCode + "_" + model.FieldName;
|
||||
if (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueParam)
|
||||
if (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew || model.FieldType == ControlType.LabMultiSelectValueParam)
|
||||
{
|
||||
modelLookUp.EditValue = btnEdit.EditValue + "";
|
||||
modelLookUp.EditText = string.Empty;
|
||||
|
||||
Reference in New Issue
Block a user