From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理

---
 WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysCatalogManage/SysCatalogManageMainPanel.cs |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysCatalogManage/SysCatalogManageMainPanel.cs b/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysCatalogManage/SysCatalogManageMainPanel.cs
index ae9e8e8..eba30df 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysCatalogManage/SysCatalogManageMainPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic.Core/02-SysCatalogManage/SysCatalogManageMainPanel.cs
@@ -22,6 +22,8 @@
 
         private Yw.BLL.SysCatalog _bll;
 
+        private long _typeId;
+
         private List<SysCatalogViewModel> _IndexList;
 
         public override void InitialDataSource()
@@ -33,6 +35,7 @@
         //鑱氱劍鍒囨崲
         private async void TypeTreeListCtrl2_FocusedChangedEvent(long typeID)
         {
+            _typeId = typeID;
             _allBindingList = new List<SysCatalogViewModel>();
             var alllist = await _bll.GetByTypeID(typeID);
             _allBindingList.Clear();
@@ -127,7 +130,7 @@
         }
 
         //鐩稿簲灞炴�х紪杈�
-        private async void BtnPropEdit_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        private void BtnPropEdit_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {
             var currentVm = this.treeList1.GetCurrentViewModel(_allBindingList);
             if (currentVm != null)
@@ -315,5 +318,10 @@
             }
             return i;
         }
+
+        private void btnRefresh_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+        {
+            TypeTreeListCtrl2_FocusedChangedEvent(_typeId);
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3