From 6c0c799c1f5da2d215ec8d9df9b92b3d1948dc14 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 18:03:33 +0800
Subject: [PATCH] 交付住宅，RGB
---
HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs | 26 ++++++++++++++++++++++----
1 files changed, 22 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..18fa6ea
--- a/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs
@@ -22,11 +22,29 @@
//鍒涘缓鍥炶皟浜嬩欢
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)
+ {
+ 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);
+ }
};
- 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