Merge branch 'temp-wxr' into WJC

陈嘉乐

2021-03-22 551e82d33c9c23442e0ecd320bcfc752f300d9ef

 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
{
@@ -32,10 +33,12 @@
                        }.Show(bodyView);
                        return;
                    }

                    function.name = name;
                    btnFunctionName.Text = name;
                    function.SaveFunctionData(true);
                    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>());
            };