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

SVN r244

Browse Source 
SVN-Revision: r244
This commit is contained in:
tdx
2025-02-06 09:42:41 +00:00
parent 0f6df2b07b
commit 35190a7db5
2 changed files with 27 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/LabelMultiAutoTextEdit2.cs
+19 -48
View File
@@ -7,22 +7,15 @@
* 修改备注：
* 版本：1.0.0.0
******************************/
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Data;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraEditors;
using Lskj.Data;
using Lskj.Control.Model;
using Lskj.Control.MultiGridLookUp;
using Lskj.Business.Impl;
using Lskj.Util;
using Lskj.Control.Model;
using Lskj.Control.MultiModelLookUp;
using System;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Windows.Forms;
namespace Lskj.Control
{
@@ -177,7 +170,7 @@ namespace Lskj.Control
else
{
this.txtEdit.Text = "";
}
}
}
}
/// <summary>
@@ -294,7 +287,7 @@ namespace Lskj.Control
/// </summary>
public void ClearSelectForm()
{
// _lookUpForm.ClearSelect();
// _lookUpForm.ClearSelect();
}
/// <summary>
/// <para>说明：打开界面</para>
@@ -311,16 +304,16 @@ namespace Lskj.Control
{
try
{
//_lookUpForm = new FrmModelLookUp();
//_lookUpForm.ValueField = ValueField;
//_lookUpForm.ValueMember = ValueMember;
//_lookUpForm.TextField = TextField;
//_lookUpForm.SourceSQL = Model.SourceSql;
//_lookUpForm.UnionModuleCodel = UnionModuleCodel;
//_lookUpForm.EditValue = this.EditValue;
//_lookUpForm.IsType = Model.FieldType;
//_lookUpForm.EditText = this.TextEdit.Text;
//_lookUpForm.DataSource = BaseImpl.GetDataTableResult(_lookUpForm.SourceSQL);
//_lookUpForm = new FrmModelLookUp();
//_lookUpForm.ValueField = ValueField;
//_lookUpForm.ValueMember = ValueMember;
//_lookUpForm.TextField = TextField;
//_lookUpForm.SourceSQL = Model.SourceSql;
//_lookUpForm.UnionModuleCodel = UnionModuleCodel;
//_lookUpForm.EditValue = this.EditValue;
//_lookUpForm.IsType = Model.FieldType;
//_lookUpForm.EditText = this.TextEdit.Text;
//_lookUpForm.DataSource = BaseImpl.GetDataTableResult(_lookUpForm.SourceSQL);
if (_lookUpForm != null)
{
if (_lookUpForm != null)
@@ -338,26 +331,4 @@ namespace Lskj.Control
_lookUpForm.SourceSQL = sqlValue;
//_lookUpForm.DataSource = MainImpl.GetDataTableResult(sqlValue);
}
_lookUpForm.InitControls(UnionModuleCodel);
DialogResult result = _lookUpForm.ShowDialog();
if (result == DialogResult.OK)
{
string value = Model.FieldType == ControlType.LabSelectReturnId ? _lookUpForm.EditValue : _lookUpForm.EditText;
this.EditValue = value;
this.TextEdit.Text = _lookUpForm.EditText;
}
}
}
catch (Exception ex)
{
string Message = ErrorMessage.PromptErrorMessage(ex);
MessageUtil.Show(Message,ex.Message);
}
}
}
}
_lo
插件库/Lskj.Control/Model/GridColumnModel.cs
+8 -12
View File
@@ -56,7 +56,7 @@ namespace Lskj.Control.Model
private bool _frozenFlag;
private int _lookUpWidth;
private string _lookUpFieldsWidth;
#endregion
#region public properties
@@ -243,7 +243,11 @@ namespace Lskj.Control.Model
/// </summary>
/// <value>The fix column.</value>
public int IsFixColumn { get { return this._isFixColumn; } }
/// <summary>
/// 模块返回列
/// </summary>
/// <value>The fix column.</value>
public string addModuleResult { get; set; }
/// <summary>
/// 模块id
/// </summary>
@@ -378,6 +382,7 @@ namespace Lskj.Control.Model
this.DisableType = item.Table.Columns.Contains("DisableType") ? item["DisableType"] + "" : string.Empty;
}
this.addModuleResult = item.Table.Columns.Contains("addModuleResult") ? item["addModuleResult"] + "" : string.Empty;
this.addModuleld = item.Table.Columns.Contains("addModuleId") ? item["addModuleId"] + "" : string.Empty;
this.unionCompare = item.Table.Columns.Contains("UnionCompare") ? item["UnionCompare"] + "" : string.Empty;
this.isExportColumns = item.Table.Columns.Contains("isExportColumns") && !string.IsNullOrWhiteSpace(item["isExportColumns"] + "") ? "1".Equals(item["isExportColumns"] + "") : false;
@@ -391,13 +396,4 @@ namespace Lskj.Control.Model
this._treeCheckModel = item.Table.Columns.Contains("treeCheckModel") ? item["treeCheckModel"] + "" : "";
this.IsRadio = item.Table.Columns.Contains("IsRadio") && !string.IsNullOrWhiteSpace(item["IsRadio"] + "") ? "1".Equals(item["IsRadio"] + "") : false;
this.SearchBoxAddition = item.Table.Columns.Contains("SearchBoxAddition") && !string.IsNullOrWhiteSpace(item["SearchBoxAddition"] + "") ? "1".Equals(item["SearchBoxAddition"] + "") : false;
this.RepeatedVerification = item.Table.Columns.Contains("RepeatedVerification") && !string.IsNullOrWhiteSpace(item["RepeatedVerification"] + "") ? "1".Equals(item["RepeatedVerification"] + "") : false;
this.SelectionConditions = item.Table.Columns.Contains("SelectionConditions") ? item["SelectionConditions"] + "" : string.Empty;
this._frozenFlag = item.Table.Columns.Contains("frozenFlag") && ("1".Equals(item["frozenFlag"] + "") || "True".Equals(item["frozenFlag"] + ""));
this._lookUpWidth = item.Table.Columns.Contains("LookUpWidth") ? int.TryParse(item["LookUpWidth"] + "", out int lookUpWidth) ? lookUpWidth : 0 : 0;
this._lookUpFieldsWidth = item.Table.Columns.Contains("LookUpFieldsWidth") ? item["LookUpFieldsWidth"] + "" : "";
this.isDynamic = item.Table.Columns.Contains("isDynamic") && !string.IsNullOrWhiteSpace(item["isDynamic"] + "") ? "1".Equals(item["isDynamic"] + "") : false;
this.ConfigureColumnMode = item.Table.Columns.Contains("ConfigureColumnMode") && !string.IsNullOrWhiteSpace(item["ConfigureColumnMode"] + "") ? "1".Equals(item["ConfigureColumnMode"] + "") : false;
}
}
}
this.RepeatedVerification = item.Table.Columns.Contains("RepeatedVerification") && !string.IsNullOrWhiteSpace(item["RepeatedVerification"] + "") ? "1".Equals(item["Repeat