From 3add06f19c3c68289ca58fb61d15dfa059c5c8f5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 22 七月 2021 09:21:07 +0800
Subject: [PATCH] Merge branch 'wxr7-ez' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into wxr7-ez
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs | 9 +++------
1 files changed, 3 insertions(+), 6 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 18fa6ea..d8c32aa
--- 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
{
@@ -34,14 +35,10 @@
}
if (function.name != name)
{
- if(name.Contains("[\\ud800\\udc00-\\udbff\\udfff\\ud800-\\udfff]"))
- {
- 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>());
--
Gitblit v1.8.0