修复phart问题

lixiaojun

2024-12-02 8486fdaaf94faddbf7e475c660726f9a71b72a4b

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/06-elbow/SetHydroElbowDlg.cs

@@ -46,18 +46,6 @@
            }
        }

        //验证
        private bool Valid()
        {
            this.dxErrorProvider1.ClearErrors();
            if (this.txtElev.EditValue == null)
            {
                this.dxErrorProvider1.SetError(this.txtElev, "必填项");
                return false;
            }
            return true;
        }

        //确定
        private void GeneralOkAndCancelCtrl1_OkEvent()
        {
@@ -65,11 +53,7 @@
            {
                return;
            }
            if (!Valid())
            {
                return;
            }
            var elev = double.Parse(this.txtElev.EditValue.ToString());
            double? elev = this.txtElev.EditValue == null ? null : double.Parse(this.txtElev.EditValue.ToString());
            double? minorLoss = this.txtMinorLoss.EditValue == null ? null : double.Parse(this.txtMinorLoss.EditValue.ToString());
            var material = this.txtMaterial.Text.Trim();
            double? caliber = this.txtCaliber.EditValue == null ? null : double.Parse(this.txtCaliber.EditValue.ToString());
@@ -77,12 +61,30 @@
            var elbowType = this.txtElbowType.Text.Trim();
            _allVisualList.ForEach(x =>
            {
                x.Elev = elev;
                x.MinorLoss = minorLoss;
                x.Material = material;
                x.Caliber = caliber;
                x.BendingAngle = blendingAngle;
                x.ElbowType = elbowType;
                if (elev.HasValue)
                {
                    x.Elev = elev.Value;
                }
                if (minorLoss.HasValue)
                {
                    x.MinorLoss = minorLoss.Value;
                }
                if (!string.IsNullOrEmpty(material))
                {
                    x.Material = material;
                }
                if (caliber.HasValue)
                {
                    x.Caliber = caliber.Value;
                }
                if (blendingAngle.HasValue)
                {
                    x.BendingAngle = blendingAngle.Value;
                }
                if (!string.IsNullOrEmpty(elbowType))
                {
                    x.ElbowType = elbowType;
                }
            });
            this.ReloadDataEvent?.Invoke(_allVisualList);
            this.DialogResult = DialogResult.OK;