Merge branch 'wxr6' into newBranch1

wxr

2021-07-05 4f8fc4fe0a7d6f73c3a06e6f924a4a2615b090d7

 HDL_ON/UI/UI0-Stan/Logic/HdlFormLogic.cs

@@ -115,6 +115,8 @@
                try

                {

                    var Myform = actionForm as EditorCommonForm;

                    //重置左滑使能

                    Myform.ScrollLeftEnabled = Myform.ScrollLeftEnabled;

                    //触发界面再次激活的事件

                    Myform.FormActionAgainEvent();

                }