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);