diff --git a/插件库/Lskj.Control/AutoGridLookUp/AutoGridLookUp.cs b/插件库/Lskj.Control/AutoGridLookUp/AutoGridLookUp.cs
index f7b2e24..13eff58 100644
--- a/插件库/Lskj.Control/AutoGridLookUp/AutoGridLookUp.cs
+++ b/插件库/Lskj.Control/AutoGridLookUp/AutoGridLookUp.cs
@@ -24,6 +24,11 @@ namespace Lskj.Control
{
public partial class AutoGridLookUp : TextEdit
{
+
+ ///
+ /// 只查询名称
+ ///
+ public bool OnlyQueryName = false;
///
/// 是否能直接弹出框
///
@@ -311,7 +316,7 @@ namespace Lskj.Control
public void ShowPopup()
{
if (!this.Properties.ReadOnly && this.Enabled && !this.IsShowPopup && this.ContainsFocus)
- {
+ {
if (AutoShowPopup && this._popup != null)
{
this.IsShowPopup = true;
@@ -529,11 +534,22 @@ namespace Lskj.Control
{
string sql = "select top 500 * from ({0}) temp where {1} like '%{3}%' or {2} like '%{3}%' ";
sqlValue = string.Format(sql + remarkCond + AddConditions, replace ? SourceSQL.Replace("#", "") : SourceSQL, ValueField, TextMember, (searchText + "").Replace("[", "[[]"));
+ if (OnlyQueryName)
+ {
+ sql = "select top 500 * from ({0}) temp where {1} like '%{2}%' ";
+ sqlValue = string.Format(sql + remarkCond + AddConditions, replace ? SourceSQL.Replace("#", "") : SourceSQL, TextMember, (searchText + "").Replace("[", "[[]"));
+ }
}
else
{
string sql = "select top 500 * from ({0}) temp where {1} like '%{3}%' or {2} like '%{3}%' or dbo.P_getpy({2}) like '%{3}%' ";
sqlValue = string.Format(sql + remarkCond + AddConditions, replace ? SourceSQL.Replace("#", "") : SourceSQL, ValueField, TextMember, (searchText + "").Replace("[", "[[]"));
+
+ if (OnlyQueryName)
+ {
+ sql = "select top 500 * from ({0}) temp where {1} like '%{2}%' or dbo.P_getpy({1}) like '%{2}%' ";
+ sqlValue = string.Format(sql + remarkCond + AddConditions, replace ? SourceSQL.Replace("#", "") : SourceSQL, TextMember, (searchText + "").Replace("[", "[[]"));
+ }
}
if (Model != null && !string.IsNullOrEmpty(Model.AddOrderByCond))
{
@@ -1454,12 +1470,23 @@ namespace Lskj.Control
{
string sql = "select top 500 * from ({0}) temp where {1} like '%{3}%' or {2} like '%{3}%' ";
sqlValue = string.Format(sql + remarkCond + AddConditions, SourceSQL, ValueField, TextMember, (searchText + "").Replace("[", "[[]"));
+ if (OnlyQueryName)
+ {
+ sql = "select top 500 * from ({0}) temp where {1} like '%{2}%' ";
+ sqlValue = string.Format(sql + remarkCond + AddConditions, SourceSQL, TextMember, (searchText + "").Replace("[", "[[]"));
+ }
}
else
{
string sql = "select top 500 * from ({0}) temp where {1} like '%{3}%' or {2} like '%{3}%' or dbo.P_getpy({2}) like '%{3}%' ";
sqlValue = string.Format(sql + remarkCond + AddConditions, SourceSQL, ValueField, TextMember, (searchText + "").Replace("[", "[[]"));
+ if (OnlyQueryName)
+ {
+ sql = "select top 500 * from ({0}) temp where {1} like '%{2}%' or dbo.P_getpy({1}) like '%{2}%' ";
+ sqlValue = string.Format(sql + remarkCond + AddConditions,SourceSQL, TextMember, (searchText + "").Replace("[", "[[]"));
+ }
+
}
if (Model != null && !string.IsNullOrEmpty(Model.AddOrderByCond))
{
diff --git a/插件库/Lskj.Control/BlinkBrowser.cs b/插件库/Lskj.Control/BlinkBrowser.cs
index 4df704c..f9c06b2 100644
--- a/插件库/Lskj.Control/BlinkBrowser.cs
+++ b/插件库/Lskj.Control/BlinkBrowser.cs
@@ -717,32 +717,38 @@ namespace Lskj.MiniBlink
}
protected override void OnMouseUp(MouseEventArgs e)
{
- base.OnMouseUp(e);
- uint msg = 0;
- if (e.Button == MouseButtons.Left)
+ try
{
- msg = (uint)wkeMouseMessage.WKE_MSG_LBUTTONUP;
- }
- else if (e.Button == MouseButtons.Middle)
- {
- msg = (uint)wkeMouseMessage.WKE_MSG_MBUTTONUP;
- }
- else if (e.Button == MouseButtons.Right)
- {
- msg = (uint)wkeMouseMessage.WKE_MSG_RBUTTONUP;
- }
- uint flags = GetMouseFlags(e);
- if (handle != IntPtr.Zero)
- {
- if (!(e.Button == MouseButtons.Right && SystemInfo.Instance.BrowserRight))
+ base.OnMouseUp(e);
+ uint msg = 0;
+ if (e.Button == MouseButtons.Left)
{
- BlinkBrowserPInvoke.wkeFireMouseEvent(handle, msg, e.X, e.Y, flags);
+ msg = (uint)wkeMouseMessage.WKE_MSG_LBUTTONUP;
}
+ else if (e.Button == MouseButtons.Middle)
+ {
+ msg = (uint)wkeMouseMessage.WKE_MSG_MBUTTONUP;
+ }
+ else if (e.Button == MouseButtons.Right)
+ {
+ msg = (uint)wkeMouseMessage.WKE_MSG_RBUTTONUP;
+ }
+ uint flags = GetMouseFlags(e);
+ if (handle != IntPtr.Zero)
+ {
+ if (!(e.Button == MouseButtons.Right && SystemInfo.Instance.BrowserRight))
+ {
+ BlinkBrowserPInvoke.wkeFireMouseEvent(handle, msg, e.X, e.Y, flags);
+ }
- //if (e.Button == MouseButtons.Right)
- //{
- // EwePInvoke.wkeFireContextMenuEvent(handle, e.X, e.Y, flags);
- //}
+ //if (e.Button == MouseButtons.Right)
+ //{
+ // EwePInvoke.wkeFireContextMenuEvent(handle, e.X, e.Y, flags);
+ //}
+ }
+ }
+ catch (Exception)
+ {
}
}
protected override void OnMouseMove(MouseEventArgs e)
@@ -1048,7 +1054,7 @@ namespace Lskj.MiniBlink
{
var _cookie = listCookie[0];
- Lable:
+ Lable:
if (_cookie == host)
{
sbCookie.AppendFormat("{0}={1};", listCookie[5], listCookie[6]);
diff --git a/插件库/Lskj.Control/FrmExport.cs b/插件库/Lskj.Control/FrmExport.cs
index 1199668..4dc775f 100644
--- a/插件库/Lskj.Control/FrmExport.cs
+++ b/插件库/Lskj.Control/FrmExport.cs
@@ -133,9 +133,10 @@ namespace Lskj.Control
hasBoolean = true;
}
GridColumnModel model = col.Tag as GridColumnModel;
- if (model != null && (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew || model.FieldType == ControlType.LabTreeLookValue || model.FieldType == ControlType.LabMultiSelectValueParam || model.FieldType == ControlType.LabSelectReturnId))
+ if (model != null && (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew || model.FieldType == ControlType.LabTreeLookValue || model.FieldType == ControlType.LabMultiSelectValueParam || model.FieldType == ControlType.LabSelectReturnId|| (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)))
{
StoreValueList.Add(col.FieldName);
+ hasBoolean = true;
}
}
@@ -453,10 +454,11 @@ namespace Lskj.Control
hasBoolean = true;
}
GridColumnModel model = col.Tag as GridColumnModel;
-
- if (model != null && (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew || model.FieldType == ControlType.LabTreeLookValue || model.FieldType == ControlType.LabMultiSelectValueParam || model.FieldType == ControlType.LabSelectReturnId))
+
+ if (model != null && (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew || model.FieldType == ControlType.LabTreeLookValue || model.FieldType == ControlType.LabMultiSelectValueParam || model.FieldType == ControlType.LabSelectReturnId|| (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)))
{
StoreValueList.Add(col.FieldName);
+ hasBoolean = true;
}
}
@@ -618,9 +620,11 @@ namespace Lskj.Control
if (gridColumn.Tag is GridColumnModel)
{
GridColumnModel model = gridColumn.Tag as GridColumnModel;
- //|| model.FieldType == ControlType.LabSelectReturnId
+
if ((model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew ||
- model.FieldType == ControlType.LabMultiSelectValueParam ) && row[col.ColumnName].ToString().Contains(","))
+ model.FieldType == ControlType.LabMultiSelectValueParam) && row[col.ColumnName].ToString().Contains(",") ||
+ (model.FieldType == ControlType.LabSelectReturnId && !model.IsRadio) ||
+ (model.FieldType == ControlType.LabSelectReturnIdNew && !model.IsRadio && model.ModuleFrameDisplayText))
{
string[] cellText = row[col.ColumnName].ToString().Split(',');
fieldValue = string.Empty;
@@ -746,6 +750,7 @@ namespace Lskj.Control
{
for (int i = 1; i < this.gridView1.Columns.Count; i++)
{
+
string columnName = this.gridView1.Columns[i].FieldName;
GridSummaryItem gsi = gridView.Columns[columnName].SummaryItem;
if (gsi.SummaryType != DevExpress.Data.SummaryItemType.None) //gsi.SummaryValue!=null&& !string.IsNullOrEmpty(gsi.SummaryValue.ToString())
@@ -764,6 +769,8 @@ namespace Lskj.Control
}
}
+
+
}
}
}
@@ -967,15 +974,15 @@ namespace Lskj.Control
ValueGridColumnTable.Add(model, translationDict);
}
- }
- else if (model.FieldType == ControlType.LabSelectReturnId)
+ }
+ else if (model.FieldType == ControlType.LabSelectReturnId|| (model.FieldType == ControlType.LabSelectReturnIdNew&& model.ModuleFrameDisplayText))
{
- string sqlValue = model.SqlSource;
- if (model.IsRadio&& !string.IsNullOrWhiteSpace(model.addModuleld))
+ string sqlValue = model.SqlSource;
+ if ((model.IsRadio && !string.IsNullOrWhiteSpace(model.addModuleld))|| model.FieldType == ControlType.LabSelectReturnIdNew)
{
- //单选模式数据源为模块sql
+ //单选模式数据源为模块sql 新版模块选中返回id固定位模块sql
DataRow modelRow = Business.Impl.MainImpl.GetSystemdllTab(model.addModuleld);
- sqlValue = modelRow["SQL"]+"";
+ sqlValue = modelRow["SQL"] + "";
}
DataTable dataTable = Business.Impl.BaseImpl.GetDataTableResult(sqlValue);
Dictionary translationDict = new Dictionary();
diff --git a/插件库/Lskj.Control/FrmImport.cs b/插件库/Lskj.Control/FrmImport.cs
index 94b781e..14cb949 100644
--- a/插件库/Lskj.Control/FrmImport.cs
+++ b/插件库/Lskj.Control/FrmImport.cs
@@ -277,15 +277,16 @@ namespace Lskj.Control
model.FieldType == ControlType.LabMultiSelectValueNew||
model.FieldType == ControlType.LabMultiSelectValueParam ||
model.FieldType == ControlType.LabAutoGridValue||
- model.FieldType == ControlType.LabSelectReturnId
+ model.FieldType == ControlType.LabSelectReturnId||
+ (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
)
{
string sqlValue = model.SqlSource;
- if (model.FieldType == ControlType.LabSelectReturnId)
+ if (model.FieldType == ControlType.LabSelectReturnId|| (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText))
{
- if (model.IsRadio && !string.IsNullOrWhiteSpace(model.addModuleld))
+ if ((model.IsRadio && !string.IsNullOrWhiteSpace(model.addModuleld))|| model.FieldType == ControlType.LabSelectReturnIdNew)
{
- //单选模式数据源为模块sql
+ //单选模式数据源为模块sql 新版模块选中返回id固定位模块sql
DataRow modelRow = Business.Impl.MainImpl.GetSystemdllTab(model.addModuleld);
sqlValue = modelRow["SQL"] + "";
}
@@ -326,7 +327,9 @@ namespace Lskj.Control
{
string selWhere = "1=1";
DataTable table = this.ValueGridColumnTable[model];
- if (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew || model.FieldType == ControlType.LabMultiSelectValueParam)
+ if (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew || model.FieldType == ControlType.LabMultiSelectValueParam
+ ||(model.FieldType == ControlType.LabSelectReturnId && !model.IsRadio)
+ ||(model.FieldType == ControlType.LabSelectReturnIdNew && !model.IsRadio && model.ModuleFrameDisplayText))
{
string[] splitString = text.Split(',');
string nemValue = string.Empty;
@@ -480,7 +483,8 @@ namespace Lskj.Control
model.FieldType == ControlType.LabMultiSelectValue ||
model.FieldType == ControlType.LabMultiSelectValueParam ||
model.FieldType == ControlType.LabAutoGridValue||
- model.FieldType == ControlType.LabSelectReturnId
+ model.FieldType == ControlType.LabSelectReturnId||
+ (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
))
{
string fieldValue = GetValueByImportText(dr, gc.FieldName, dr[gc.FieldName] + "");
diff --git a/插件库/Lskj.Control/Model/GridExtend.cs b/插件库/Lskj.Control/Model/GridExtend.cs
index 3de1fa3..3d1fceb 100644
--- a/插件库/Lskj.Control/Model/GridExtend.cs
+++ b/插件库/Lskj.Control/Model/GridExtend.cs
@@ -1964,7 +1964,9 @@ namespace Lskj.Control.Model
string selWhere = "1=1";
DataTable table = ValueGridColumnTable[model];
- if (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew || model.FieldType == ControlType.LabMultiSelectValueParam)
+ if (model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew || model.FieldType == ControlType.LabMultiSelectValueParam
+ || (model.FieldType == ControlType.LabSelectReturnId && !model.IsRadio)
+ || (model.FieldType == ControlType.LabSelectReturnIdNew && !model.IsRadio && model.ModuleFrameDisplayText))
{
string[] splitString = text.Split(',');
string nemValue = string.Empty;
@@ -2181,7 +2183,7 @@ namespace Lskj.Control.Model
model.FieldType == ControlType.LabDateTime ||
model.FieldType == ControlType.LabDateTimeShort ||
model.FieldType == ControlType.LabTime ||
- model.FieldType == ControlType.LabShortTime)&& (cell == null || cell.CellType == CellType.Blank||string.IsNullOrWhiteSpace(cell+"")))
+ model.FieldType == ControlType.LabShortTime)&& (cell == null&&cell.StringCellValue!=null && cell.CellType == CellType.Blank && string.IsNullOrWhiteSpace(cell+"")))
{
//日期框如果值是空，就直接跳过。赋空值（""）会报错
continue;
@@ -2240,20 +2242,21 @@ namespace Lskj.Control.Model
|| model.FieldType == ControlType.LabAutoGridValue
|| model.FieldType == ControlType.LabAutoGridValueParam
|| model.FieldType == ControlType.LabSelectReturnId
+ ||(model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
))
{
bool isEmpty = model.CanNull;
string fieldValue = GetValueByImportText(dataRow, col.FieldName, cell + "", isBillImport);
- if ((model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew ||
- model.FieldType == ControlType.LabMultiSelectValueParam) && cell.ToString().Contains(","))
- {
- string[] cellText = cell.ToString().Split(',');
- foreach (string cellValue in cellText)
- {
- fieldValue += GetValueByImportText(dataRow, col.FieldName, cellValue, isBillImport) + ',';
- }
- fieldValue = fieldValue.TrimEnd(',');
- }
+ // if ((model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew ||
+ //model.FieldType == ControlType.LabMultiSelectValueParam) && cell.ToString().Contains(","))
+ // {
+ // string[] cellText = cell.ToString().Split(',');
+ // foreach (string cellValue in cellText)
+ // {
+ // fieldValue += GetValueByImportText(dataRow, col.FieldName, cellValue, isBillImport) + ',';
+ // }
+ // fieldValue = fieldValue.TrimEnd(',');
+ // }
if (string.IsNullOrEmpty(fieldValue))
{
if (isEmpty)
@@ -2585,20 +2588,21 @@ namespace Lskj.Control.Model
|| model.FieldType == ControlType.LabAutoGridValue
|| model.FieldType == ControlType.LabAutoGridValueParam
|| model.FieldType == ControlType.LabSelectReturnId
+ || (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
))
{
bool isEmpty = model.CanNull;
string fieldValue = GetValueByImportText(dataRow, col.FieldName, cell + "", isBillImport);
- if ((model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew ||
- model.FieldType == ControlType.LabMultiSelectValueParam) && cell.ToString().Contains(","))
- {
- string[] cellText = cell.ToString().Split(',');
- foreach (string cellValue in cellText)
- {
- fieldValue += GetValueByImportText(dataRow, col.FieldName, cellValue, isBillImport) + ',';
- }
- fieldValue = fieldValue.TrimEnd(',');
- }
+ // if ((model.FieldType == ControlType.LabMultiSelectValue || model.FieldType == ControlType.LabMultiSelectValueNew ||
+ //model.FieldType == ControlType.LabMultiSelectValueParam) && cell.ToString().Contains(","))
+ // {
+ // string[] cellText = cell.ToString().Split(',');
+ // foreach (string cellValue in cellText)
+ // {
+ // fieldValue += GetValueByImportText(dataRow, col.FieldName, cellValue, isBillImport) + ',';
+ // }
+ // fieldValue = fieldValue.TrimEnd(',');
+ // }
if (string.IsNullOrEmpty(fieldValue))
{
if (isEmpty)
@@ -3009,7 +3013,8 @@ namespace Lskj.Control.Model
model.FieldType == ControlType.LabMultiSelectValue ||
model.FieldType == ControlType.LabMultiSelectValueParam ||
model.FieldType == ControlType.LabAutoGridValue ||
- model.FieldType == ControlType.LabSelectReturnId
+ model.FieldType == ControlType.LabSelectReturnId||
+ (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
))
{
string fieldValue = GetValueByImportText(dr, gc.FieldName, dr[gc.FieldName] + "");
@@ -3417,14 +3422,15 @@ namespace Lskj.Control.Model
|| model.FieldType == ControlType.LabAutoGridValue
|| model.FieldType == ControlType.LabAutoGridValueParam
|| model.FieldType == ControlType.LabSelectReturnId
+ || (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
)
{
string sqlValue = model.SqlSource;
- if (model.FieldType == ControlType.LabSelectReturnId)
+ if (model.FieldType == ControlType.LabSelectReturnId || model.FieldType == ControlType.LabSelectReturnIdNew)
{
- if (model.IsRadio && !string.IsNullOrWhiteSpace(model.addModuleld))
+ if ((model.IsRadio && !string.IsNullOrWhiteSpace(model.addModuleld)) ||model.FieldType == ControlType.LabSelectReturnIdNew)
{
- //单选模式数据源为模块sql
+ //单选模式数据源为模块sql 新版模块选中返回id固定位模块sql
DataRow modelRow = Business.Impl.MainImpl.GetSystemdllTab(model.addModuleld);
sqlValue = modelRow["SQL"] + "";
}
@@ -3491,9 +3497,21 @@ namespace Lskj.Control.Model
|| model.FieldType == ControlType.LabAutoGridValue
|| model.FieldType == ControlType.LabAutoGridValueParam
|| model.FieldType == ControlType.LabSelectReturnId
+ || (model.FieldType == ControlType.LabSelectReturnIdNew && model.ModuleFrameDisplayText)
)
{
string sqlValue = model.SqlSource;
+
+ if (model.FieldType == ControlType.LabSelectReturnId || model.FieldType == ControlType.LabSelectReturnIdNew)
+ {
+ if ((model.IsRadio && !string.IsNullOrWhiteSpace(model.addModuleld)) || model.FieldType == ControlType.LabSelectReturnIdNew)
+ {
+ //单选模式数据源为模块sql 新版模块选中返回id固定位模块sql
+ DataRow modelRow = Business.Impl.MainImpl.GetSystemdllTab(model.addModuleld);
+ sqlValue = modelRow["SQL"] + "";
+ }
+ }
+
if (sqlValue.Contains(" #"))
{
//sqlValue = sqlValue.Replace("#", "");
diff --git a/插件库/Lskj.Control/TreeGridControlEx.cs b/插件库/Lskj.Control/TreeGridControlEx.cs
index 90b0eff..c7bddf8 100644
--- a/插件库/Lskj.Control/TreeGridControlEx.cs
+++ b/插件库/Lskj.Control/TreeGridControlEx.cs
@@ -93,7 +93,6 @@ namespace Lskj.Control
this.TreeListObj.CustomDrawNodeIndicator += TreeListObj_CustomDrawNodeIndicator;//显示行号
this.gcMain.CellValueChanged += GcMain_CellValueChanged;
this.gcMain.NodesReloaded += OnNodesReloaded;
-
this.gcMain.ColumnFilterChanged += TreeList1_ColumnFilterChanged;
@@ -1134,6 +1133,12 @@ namespace Lskj.Control
btnEdit.SeparatorChar = ',';
btnEdit.ValueMember = model.FieldType == ControlType.LabSelectReturnIdNew ? model.ValueMember : model.TextMember;
//btnEdit.DataSource = MainImpl.GetDataTableResult(model.SqlSource);
+ if (model.ModuleFrameDisplayText)
+ {
+ DataTable dataTable = MainImpl.GetDataTableResult(modelLookUp.SysModel.MenuSql);
+ btnEdit.DataSource = dataTable;
+ }
+
btnEdit.Buttons[0].Visible = false; // 不能移除,移除后事件不起作用.
btnEdit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Ellipsis) });