From d07d62be7111d78b2aaa44c9cdee23a7d22b4dda Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期二, 22 十二月 2020 10:38:15 +0800 Subject: [PATCH] 20201222-1 --- HDL_ON/UI/UI0-Public/PublicAssmebly.cs | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 deletions(-) diff --git a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs index 248a2fd..089d489 100644 --- a/HDL_ON/UI/UI0-Public/PublicAssmebly.cs +++ b/HDL_ON/UI/UI0-Public/PublicAssmebly.cs @@ -1,5 +1,6 @@ 锘縰sing System; using System.Collections.Generic; +using System.Text.RegularExpressions; using System.Threading; using HDL_ON.Entity; using HDL_ON.UI.CSS; @@ -28,15 +29,22 @@ btnConfirm.MouseUpEventHandler += (sender, e) => { - //btnConfirm.IsSelected = false; - if (string.IsNullOrEmpty(editText.Text.Trim()) || list.Contains(editText.Text.Trim())) + var text = editText.Text.Trim(); + Regex regtest = new Regex(@"\p{Cs}"); + Match match = regtest.Match(text); + if (match.Success) + { + HDLCommon.Current.ShowAlert(Language.StringByID(StringId.CannotEnterSpecialCharacters)); + return; + } + if (string.IsNullOrEmpty(text) || list.Contains(text)) { //if (titleId == StringId.ModifyMemberNickname) //{ // return; //} string tipMsgString = ""; - if (string.IsNullOrEmpty(editText.Text.Trim())) + if (string.IsNullOrEmpty(text)) { tipMsgString = Language.StringByID(errorId_IsNullOrEmpty); } @@ -58,7 +66,7 @@ } - callBackAction(editText.Text.Trim()); + callBackAction(text); dialog.Close(); }; } @@ -124,6 +132,21 @@ //TextAlignment = TextAlignment.CenterLeft , }; editView.AddChidren(etParater); + + Button btnClear = new Button() + { + X = Application.GetRealWidth(218-25), + Gravity = Gravity.CenterVertical, + Width = Application.GetRealWidth(24), + Height = Application.GetRealWidth(24), + UnSelectedImagePath = "Public/ClearIcon.png", + }; + editView.AddChidren(btnClear); + + btnClear.MouseUpEventHandler = (sender, e) => + { + etParater.Text = ""; + }; etParater.TextChangeEventHandler = (sender, e) => { @@ -604,7 +627,7 @@ TextAlignment = TextAlignment.CenterRight, TextColor = CSS_Color.MainColor, TextSize = CSS_FontSize.TextFontSize, - TextID = StringId.Complete, + TextID = StringId.Confirm, }; topView.AddChidren(btnConfrim); -- Gitblit v1.8.0