From 294b81166f21e12247e784d6bf404f5f34b2ee19 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 19 二月 2025 12:51:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/FourLinkManageMainPage.Designer.cs | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/FourLinkManageMainPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/FourLinkManageMainPage.Designer.cs
index 07704bb..7b6c24b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/FourLinkManageMainPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/FourLinkManageMainPage.Designer.cs
@@ -28,8 +28,8 @@
/// </summary>
private void InitializeComponent()
{
- components = new System.ComponentModel.Container();
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FourLinkManageMainPage));
+ components = new Container();
+ ComponentResourceManager resources = new ComponentResourceManager(typeof(FourLinkManageMainPage));
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
BtnAdd = new DevExpress.XtraBars.BarButtonItem();
BtnEdit = new DevExpress.XtraBars.BarButtonItem();
@@ -49,18 +49,18 @@
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
colCoefficient = new DevExpress.XtraGrid.Columns.GridColumn();
colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
+ colKeyWord = new DevExpress.XtraGrid.Columns.GridColumn();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
fourLinkTreeListCtrl1 = new FourLinkTreeListCtrl();
- colKeyWord = new DevExpress.XtraGrid.Columns.GridColumn();
- ((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)fourLinkViewModelBindingSource).BeginInit();
- ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
+ ((ISupportInitialize)gridControl1).BeginInit();
+ ((ISupportInitialize)fourLinkViewModelBindingSource).BeginInit();
+ ((ISupportInitialize)gridView1).BeginInit();
+ ((ISupportInitialize)dockManager1).BeginInit();
dockPanel1.SuspendLayout();
dockPanel1_Container.SuspendLayout();
SuspendLayout();
@@ -198,7 +198,7 @@
colCaliber.FieldName = "Caliber";
colCaliber.Name = "colCaliber";
colCaliber.Visible = true;
- colCaliber.VisibleIndex = 3;
+ colCaliber.VisibleIndex = 4;
colCaliber.Width = 85;
//
// colDescription
@@ -216,14 +216,21 @@
colCoefficient.FieldName = "Coefficient";
colCoefficient.Name = "colCoefficient";
colCoefficient.Visible = true;
- colCoefficient.VisibleIndex = 4;
+ colCoefficient.VisibleIndex = 1;
//
// colMaterial
//
colMaterial.FieldName = "Material";
colMaterial.Name = "colMaterial";
colMaterial.Visible = true;
- colMaterial.VisibleIndex = 2;
+ colMaterial.VisibleIndex = 3;
+ //
+ // colKeyWord
+ //
+ colKeyWord.FieldName = "KeyWord";
+ colKeyWord.Name = "colKeyWord";
+ colKeyWord.Visible = true;
+ colKeyWord.VisibleIndex = 2;
//
// dockManager1
//
@@ -262,13 +269,6 @@
fourLinkTreeListCtrl1.Size = new Size(193, 491);
fourLinkTreeListCtrl1.TabIndex = 0;
//
- // colKeyWord
- //
- colKeyWord.FieldName = "KeyWord";
- colKeyWord.Name = "colKeyWord";
- colKeyWord.Visible = true;
- colKeyWord.VisibleIndex = 1;
- //
// FourLinkManageMainPage
//
Appearance.BackColor = SystemColors.Control;
@@ -279,14 +279,14 @@
Controls.Add(dockPanel1);
Name = "FourLinkManageMainPage";
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)fourLinkViewModelBindingSource).EndInit();
- ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
- ((System.ComponentModel.ISupportInitialize)dockManager1).EndInit();
+ ((ISupportInitialize)gridControl1).EndInit();
+ ((ISupportInitialize)fourLinkViewModelBindingSource).EndInit();
+ ((ISupportInitialize)gridView1).EndInit();
+ ((ISupportInitialize)dockManager1).EndInit();
dockPanel1.ResumeLayout(false);
dockPanel1_Container.ResumeLayout(false);
ResumeLayout(false);
--
Gitblit v1.9.3