From 3f24b14f07ef82526b2e1d56cc808f226e91cbb9 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 20 十二月 2024 21:47:33 +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 | 55 +++++++++++++++++++++++++------------------------------
1 files changed, 25 insertions(+), 30 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 26762d2..bec0b13 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
@@ -1,7 +1,4 @@
锘縰sing DevExpress.Utils;
-using HStation.Vmo;
-using NetTaste;
-using Yw.WinFrmUI.Page;
namespace HStation.WinFrmUI
{
@@ -12,7 +9,6 @@
InitializeComponent();
this.treeList1.InitialDefaultSettings();
this.layoutControl1.SetupLayoutControl();
- this.treeList1.SelectImageList = imageCollection1;
}
/// <summary>
@@ -25,14 +21,14 @@
/// </summary>
public event Action RefreshDataEvent;
- public event Action<XhsProjectVmo> JumpDirectEvent;
+ public event Action<long> JumpDirectEvent;
/// <summary>
/// 椤圭洰瀵煎叆瀹屾垚浜嬩欢
/// </summary>
public event Action<ImportXhsProjectViewModel> ImportProjectCompletedEvent;
- private List<HomeXhsProjectTreeViewModel> _allBindingList = null;//褰撳墠缁戝畾鍒楄〃
+ private List<HomeXhsProjectTreeViewModel> _allBindingList = new List<HomeXhsProjectTreeViewModel>();//褰撳墠缁戝畾鍒楄〃
/// <summary>
/// 缁戝畾鏁版嵁
@@ -40,17 +36,20 @@
public async void SetBindingData(List<XhsProjectVmo> allProjectList)
{
_allBindingList = new List<HomeXhsProjectTreeViewModel>();
- 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;
@@ -135,21 +134,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);
- }
-
//鑱氱劍鑺傜偣鏀瑰彉
private void treeList1_FocusedNodeChanged(object sender, DevExpress.XtraTreeList.FocusedNodeChangedEventArgs e)
{
@@ -173,5 +157,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