From c24e84e3558b6a4b9e5a31c1f87078dad94ae961 Mon Sep 17 00:00:00 2001 From: dqb-dev Date: Fri, 2 Oct 2026 11:20:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E9=80=89=E5=9E=8B=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=B8=85=E9=99=A4=E4=B8=8D=E7=94=9F=E6=95=88:=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=8A=B6=E6=80=81=E6=9C=BA=E2=80=94=E2=80=94=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E7=94=9F=E6=95=88=E4=B8=AD(=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=B8=85=E9=99=A4)=E7=82=B9=E5=87=BB=E6=97=A0=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=B8=85=20RowFilter=20=E5=B9=B6=E5=A4=8D=E4=BD=8D?= =?UTF-8?q?=E6=8C=89=E9=92=AE,=E4=B8=8D=E5=86=8D=E8=A2=AB=E6=AE=8B?= =?UTF-8?q?=E7=95=99=E5=85=B3=E9=94=AE=E5=AD=97=E5=B8=A6=E5=81=8F;?= =?UTF-8?q?=E7=A9=BA=E5=85=B3=E9=94=AE=E5=AD=97=E8=B7=AF=E5=BE=84=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E5=8F=8C=E4=BF=9D=E9=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DockWindows/DockWindow3/DockWindow3.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/成套报价软件/DockWindows/DockWindow3/DockWindow3.cs b/成套报价软件/DockWindows/DockWindow3/DockWindow3.cs index 295168d..0ad6d9a 100644 --- a/成套报价软件/DockWindows/DockWindow3/DockWindow3.cs +++ b/成套报价软件/DockWindows/DockWindow3/DockWindow3.cs @@ -28,17 +28,27 @@ namespace 成套报价软件 } /// 筛选/清除:对汇总表(advancedDataGridView1)的 元件名称/规格/图纸规格 - /// 三列任一包含关键字即显示(RowFilter 过滤视图,不动数据源,刷新加载自动重置)。 + /// 三列任一包含关键字即显示(RowFilter 过滤视图,不动数据源,刷新加载自动重置)。 + /// 按钮状态机:Text="清除"(筛选生效中)→点击=无条件清除;Text="筛选"→按关键字筛选,空关键字=清除。 private void button1_筛选_Click(object sender, EventArgs e) { try { var dt = advancedDataGridView1.DataSource as System.Data.DataTable; if (dt == null) return; // 尚未加载数据 + + // ★ 筛选生效中(按钮显示"清除"):点击即无条件清除(关键字保留在框里便于改词再筛) + if (button1.Text == "清除") + { + dt.DefaultView.RowFilter = ""; + button1.Text = "筛选"; + return; + } + string kw = (comboBox1.Text ?? "").Trim(); if (kw.Length == 0) { - dt.DefaultView.RowFilter = ""; + dt.DefaultView.RowFilter = ""; // 空关键字 = 清除(双保险路径) button1.Text = "筛选"; return; }