Merge pull request kwwwvagaa#4 from kwwwvagaa/master

同步

HZH_Controls/HZH_Controls/Controls/Checkbox/UCCheckBox.cs

@@ -78,6 +78,7 @@ public override Font Font
             get { return _ForeColor; }
             set
             {
+                base.ForeColor = value;
                 label1.ForeColor = value;
                 _ForeColor = value;
             }

HZH_Controls/HZH_Controls/Controls/ComboBox/UCComboxGridPanel.cs

@@ -93,23 +93,20 @@ public List<object> DataSource
         /// The string last search text
         /// </summary>
         private string strLastSearchText = string.Empty;
-        /// <summary>
-        /// The m page
-        /// </summary>
-        UCPagerControl m_page = new UCPagerControl();
-
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UCComboxGridPanel" /> class.
         /// </summary>
         public UCComboxGridPanel()
         {
             InitializeComponent();
-            this.ucDataGridView1.Page = m_page;
-            this.ucDataGridView1.IsCloseAutoHeight = false;
             this.txtSearch.txtInput.TextChanged += txtInput_TextChanged;
             this.ucDataGridView1.ItemClick += ucDataGridView1_ItemClick;
+            m_page.ShowSourceChanged += m_page_ShowSourceChanged;
         }
 
+
+
         /// <summary>
         /// Handles the ItemClick event of the ucDataGridView1 control.
         /// </summary>
@@ -172,7 +169,7 @@ private void Search(string strText)
             m_page.StartIndex = 0;
             if (!string.IsNullOrEmpty(strText))
             {
-                strText = strText.ToLower();
+                strText = strText.ToLower().Trim();
                 List<object> lst = m_dataSource.FindAll(p => m_columns.Any(c => (c.Format == null ? (p.GetType().GetProperty(c.DataField).GetValue(p, null).ToStringExt()) : c.Format(p.GetType().GetProperty(c.DataField).GetValue(p, null))).ToLower().Contains(strText)));
                 m_page.DataSource = lst;
             }
@@ -182,5 +179,10 @@ private void Search(string strText)
             }
             m_page.Reload();
         }
+
+        void m_page_ShowSourceChanged(object currentSource)
+        {
+            this.ucDataGridView1.DataSource = currentSource;
+        }
     }
 }

HZH_Controls/HZH_Controls/Controls/DataGridView/DataGridViewColumnEntity.cs

@@ -60,5 +60,23 @@ public class DataGridViewColumnEntity
         /// </summary>
         /// <value>The text align.</value>
         public ContentAlignment TextAlign { get { return _TextAlign; } set { _TextAlign = value; } }
+        /// <summary>
+        /// 自定义的单元格控件，一个实现IDataGridViewCustomCell的Control
+        /// </summary>
+        /// <value>The custom cell.</value>
+        private Type customCellType = null;
+        public Type CustomCellType
+        {
+            get
+            {
+                return customCellType;
+            }
+            set
+            {
+                if (!typeof(IDataGridViewCustomCell).IsAssignableFrom(value) || !value.IsSubclassOf(typeof(System.Windows.Forms.Control)))
+                    throw new Exception("行控件没有实现IDataGridViewCustomCell接口");
+                customCellType = value;
+            }
+        }
     }
 }

HZH_Controls/HZH_Controls/Controls/DataGridView/IDataGridViewCustomCell.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace HZH_Controls.Controls
+{
+    public interface IDataGridViewCustomCell
+    {
+        /// <summary>
+        /// 绑定行关联的数据
+        /// </summary>
+        /// <param name="obj">The object.</param>
+        void SetBindSource(object obj);
+    }
+}