排除bug

Shuxia Ning

2024-12-20 1bf6b7a300e21e9b8996f9ebeeb55a1eccda7a02

 WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/ElbowViewModel.cs

@@ -21,7 +21,7 @@
            {
                this.Caliber = rhs.Caliber.ToString();
            }
            if (rhs.Material == null)
            if (rhs.Material == null || rhs.Material == string.Empty)
            {
                this.MaterialName = "默认";
            }
@@ -31,9 +31,9 @@
            }
            this.Name = rhs.Name;
            this.SortCode = rhs.SortCode;
            this.KeyWord = rhs.KeyWord;
            this.KeyWord = string.Join(",", rhs.KeyWord);
            this.Angle = rhs.Angle;
            this.ElbowLengthType = rhs.ElbowLengthType;
            this.ElbowLengthType = rhs.ElbowType;
            this.MinorLoss = rhs.MinorLoss;
        }

@@ -48,7 +48,7 @@
            {
                this.Caliber = rhs.Caliber.ToString();
            }
            if (rhs.Material == null)
            if (rhs.Material == null || rhs.Material == string.Empty)
            {
                this.MaterialName = "默认";
            }
@@ -58,10 +58,10 @@
            }
            this.Description = rhs.Description;
            this.Name = rhs.Name;
            this.KeyWord = rhs.KeyWord;
            this.KeyWord = string.Join(",", rhs.KeyWord);
            this.SortCode = rhs.SortCode;
            this.Angle = rhs.Angle;
            this.ElbowLengthType = rhs.ElbowLengthType;
            this.ElbowLengthType = rhs.ElbowType;
            this.MinorLoss = rhs.MinorLoss;
        }

@@ -110,14 +110,14 @@
        /// </summary>
        [DisplayName("关键字")]
        [Browsable(true)]
        public List<string> KeyWord { get; set; }
        public string KeyWord { get; set; }

        /// <summary>
        /// 弯头类型
        /// </summary>
        [DisplayName("弯头类型")]
        [Browsable(true)]
        public eLengthType? ElbowLengthType { get; set; }
        public eElbowType? ElbowLengthType { get; set; }

        /// <summary>
        /// 角度