From 7c2197ebde1e3bb7fa677bb7c287114c3c969824 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 08 十月 2024 14:19:51 +0800
Subject: [PATCH] 优化界面细节
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLinkManage/02-main/EditThreeLinkMainDlg.cs | 1 +
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/ValveManageMainPanel.Designer.cs | 6 +++---
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbowManage/02-main/EditElbowMainDlg.cs | 1 +
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLinkManage/02-main/EditFourLinkMainDlg.cs | 1 +
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/02-main/AddPipeLineMainDlg.cs | 1 +
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLinkManage/02-main/FourLinkManageMainPanel.Designer.cs | 2 ++
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLinkManage/02-main/ThreeLinkManageMainPanel.Designer.cs | 2 ++
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/02-main/EditPipeLineMainDlg.cs | 1 +
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/02-main/pipelineManageMainPanel.Designer.cs | 18 ++++++++++--------
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-NozzleManage/02-main/EditNozzleMainDlg.cs | 1 +
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-NozzleManage/02-main/NozzleManageMainPanel.Designer.cs | 2 ++
Desktop/HStation.Desktop.Xhs.Core/MainForm.cs | 4 ++--
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbowManage/02-main/ElbowManageMainPanel.Designer.cs | 2 ++
13 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
index 8744bc4..0168c59 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
+++ b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
@@ -246,7 +246,7 @@
}
}
},
- new TilePeekItem(){
+ /*new TilePeekItem(){
Caption="管道附件",
SvgImage=svgImg32Model[8],
SvgImageSize=new Size(24,24),
@@ -263,7 +263,7 @@
CreatePage(page,guid);
}
}
- }, new TilePeekItem(){
+ }, */ new TilePeekItem(){
Caption="弯头管理",
SvgImage=svgImg32Model[3],
SvgImageSize=new Size(24,24),
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/ValveManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/ValveManageMainPanel.Designer.cs
index 2838570..4afb24e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/ValveManageMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valveManage/ValveManageMainPanel.Designer.cs
@@ -86,7 +86,7 @@
//
// BtnAdd
//
- BtnAdd.Caption = "娣诲姞闃�闂�";
+ BtnAdd.Caption = "娣诲姞";
BtnAdd.Id = 1;
BtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAdd.ImageOptions.SvgImage");
BtnAdd.Name = "BtnAdd";
@@ -94,7 +94,7 @@
//
// BtnEdit
//
- BtnEdit.Caption = "缂栬緫闃�闂�";
+ BtnEdit.Caption = "缂栬緫";
BtnEdit.Id = 2;
BtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnEdit.ImageOptions.SvgImage");
BtnEdit.Name = "BtnEdit";
@@ -102,7 +102,7 @@
//
// BtnDelete
//
- BtnDelete.Caption = "鍒犻櫎闃�闂�";
+ BtnDelete.Caption = "鍒犻櫎";
BtnDelete.Id = 3;
BtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnDelete.ImageOptions.SvgImage");
BtnDelete.Name = "BtnDelete";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/02-main/AddPipeLineMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/02-main/AddPipeLineMainDlg.cs
index ba20b3f..effbf3a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/02-main/AddPipeLineMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/02-main/AddPipeLineMainDlg.cs
@@ -81,6 +81,7 @@
{
_PipeLineVmo.Manning = manning;
}
+ _PipeLineVmo.KeyWord = this.TextEditKeyWorld.Text.Trim();
if (await this.ReloadDataEvent.Invoke(_PipeLineVmo))
{
TipFormHelper.ShowSucceed("娣诲姞鎴愬姛!");
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/02-main/EditPipeLineMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/02-main/EditPipeLineMainDlg.cs
index 7603dca..4f962b7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/02-main/EditPipeLineMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/02-main/EditPipeLineMainDlg.cs
@@ -49,6 +49,7 @@
this.TextEditName.Text = _PipeLineVmo.Name;
this.DescriptionTextEdit.Text = _PipeLineVmo.Description;
this.TextEditMaterial.EditValue = _PipeLineVmo.MaterialName;
+ this.TextEditKeyWorld.Text = _PipeLineVmo.KeyWord;
}
public event Func<Vmo.PipeLineMainVmo, Task<bool>> ReloadDataEvent = null;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/02-main/pipelineManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/02-main/pipelineManageMainPanel.Designer.cs
index c2cc255..e6bf663 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/02-main/pipelineManageMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipelineManage/02-main/pipelineManageMainPanel.Designer.cs
@@ -36,6 +36,7 @@
BtnDelete = new DevExpress.XtraBars.BarButtonItem();
BarBtnEidtPumpPart = new DevExpress.XtraBars.BarButtonItem();
BtnDescription = new DevExpress.XtraBars.BarButtonItem();
+ barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -57,7 +58,6 @@
dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
pipeLineTreeListCtrl1 = new PipeLineTreeListCtrl();
- barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)svgImageCollection1).BeginInit();
sidePanel1.SuspendLayout();
@@ -123,6 +123,13 @@
BtnDescription.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnDescription.ImageOptions.SvgImage");
BtnDescription.Name = "BtnDescription";
BtnDescription.ItemClick += BtnDescription_ItemClick;
+ //
+ // barButtonItem1
+ //
+ barButtonItem1.Caption = "璁剧疆榛樿";
+ barButtonItem1.Id = 23;
+ barButtonItem1.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem1.ImageOptions.SvgImage");
+ barButtonItem1.Name = "barButtonItem1";
//
// ribbonPage1
//
@@ -275,6 +282,8 @@
//
// dockManager1
//
+ dockManager1.DockingOptions.ShowAutoHideButton = false;
+ dockManager1.DockingOptions.ShowCloseButton = false;
dockManager1.Form = this;
dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 });
dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
@@ -307,13 +316,6 @@
pipeLineTreeListCtrl1.Name = "pipeLineTreeListCtrl1";
pipeLineTreeListCtrl1.Size = new Size(193, 491);
pipeLineTreeListCtrl1.TabIndex = 0;
- //
- // barButtonItem1
- //
- barButtonItem1.Caption = "璁剧疆榛樿";
- barButtonItem1.Id = 23;
- barButtonItem1.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem1.ImageOptions.SvgImage");
- barButtonItem1.Name = "barButtonItem1";
//
// PipeLineManageMainPanel
//
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbowManage/02-main/EditElbowMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbowManage/02-main/EditElbowMainDlg.cs
index d5f5510..ee2843e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbowManage/02-main/EditElbowMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbowManage/02-main/EditElbowMainDlg.cs
@@ -53,6 +53,7 @@
this.TextEditName.Text = _ElbowVmo.Name;
this.TextEditCoefficient.Text = _ElbowVmo.Coefficient.ToString();
this.DescriptionTextEdit.Text = _ElbowVmo.Description;
+ this.TextEditKeyWorld.Text = _ElbowVmo.KeyWord;
}
public event Func<Vmo.ElbowMainVmo, Task<bool>> ReloadDataEvent = null;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbowManage/02-main/ElbowManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbowManage/02-main/ElbowManageMainPanel.Designer.cs
index b9a4c9f..aa345f0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbowManage/02-main/ElbowManageMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbowManage/02-main/ElbowManageMainPanel.Designer.cs
@@ -245,6 +245,8 @@
//
// dockManager1
//
+ dockManager1.DockingOptions.ShowAutoHideButton = false;
+ dockManager1.DockingOptions.ShowCloseButton = false;
dockManager1.Form = this;
dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 });
dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLinkManage/02-main/EditThreeLinkMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLinkManage/02-main/EditThreeLinkMainDlg.cs
index 5b8a5c1..9661ed1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLinkManage/02-main/EditThreeLinkMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLinkManage/02-main/EditThreeLinkMainDlg.cs
@@ -53,6 +53,7 @@
this.TextEditName.Text = _ThreeLinkVmo.Name;
this.DescriptionTextEdit.Text = _ThreeLinkVmo.Description;
this.TextEditCoefficient.Text = _ThreeLinkVmo.Coefficient.ToString();
+ this.TextEditKeyWorld.Text = _ThreeLinkVmo.KeyWord;
}
public event Func<Vmo.ThreeLinkMainVmo, Task<bool>> ReloadDataEvent = null;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLinkManage/02-main/ThreeLinkManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLinkManage/02-main/ThreeLinkManageMainPanel.Designer.cs
index 0c9ba3f..ccb13a9 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLinkManage/02-main/ThreeLinkManageMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLinkManage/02-main/ThreeLinkManageMainPanel.Designer.cs
@@ -251,6 +251,8 @@
//
// dockManager1
//
+ dockManager1.DockingOptions.ShowAutoHideButton = false;
+ dockManager1.DockingOptions.ShowCloseButton = false;
dockManager1.Form = this;
dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 });
dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLinkManage/02-main/EditFourLinkMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLinkManage/02-main/EditFourLinkMainDlg.cs
index 48f548f..99addb0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLinkManage/02-main/EditFourLinkMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLinkManage/02-main/EditFourLinkMainDlg.cs
@@ -53,6 +53,7 @@
this.TextEditName.Text = _FourLinkVmo.Name;
this.TextEditCoefficient.Text = _FourLinkVmo.Coefficient.ToString();
this.DescriptionTextEdit.Text = _FourLinkVmo.Description;
+ this.TextEditKeyWorld.Text = _FourLinkVmo.KeyWord;
}
public event Func<Vmo.FourLinkMainVmo, Task<bool>> ReloadDataEvent = null;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLinkManage/02-main/FourLinkManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLinkManage/02-main/FourLinkManageMainPanel.Designer.cs
index 3cf5982..df02946 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLinkManage/02-main/FourLinkManageMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLinkManage/02-main/FourLinkManageMainPanel.Designer.cs
@@ -245,6 +245,8 @@
//
// dockManager1
//
+ dockManager1.DockingOptions.ShowAutoHideButton = false;
+ dockManager1.DockingOptions.ShowCloseButton = false;
dockManager1.Form = this;
dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 });
dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-NozzleManage/02-main/EditNozzleMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-NozzleManage/02-main/EditNozzleMainDlg.cs
index 60de875..9af4d4e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-NozzleManage/02-main/EditNozzleMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-NozzleManage/02-main/EditNozzleMainDlg.cs
@@ -53,6 +53,7 @@
this.TextEditName.Text = _NozzleVmo.Name;
this.TextEditCoefficient.Text = _NozzleVmo.Coefficient.ToString();
this.DescriptionTextEdit.Text = _NozzleVmo.Description;
+ this.TextEditKeyWorld.Text = _NozzleVmo.KeyWord;
}
public event Func<Vmo.NozzleMainVmo, Task<bool>> ReloadDataEvent = null;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-NozzleManage/02-main/NozzleManageMainPanel.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-NozzleManage/02-main/NozzleManageMainPanel.Designer.cs
index 6b5c282..8e3c238 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-NozzleManage/02-main/NozzleManageMainPanel.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-NozzleManage/02-main/NozzleManageMainPanel.Designer.cs
@@ -245,6 +245,8 @@
//
// dockManager1
//
+ dockManager1.DockingOptions.ShowAutoHideButton = false;
+ dockManager1.DockingOptions.ShowCloseButton = false;
dockManager1.Form = this;
dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] { dockPanel1 });
dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
--
Gitblit v1.9.3