Merge branch 'CJL' into wxr4

wxr

2021-05-12 9acd3887f1f8db40d59f991b1726a61aa7c7637c

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs

old mode 100755
new mode 100644
@@ -72,8 +72,8 @@

            btnFunctionName = new Button()
            {
                X = Application.GetRealWidth(186),
                Width = Application.GetRealWidth(137),
                X = Application.GetRealWidth(86),
                Width = Application.GetRealWidth(237),
                TextAlignment = TextAlignment.CenterRight,
                TextColor = CSS_Color.PromptingColor1,
                TextSize = CSS_FontSize.TextFontSize,
@@ -125,8 +125,8 @@

            btnLocationValues = new Button()
            {
                X = Application.GetRealWidth(186),
                Width = Application.GetRealWidth(137),
                X = Application.GetRealWidth(86),
                Width = Application.GetRealWidth(237),
                TextAlignment = TextAlignment.CenterRight,
                TextColor = CSS_Color.PromptingColor1,
                TextSize = CSS_FontSize.TextFontSize,