From 208ca42e1c20afafbe48d66259d553ee81eb48ed Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 13 十一月 2024 11:02:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs
index 1e05f7f..2344bca 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs
@@ -22,18 +22,18 @@
}
if (rhs.Material == null)
{
- this.MaterialName = "榛樿";
+ this.Material = "榛樿";
}
else
{
- this.MaterialName = rhs.Material.ToString();
+ this.Material = rhs.Material.ToString();
}
this.Hazen = rhs.Hazen;
this.Darcy = rhs.Darcy;
this.Manning = rhs.Manning;
this.Name = rhs.Name;
this.SortCode = rhs.SortCode;
- this.KeyWord = rhs.KeyWord;
+ this.KeyWord = string.Join(",", rhs.KeyWord);
}
public void Reset(Vmo.AssetsPipeMainVmo rhs)
@@ -50,10 +50,10 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- this.MaterialName = rhs.Material;
+ this.Material = rhs.Material;
this.Description = rhs.Description;
this.Name = rhs.Name;
- this.KeyWord = rhs.KeyWord;
+ this.KeyWord = string.Join(",", rhs.KeyWord);
this.SortCode = rhs.SortCode;
}
@@ -81,7 +81,7 @@
/// </summary>
[DisplayName("鏉愭枡")]
[Browsable(true)]
- public string MaterialName { get; set; }
+ public string Material { get; set; }
/// <summary>
/// Hazen
@@ -116,14 +116,7 @@
/// </summary>
[DisplayName("鍏抽敭瀛�")]
[Browsable(true)]
- public List<string> KeyWord { get; set; }
-
- /// <summary>
- /// 鏄惁榛樿
- /// </summary>
- [DisplayName("鏄惁榛樿")]
- [Browsable(true)]
- public bool IsDefault { get; set; }
+ public string KeyWord { get; set; }
/// <summary>
/// 璇存槑
--
Gitblit v1.9.3