From 59f2c4c04e06d77de7f10ab96d1a5c73ccd01262 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期四, 05 十二月 2024 16:23:42 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.Designer.cs | 36 +++--------------------------------- 1 files changed, 3 insertions(+), 33 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.Designer.cs index fcee333..7062361 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.Designer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.Designer.cs @@ -41,13 +41,10 @@ gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView(); colCaliber = new DevExpress.XtraGrid.Columns.GridColumn(); colCoefficient = new DevExpress.XtraGrid.Columns.GridColumn(); - colExchangerLift = new DevExpress.XtraGrid.Columns.GridColumn(); colName = new DevExpress.XtraGrid.Columns.GridColumn(); colKeyWord = new DevExpress.XtraGrid.Columns.GridColumn(); - colExchangerSetting = new DevExpress.XtraGrid.Columns.GridColumn(); colDescription = new DevExpress.XtraGrid.Columns.GridColumn(); colMaterial = new DevExpress.XtraGrid.Columns.GridColumn(); - colSeriesType = new DevExpress.XtraGrid.Columns.GridColumn(); gridControl1 = new DevExpress.XtraGrid.GridControl(); gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); ColShowChart = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -111,7 +108,7 @@ // gridView3.Appearance.HeaderPanel.Options.UseTextOptions = true; gridView3.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; - gridView3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colCaliber, colCoefficient, colExchangerLift, colName, colKeyWord, colExchangerSetting, colDescription, colMaterial, colSeriesType }); + gridView3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colCaliber, colCoefficient, colName, colKeyWord, colDescription, colMaterial }); gridView3.GridControl = gridControl3; gridView3.Name = "gridView3"; gridView3.OptionsView.ShowGroupPanel = false; @@ -133,14 +130,6 @@ colCoefficient.VisibleIndex = 3; colCoefficient.Width = 89; // - // colExchangerLift - // - colExchangerLift.FieldName = "ExchangerLift"; - colExchangerLift.Name = "colExchangerLift"; - colExchangerLift.Visible = true; - colExchangerLift.VisibleIndex = 4; - colExchangerLift.Width = 86; - // // colName // colName.FieldName = "Name"; @@ -157,20 +146,12 @@ colKeyWord.VisibleIndex = 1; colKeyWord.Width = 85; // - // colExchangerSetting - // - colExchangerSetting.FieldName = "ExchangerSetting"; - colExchangerSetting.Name = "colExchangerSetting"; - colExchangerSetting.Visible = true; - colExchangerSetting.VisibleIndex = 5; - colExchangerSetting.Width = 84; - // // colDescription // colDescription.FieldName = "Description"; colDescription.Name = "colDescription"; colDescription.Visible = true; - colDescription.VisibleIndex = 8; + colDescription.VisibleIndex = 5; colDescription.Width = 194; // // colMaterial @@ -178,16 +159,8 @@ colMaterial.FieldName = "Material"; colMaterial.Name = "colMaterial"; colMaterial.Visible = true; - colMaterial.VisibleIndex = 6; + colMaterial.VisibleIndex = 4; colMaterial.Width = 66; - // - // colSeriesType - // - colSeriesType.FieldName = "SeriesType"; - colSeriesType.Name = "colSeriesType"; - colSeriesType.Visible = true; - colSeriesType.VisibleIndex = 7; - colSeriesType.Width = 112; // // gridControl1 // @@ -380,13 +353,10 @@ private BindingSource ExchangerSingleMatchingViewModelBindingSource; private DevExpress.XtraGrid.Columns.GridColumn colCaliber; private DevExpress.XtraGrid.Columns.GridColumn colCoefficient; - private DevExpress.XtraGrid.Columns.GridColumn colExchangerLift; private DevExpress.XtraGrid.Columns.GridColumn colName; private DevExpress.XtraGrid.Columns.GridColumn colKeyWord; - private DevExpress.XtraGrid.Columns.GridColumn colExchangerSetting; private DevExpress.XtraGrid.Columns.GridColumn colDescription; private DevExpress.XtraGrid.Columns.GridColumn colMaterial; - private DevExpress.XtraGrid.Columns.GridColumn colSeriesType; private DevExpress.XtraGrid.Columns.GridColumn ColShowChart; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; } -- Gitblit v1.9.3