Commit f7b20196 HZH

修改多输入样例的正则表达式

1 个父辈 062d5873
/HZH_Controls/*.suo
/HZH_Controls/HZH_Controls/obj
/HZH_Controls/HZH_Controls/bin
/HZH_Controls/Test/obj
/HZH_Controls/Test/bin
/HZH_Controls/HZH_Controls/*.user
/HZH_Controls/HZH_Controls/*.nupkg
......@@ -62,6 +62,7 @@ namespace HZH_Controls.Forms
/// <param name="isShowMaskDialog">isShowMaskDialog</param>
/// <param name="blnShowClose">blnShowClose</param>
/// <param name="isEnterClose">isEnterClose</param>
/// <param name="deviationSize">大小偏移,当默认大小过大或过小时,可以进行调整(增量)</param>
/// <returns>返回值</returns>
public static DialogResult ShowDialog(
IWin32Window owner,
......@@ -70,17 +71,24 @@ namespace HZH_Controls.Forms
bool blnShowCancel = false,
bool isShowMaskDialog = true,
bool blnShowClose = false,
bool blnIsEnterClose = true)
bool blnIsEnterClose = true,
Size? deviationSize = null)
{
DialogResult result = DialogResult.Cancel;
if (owner == null || (owner is Control && (owner as Control).IsDisposed))
{
result = new FrmDialog(strMessage, strTitle, blnShowCancel, blnShowClose, blnIsEnterClose)
var frm = new FrmDialog(strMessage, strTitle, blnShowCancel, blnShowClose, blnIsEnterClose)
{
StartPosition = FormStartPosition.CenterScreen,
IsShowMaskDialog = isShowMaskDialog,
TopMost = true
}.ShowDialog();
};
if (deviationSize != null)
{
frm.Width += deviationSize.Value.Width;
frm.Height += deviationSize.Value.Height;
}
result = frm.ShowDialog();
}
else
{
......@@ -88,12 +96,18 @@ namespace HZH_Controls.Forms
{
owner = (owner as Control).FindForm();
}
result = new FrmDialog(strMessage, strTitle, blnShowCancel, blnShowClose, blnIsEnterClose)
var frm = new FrmDialog(strMessage, strTitle, blnShowCancel, blnShowClose, blnIsEnterClose)
{
StartPosition = (owner != null) ? FormStartPosition.CenterParent : FormStartPosition.CenterScreen,
IsShowMaskDialog = isShowMaskDialog,
TopMost = true
}.ShowDialog(owner);
};
if (deviationSize != null)
{
frm.Width += deviationSize.Value.Width;
frm.Height += deviationSize.Value.Height;
}
result = frm.ShowDialog(owner);
}
return result;
}
......
......@@ -97,7 +97,7 @@ namespace Test
};
lstMenu.Add(item);
}
this.ucMenu1.MenuStyle = MenuStyle.Top;
this.ucMenu1.MenuStyle = MenuStyle.Top;
this.ucMenu1.DataSource = lstMenu;
......@@ -112,7 +112,7 @@ namespace Test
ucBtnsGroup1.DataSource = new Dictionary<string, string>() { { "1", "男" }, { "0", "女" } };
ucBtnsGroup2.IsMultiple = true;
ucBtnsGroup2.DataSource = new Dictionary<string, string>() { { "1", "河南" }, { "2", "北京" }, { "3", "湖南" }, { "4", "上海" } };
ucBtnsGroup2.SelectItem = new List<string>() { "2","3"};
ucBtnsGroup2.SelectItem = new List<string>() { "2", "3" };
this.processExt1.Value = 50;
}
......@@ -136,7 +136,7 @@ namespace Test
FrmInputs frm = new FrmInputs("动态多输入窗体测试",
new string[] { "姓名", "电话", "身份证号", "住址" },
new Dictionary<string, HZH_Controls.TextInputType>() { { "电话", HZH_Controls.TextInputType.Regex }, { "身份证号", HZH_Controls.TextInputType.Regex } },
new Dictionary<string, string>() { { "电话", "^1\\d{10}$" }, { "身份证号", "^\\d{18}$" } },
new Dictionary<string, string>() { { "电话", "^1\\d{0,10}$" }, { "身份证号", "^\\d{0,18}$" } },
new Dictionary<string, KeyBoardType>() { { "电话", KeyBoardType.UCKeyBorderNum }, { "身份证号", KeyBoardType.UCKeyBorderNum } },
new List<string>() { "姓名", "电话", "身份证号" });
frm.ShowDialog(this);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!