From d2cee56db11f0ee475e9f9dbdc8bfd03ad982e18 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 12 八月 2024 09:42:01 +0800
Subject: [PATCH] 报错
---
Desktop/HStation.Desktop.Xhs.Core/MainForm.cs | 190 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 158 insertions(+), 32 deletions(-)
diff --git a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
index c704232..489df8e 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
+++ b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
@@ -6,6 +6,8 @@
using DevExpress.XtraBars.Ribbon;
using DevExpress.XtraEditors;
using HStation.WinFrmUI;
+using HStation.WinFrmUI.Basic;
+using HStation.WinFrmUI.Xhs.PumpProduct;
using System.IO;
using Yw.WinFrmUI;
using Yw.WinFrmUI.Page;
@@ -65,7 +67,9 @@
{
var hitInfo = this.tileNavPane.CalcHitInfo(e.Location);
if (hitInfo.InButton)
+ {
return;
+ }
this.DragMove();
}
}
@@ -78,7 +82,6 @@
{
if (item.Tag is string)
{
-
}
}
}
@@ -116,7 +119,7 @@
}
//模型管理
- private void nbBimfaceMgr_ElementClick(object sender, NavElementEventArgs e)
+ private void nbModelMgr_ElementClick(object sender, NavElementEventArgs e)
{
var pt = this.tileNavPane.PointToClient(MousePosition);
var hitInfo = this.tileNavPane.CalcHitInfo(pt);
@@ -126,16 +129,53 @@
{
var peakItemList = new List<Yw.WinFrmUI.TilePeekItem>()
{
+ new TilePeekItem()
+ {
+ Caption="水力场景",
+ SvgImage=svgImg32Model[0],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Hydro",
+ MoudingType=eMoudingType.Tab,
+ Function="SceneMgr",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new Yw.WinFrmUI.HydroSceneMgrPage();
+ CreatePage(page,guid);
+ }
+ }
+ },
new TilePeekItem(){
- Caption="文件管理",
- SvgImage=svgImg32[0],
+ Caption="水力模型",
+ SvgImage=svgImg32Model[1],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Hydro",
+ MoudingType=eMoudingType.Tab,
+ Function="ModelMgr",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new HStation.WinFrmUI.HydroModelMgrPage();
+ CreatePage(page,guid);
+ }
+ }
+ },
+ new TilePeekItem(){
+ Caption="三维模型",
+ SvgImage=svgImg32Model[2],
SvgImageSize=new Size(24,24),
Click=()=>{
this.flyoutPanel1.HideBeakForm();
var guid=new PageGuid(){
Modular="Bimface",
MoudingType=eMoudingType.Tab,
- Function="fileMgr",
+ Function="FileMgr",
};
if(!IsExistPage(guid,true))
{
@@ -143,28 +183,123 @@
CreatePage(page,guid);
}
}
- }
+ },
};
_bimfaceMgrBeakCtrl = peakItemList.CreatePeekCtrl();
- _bimfaceMgrBeakCtrl.Dock = DockStyle.Fill;
- this.flyoutPanel1.Size = _bimfaceMgrBeakCtrl.Size;
- this.flyoutPanelControl1.Controls.Clear();
- this.flyoutPanelControl1.Controls.Add(_bimfaceMgrBeakCtrl);
}
- this.flyoutPanel1.ShowBeakForm(hitInfo.ButtonInfo.Bounds);
+ this.flyoutPanel1.Size = _bimfaceMgrBeakCtrl.Size;
+ this.flyoutPanelControl1.Controls.Clear();
+ this.flyoutPanelControl1.Controls.Add(_bimfaceMgrBeakCtrl);
+ var rectangle = this.RectangleToScreen(hitInfo.ButtonInfo.Bounds);
+ this.flyoutPanel1.ShowBeakForm(rectangle);
}
}
+
private Control _bimfaceMgrBeakCtrl = null;//bimface管理弹出界面
- #endregion
+ //系统配置
+ private void nbSystemConfig_ElementClick(object sender, NavElementEventArgs e)
+ {
+ var pt = this.tileNavPane.PointToClient(MousePosition);
+ var hitInfo = this.tileNavPane.CalcHitInfo(pt);
+ if (hitInfo.ButtonInfo != null)
+ {
+ if (_SystemConfigBeakCtrl == null)
+ {
+ var peakItemList = new List<Yw.WinFrmUI.TilePeekItem>()
+ {
+ new TilePeekItem(){
+ Caption="水泵管理",
+ SvgImage=svgImg32Model[0],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Asstes",
+ MoudingType=eMoudingType.Tab,
+ Function="pumpMgr",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new PumpProductMainPanel();
+ CreatePage(page,guid);
+ }
+ }
+ },
+ new TilePeekItem(){
+ Caption="类型管理",
+ SvgImage=svgImg32Model[0],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Basic",
+ MoudingType=eMoudingType.Tab,
+ Function="TypeMgr",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new SysTypeManageMainPanel();
+ CreatePage(page,guid);
+ }
+ }
+ },
+ new TilePeekItem(){
+ Caption="分类管理",
+ SvgImage=svgImg32Model[0],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Basic",
+ MoudingType=eMoudingType.Tab,
+ Function="CataLogMgr",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new SysCatalogManageMainPanel();
+ CreatePage(page,guid);
+ }
+ }
+ }, new TilePeekItem(){
+ Caption="属性管理",
+ SvgImage=svgImg32Model[0],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Basic",
+ MoudingType=eMoudingType.Tab,
+ Function="PropMgr",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new SysPropManageMainPanel();
+ CreatePage(page,guid);
+ }
+ }
+ }
+ };
+ _SystemConfigBeakCtrl = peakItemList.CreatePeekCtrl();
+ }
+ this.flyoutPanel1.Size = _SystemConfigBeakCtrl.Size;
+ this.flyoutPanelControl1.Controls.Clear();
+ this.flyoutPanelControl1.Controls.Add(_SystemConfigBeakCtrl);
+ var rectangle = this.RectangleToScreen(hitInfo.ButtonInfo.Bounds);
+ this.flyoutPanel1.ShowBeakForm(rectangle);
+ }
+ }
+
+ private Control _SystemConfigBeakCtrl = null;//系统配置弹出界面
+
+ #endregion TileNavPane 相关处理
#region 窗体事件
//界面记载事件
private void MainForm_Load(object sender, EventArgs e)
{
-
}
//界面显示事件
@@ -199,7 +334,6 @@
//界面退出
private void MainForm_FormClosed(object sender, FormClosedEventArgs e)
{
-
}
//窗体尺寸改变
@@ -207,15 +341,13 @@
{
if (this.WindowState == FormWindowState.Maximized)
{
-
}
else
{
-
}
}
- #endregion
+ #endregion 窗体事件
#region TabbedView 相关事件处理程序
@@ -230,10 +362,9 @@
SelectModular(surfaceGuid.Modular, surfaceGuid);
}
- //添加
+ //添加
private void tabbedView1_DocumentAdded(object sender, DocumentEventArgs e)
{
-
}
//激活
@@ -247,10 +378,9 @@
//关闭 此时控件已经为空
private void tabbedView1_DocumentClosed(object sender, DocumentEventArgs e)
{
-
}
- #endregion
+ #endregion TabbedView 相关事件处理程序
#region Page
@@ -436,6 +566,7 @@
docPnl.Show();
}
break;
+
case eMoudingType.Tab:
{
this.tabbedView1.BeginUpdate();
@@ -454,6 +585,7 @@
this.tabbedView1.Controller.Activate(doc);
}
break;
+
default: break;
}
page.InitialDataSource();
@@ -479,6 +611,7 @@
}
}
break;
+
case eMoudingType.Tab:
{
if (this.tabbedView1.Documents != null && this.tabbedView1.Documents.Count > 0)
@@ -491,11 +624,12 @@
}
}
break;
+
default: break;
}
}
- #endregion
+ #endregion Page
#region Modular
@@ -528,14 +662,6 @@
//}
}
-
- #endregion
-
-
-
-
-
-
-
+ #endregion Modular
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3