From 294b81166f21e12247e784d6bf404f5f34b2ee19 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 19 二月 2025 12:51:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/PipeManageMainPage.Designer.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/PipeManageMainPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/PipeManageMainPage.Designer.cs
index 843a433..7a95278 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/PipeManageMainPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/PipeManageMainPage.Designer.cs
@@ -28,8 +28,8 @@
/// </summary>
private void InitializeComponent()
{
- components = new System.ComponentModel.Container();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PipeManageMainPage));
+ components = new Container();
+ ComponentResourceManager resources = new ComponentResourceManager(typeof(PipeManageMainPage));
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
BtnAdd = new DevExpress.XtraBars.BarButtonItem();
BtnEdit = new DevExpress.XtraBars.BarButtonItem();
@@ -58,13 +58,13 @@
dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
pipeLineTreeListCtrl1 = new PipeLineTreeListCtrl();
- ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)svgImageCollection1).BeginInit();
+ ((ISupportInitialize)ribbonControl1).BeginInit();
+ ((ISupportInitialize)svgImageCollection1).BeginInit();
sidePanel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)pipeLineViewModelBindingSource).BeginInit();
- ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
+ ((ISupportInitialize)gridControl1).BeginInit();
+ ((ISupportInitialize)pipeLineViewModelBindingSource).BeginInit();
+ ((ISupportInitialize)gridView1).BeginInit();
+ ((ISupportInitialize)dockManager1).BeginInit();
dockPanel1.SuspendLayout();
dockPanel1_Container.SuspendLayout();
SuspendLayout();
@@ -211,7 +211,7 @@
colCaliber.FieldName = "Caliber";
colCaliber.Name = "colCaliber";
colCaliber.Visible = true;
- colCaliber.VisibleIndex = 3;
+ colCaliber.VisibleIndex = 4;
colCaliber.Width = 63;
//
// colHazen
@@ -262,7 +262,7 @@
colKeyWord.FieldName = "KeyWord";
colKeyWord.Name = "colKeyWord";
colKeyWord.Visible = true;
- colKeyWord.VisibleIndex = 1;
+ colKeyWord.VisibleIndex = 2;
colKeyWord.Width = 91;
//
// colMaterial
@@ -270,7 +270,7 @@
colMaterial.FieldName = "Material";
colMaterial.Name = "colMaterial";
colMaterial.Visible = true;
- colMaterial.VisibleIndex = 2;
+ colMaterial.VisibleIndex = 3;
colMaterial.Width = 135;
//
// colMinorLoss
@@ -278,7 +278,7 @@
colMinorLoss.FieldName = "MinorLoss";
colMinorLoss.Name = "colMinorLoss";
colMinorLoss.Visible = true;
- colMinorLoss.VisibleIndex = 4;
+ colMinorLoss.VisibleIndex = 1;
colMinorLoss.Width = 65;
//
// dockManager1
@@ -328,14 +328,14 @@
Controls.Add(dockPanel1);
Name = "PipeManageMainPage";
Size = new Size(890, 520);
- ((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit();
- ((System.ComponentModel.ISupportInitialize)svgImageCollection1).EndInit();
+ ((ISupportInitialize)ribbonControl1).EndInit();
+ ((ISupportInitialize)svgImageCollection1).EndInit();
sidePanel1.ResumeLayout(false);
sidePanel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
- ((System.ComponentModel.ISupportInitialize)pipeLineViewModelBindingSource).EndInit();
- ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
- ((System.ComponentModel.ISupportInitialize)dockManager1).EndInit();
+ ((ISupportInitialize)gridControl1).EndInit();
+ ((ISupportInitialize)pipeLineViewModelBindingSource).EndInit();
+ ((ISupportInitialize)gridView1).EndInit();
+ ((ISupportInitialize)dockManager1).EndInit();
dockPanel1.ResumeLayout(false);
dockPanel1_Container.ResumeLayout(false);
ResumeLayout(false);
--
Gitblit v1.9.3