Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

duheng

2024-12-04 935a8a4996853c51188402c57f905ee9c9eac898

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs

@@ -147,10 +147,10 @@
        #region 属性控件

        //属性控件
        private XhsProjectSimulationPropertyCtrl _propertyCtrl = null;
        private SimulationPropertyCtrl _propertyCtrl = null;

        //获取属性控件
        private XhsProjectSimulationPropertyCtrl GetPropertyCtrl()
        private SimulationPropertyCtrl GetPropertyCtrl()
        {
            if (_hydroInfo == null)
            {
@@ -158,7 +158,7 @@
            }
            if (_propertyCtrl == null)
            {
                _propertyCtrl = new XhsProjectSimulationPropertyCtrl();
                _propertyCtrl = new SimulationPropertyCtrl();
                _propertyCtrl.Dock = DockStyle.Fill;
                _propertyCtrl.HydroViewEvent += (visual) =>
                {
@@ -246,7 +246,7 @@
                {
                    if (this.controlContainerRight.Controls.Count > 0)
                    {
                        if (this.controlContainerRight.Controls[0] is XhsProjectSimulationPropertyCtrl)
                        if (this.controlContainerRight.Controls[0] is SimulationPropertyCtrl)
                        {
                            return true;
                        }