Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

wxr

2020-12-18 f2d122dc78c58925a05d770d716e7fefcbd784ef

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs

old mode 100644
new mode 100755
@@ -2,6 +2,7 @@
using System;
using Shared;
using HDL_ON.Entity;
using System.Text.RegularExpressions;

namespace HDL_ON.UI
{
@@ -32,10 +33,19 @@
                        }.Show(bodyView);
                        return;
                    }

                    function.name = name;
                    btnFunctionName.Text = name;
                    function.SaveFunctionData();
                    if (function.name != name)
                    {
                        Regex regtest = new Regex(@"\p{Cs}");
                        Match match = regtest.Match(name);
                        if (match.Success)
                        {
                            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,StringId.DeviceNameCannotBeEmpty,0,new System.Collections.Generic.List<string>());
            };