From c9585ab171fb973d16792d7a290994bf8279da63 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 09 十一月 2024 09:56:41 +0800
Subject: [PATCH] 属性视图调整

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/HydroPipeListCtrl.cs |  158 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 105 insertions(+), 53 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/14-pipe/HydroPipeListCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/HydroPipeListCtrl.cs
similarity index 78%
rename from WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/14-pipe/HydroPipeListCtrl.cs
rename to WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/HydroPipeListCtrl.cs
index 318440f..1031db6 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-parter/14-pipe/HydroPipeListCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/14-pipe/HydroPipeListCtrl.cs
@@ -3,7 +3,7 @@
 
 namespace Yw.WinFrmUI
 {
-    public partial class HydroPipeListCtrl : DevExpress.XtraEditors.XtraUserControl, IHydroParterList
+    public partial class HydroPipeListCtrl : DevExpress.XtraEditors.XtraUserControl, IHydroVisualList
     {
         public HydroPipeListCtrl()
         {
@@ -17,11 +17,19 @@
         /// <summary>
         /// 姘村姏鐐瑰嚮浜嬩欢
         /// </summary>
-        public event Action<Yw.Model.HydroParterInfo> HydroClickEvent;
+        public event Action<Yw.Model.HydroVisualInfo> HydroClickInfoEvent;
+        /// <summary>
+        /// 姘村姏鐐瑰嚮瑙嗗浘浜嬩欢
+        /// </summary>
+        public event Action<HydroVisualViewModel> HydroClickViewEvent;
         /// <summary>
         /// 姘村姏鏀瑰彉浜嬩欢
         /// </summary>
-        public event Action<List<HydroParterInfo>> HydroChangedEvent;
+        public event Action<List<Yw.Model.HydroVisualInfo>> HydroChangedInfoEvent;
+        /// <summary>
+        /// 姘村姏鏀瑰彉瑙嗗浘浜嬩欢
+        /// </summary>
+        public event Action<List<HydroVisualViewModel>> HydroChangedViewEvent;
 
         /// <summary>
         /// 鏄剧ず鏌ヨ闈㈡澘
@@ -36,7 +44,7 @@
         }
 
         /// <summary>
-        /// 鏄惁鎷ユ湁姘村埄鍒楄〃
+        /// 鏄惁鎷ユ湁姘村姏鍒楄〃
         /// </summary>
         public bool HasHydroList
         {
@@ -51,14 +59,14 @@
         /// <summary>
         /// 缁戝畾鏁版嵁
         /// </summary>
-        public void SetBindingData(HydroModelInfo hydroInfo)
+        public void SetBindingData(Yw.Model.HydroModelInfo hydroInfo)
         {
             _allList = new List<HydroPipeViewModel>();
             if (hydroInfo != null && hydroInfo.Pipes != null && hydroInfo.Pipes.Count > 0)
             {
-                foreach (var pipe in hydroInfo.Pipes)
+                foreach (var visual in hydroInfo.Pipes)
                 {
-                    var vm = new HydroPipeViewModel(pipe, hydroInfo);
+                    var vm = new HydroPipeViewModel(visual, hydroInfo);
                     _allList.Add(vm);
                 }
             }
@@ -73,10 +81,10 @@
             _allList = new List<HydroPipeViewModel>();
             if (hydroInfo != null && hydroInfo.Pipes != null && hydroInfo.Pipes.Count > 0)
             {
-                foreach (var pipe in hydroInfo.Pipes)
+                foreach (var visual in hydroInfo.Pipes)
                 {
-                    var vm = new HydroPipeViewModel(pipe, hydroInfo);
-                    var calcuResult = allCalcuResultList?.Find(x => x.Code == pipe.Code);
+                    var vm = new HydroPipeViewModel(visual, hydroInfo);
+                    var calcuResult = allCalcuResultList?.Find(x => x.Code == visual.Code);
                     if (calcuResult != null)
                     {
                         vm.UpdateCalcuProperty(calcuResult);
@@ -85,6 +93,30 @@
                 }
             }
             Search();
+        }
+
+        /// <summary>
+        /// 缁戝畾鏁版嵁
+        /// </summary>
+        public void SetBindingData(List<HydroVisualViewModel> allVisualViewModelList)
+        {
+            _allList = new List<HydroPipeViewModel>();
+            allVisualViewModelList?.ForEach(x =>
+            {
+                if (x.Catalog == HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Pipe))
+                {
+                    _allList.Add(x as HydroPipeViewModel);
+                }
+            });
+            Search();
+        }
+
+        /// <summary>
+        /// 鏇存柊缁戝畾
+        /// </summary>
+        public void UpdateBindingData()
+        {
+            this.hydroPipeViewModelBindingSource.ResetBindings(false);
         }
 
         /// <summary>
@@ -103,17 +135,17 @@
         /// <summary>
         /// 鏇存柊灞炴��
         /// </summary>
-        public void UpdateProperty(Yw.Model.HydroParterInfo parter)
+        public void UpdateProperty(Yw.Model.HydroVisualInfo visual)
         {
             if (_allList == null || _allList.Count < 1)
             {
                 return;
             }
-            if (parter == null)
+            if (visual == null)
             {
                 return;
             }
-            var vm = _allList.Find(x => x.Code == parter.Code);
+            var vm = _allList.Find(x => x.Code == visual.Code);
             if (vm == null)
             {
                 return;
@@ -125,17 +157,17 @@
         /// <summary>
         /// 鏇存柊灞炴��
         /// </summary>
-        public void UpdateProperty(List<Yw.Model.HydroParterInfo> parterList)
+        public void UpdateProperty(List<Yw.Model.HydroVisualInfo> visualList)
         {
             if (_allList == null || _allList.Count < 1)
             {
                 return;
             }
-            if (parterList == null || parterList.Count < 1)
+            if (visualList == null || visualList.Count < 1)
             {
                 return;
             }
-            parterList.ForEach(x =>
+            visualList.ForEach(x =>
             {
                 var vm = _allList.Find(t => x.Code == x.Code);
                 if (vm != null)
@@ -155,12 +187,12 @@
             {
                 if (_allList != null && _allList.Count > 0)
                 {
-                    foreach (var parter in _allList)
+                    foreach (var visual in _allList)
                     {
-                        var calcuResult = allCalcuResultList.Find(x => x.Code == parter.Code);
+                        var calcuResult = allCalcuResultList.Find(x => x.Code == visual.Code);
                         if (calcuResult != null)
                         {
-                            parter.UpdateCalcuProperty(calcuResult);
+                            visual.UpdateCalcuProperty(calcuResult);
                         }
                     }
                     this.hydroPipeViewModelBindingSource.ResetBindings(false);
@@ -210,23 +242,69 @@
             Search();
             if (_allBindingList == null || _allBindingList.Count < 1)
             {
-                XtraMessageBox.Show("鏃犲彲璁剧疆绠¢亾鏁版嵁");
+                TipFormHelper.ShowWarn("鏃犳暟鎹紒");
                 return;
             }
             var dlg = new SetHydroPipeDlg();
             dlg.SetBindingData(_allBindingList.Select(x => x.Vmo).ToList());
             dlg.ReloadDataEvent += (list) =>
             {
-                _allBindingList.ForEach(x =>
-                {
-                    x.UpdateProperty();
-                });
+                _allBindingList.ForEach(x => x.UpdateProperty());
                 this.hydroPipeViewModelBindingSource.ResetBindings(false);
-                var allParterList = _allBindingList.Select(x => x.Vmo as HydroParterInfo).ToList();
-                this.HydroChangedEvent?.Invoke(allParterList);
+                var allVisualViewModelList = _allBindingList.Select(x => x as HydroVisualViewModel).ToList();
+                this.HydroChangedViewEvent?.Invoke(allVisualViewModelList);
+                var allVisualInfoList = allVisualViewModelList.Select(x => x.Vmo).ToList();
+                this.HydroChangedInfoEvent?.Invoke(allVisualInfoList);
             };
             dlg.ShowDialog();
         }
+
+        //鏌ヨ
+        private void btnSearch_Click(object sender, EventArgs e)
+        {
+            Search();
+        }
+
+        //閲嶇疆
+        private void btnReset_Click(object sender, EventArgs e)
+        {
+            Reset();
+        }
+
+        //璁剧疆
+        private void btnSet_Click(object sender, EventArgs e)
+        {
+            Set();
+        }
+
+        private void gridView1_RowCellClick(object sender, DevExpress.XtraGrid.Views.Grid.RowCellClickEventArgs e)
+        {
+            var row = this.gridView1.GetRow(e.RowHandle) as HydroPipeViewModel;
+            if (row == null)
+            {
+                return;
+            }
+
+            if (e.Column == this.colSet)
+            {
+                var dlg = new SetHydroPipeDlg();
+                dlg.SetBindingData(row.Vmo);
+                dlg.ReloadDataEvent += (list) =>
+                {
+                    row.UpdateProperty();
+                    this.gridView1.RefreshRow(e.RowHandle);
+                    this.HydroChangedViewEvent?.Invoke(new List<HydroVisualViewModel>() { row });
+                    this.HydroChangedInfoEvent?.Invoke(new List<HydroVisualInfo>() { row.Vmo });
+                };
+                dlg.ShowDialog();
+            }
+            else
+            {
+                this.HydroClickViewEvent?.Invoke(row);
+                this.HydroClickInfoEvent?.Invoke(row.Vmo);
+            }
+        }
+
 
         /// <summary>
         /// 璁剧疆绠�鍗曟樉绀烘ā寮�
@@ -328,33 +406,6 @@
             this.colSet.Visible = true;
         }
 
-        private void gridView1_RowCellClick(object sender, DevExpress.XtraGrid.Views.Grid.RowCellClickEventArgs e)
-        {
-            var row = this.gridView1.GetRow(e.RowHandle) as HydroPipeViewModel;
-            if (row == null)
-            {
-                return;
-            }
-
-            if (e.Column == this.colSet)
-            {
-                var dlg = new SetHydroPipeDlg();
-                dlg.SetBindingData(row.Vmo);
-                dlg.ReloadDataEvent += (list) =>
-                {
-                    row.UpdateProperty();
-                    this.gridView1.RefreshRow(e.RowHandle);
-                    this.HydroChangedEvent?.Invoke(new List<Model.HydroParterInfo>() { row.Vmo });
-                };
-                dlg.ShowDialog();
-            }
-            else
-            {
-                this.HydroClickEvent?.Invoke(row.Vmo);
-            }
-        }
-
-
         //鍒濆鍖栫娈电姸鎬�
         private void InitialLinkStatus()
         {
@@ -366,5 +417,6 @@
             this.imgCmbLinkStatus.Properties.EndUpdate();
         }
 
+
     }
 }

--
Gitblit v1.9.3