From ad4360df5a1245151efc826bee69b63946426891 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期一, 23 十二月 2024 17:50:18 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/ThreeLinkManageMainPage.Designer.cs | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/ThreeLinkManageMainPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/ThreeLinkManageMainPage.Designer.cs index b2bd9ea..a923138 100644 --- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/ThreeLinkManageMainPage.Designer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/ThreeLinkManageMainPage.Designer.cs @@ -28,8 +28,8 @@ /// </summary> private void InitializeComponent() { - components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ThreeLinkManageMainPage)); + components = new Container(); + ComponentResourceManager resources = new ComponentResourceManager(typeof(ThreeLinkManageMainPage)); ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl(); BtnAdd = new DevExpress.XtraBars.BarButtonItem(); BtnEdit = new DevExpress.XtraBars.BarButtonItem(); @@ -56,13 +56,13 @@ dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel(); dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer(); threeLinkTreeListCtrl1 = new ThreeLinkTreeListCtrl(); - ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit(); - ((System.ComponentModel.ISupportInitialize)svgImageCollection1).BeginInit(); + ((ISupportInitialize)ribbonControl1).BeginInit(); + ((ISupportInitialize)svgImageCollection1).BeginInit(); sidePanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit(); - ((System.ComponentModel.ISupportInitialize)threeLinkViewModelBindingSource).BeginInit(); - ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit(); - ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit(); + ((ISupportInitialize)gridControl1).BeginInit(); + ((ISupportInitialize)threeLinkViewModelBindingSource).BeginInit(); + ((ISupportInitialize)gridView1).BeginInit(); + ((ISupportInitialize)dockManager1).BeginInit(); dockPanel1.SuspendLayout(); dockPanel1_Container.SuspendLayout(); SuspendLayout(); @@ -195,7 +195,7 @@ colCaliber.FieldName = "Caliber"; colCaliber.Name = "colCaliber"; colCaliber.Visible = true; - colCaliber.VisibleIndex = 3; + colCaliber.VisibleIndex = 4; // // colKeyWord // @@ -223,14 +223,14 @@ colMinorLoss.FieldName = "MinorLoss"; colMinorLoss.Name = "colMinorLoss"; colMinorLoss.Visible = true; - colMinorLoss.VisibleIndex = 4; + colMinorLoss.VisibleIndex = 2; // // colMaterial // colMaterial.FieldName = "Material"; colMaterial.Name = "colMaterial"; colMaterial.Visible = true; - colMaterial.VisibleIndex = 2; + colMaterial.VisibleIndex = 3; // // colDescription // @@ -286,14 +286,14 @@ Controls.Add(dockPanel1); Name = "ThreeLinkManageMainPage"; Size = new Size(890, 520); - ((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit(); - ((System.ComponentModel.ISupportInitialize)svgImageCollection1).EndInit(); + ((ISupportInitialize)ribbonControl1).EndInit(); + ((ISupportInitialize)svgImageCollection1).EndInit(); sidePanel1.ResumeLayout(false); sidePanel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)gridControl1).EndInit(); - ((System.ComponentModel.ISupportInitialize)threeLinkViewModelBindingSource).EndInit(); - ((System.ComponentModel.ISupportInitialize)gridView1).EndInit(); - ((System.ComponentModel.ISupportInitialize)dockManager1).EndInit(); + ((ISupportInitialize)gridControl1).EndInit(); + ((ISupportInitialize)threeLinkViewModelBindingSource).EndInit(); + ((ISupportInitialize)gridView1).EndInit(); + ((ISupportInitialize)dockManager1).EndInit(); dockPanel1.ResumeLayout(false); dockPanel1_Container.ResumeLayout(false); ResumeLayout(false); -- Gitblit v1.9.3