From b8b4a64639871398247fe43c84ddd0ba058a14dc Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 30 十一月 2024 14:46:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/06-elbow/HydroElbowListCtrl.Designer.cs | 121 ++++++++++++++++++++++-----------------
1 files changed, 68 insertions(+), 53 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/06-elbow/HydroElbowListCtrl.Designer.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/06-elbow/HydroElbowListCtrl.Designer.cs
index 963919c..583259e 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/06-elbow/HydroElbowListCtrl.Designer.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/06-elbow/HydroElbowListCtrl.Designer.cs
@@ -42,17 +42,18 @@
colCode = new DevExpress.XtraGrid.Columns.GridColumn();
colName = new DevExpress.XtraGrid.Columns.GridColumn();
colModelType = new DevExpress.XtraGrid.Columns.GridColumn();
- colHasDb = new DevExpress.XtraGrid.Columns.GridColumn();
colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
colCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
colBendingAngle = new DevExpress.XtraGrid.Columns.GridColumn();
colElbowType = new DevExpress.XtraGrid.Columns.GridColumn();
- colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
colElev = new DevExpress.XtraGrid.Columns.GridColumn();
- colCalcuPress = new DevExpress.XtraGrid.Columns.GridColumn();
- colCalcuHead = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
+ colHasDb = new DevExpress.XtraGrid.Columns.GridColumn();
colFlags = new DevExpress.XtraGrid.Columns.GridColumn();
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
+ colCalcuPress = new DevExpress.XtraGrid.Columns.GridColumn();
+ colCalcuHead = new DevExpress.XtraGrid.Columns.GridColumn();
+ colCalcuDemand = new DevExpress.XtraGrid.Columns.GridColumn();
colSet = new DevExpress.XtraGrid.Columns.GridColumn();
repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
@@ -74,7 +75,7 @@
layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- colCalcuDemand = new DevExpress.XtraGrid.Columns.GridColumn();
+ colCalcuMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
((ISupportInitialize)gridControl1).BeginInit();
((ISupportInitialize)hydroElbowViewModelBindingSource).BeginInit();
((ISupportInitialize)gridView1).BeginInit();
@@ -117,7 +118,7 @@
//
// gridView1
//
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colCode, colName, colModelType, colMaterial, colCaliber, colBendingAngle, colElbowType, colElev, colMinorLoss, colHasDb, colFlags, colDescription, colCalcuPress, colCalcuHead, colCalcuDemand, colSet });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colDbLocked, colCode, colName, colModelType, colMaterial, colCaliber, colBendingAngle, colElbowType, colElev, colMinorLoss, colHasDb, colFlags, colDescription, colCalcuPress, colCalcuHead, colCalcuDemand, colCalcuMinorLoss, colSet });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.RowCellClick += gridView1_RowCellClick;
@@ -163,16 +164,6 @@
colModelType.VisibleIndex = 3;
colModelType.Width = 127;
//
- // colHasDb
- //
- colHasDb.FieldName = "HasDb";
- colHasDb.MaxWidth = 40;
- colHasDb.MinWidth = 40;
- colHasDb.Name = "colHasDb";
- colHasDb.Visible = true;
- colHasDb.VisibleIndex = 10;
- colHasDb.Width = 40;
- //
// colMaterial
//
colMaterial.FieldName = "Material";
@@ -213,6 +204,16 @@
colElbowType.VisibleIndex = 7;
colElbowType.Width = 100;
//
+ // colElev
+ //
+ colElev.FieldName = "Elev";
+ colElev.MaxWidth = 80;
+ colElev.MinWidth = 80;
+ colElev.Name = "colElev";
+ colElev.Visible = true;
+ colElev.VisibleIndex = 8;
+ colElev.Width = 80;
+ //
// colMinorLoss
//
colMinorLoss.FieldName = "MinorLoss";
@@ -223,15 +224,34 @@
colMinorLoss.VisibleIndex = 9;
colMinorLoss.Width = 100;
//
- // colElev
+ // colHasDb
//
- colElev.FieldName = "Elev";
- colElev.MaxWidth = 80;
- colElev.MinWidth = 80;
- colElev.Name = "colElev";
- colElev.Visible = true;
- colElev.VisibleIndex = 8;
- colElev.Width = 80;
+ colHasDb.FieldName = "HasDb";
+ colHasDb.MaxWidth = 40;
+ colHasDb.MinWidth = 40;
+ colHasDb.Name = "colHasDb";
+ colHasDb.Visible = true;
+ colHasDb.VisibleIndex = 10;
+ colHasDb.Width = 40;
+ //
+ // colFlags
+ //
+ colFlags.FieldName = "Flags";
+ colFlags.MaxWidth = 200;
+ colFlags.MinWidth = 100;
+ colFlags.Name = "colFlags";
+ colFlags.Visible = true;
+ colFlags.VisibleIndex = 11;
+ colFlags.Width = 127;
+ //
+ // colDescription
+ //
+ colDescription.FieldName = "Description";
+ colDescription.MinWidth = 100;
+ colDescription.Name = "colDescription";
+ colDescription.Visible = true;
+ colDescription.VisibleIndex = 12;
+ colDescription.Width = 392;
//
// colCalcuPress
//
@@ -259,24 +279,18 @@
colCalcuHead.VisibleIndex = 14;
colCalcuHead.Width = 100;
//
- // colFlags
+ // colCalcuDemand
//
- colFlags.FieldName = "Flags";
- colFlags.MaxWidth = 200;
- colFlags.MinWidth = 100;
- colFlags.Name = "colFlags";
- colFlags.Visible = true;
- colFlags.VisibleIndex = 11;
- colFlags.Width = 127;
- //
- // colDescription
- //
- colDescription.FieldName = "Description";
- colDescription.MinWidth = 100;
- colDescription.Name = "colDescription";
- colDescription.Visible = true;
- colDescription.VisibleIndex = 12;
- colDescription.Width = 392;
+ colCalcuDemand.FieldName = "CalcuDemand";
+ colCalcuDemand.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+ colCalcuDemand.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colCalcuDemand.ImageOptions.SvgImage");
+ colCalcuDemand.ImageOptions.SvgImageSize = new Size(16, 16);
+ colCalcuDemand.MaxWidth = 110;
+ colCalcuDemand.MinWidth = 110;
+ colCalcuDemand.Name = "colCalcuDemand";
+ colCalcuDemand.Visible = true;
+ colCalcuDemand.VisibleIndex = 15;
+ colCalcuDemand.Width = 110;
//
// colSet
//
@@ -287,7 +301,7 @@
colSet.MinWidth = 60;
colSet.Name = "colSet";
colSet.Visible = true;
- colSet.VisibleIndex = 16;
+ colSet.VisibleIndex = 17;
colSet.Width = 60;
//
// repositoryItemButtonEdit1
@@ -515,18 +529,18 @@
layoutControlItem11.TextSize = new Size(0, 0);
layoutControlItem11.TextVisible = false;
//
- // colCalcuDemand
+ // colCalcuMinorLoss
//
- colCalcuDemand.FieldName = "CalcuDemand";
- colCalcuDemand.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
- colCalcuDemand.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colCalcuDemand.ImageOptions.SvgImage");
- colCalcuDemand.ImageOptions.SvgImageSize = new Size(16, 16);
- colCalcuDemand.MaxWidth = 110;
- colCalcuDemand.MinWidth = 110;
- colCalcuDemand.Name = "colCalcuDemand";
- colCalcuDemand.Visible = true;
- colCalcuDemand.VisibleIndex = 15;
- colCalcuDemand.Width = 110;
+ colCalcuMinorLoss.FieldName = "CalcuMinorLoss";
+ colCalcuMinorLoss.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+ colCalcuMinorLoss.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colCalcuMinorLoss.ImageOptions.SvgImage");
+ colCalcuMinorLoss.ImageOptions.SvgImageSize = new Size(16, 16);
+ colCalcuMinorLoss.MaxWidth = 100;
+ colCalcuMinorLoss.MinWidth = 100;
+ colCalcuMinorLoss.Name = "colCalcuMinorLoss";
+ colCalcuMinorLoss.Visible = true;
+ colCalcuMinorLoss.VisibleIndex = 16;
+ colCalcuMinorLoss.Width = 100;
//
// HydroElbowListCtrl
//
@@ -603,5 +617,6 @@
private GeneralSearchAndSetCtrl generalSearchAndSetCtrl1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraGrid.Columns.GridColumn colCalcuDemand;
+ private DevExpress.XtraGrid.Columns.GridColumn colCalcuMinorLoss;
}
}
--
Gitblit v1.9.3