zhaoyushun1999/SunnyUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/yhuse/SunnyUI

Browse Source
This commit is contained in:
Sunny 2022-11-21 14:08:27 +08:00
commit d5c24ecb32
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SunnyUI/Controls/DropItem/UIComboDataGridViewItem.cs
View File

@ -198,6 +198,7 @@ namespace Sunny.UI
dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(48)))), ((int)(((byte)(48)))), ((int)(((byte)(48)))));
this.dataGridView.RowsDefaultCellStyle = dataGridViewCellStyle5;
this.dataGridView.RowTemplate.Height = 25;
this.dataGridView.ScrollBarRectColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
this.dataGridView.SelectedIndex = -1;
this.dataGridView.Size = new System.Drawing.Size(569, 245);
this.dataGridView.TabIndex = 3;
@ -268,7 +269,9 @@ namespace Sunny.UI
this.edtFilter.Size = new System.Drawing.Size(363, 25);
this.edtFilter.TabIndex = 0;
this.edtFilter.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.edtFilter.Watermark = "";
this.edtFilter.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
this.edtFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.edtFilter_KeyDown);
//
// UIComboDataGridViewItem
//
@ -415,5 +418,11 @@ namespace Sunny.UI
btnOK.Focus();
}
}
private void edtFilter_KeyDown(object sender, KeyEventArgs e)
{
if (!Filter1by1 && e.KeyData == Keys.Enter)
btnSearch_Click(null, null);
}
}
}

1
SunnyUI/Controls/UIComboDataGridView.cs
View File

@ -25,6 +25,7 @@
* 2022-09-08: V3.2.3 增加过滤字异常判断
* 2022-11-03: V3.2.6 过滤时删除字符串前面、后面的空格
* 2022-11-18: V3.2.9 增加过滤框输入逐一过滤属性Filter1by1
* 2022-11-18: V3.2.9 过滤框输入增加回车确认
******************************************************************************/
using System;