From f45bba0b5ecf73df67af6cb60e57ea956d82a8ab Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期二, 30 七月 2024 14:36:10 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs index 4d18c6a..4d28abb 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrPage.cs @@ -39,7 +39,6 @@ //鍙戝竷 private void barBtnPublish_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) { - } //鏌ョ湅bimface妯″瀷 @@ -52,10 +51,10 @@ } var guid = new PageGuid() { - Modular = "Bimface", + Modular = Yw.WinFrmUI.PageModular.Bimface, MoudingType = Yw.WinFrmUI.Page.eMoudingType.Tab, - Function = "BimfaceView", - TagName = vm.ID.ToString() + Function = Yw.WinFrmUI.PageFunction.ViewBimface3d, + TagName = $"{vm.ID}" }; if (!IsExistPage(guid, true)) @@ -97,5 +96,31 @@ { this.RefreshData(); } + + #region 褰撳墠 + + //鑾峰彇褰撳墠 + private XhsProjectMgrViewModel GetCurrentViewModel() + { + if (_allProjectList == null) + { + Yw.WinFrmUI.MessageBoxHelper.ShowError("鏁版嵁鍒濆鍖栭敊璇紒"); + return null; + } + if (_allProjectList == null) + { + Yw.WinFrmUI.MessageBoxHelper.ShowInfo("鏃犳暟鎹�"); + return null; + } + var vm = this.treeList1.GetCurrentViewModel(_allProjectList); + if (vm == null) + { + Yw.WinFrmUI.MessageBoxHelper.ShowInfo("璇烽�夋嫨鏁版嵁琛�"); + return null; + } + return vm; + } + + #endregion 褰撳墠 } -} +} \ No newline at end of file -- Gitblit v1.9.3