Merge branch 'master' into WJC

陈嘉乐

2020-11-30 c44b10e4447e84dbdfa9105edf460ef364a8f2b3

 HDL_ON/UI/UI0-Public/TopViewDivBLL.cs

@@ -15,13 +15,16 @@
        {
            btnBack.MouseUpEventHandler = (sender, e) => {
                backAction?.Invoke();
                if (baseView != null)
                if (needClose)
                {
                    baseView.RemoveFromParent();
                }
                if (baseDialog != null)
                {
                    baseDialog.Close();
                    if (baseView != null)
                    {
                        baseView.RemoveFromParent();
                    }
                    if (baseDialog != null)
                    {
                        baseDialog.Close();
                    }
                }
            };
        }