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

SVN r610

Browse Source 
SVN-Revision: r610
This commit is contained in:
cyf
2025-05-21 03:43:09 +00:00
parent 9d06e8fcf4
commit ad7c540610
1 changed files with 70 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.Control/GridControlEx.cs
+70 -8
View File
@@ -885,7 +885,7 @@ namespace Lskj.Control
case ControlType.LabMultiComTreeboxTextParam:
InitAutoTreeSearchEdit(column, model, true, true);
break;
case ControlType.LabTreeLastlevelValue:
case ControlType.LabTreeLastlevelText:
case ControlType.LabCheckTreeLastlevelValue:
@@ -3571,7 +3571,7 @@ namespace Lskj.Control
PubTreeLookUp _popup = new PubTreeLookUp();
//_popup.LookUp = gridColumn;
//_popup.ValueMember = ControlType.LabTreeLookValue == model.FieldType || ControlType.LabCheckTreeLookValue == model.FieldType || ControlType.LabTreeLastlevelValue == model.FieldType || ControlType.LabCheckTreeLastlevelValue == model.FieldType ? model.ValueMember : model.TextMember;
_popup.ValueMember = ControlType.LabMultiComTreeboxValueParam == model.FieldType || ControlType.LabMultiComTreeboxValue == model.FieldType|| ControlType.LabMulitTreeValue == model.FieldType || ControlType.LabMulitTreeValueParam == model.FieldType || ControlType.LabTreeLookValue == model.FieldType || ControlType.LabCheckTreeLookValue == model.FieldType || ControlType.LabTreeLastlevelValue == model.FieldType || ControlType.LabCheckTreeLastlevelValue == model.FieldType ? model.ValueMember : model.TextMember;
_popup.ValueMember = ControlType.LabMultiComTreeboxValueParam == model.FieldType || ControlType.LabMultiComTreeboxValue == model.FieldType || ControlType.LabMulitTreeValue == model.FieldType || ControlType.LabMulitTreeValueParam == model.FieldType || ControlType.LabTreeLookValue == model.FieldType || ControlType.LabCheckTreeLookValue == model.FieldType || ControlType.LabTreeLastlevelValue == model.FieldType || ControlType.LabCheckTreeLastlevelValue == model.FieldType ? model.ValueMember : model.TextMember;
_popup.ValueField = model.ValueMember;
_popup.TextMember = model.TextMember;
_popup.SourceSQL = model.SqlSource;
@@ -3595,7 +3595,7 @@ namespace Lskj.Control
if (!isMulitClick) _popup.TreeViewExObj.OnTreeNodeMouseClick += OnPopupGridMouseClick;
btnEdit.PopupControl.Tag = _popup;
btnEdit.QueryPopUp += OnQueryPopUp;
if (ControlType.LabMultiComTreeboxValueParam == model.FieldType || ControlType.LabMultiComTreeboxValue == model.FieldType||ControlType.LabMulitTreeValue == model.FieldType || ControlType.LabMulitTreeValueParam == model.FieldType || model.FieldType == ControlType.LabTreeLookValue || model.FieldType == ControlType.LabCheckTreeLookValue || ControlType.LabTreeLastlevelValue == model.FieldType || ControlType.LabCheckTreeLastlevelValue == model.FieldType)
if (ControlType.LabMultiComTreeboxValueParam == model.FieldType || ControlType.LabMultiComTreeboxValue == model.FieldType || ControlType.LabMulitTreeValue == model.FieldType || ControlType.LabMulitTreeValueParam == model.FieldType || model.FieldType == ControlType.LabTreeLookValue || model.FieldType == ControlType.LabCheckTreeLookValue || ControlType.LabTreeLastlevelValue == model.FieldType || ControlType.LabCheckTreeLastlevelValue == model.FieldType)
{
btnEdit.QueryDisplayText += OnQueryDisplayText;
}
@@ -7088,7 +7088,7 @@ namespace Lskj.Control
if (e.KeyCode == Keys.Enter)
{
GridColumnModel model = popup.model;
// string ids = popup.TreeViewExObj.GetCheckValues();
// string ids = popup.TreeViewExObj.GetCheckValues();
string ids = popup.isRootNode ? popup.TreeViewExObj.GetCheckValues(true) : popup.TreeViewExObj.GetCheckValues(false);
if (ids != null)
{
@@ -7803,13 +7803,13 @@ namespace Lskj.Control
public void SetColumnName(DataRow dataRow)
{
this.gridView.BeginUpdate();
foreach (GridColumn item in gridView.Columns)
{
GridColumnModel model = item.Tag as GridColumnModel;
if (dataRow.Table.Columns.Contains(model.FieldName))
if (dataRow.Table.Columns.Contains(model.FieldName))
{
item.Caption = dataRow[model.FieldName]+"";
item.Caption = dataRow[model.FieldName] + "";
item.Visible = !string.IsNullOrWhiteSpace(item.Caption);
}
}
@@ -8280,4 +8280,66 @@ namespace Lskj.Control
{
int returnIndex = 0;
isContain = false;
DataRow dragEn
DataRow dragEndRow = sourceTab.Rows[dragEndRowIndex];
if (selectRows.Contains(dragEndRow))
{
isContain = true;
dragEndRowIndex = dragEndRowIndex - 1;
if (dragEndRowIndex >= 0)
{
dragEndRow = sourceTab.Rows[dragEndRowIndex];
if (selectRows.Contains(dragEndRow))
{
bool iscontain = false;
returnIndex = GetDragEndRowIndex(sourceTab, dragEndRowIndex, selectRows, out iscontain);
}
else
{
returnIndex = dragEndRowIndex;
}
}
else
{
returnIndex = -1;
}
}
else
{
returnIndex = dragEndRowIndex;
}
return returnIndex;
}
#endregion
/// <summary>
/// 新建汇总
/// </summary>
/// <param name="dataRow"></param>
public void AddHeadquarters(DataRow dataRow=null)
{
try
{
this.gridControl.BeginUpdate();
foreach (GridColumn gridColumn in this.gridView.Columns)
{
if (gridColumn.Summary.ActiveCount > 0)
{
if (gridColumn.Summary.ActiveCount == 1 && dataRow == null) continue;
GridColumnSummaryItem sumItem = new GridColumnSummaryItem();
if (gridColumn.Summary.ActiveCount == 1)
{
sumItem = gridColumn.Summary[0];
}
else
{
sumItem = gridColumn.Summary[1];
}
//清空所有汇总
gridColumn.Summary.Clear();
//新建汇总
if (dataRow != null)
{