From f6e32625e288056a7fd7d577385e7d6703644b0b Mon Sep 17 00:00:00 2001
From: cyf <cyf@local>
Date: Wed, 12 Mar 2025 01:45:13 +0000
Subject: [PATCH] SVN r312

SVN-Revision: r312
---
 插件库/Lskj.Control/GridControlEx.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/插件库/Lskj.Control/GridControlEx.cs b/插件库/Lskj.Control/GridControlEx.cs
index 451abdd..1559a2c 100644
--- a/插件库/Lskj.Control/GridControlEx.cs
+++ b/插件库/Lskj.Control/GridControlEx.cs
@@ -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})";
                         }
                     }