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 | 66 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 32 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 c7094aa..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();
@@ -53,18 +53,18 @@
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
colKeyWord = new DevExpress.XtraGrid.Columns.GridColumn();
colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
pipeLineTreeListCtrl1 = new PipeLineTreeListCtrl();
- colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
- ((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();
@@ -202,7 +202,7 @@
colName.Name = "colName";
colName.Visible = true;
colName.VisibleIndex = 0;
- colName.Width = 192;
+ colName.Width = 149;
//
// colCaliber
//
@@ -211,8 +211,8 @@
colCaliber.FieldName = "Caliber";
colCaliber.Name = "colCaliber";
colCaliber.Visible = true;
- colCaliber.VisibleIndex = 3;
- colCaliber.Width = 85;
+ colCaliber.VisibleIndex = 4;
+ colCaliber.Width = 63;
//
// colHazen
//
@@ -223,7 +223,7 @@
colHazen.Name = "colHazen";
colHazen.Visible = true;
colHazen.VisibleIndex = 5;
- colHazen.Width = 117;
+ colHazen.Width = 85;
//
// colDarcy
//
@@ -234,7 +234,7 @@
colDarcy.Name = "colDarcy";
colDarcy.Visible = true;
colDarcy.VisibleIndex = 6;
- colDarcy.Width = 98;
+ colDarcy.Width = 85;
//
// colManning
//
@@ -245,7 +245,7 @@
colManning.Name = "colManning";
colManning.Visible = true;
colManning.VisibleIndex = 7;
- colManning.Width = 111;
+ colManning.Width = 64;
//
// colDescription
//
@@ -255,22 +255,31 @@
colDescription.Name = "colDescription";
colDescription.Visible = true;
colDescription.VisibleIndex = 8;
- colDescription.Width = 222;
+ colDescription.Width = 122;
//
// colKeyWord
//
colKeyWord.FieldName = "KeyWord";
colKeyWord.Name = "colKeyWord";
colKeyWord.Visible = true;
- colKeyWord.VisibleIndex = 1;
- colKeyWord.Width = 128;
+ colKeyWord.VisibleIndex = 2;
+ colKeyWord.Width = 91;
//
// colMaterial
//
colMaterial.FieldName = "Material";
colMaterial.Name = "colMaterial";
colMaterial.Visible = true;
- colMaterial.VisibleIndex = 2;
+ colMaterial.VisibleIndex = 3;
+ colMaterial.Width = 135;
+ //
+ // colMinorLoss
+ //
+ colMinorLoss.FieldName = "MinorLoss";
+ colMinorLoss.Name = "colMinorLoss";
+ colMinorLoss.Visible = true;
+ colMinorLoss.VisibleIndex = 1;
+ colMinorLoss.Width = 65;
//
// dockManager1
//
@@ -309,13 +318,6 @@
pipeLineTreeListCtrl1.Size = new Size(193, 491);
pipeLineTreeListCtrl1.TabIndex = 0;
//
- // colMinorLoss
- //
- colMinorLoss.FieldName = "MinorLoss";
- colMinorLoss.Name = "colMinorLoss";
- colMinorLoss.Visible = true;
- colMinorLoss.VisibleIndex = 4;
- //
// PipeManageMainPage
//
Appearance.BackColor = SystemColors.Control;
@@ -326,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