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.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.cs |   51 ++++++++++++++++++++++++---------------------------
 1 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.cs
index eece155..2e18218 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.cs
@@ -32,7 +32,7 @@
         /// </summary>
         public event Action<ImportXhsProjectViewModel> ImportProjectCompletedEvent;
 
-        private List<HomeXhsProjectTreeViewModel> _allBindingList = null;//褰撳墠缁戝畾鍒楄〃
+        private List<HomeXhsProjectTreeViewModel> _allBindingList = new List<HomeXhsProjectTreeViewModel>();//褰撳墠缁戝畾鍒楄〃
 
         /// <summary>
         /// 缁戝畾鏁版嵁
@@ -40,19 +40,20 @@
         public async void SetBindingData(List<XhsProjectVmo> allProjectList)
         {
             _allBindingList = new List<HomeXhsProjectTreeViewModel>();
-            if (allProjectList == null)
-                return;
-            foreach (var item in allProjectList)
+            if (allProjectList != null)
             {
-                if (await IsHaveBimFace(item.ID))
+                foreach (var item in allProjectList)
                 {
-                    var vm = new HomeXhsProjectTreeViewModel(item, true);
-                    _allBindingList.Add(vm);
-                }
-                else
-                {
-                    var vm = new HomeXhsProjectTreeViewModel(item, false);
-                    _allBindingList.Add(vm);
+                    if (await IsHaveBimFace(item.ID))
+                    {
+                        var vm = new HomeXhsProjectTreeViewModel(item, true);
+                        _allBindingList.Add(vm);
+                    }
+                    else
+                    {
+                        var vm = new HomeXhsProjectTreeViewModel(item, false);
+                        _allBindingList.Add(vm);
+                    }
                 }
             }
             this.treeList1.DataSource = _allBindingList;
@@ -137,21 +138,6 @@
             this.treeList1.OptionsView.ShowTreeLines = this.barCkTreeLine.Checked ? DefaultBoolean.True : DefaultBoolean.False;
         }
 
-        //榧犳爣鐐瑰嚮
-        private async void treeList1_RowCellClick(object sender, DevExpress.XtraTreeList.RowCellClickEventArgs e)
-        {
-            if (_allBindingList == null || _allBindingList.Count < 1)
-                return;
-            var vm = this.treeList1.GetCurrentViewModel(_allBindingList);
-            if (vm == null)
-            {
-                return;
-            }
-            if (e.Column != this.colJump)
-                return;
-            JumpDirectEvent.Invoke(vm.Project.ID);
-        }
-
         //鑱氱劍鑺傜偣鏀瑰彉
         private void treeList1_FocusedNodeChanged(object sender, DevExpress.XtraTreeList.FocusedNodeChangedEventArgs e)
         {
@@ -175,5 +161,16 @@
         {
             this.RefreshDataEvent?.Invoke();
         }
+
+        //鍙屽嚮浜嬩欢
+        private void treeList1_DoubleClick(object sender, EventArgs e)
+        {
+            var vm = this.treeList1.GetCurrentViewModel(_allBindingList);
+            if (vm == null)
+            {
+                return;
+            }
+            JumpDirectEvent.Invoke(vm.Project.ID);
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3