From 4999c3c3884084c10c8a4bb2426e92cb63600166 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 09 十一月 2024 09:58:22 +0800
Subject: [PATCH] 冲突

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.cs |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroParterPropertyCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.cs
similarity index 96%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroParterPropertyCtrl.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.cs
index cb6b5d7..61c6de3 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroParterPropertyCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.cs
@@ -9,9 +9,9 @@
 namespace Yw.WinFrmUI
 {
 
-    public partial class HydroParterPropertyCtrl : XtraUserControl
+    public partial class HydroVisualPropertyCtrl : XtraUserControl
     {
-        public HydroParterPropertyCtrl()
+        public HydroVisualPropertyCtrl()
         {
             InitializeComponent();
             this.layoutControl1.SetupLayoutControl();
@@ -25,40 +25,40 @@
         /// 绗竴涓弬鏁颁负鍖归厤Db鐨刅iewModel
         /// 绗簩涓弬鏁颁负鏄惁鍖归厤鎴愬姛
         /// </summary>
-        public event Func<HydroParterViewModel, bool> MatchingDbEvent;
+        public event Func<HydroVisualViewModel, bool> MatchingDbEvent;
         /// <summary>
         /// 璁剧疆鏇茬嚎浜嬩欢
         /// 绗竴涓弬鏁颁负璁剧疆鏇茬嚎鐨刅iewModel
         /// 绗簩涓弬鏁颁负鏇茬嚎绫诲瀷
         /// 绗笁涓弬鏁颁负鏄惁璁剧疆鎴愬姛
         /// </summary>
-        public event Func<HydroParterViewModel, string, bool> SetCurveEvent;
+        public event Func<HydroVisualViewModel, string, bool> SetCurveEvent;
         /// <summary>
         /// 璁剧疆妯″紡浜嬩欢
         /// 绗竴涓弬鏁颁负璁剧疆妯″紡浜嬬殑ViewModel
         /// 绗簩涓弬鏁颁负妯″紡浜嬬被鍨�
         /// 绗笁涓弬鏁颁负鏄惁璁剧疆鎴愬姛
         /// </summary>
-        public event Func<HydroParterViewModel, string, bool> SetPatternEvent;
+        public event Func<HydroVisualViewModel, string, bool> SetPatternEvent;
         /// <summary>
         /// 灞炴�у�煎彂鐢熸敼鍙樹簨浠�
         /// </summary>
-        public event Action<HydroParterViewModel> PropertyValueChangedEvent;
+        public event Action<HydroVisualViewModel> PropertyValueChangedEvent;
 
         /// <summary>
         /// 鏍囨敞灞炴�у�兼敼鍙樹簨浠�
         /// </summary>
-        public event Action<HydroParterViewModel> MarkPropertyValueChangedEvent;
+        public event Action<HydroVisualViewModel> MarkPropertyValueChangedEvent;
 
         /// <summary>
         /// 鍒嗙骇灞炴�у�兼敼鍙樹簨浠�
         /// </summary>
-        public event Action<HydroParterViewModel> GradingPropertyValueChangedEvent;
+        public event Action<HydroVisualViewModel> GradingPropertyValueChangedEvent;
 
         /// <summary>
         /// 娴佸悜灞炴�у�兼敼鍙樹簨浠�
         /// </summary>
-        public event Action<HydroParterViewModel> FlowDirectionPropertyValueChangedEvent;
+        public event Action<HydroVisualViewModel> FlowDirectionPropertyValueChangedEvent;
 
         /// <summary>
         /// 寮鸿皟杩炴帴缁勪欢浜嬩欢
@@ -70,7 +70,7 @@
         /// <summary>
         /// 鏌ョ湅鏋勪欢浜嬩欢
         /// </summary>
-        public event Action<HydroParterViewModel> ViewParterEvent;
+        public event Action<HydroVisualViewModel> HydroViewEvent;
 
 
 
@@ -80,11 +80,11 @@
         /// <summary>
         /// 缁戝畾瀵硅薄
         /// </summary>
-        public HydroParterViewModel SelectedObject
+        public HydroVisualViewModel SelectedObject
         {
             get
             {
-                var vm = this.propertyGridControl1.SelectedObject as HydroParterViewModel;
+                var vm = this.propertyGridControl1.SelectedObject as HydroVisualViewModel;
                 return vm;
             }
             set
@@ -114,7 +114,7 @@
         }
 
         //鑾峰彇琛岀殑瑙嗗浘瀵硅薄
-        private HydroParterViewModel GetPropertyViewModel(DevExpress.XtraVerticalGrid.Rows.BaseRow row)
+        private HydroVisualViewModel GetPropertyViewModel(DevExpress.XtraVerticalGrid.Rows.BaseRow row)
         {
             if (row == null)
             {
@@ -128,9 +128,9 @@
             {
                 return this.SelectedObject;
             }
-            if (row.ParentRow.Properties.Value is HydroParterViewModel)
+            if (row.ParentRow.Properties.Value is HydroVisualViewModel)
             {
-                return row.ParentRow.Properties.Value as HydroParterViewModel;
+                return row.ParentRow.Properties.Value as HydroVisualViewModel;
             }
             return GetPropertyViewModel(row.ParentRow);
         }
@@ -656,7 +656,7 @@
             {
                 return;
             }
-            this.ViewParterEvent?.Invoke(vm);
+            this.HydroViewEvent?.Invoke(vm);
         }
 
         // 鎻忚堪
@@ -710,7 +710,7 @@
             }
 
             var propStatus = vm.GetPropStatus(fieldName);
-            this.hydroParterPropertyDescriptionCtrl1.SetBindingData(caption, descrition, propStatus);
+            this.hydroVisualPropertyDescriptionCtrl1.SetBindingData(caption, descrition, propStatus);
 
         }
 

--
Gitblit v1.9.3