From 32b2fee0421e7997672fe4a14fe5bf9a6de926c2 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 27 九月 2024 15:45:58 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/05-elbows/XhsProjectSimulationElbowsMatchingListCtrl.Designer.cs | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/05-elbows/XhsProjectSimulationElbowsMatchingListCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/05-elbows/XhsProjectSimulationElbowsMatchingListCtrl.Designer.cs
index ef56778..051bf77 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/05-elbows/XhsProjectSimulationElbowsMatchingListCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/05-elbows/XhsProjectSimulationElbowsMatchingListCtrl.Designer.cs
@@ -55,6 +55,7 @@
gridControl1.Location = new Point(0, 0);
gridControl1.MainView = gridView1;
gridControl1.Name = "gridControl1";
+ gridControl1.Padding = new Padding(0, 1, 0, 0);
gridControl1.Size = new Size(1035, 503);
gridControl1.TabIndex = 0;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
@@ -76,7 +77,7 @@
colName.FieldName = "Name";
colName.Name = "colName";
colName.Visible = true;
- colName.VisibleIndex = 0;
+ colName.VisibleIndex = 1;
colName.Width = 95;
//
// colCode
@@ -84,7 +85,7 @@
colCode.FieldName = "Code";
colCode.Name = "colCode";
colCode.Visible = true;
- colCode.VisibleIndex = 1;
+ colCode.VisibleIndex = 0;
colCode.Width = 59;
//
// colModelType
@@ -92,14 +93,14 @@
colModelType.FieldName = "ModelType";
colModelType.Name = "colModelType";
colModelType.Visible = true;
- colModelType.VisibleIndex = 2;
+ colModelType.VisibleIndex = 3;
//
// colMaterial
//
colMaterial.FieldName = "Material";
colMaterial.Name = "colMaterial";
colMaterial.Visible = true;
- colMaterial.VisibleIndex = 3;
+ colMaterial.VisibleIndex = 4;
colMaterial.Width = 68;
//
// colMatchingMaterial
@@ -107,7 +108,7 @@
colMatchingMaterial.FieldName = "MatchingMaterial";
colMatchingMaterial.Name = "colMatchingMaterial";
colMatchingMaterial.Visible = true;
- colMatchingMaterial.VisibleIndex = 4;
+ colMatchingMaterial.VisibleIndex = 7;
//
// colCaliber
//
@@ -121,14 +122,14 @@
colMatchingCaliber.FieldName = "MatchingCaliber";
colMatchingCaliber.Name = "colMatchingCaliber";
colMatchingCaliber.Visible = true;
- colMatchingCaliber.VisibleIndex = 6;
+ colMatchingCaliber.VisibleIndex = 8;
//
// colDbLocked
//
colDbLocked.FieldName = "DbLocked";
colDbLocked.Name = "colDbLocked";
colDbLocked.Visible = true;
- colDbLocked.VisibleIndex = 10;
+ colDbLocked.VisibleIndex = 2;
colDbLocked.Width = 91;
//
// colMinorLoss
@@ -136,28 +137,28 @@
colMinorLoss.FieldName = "MinorLoss";
colMinorLoss.Name = "colMinorLoss";
colMinorLoss.Visible = true;
- colMinorLoss.VisibleIndex = 7;
+ colMinorLoss.VisibleIndex = 6;
//
// colMatchingMinorLoss
//
colMatchingMinorLoss.FieldName = "MatchingMinorLoss";
colMatchingMinorLoss.Name = "colMatchingMinorLoss";
colMatchingMinorLoss.Visible = true;
- colMatchingMinorLoss.VisibleIndex = 8;
+ colMatchingMinorLoss.VisibleIndex = 9;
//
// colMatchingType
//
colMatchingType.FieldName = "MatchingType";
colMatchingType.Name = "colMatchingType";
colMatchingType.Visible = true;
- colMatchingType.VisibleIndex = 9;
+ colMatchingType.VisibleIndex = 10;
//
- // ElbowsMatchingCtrl
+ // XhsProjectSimulationElbowsMatchingListCtrl
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(gridControl1);
- Name = "ElbowsMatchingCtrl";
+ Name = "XhsProjectSimulationElbowsMatchingListCtrl";
Size = new Size(1035, 503);
((ISupportInitialize)gridControl1).EndInit();
((ISupportInitialize)elbowsFormViewModelBindingSource).EndInit();
--
Gitblit v1.9.3