From d15b52d414204fd30fff4495e0f53526728238ec Mon Sep 17 00:00:00 2001 From: Sunny Date: Thu, 8 Sep 2022 13:55:47 +0800 Subject: [PATCH] =?UTF-8?q?*=20UIComboDataGridView:=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=AD=97=E5=BC=82=E5=B8=B8=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs | 11 ++++++++++- SunnyUI/Controls/UIComboDataGridView.cs | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs index b2f2e8c1..33b4a76b 100644 --- a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs +++ b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Data; using System.Windows.Forms; @@ -365,10 +366,18 @@ namespace Sunny.UI filter = string.Join(" or ", strings); } } + filter = filter.Replace("*", "[*]"); if (dataGridView.DataSource is DataTable table) { - table.DefaultView.RowFilter = filter; + try + { + table.DefaultView.RowFilter = filter; + } + catch (Exception ex) + { + UIMessageTip.ShowError(ex.Message); + } } ComboDataGridViewFilterChanged?.Invoke(this, new UIComboDataGridViewArgs(edtFilter.Text, dataGridView.RowCount)); diff --git a/SunnyUI/Controls/UIComboDataGridView.cs b/SunnyUI/Controls/UIComboDataGridView.cs index cb135e2b..349eecc2 100644 --- a/SunnyUI/Controls/UIComboDataGridView.cs +++ b/SunnyUI/Controls/UIComboDataGridView.cs @@ -22,6 +22,7 @@ * 2022-04-16: V3.1.3 增加行多选 * 2022-06-16: V3.2.0 增加下拉框宽度、高度 * 2022-06-19: V3.2.0 增加FilterChanged,输出过滤文字和记录条数 + * 2022-09-08: V3.2.3 增加过滤字异常判断 ******************************************************************************/ using System;