From 4cb1f00f84d160f97afd0fb86cf600e1be667dd5 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 17 十月 2024 11:22:15 +0800
Subject: [PATCH] 水力组件更新

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModelBuilder.cs |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModelBuilder.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModelBuilder.cs
index 68ed854..63f7a81 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModelBuilder.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModelBuilder.cs
@@ -13,6 +13,10 @@
         /// <returns></returns>
         public static HydroParterPropertyViewModel CreateViewModel(this Yw.Model.HydroParterInfo rhs, List<Yw.Model.HydroParterInfo> allParterList)
         {
+            if (rhs == null)
+            {
+                return default;
+            }
             HydroParterPropertyViewModel vm = null;
             switch (rhs.Catalog)
             {
@@ -34,6 +38,16 @@
                 case Yw.Hydro.ParterCatalog.Junction://杩炴帴鑺傜偣
                     {
                         vm = new HydroJunctionPropertyViewModel(rhs as Yw.Model.HydroJunctionInfo);
+                    }
+                    break;
+                case Yw.Hydro.ParterCatalog.Nozzle://鍠峰槾
+                    {
+                        vm = new HydroNozzlePropertyViewModel(rhs as Yw.Model.HydroNozzleInfo);
+                    }
+                    break;
+                case Yw.Hydro.ParterCatalog.Hydrant://娑堢伀鏍�
+                    {
+                        vm = new HydroHydrantPropertyViewModel(rhs as Yw.Model.HydroHydrantInfo);
                     }
                     break;
                 case Yw.Hydro.ParterCatalog.Blunthead://闂峰ご
@@ -69,16 +83,6 @@
                 case Yw.Hydro.ParterCatalog.Pressmeter://鍘嬪姏琛�
                     {
                         vm = new HydroPressmeterPropertyViewModel(rhs as Yw.Model.HydroPressmeterInfo);
-                    }
-                    break;
-                case Yw.Hydro.ParterCatalog.Nozzle://鍠峰槾
-                    {
-                        vm = new HydroNozzlePropertyViewModel(rhs as Yw.Model.HydroNozzleInfo);
-                    }
-                    break;
-                case Yw.Hydro.ParterCatalog.Hydrant://娑堢伀鏍�
-                    {
-                        vm = new HydroHydrantPropertyViewModel(rhs as Yw.Model.HydroHydrantInfo);
                     }
                     break;
                 case Yw.Hydro.ParterCatalog.Pipe://绠¢亾

--
Gitblit v1.9.3