From e327510c7329aa9a95e62a460ec659ea0c9563ad Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 19:05:47 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
old mode 100644
new mode 100755
index aaf11da..1542eb7
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
@@ -2,6 +2,7 @@
using System;
using Shared;
using HDL_ON.Entity;
+using System.Text.RegularExpressions;
namespace HDL_ON.UI
{
@@ -22,11 +23,31 @@
//鍒涘缓鍥炶皟浜嬩欢
Action<string> callBackAction = (name) =>
{
- function.name = name;
- btnFunctionName.Text = name;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ if (string.IsNullOrEmpty(name))
+ {
+ new Tip()
+ {
+ CloseTime = 1,
+ Text = Language.StringByID(StringId.DeviceNameCannotBeEmpty),
+ Direction = AMPopTipDirection.None,
+ }.Show(bodyView);
+ return;
+ }
+ 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);
+ }
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, function.name, callBackAction);
+ new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, function.name, callBackAction,StringId.DeviceNameCannotBeEmpty,0,new System.Collections.Generic.List<string>());
};
btnEditName.MouseUpEventHandler = eventHandler;
btnFunctionName.MouseUpEventHandler = eventHandler;
--
Gitblit v1.8.0