Merge branch 'WJC'

wxr

2020-12-08 145b157ba183ebf877c93ed2dbb01ec737c993d3

 HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs

@@ -90,13 +90,13 @@
        {
            LogicView.TimeView timePointView = new LogicView.TimeView();
            timePointView.FLayoutView(fLayout);
            EventHandler<MouseEventArgs> RemovefLayout = (sender, e1) =>
            EventHandler<MouseEventArgs> removefLayout = (sender, e1) =>
             {
                //移除fLayout界面
                fLayout.RemoveFromParent();
             };
            //取消点击事件
            timePointView.btnCancel.MouseUpEventHandler += RemovefLayout;
            timePointView.btnCancel.MouseUpEventHandler += removefLayout; 

            //加载数据界面的设置方法(列表互不联动)
            timePointView.mUIPickerView.setNPicker(timePointView.GethStringList(), timePointView.GetmStringList(), null);