cloudflight
2025-01-13 02c14c9c57dbde72d9c771bd8b0fab1cd023047d
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/SprinklerViewModel.cs
@@ -20,7 +20,7 @@
            {
                this.Caliber = rhs.Caliber.ToString();
            }
            if (rhs.Material == null)
            if (rhs.Material == null || rhs.Material == string.Empty)
            {
                this.Material = "默认";
            }
@@ -30,7 +30,7 @@
            }
            this.Name = rhs.Name;
            this.SortCode = rhs.SortCode;
            this.KeyWord = string.Join(",", rhs.KeyWord);
            this.KeyWord = string.Join(",", rhs.KeyWords);
            this.MinorLoss = rhs.MinorLoss;
            this.Angle = rhs.Angle;
            this.FlowMinorLoss = rhs.FlowMinorLoss;
@@ -47,7 +47,7 @@
            {
                this.Caliber = rhs.Caliber.ToString();
            }
            if (rhs.Material == null)
            if (rhs.Material == null || rhs.Material == string.Empty)
            {
                this.Material = "默认";
            }
@@ -57,7 +57,7 @@
            }
            this.Description = rhs.Description;
            this.Name = rhs.Name;
            this.KeyWord = string.Join(",", rhs.KeyWord);
            this.KeyWord = string.Join(",", rhs.KeyWords);
            this.SortCode = rhs.SortCode;
            this.MinorLoss = rhs.MinorLoss;
            this.Angle = rhs.Angle;
@@ -105,13 +105,6 @@
        public double MinorLoss { get; set; }
        /// <summary>
        /// 流量系数
        /// </summary>
        [DisplayName("流量系数")]
        [Browsable(true)]
        private double? FlowMinorLoss { get; set; }
        /// <summary>
        /// 识别关键字
        /// </summary>
        [DisplayName("关键字")]
@@ -119,6 +112,13 @@
        public string KeyWord { get; set; }
        /// <summary>
        /// 流量系数
        /// </summary>
        [DisplayName("流量系数")]
        [Browsable(true)]
        public double? FlowMinorLoss { get; set; }
        /// <summary>
        /// 排序码
        /// </summary>
        [DisplayName("排序码")]