Merge branch 'wxr6' into wxr4

wxr

2021-07-05 1ee407dd57a7273ef6b686ac25a40d4199f5bce9

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputTextView.cs

@@ -35,6 +35,7 @@
            frameLayout.Height = Application.GetRealHeight(flHeight);
            btnIf.Y= Application.GetRealHeight(btnY);
            frameLayout.AddChidren(btnIf);

            return frameLayout;
        }
    }