From 6f8c6a3b2277b92a24319f672811da113861cfc1 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 23 九月 2024 10:42:30 +0800
Subject: [PATCH] 提交缺少修改
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/FourLinkMatchingCtrl.Designer.cs | 79 ++++++++++++++++++++++++++++-----------
1 files changed, 57 insertions(+), 22 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/FourLinkMatchingCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/FourLinkMatchingCtrl.Designer.cs
index d4a767b..1e79ec8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/FourLinkMatchingCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/FourLinkMatchingCtrl.Designer.cs
@@ -30,23 +30,27 @@
{
components = new Container();
gridControl1 = new DevExpress.XtraGrid.GridControl();
+ fourLinkFormViewModelBindingSource = new BindingSource(components);
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
colName = new DevExpress.XtraGrid.Columns.GridColumn();
- colDbid = new DevExpress.XtraGrid.Columns.GridColumn();
colCode = new DevExpress.XtraGrid.Columns.GridColumn();
colModelType = new DevExpress.XtraGrid.Columns.GridColumn();
colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMatchingMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
colCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMatchingCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
colDbLocked = new DevExpress.XtraGrid.Columns.GridColumn();
- fourLinkMatchingViewModelBindingSource = new BindingSource(components);
+ colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMatchingMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMatchingType = new DevExpress.XtraGrid.Columns.GridColumn();
((ISupportInitialize)gridControl1).BeginInit();
+ ((ISupportInitialize)fourLinkFormViewModelBindingSource).BeginInit();
((ISupportInitialize)gridView1).BeginInit();
- ((ISupportInitialize)fourLinkMatchingViewModelBindingSource).BeginInit();
SuspendLayout();
//
// gridControl1
//
- gridControl1.DataSource = fourLinkMatchingViewModelBindingSource;
+ gridControl1.DataSource = fourLinkFormViewModelBindingSource;
gridControl1.Dock = DockStyle.Fill;
gridControl1.Location = new Point(0, 0);
gridControl1.MainView = gridView1;
@@ -55,12 +59,17 @@
gridControl1.TabIndex = 0;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
+ // fourLinkFormViewModelBindingSource
+ //
+ fourLinkFormViewModelBindingSource.DataSource = typeof(FourLinkFormViewModel);
+ //
// gridView1
//
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colDbid, colCode, colModelType, colMaterial, colCaliber, colDbLocked });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colMaterial, colMatchingMaterial, colCaliber, colMatchingCaliber, colDbLocked, colMinorLoss, colMatchingMinorLoss, colMatchingType });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.OptionsView.ShowGroupPanel = false;
+ gridView1.RowCellClick += gridView1_RowCellClick;
//
// colName
//
@@ -69,33 +78,33 @@
colName.Visible = true;
colName.VisibleIndex = 0;
//
- // colDbid
- //
- colDbid.FieldName = "Dbid";
- colDbid.Name = "colDbid";
- colDbid.Visible = true;
- colDbid.VisibleIndex = 1;
- //
// colCode
//
colCode.FieldName = "Code";
colCode.Name = "colCode";
colCode.Visible = true;
- colCode.VisibleIndex = 2;
+ colCode.VisibleIndex = 1;
//
// colModelType
//
colModelType.FieldName = "ModelType";
colModelType.Name = "colModelType";
colModelType.Visible = true;
- colModelType.VisibleIndex = 3;
+ colModelType.VisibleIndex = 2;
//
// colMaterial
//
colMaterial.FieldName = "Material";
colMaterial.Name = "colMaterial";
colMaterial.Visible = true;
- colMaterial.VisibleIndex = 4;
+ colMaterial.VisibleIndex = 3;
+ //
+ // colMatchingMaterial
+ //
+ colMatchingMaterial.FieldName = "MatchingMaterial";
+ colMatchingMaterial.Name = "colMatchingMaterial";
+ colMatchingMaterial.Visible = true;
+ colMatchingMaterial.VisibleIndex = 4;
//
// colCaliber
//
@@ -104,16 +113,38 @@
colCaliber.Visible = true;
colCaliber.VisibleIndex = 5;
//
+ // colMatchingCaliber
+ //
+ colMatchingCaliber.FieldName = "MatchingCaliber";
+ colMatchingCaliber.Name = "colMatchingCaliber";
+ colMatchingCaliber.Visible = true;
+ colMatchingCaliber.VisibleIndex = 6;
+ //
// colDbLocked
//
colDbLocked.FieldName = "DbLocked";
colDbLocked.Name = "colDbLocked";
- colDbLocked.Visible = true;
- colDbLocked.VisibleIndex = 6;
//
- // fourLinkMatchingViewModelBindingSource
+ // colMinorLoss
//
- fourLinkMatchingViewModelBindingSource.DataSource = typeof(FourLinkMatchingViewModel);
+ colMinorLoss.FieldName = "MinorLoss";
+ colMinorLoss.Name = "colMinorLoss";
+ colMinorLoss.Visible = true;
+ colMinorLoss.VisibleIndex = 7;
+ //
+ // colMatchingMinorLoss
+ //
+ colMatchingMinorLoss.FieldName = "MatchingMinorLoss";
+ colMatchingMinorLoss.Name = "colMatchingMinorLoss";
+ colMatchingMinorLoss.Visible = true;
+ colMatchingMinorLoss.VisibleIndex = 8;
+ //
+ // colMatchingType
+ //
+ colMatchingType.FieldName = "MatchingType";
+ colMatchingType.Name = "colMatchingType";
+ colMatchingType.Visible = true;
+ colMatchingType.VisibleIndex = 9;
//
// FourLinkMatchingCtrl
//
@@ -123,8 +154,8 @@
Name = "FourLinkMatchingCtrl";
Size = new Size(1035, 503);
((ISupportInitialize)gridControl1).EndInit();
+ ((ISupportInitialize)fourLinkFormViewModelBindingSource).EndInit();
((ISupportInitialize)gridView1).EndInit();
- ((ISupportInitialize)fourLinkMatchingViewModelBindingSource).EndInit();
ResumeLayout(false);
}
@@ -132,13 +163,17 @@
private DevExpress.XtraGrid.GridControl gridControl1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private BindingSource fourLinkFormViewModelBindingSource;
private DevExpress.XtraGrid.Columns.GridColumn colName;
- private DevExpress.XtraGrid.Columns.GridColumn colDbid;
private DevExpress.XtraGrid.Columns.GridColumn colCode;
private DevExpress.XtraGrid.Columns.GridColumn colModelType;
private DevExpress.XtraGrid.Columns.GridColumn colMaterial;
+ private DevExpress.XtraGrid.Columns.GridColumn colMatchingMaterial;
private DevExpress.XtraGrid.Columns.GridColumn colCaliber;
+ private DevExpress.XtraGrid.Columns.GridColumn colMatchingCaliber;
private DevExpress.XtraGrid.Columns.GridColumn colDbLocked;
- private BindingSource fourLinkMatchingViewModelBindingSource;
+ private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
+ private DevExpress.XtraGrid.Columns.GridColumn colMatchingMinorLoss;
+ private DevExpress.XtraGrid.Columns.GridColumn colMatchingType;
}
}
--
Gitblit v1.9.3