Merge branch 'NewFilePath' into CJL

JLChen

2020-12-12 f2c1e5bf3a67478076fb5bbcf546824b3127db15

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs

@@ -32,10 +32,12 @@
                        }.Show(bodyView);
                        return;
                    }

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