SVN r312
SVN-Revision: r312
This commit is contained in:
@@ -6769,7 +6769,7 @@ namespace Lskj.Control
|
||||
|
||||
DataTable datatable = new DataTable();
|
||||
|
||||
if (!actStr_list[0].Contains(e.Column.FieldName) && actStr != "")
|
||||
if (actStr != "" && (!actStr_list[0].Contains(e.Column.FieldName) || (this.gridView.OptionsView.ShowAutoFilterRow && e.Column.FilterInfo.Type == ColumnFilterType.AutoFilter)))//
|
||||
{
|
||||
CriteriaOperator criteria_op = this.gridView.ActiveFilterCriteria;
|
||||
GroupOperator group_op = new GroupOperator();
|
||||
@@ -6871,11 +6871,16 @@ namespace Lskj.Control
|
||||
for (int i = 0; i < _Items.Count; i++)
|
||||
{
|
||||
e.CheckedComboBox.Items.Add(_Items[i]);
|
||||
|
||||
}
|
||||
e.CheckedComboBox.HighlightedItemStyle = HighlightStyle.Skinned;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
DataRow[] dataRowArray = filterTable.Select();
|
||||
for (int i = 0; i < e.CheckedComboBox.Items.Count(); i++)
|
||||
{
|
||||
try
|
||||
@@ -6886,7 +6891,7 @@ namespace Lskj.Control
|
||||
FilterItem filterItem = (FilterItem)checkedListBoxItem.Value;
|
||||
string text = filterItem.Text;
|
||||
object value = filterItem.Value;
|
||||
int count = filterTable.Select().Where(n => (n[e.Column.FieldName] + "").Equals(value + "")).Count();
|
||||
int count = dataRowArray.Where(n => (n[e.Column.FieldName] + "").Equals(value + "")).Count();
|
||||
checkedListBoxItem.Description = $"{text} ({count})";
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user