From 2614964c9c3e0c8740e208d4d0606fa8a518b9c4 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 01 九月 2021 15:16:39 +0800 Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into wxr7 --- HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs old mode 100755 new mode 100644 index 1542eb7..b5d660b --- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs @@ -35,16 +35,10 @@ } if (function.name != name) { - Regex regtest = new Regex(@"\p{Cs}"); - Match match = regtest.Match(name); - if (match.Success) - { - HDLCommon.Current.ShowAlert(Language.StringByID(StringId.CannotEnterSpecialCharacters)); - return; - } function.name = name; btnFunctionName.Text = name; - function.SaveFunctionData(true); + function.UpdataFuncitonInfo(); + actionRefresh?.Invoke(); } }; new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, function.name, callBackAction,StringId.DeviceNameCannotBeEmpty,0,new System.Collections.Generic.List<string>()); @@ -69,7 +63,10 @@ view.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; - btnLocationInfoRight.MouseUpEventHandler = eventHandler; + if (btnLocationInfoRight != null) + { + btnLocationInfoRight.MouseUpEventHandler = eventHandler; + } btnLocationValues.MouseUpEventHandler = eventHandler; } } -- Gitblit v1.8.0