From 3f24b14f07ef82526b2e1d56cc808f226e91cbb9 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 20 十二月 2024 21:47:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/AssetsExchangerFactorMgrPage.Designer.cs | 77 ++++++++++++++------------------------
1 files changed, 28 insertions(+), 49 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/AssetsExchangerFactorMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/AssetsExchangerFactorMgrPage.Designer.cs
index 2482b25..6e3d7c3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/AssetsExchangerFactorMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/03-factor/AssetsExchangerFactorMgrPage.Designer.cs
@@ -56,16 +56,14 @@
colID = new DevExpress.XtraGrid.Columns.GridColumn();
colName = new DevExpress.XtraGrid.Columns.GridColumn();
colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
- colCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
- colCoefficient = new DevExpress.XtraGrid.Columns.GridColumn();
- colLowerLimit = new DevExpress.XtraGrid.Columns.GridColumn();
colSortCode = new DevExpress.XtraGrid.Columns.GridColumn();
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
colDetail = new DevExpress.XtraGrid.Columns.GridColumn();
repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(components);
dragDropEvents1 = new DevExpress.Utils.DragDrop.DragDropEvents(components);
+ colDiameter = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)panelControl1).BeginInit();
panelControl1.SuspendLayout();
@@ -73,7 +71,6 @@
((ISupportInitialize)assetsExchangerFactorMgrViewModelBindingSource).BeginInit();
((ISupportInitialize)gridView1).BeginInit();
((ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
- ((ISupportInitialize)svgImg32).BeginInit();
((ISupportInitialize)behaviorManager1).BeginInit();
SuspendLayout();
//
@@ -229,7 +226,7 @@
// gridView1
//
behaviorManager1.SetBehaviors(gridView1, new DevExpress.Utils.Behaviors.Behavior[] { DevExpress.Utils.DragDrop.DragDropBehavior.Create(typeof(DevExpress.XtraGrid.Extensions.ColumnViewDragDropSource), true, true, true, true, dragDropEvents1) });
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colID, colName, colMaterial, colCaliber, colCoefficient, colLowerLimit, colSortCode, colDescription, colDetail });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colID, colName, colMaterial, colDiameter, colMinorLoss, colSortCode, colDescription, colDetail });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.RowCellClick += gridView1_RowCellClick;
@@ -240,7 +237,7 @@
colID.MaxWidth = 100;
colID.MinWidth = 150;
colID.Name = "colID";
- colID.Width = 150;
+ colID.Width = 100;
//
// colName
//
@@ -262,36 +259,6 @@
colMaterial.VisibleIndex = 1;
colMaterial.Width = 150;
//
- // colCaliber
- //
- colCaliber.FieldName = "Caliber";
- colCaliber.MaxWidth = 100;
- colCaliber.MinWidth = 100;
- colCaliber.Name = "colCaliber";
- colCaliber.Visible = true;
- colCaliber.VisibleIndex = 2;
- colCaliber.Width = 100;
- //
- // colCoefficient
- //
- colCoefficient.FieldName = "Coefficient";
- colCoefficient.MaxWidth = 100;
- colCoefficient.MinWidth = 100;
- colCoefficient.Name = "colCoefficient";
- colCoefficient.Visible = true;
- colCoefficient.VisibleIndex = 3;
- colCoefficient.Width = 100;
- //
- // colLowerLimit
- //
- colLowerLimit.FieldName = "LowerLimit";
- colLowerLimit.MaxWidth = 100;
- colLowerLimit.MinWidth = 100;
- colLowerLimit.Name = "colLowerLimit";
- colLowerLimit.Visible = true;
- colLowerLimit.VisibleIndex = 4;
- colLowerLimit.Width = 100;
- //
// colSortCode
//
colSortCode.FieldName = "SortCode";
@@ -306,7 +273,7 @@
colDescription.MinWidth = 100;
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 5;
+ colDescription.VisibleIndex = 4;
colDescription.Width = 100;
//
// colDetail
@@ -317,7 +284,7 @@
colDetail.MinWidth = 60;
colDetail.Name = "colDetail";
colDetail.Visible = true;
- colDetail.VisibleIndex = 6;
+ colDetail.VisibleIndex = 5;
colDetail.Width = 60;
//
// repositoryItemButtonEdit1
@@ -329,14 +296,29 @@
repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
- // svgImg32
- //
- svgImg32.ImageSize = new Size(32, 32);
- svgImg32.Add("top10percent", "image://svgimages/spreadsheet/top10percent.svg");
- //
// dragDropEvents1
//
dragDropEvents1.DragDrop += dragDropEvents1_DragDrop;
+ //
+ // colDiameter
+ //
+ colDiameter.FieldName = "Diameter";
+ colDiameter.MaxWidth = 100;
+ colDiameter.MinWidth = 100;
+ colDiameter.Name = "colDiameter";
+ colDiameter.Visible = true;
+ colDiameter.VisibleIndex = 2;
+ colDiameter.Width = 100;
+ //
+ // colMinorLoss
+ //
+ colMinorLoss.FieldName = "MinorLoss";
+ colMinorLoss.MaxWidth = 100;
+ colMinorLoss.MinWidth = 100;
+ colMinorLoss.Name = "colMinorLoss";
+ colMinorLoss.Visible = true;
+ colMinorLoss.VisibleIndex = 3;
+ colMinorLoss.Width = 100;
//
// AssetsExchangerFactorMgrPage
//
@@ -356,7 +338,6 @@
((ISupportInitialize)assetsExchangerFactorMgrViewModelBindingSource).EndInit();
((ISupportInitialize)gridView1).EndInit();
((ISupportInitialize)repositoryItemButtonEdit1).EndInit();
- ((ISupportInitialize)svgImg32).EndInit();
((ISupportInitialize)behaviorManager1).EndInit();
ResumeLayout(false);
PerformLayout();
@@ -375,7 +356,6 @@
private DevExpress.XtraBars.BarButtonItem barBtnSearch;
private DevExpress.XtraBars.BarButtonItem barBtnRefresh;
private DevExpress.XtraEditors.PanelControl panelControl1;
- private DevExpress.Utils.SvgImageCollection svgImg32;
private DevExpress.XtraGrid.GridControl gridControl1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
@@ -384,9 +364,6 @@
private BindingSource assetsExchangerFactorMgrViewModelBindingSource;
private DevExpress.XtraGrid.Columns.GridColumn colName;
private DevExpress.XtraGrid.Columns.GridColumn colMaterial;
- private DevExpress.XtraGrid.Columns.GridColumn colCaliber;
- private DevExpress.XtraGrid.Columns.GridColumn colCoefficient;
- private DevExpress.XtraGrid.Columns.GridColumn colLowerLimit;
private DevExpress.XtraGrid.Columns.GridColumn colSortCode;
private DevExpress.XtraGrid.Columns.GridColumn colDescription;
private DevExpress.XtraGrid.Columns.GridColumn colID;
@@ -395,5 +372,7 @@
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
private DevExpress.Utils.DragDrop.DragDropEvents dragDropEvents1;
+ private DevExpress.XtraGrid.Columns.GridColumn colDiameter;
+ private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
}
}
--
Gitblit v1.9.3