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

SVN r260

Browse Source 
SVN-Revision: r260
This commit is contained in:
cyf
2025-02-10 03:22:35 +00:00
parent 2d55f472c0
commit 9cfb9ec919
6 changed files with 78 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/GridControlEx.cs
+19 -22
View File
@@ -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)
{
插件库/Lskj.Control/LabelMultiAutoTextEdit2.cs
+33 -7
View File
@@ -77,6 +77,14 @@ namespace Lskj.Control
/// </summary>
/// <value>The Union ModuleCodel.</value>
public string UnionModuleCodel;
/// <summary>
///模块选择返回框，是否单选模式
/// </summary>
public bool IsRadio { get; set; }
/// <summary>
///模块选择返回框，配置列加载模式（默认根据sql动态加载列）
/// </summary>
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();
}
}
/// <summary>
/// <para>说明：初始化弹出框</para>
/// <para>创建人：龚宇超</para>
/// <para>创建日期：2017-08-08 </para>
/// <para>修改人：</para>
/// <para>修改日期：</para>
/// <para>修改备注：</para>
/// <para>版本：1.0</para>
/// </summary>
/// <param name="dataSource">数据源</param>
///
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;
}
/// <summary>
/// <para>说明：设置数据源</para>
/// <para>创建人：龚宇超</para>
@@ -276,13 +306,9 @@ namespace Lskj.Control
/// <param name="dataSource">数据源</param>
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;
}
/// <summary>
/// <para>说明：清空选中的值</para>
/// <para>创建人：龚宇超</para>
插件库/Lskj.Control/LabelMultiAutoTextEdit4.cs
+3 -1
View File
@@ -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
_lookUpForm.InitControls(UnionModuleCodel);
Di
插件库/Lskj.Control/Model/MyControl.cs
+16 -3
View File
@@ -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);
插件库/Lskj.Control/MultiModelLookUp/FrmModelLookUp2.cs
+3
View File
@@ -658,6 +658,9 @@ namespace Lskj.Control.MultiModelLookUp
}
this.SetDefaultValue();
//查询
if(this.SysModel.CsHasDefultSearch) this.SearchObj.SearchGrid();
//单选模式不需要设置下方表中选中行
//if (!SingleChoiceMode) this.SetDefaultValue();
插件库/Lskj.Control/TreeGridControlEx.cs
+4 -12
View File
@@ -1010,7 +1010,7 @@ namespace Lskj.Control
/// </summary>
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
/// </summary>
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;
//单据头关联取值