From e0cea373fd5cda37421407a41453286469ac1145 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 11:16:11 +0800
Subject: [PATCH] Merge branch 'WJC' into MergeFL
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
index 84bfea6..2742514 100644
--- 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
{
@@ -26,16 +27,18 @@
{
new Tip()
{
- CloseTime = 3,
+ CloseTime = 1,
Text = Language.StringByID(StringId.DeviceNameCannotBeEmpty),
Direction = AMPopTipDirection.None,
}.Show(bodyView);
return;
}
-
- function.name = name;
- btnFunctionName.Text = name;
- function.SaveFunctionData();
+ if (function.name != name)
+ {
+ function.name = name;
+ btnFunctionName.Text = name;
+ function.UpdataFuncitonInfo();
+ }
};
new PublicAssmebly().LoadDialog_EditParater(StringId.ChangeName, function.name, callBackAction,StringId.DeviceNameCannotBeEmpty,0,new System.Collections.Generic.List<string>());
};
--
Gitblit v1.8.0