From 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 12:04:42 +0800
Subject: [PATCH] 2020-12-15-1

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

diff --git a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
index aaf11da..b030aba 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
@@ -22,11 +22,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