diff --git a/插件库/Lskj.Control/GridControlEx.cs b/插件库/Lskj.Control/GridControlEx.cs
index 186ffaf..1a1587e 100644
--- a/插件库/Lskj.Control/GridControlEx.cs
+++ b/插件库/Lskj.Control/GridControlEx.cs
@@ -4900,7 +4900,7 @@ namespace Lskj.Control
if (model.FieldType == 116)
{
RepositoryItemCheckedComboBoxEdit rccbe = col.ColumnEdit as RepositoryItemCheckedComboBoxEdit;
- FrmModelLookUp2 modelLookUp = rccbe.Buttons[1].Tag as FrmModelLookUp2;
+ FrmModelLookUp modelLookUp = rccbe.Buttons[1].Tag as FrmModelLookUp;
if (modelLookUp.SingleChoiceMode)
{
value = GetValueByCaption(model, col.ColumnEdit, cellValue, out IsTextEqualValue);
@@ -4911,7 +4911,6 @@ namespace Lskj.Control
continue;
}
}
-
}
@@ -6038,16 +6037,20 @@ 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)
- {
- modelLookUp.EditValue = btnEdit.EditValue + "";
- modelLookUp.EditText = string.Empty;
- }
- else
- {
- modelLookUp.EditText = btnEdit.Text;
- modelLookUp.EditValue = string.Empty;
- }
+ //if (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueParam)
+ //{
+ // modelLookUp.EditValue = btnEdit.EditValue + "";
+ // modelLookUp.EditText = string.Empty;
+ //}
+ //else
+ //{
+ // modelLookUp.EditText = btnEdit.Text;
+ // modelLookUp.EditValue = string.Empty;
+ //}
+
+ modelLookUp.EditText = btnEdit.Text;
+ modelLookUp.EditValue = btnEdit.EditValue + "";
+
//多选关联单据头
modelLookUp.SourceSQL = model.SqlSource.Replace("#", "");
//单据头关联取值
@@ -6092,18 +6095,12 @@ 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)
- {
- modelLookUp.EditValue = btnEdit.EditValue + "";
- modelLookUp.EditText = string.Empty;
- }
- else
- {
- modelLookUp.EditText = btnEdit.Text;
- modelLookUp.EditValue = string.Empty;
- }
+ modelLookUp.EditText = btnEdit.Text;
+ modelLookUp.EditValue = btnEdit.EditValue + "";
+
//多选关联单据头
string SourceSQL = modelLookUp.SysModel.MenuSql.Replace("#", "") + model.SplicingConditions;
+ //SourceSQL = modelLookUp.SysModel.MenuSql.Replace("#", "");
//单据头关联取值
if (this.ParentControl != null)
{
diff --git a/插件库/Lskj.Control/LabelMultiAutoTextEdit2.cs b/插件库/Lskj.Control/LabelMultiAutoTextEdit2.cs
index de09895..6ed8b01 100644
--- a/插件库/Lskj.Control/LabelMultiAutoTextEdit2.cs
+++ b/插件库/Lskj.Control/LabelMultiAutoTextEdit2.cs
@@ -77,6 +77,14 @@ namespace Lskj.Control
///
/// The Union ModuleCodel.
public string UnionModuleCodel;
+ ///
+ ///模块选择返回框，是否单选模式
+ ///
+ public bool IsRadio { get; set; }
+ ///
+ ///模块选择返回框，配置列加载模式（默认根据sql动态加载列）
+ ///
+ public bool ConfigureColumnMode { get; set; }
public LabelMultiAutoTextEdit2()
{
@@ -172,7 +180,7 @@ namespace Lskj.Control
text += rowItem[TextField] + ",";
}
}
- this.txtEdit.Text = text;
+ this.txtEdit.Text = text.TrimEnd(',');
}
else
{
@@ -264,6 +272,28 @@ namespace Lskj.Control
return base.IsUpdate();
}
}
+ ///
+ /// 说明：初始化弹出框
+ /// 创建人：龚宇超
+ /// 创建日期：2017-08-08
+ /// 修改人：
+ /// 修改日期：
+ /// 修改备注：
+ /// 版本：1.0
+ ///
+ /// 数据源
+ ///
+ public void InitialFrame()
+ {
+ _lookUpForm = new FrmModelLookUp(UnionModuleCodel, IsRadio);
+ _lookUpForm.ConfigureColumnMode = ConfigureColumnMode;
+ _lookUpForm.ValueField = ValueField;
+ _lookUpForm.ValueMember = ValueMember;
+ _lookUpForm.TextField = TextField;
+ if(!string.IsNullOrWhiteSpace(SourceSQL)&&!IsRadio) _lookUpForm.SourceSQL = SourceSQL;//配置了控件数据源sql，并且是多选，以控件sql为准。（单选模式以模块sql为准）
+ SourceSQL = _lookUpForm.SourceSQL;
+ }
+
///
/// 说明：设置数据源
/// 创建人：龚宇超
@@ -276,13 +306,9 @@ namespace Lskj.Control
/// 数据源
public void SetDataSource(DataTable dataSource)
{
- _lookUpForm = new FrmModelLookUp(UnionModuleCodel);
- _lookUpForm.ValueField = ValueField;
- _lookUpForm.ValueMember = ValueMember;
- _lookUpForm.TextField = TextField;
- _lookUpForm.SourceSQL = SourceSQL;
- _lookUpForm.DataSource = dataSource;
+ if(_lookUpForm!=null) _lookUpForm.DataSource = dataSource;
}
+
///
/// 说明：清空选中的值
/// 创建人：龚宇超
diff --git a/插件库/Lskj.Control/LabelMultiAutoTextEdit4.cs b/插件库/Lskj.Control/LabelMultiAutoTextEdit4.cs
index b974f71..0b99a81 100644
--- a/插件库/Lskj.Control/LabelMultiAutoTextEdit4.cs
+++ b/插件库/Lskj.Control/LabelMultiAutoTextEdit4.cs
@@ -335,6 +335,7 @@ namespace Lskj.Control
}
string sqlValue = _lookUpForm.SysModel.MenuSql + Model.SplicingConditions;
+ //sqlValue = _lookUpForm.SysModel.MenuSql.Replace("#", "");
if (this.ControlObj != null)
{
sqlValue = this.ControlObj.ReplaceControlValue(sqlValue);
@@ -344,4 +345,5 @@ namespace Lskj.Control
}
_lookUpForm.NewSourceSQL = sqlValue;
_lookUpForm.AddModuleResult = Model.AddModuleResult;
- _lookUpForm.In
\ No newline at end of file
+ _lookUpForm.InitControls(UnionModuleCodel);
+ Di
\ No newline at end of file
diff --git a/插件库/Lskj.Control/Model/MyControl.cs b/插件库/Lskj.Control/Model/MyControl.cs
index 6210dca..2f5cde9 100644
--- a/插件库/Lskj.Control/Model/MyControl.cs
+++ b/插件库/Lskj.Control/Model/MyControl.cs
@@ -3650,6 +3650,16 @@ 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"] + "";
@@ -4177,8 +4187,11 @@ namespace Lskj.Control.Model
moduleReturnsId.ControlObj = this;
moduleReturnsId.UnionModuleCodel = model.AddModuleId;
moduleReturnsId.SourceSQL = model.SourceSql;
- // DataTable dataSource = new DataTable();
- //moduleReturnsId.SetDataSource(dataSource);
+ moduleReturnsId.IsRadio = model.IsRadio;
+ moduleReturnsId.ConfigureColumnMode = model.ConfigureColumnMode;
+ moduleReturnsId.InitialFrame();
+ //如果没有配置控件数据源sql，就以弹出模块的sql为数据源sql。这里赋值是为了延迟加载数据源时model.SourceSql不为空
+ if (string.IsNullOrWhiteSpace(model.SourceSql)) model.SourceSql = moduleReturnsId.SourceSQL;
moduleReturnsId.TextEdit.KeyDown += new KeyEventHandler(OnTextEditKeyDown);
moduleReturnsId.TextEdit.TextChanged += new EventHandler(OnTextEditTextChanged);
@@ -4198,7 +4211,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);
diff --git a/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp2.cs b/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp2.cs
index eb0f691..b9f5f3f 100644
--- a/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp2.cs
+++ b/插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp2.cs
@@ -658,6 +658,9 @@ namespace Lskj.Control.MultiModelLookUp
}
this.SetDefaultValue();
+ //查询
+ if(this.SysModel.CsHasDefultSearch) this.SearchObj.SearchGrid();
+
//单选模式不需要设置下方表中选中行
//if (!SingleChoiceMode) this.SetDefaultValue();
diff --git a/插件库/Lskj.Control/TreeGridControlEx.cs b/插件库/Lskj.Control/TreeGridControlEx.cs
index 8d93005..041a57e 100644
--- a/插件库/Lskj.Control/TreeGridControlEx.cs
+++ b/插件库/Lskj.Control/TreeGridControlEx.cs
@@ -1010,7 +1010,7 @@ namespace Lskj.Control
///
private void InitSelectReturnId(TreeListColumn gridColumn, GridColumnModel model)
{
- FrmModelLookUp modelLookUp = new FrmModelLookUp(model.addModuleld);
+ FrmModelLookUp modelLookUp = new FrmModelLookUp(model.addModuleld, model.IsRadio);
modelLookUp.ValueField = model.ValueMember;
modelLookUp.TextField = model.TextMember;
modelLookUp.SourceSQL = model.SqlSource;
@@ -1051,7 +1051,7 @@ namespace Lskj.Control
///
private void InitSelectReturnIdNew(TreeListColumn gridColumn, GridColumnModel model)
{
- FrmModelLookUp2 modelLookUp = new FrmModelLookUp2(model.addModuleld);
+ FrmModelLookUp2 modelLookUp = new FrmModelLookUp2(model.addModuleld, model.IsRadio);
modelLookUp.ValueField = model.ValueMember;
modelLookUp.TextField = model.TextMember;
modelLookUp.SourceSQL = model.SqlSource;
@@ -2643,16 +2643,8 @@ 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)
- {
- modelLookUp.EditValue = btnEdit.EditValue + "";
- modelLookUp.EditText = string.Empty;
- }
- else
- {
- modelLookUp.EditText = btnEdit.Text;
- modelLookUp.EditValue = string.Empty;
- }
+ modelLookUp.EditText = btnEdit.Text;
+ modelLookUp.EditValue = btnEdit.EditValue + "";
//多选关联单据头
string SourceSQL = modelLookUp.SysModel.MenuSql.Replace("#", "") + model.SplicingConditions;
//单据头关联取值