From daec2b268c3ed6d9ebec7e8c58a4437ca39dd1d1 Mon Sep 17 00:00:00 2001
From: jpf6592746 <hhu.jpf@foxmail.com>
Date: Tue, 11 Jan 2022 15:46:32 +0800
Subject: [PATCH] =?UTF-8?q?UIComboDataGridView=E7=9B=AE=E5=89=8D=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4selectedIndex=3D-1,=E4=BF=AE=E6=94=B9:=E5=A6=82?=
 =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=E8=AE=BE=E7=BD=AEselectedIndex=3D0,?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=B8=85=E9=99=A4=E6=8C=89=E9=92=AE=E5=90=8E?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA-1=E5=B9=B6=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DropItem/UIComboDataGridViewItem.cs         | 17 +++++++++++++++++
 SunnyUI/Controls/UIDataGridView.cs              |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs
index 04bf717f..cffe3a44 100644
--- a/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs
+++ b/SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs
@@ -246,14 +246,29 @@ namespace Sunny.UI
             this.Name = "UIComboDataGridViewItem";
             this.Size = new System.Drawing.Size(569, 333);
             this.panel.ResumeLayout(false);
+            this.dataGridView.DataSourceChanged += DataGridView_DataSourceChanged;
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
             this.pFilter.ResumeLayout(false);
             this.ResumeLayout(false);
 
         }
 
+        private void DataGridView_DataSourceChanged(object sender, System.EventArgs e)
+        {
+            if (dataGridView.RowCount > 0)
+            {
+                dataGridView.SelectedIndex = 0;
+            }
+            else
+            {
+                dataGridView.ClearSelection();
+            }
+        }
+
         private void btnOK_Click(object sender, System.EventArgs e)
         {
+            //UIMessageTip.ShowOk(dataGridView.SelectedIndex.ToString(), 3000);
+            //UConsole.WriteConsole("所选行:"+dataGridView.SelectedIndex.ToString(),e,sender);
             if (dataGridView.RowCount > 0 && dataGridView.SelectedIndex >= 0)
             {
                 if (ShowFilter)
@@ -315,6 +330,8 @@ namespace Sunny.UI
         {
             edtFilter.Text = "";
             btnSearch.PerformClick();
+            dataGridView.SelectedIndex = -1;
+            dataGridView.ClearSelection();
             DoValueChanged(this, null);
         }
 
diff --git a/SunnyUI/Controls/UIDataGridView.cs b/SunnyUI/Controls/UIDataGridView.cs
index 73a7e342..11e0d802 100644
--- a/SunnyUI/Controls/UIDataGridView.cs
+++ b/SunnyUI/Controls/UIDataGridView.cs
@@ -627,7 +627,7 @@ namespace Sunny.UI
         {
             base.OnDataSourceChanged(e);
             SetScrollInfo();
-            selectedIndex = -1;
+            //selectedIndex = -1;
         }
 
         public delegate void OnSelectIndexChange(object sender, int index);