From 263401d40b2d9d2c1b36a24f33d45c5cb7192518 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 15:51:54 +0800
Subject: [PATCH] 20201223-6

---
 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
index aaf11da..a46b8a4 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
 {
@@ -22,11 +23,24 @@
                 //鍒涘缓鍥炶皟浜嬩欢
                 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)
+                    {
+                        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