Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

lixiaojun

2024-12-23 ad4360df5a1245151efc826bee69b63946426891

 WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/ElbowManageMainPage.Designer.cs

@@ -28,8 +28,8 @@
        /// </summary>
        private void InitializeComponent()
        {
            components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ElbowManageMainPage));
            components = new Container();
            ComponentResourceManager resources = new ComponentResourceManager(typeof(ElbowManageMainPage));
            ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
            BtnAdd = new DevExpress.XtraBars.BarButtonItem();
            BtnEdit = new DevExpress.XtraBars.BarButtonItem();
@@ -51,18 +51,18 @@
            colAngle = new DevExpress.XtraGrid.Columns.GridColumn();
            colElbowLengthType = new DevExpress.XtraGrid.Columns.GridColumn();
            colMinorLoss = 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();
            elbowTreeListCtrl1 = new ElbowTreeListCtrl();
            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)elbowViewModelBindingSource).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)elbowViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
            ((ISupportInitialize)dockManager1).BeginInit();
            dockPanel1.SuspendLayout();
            dockPanel1_Container.SuspendLayout();
            SuspendLayout();
@@ -200,7 +200,7 @@
            colCaliber.FieldName = "Caliber";
            colCaliber.Name = "colCaliber";
            colCaliber.Visible = true;
            colCaliber.VisibleIndex = 4;
            colCaliber.VisibleIndex = 5;
            colCaliber.Width = 85;
            // 
            // colDescription
@@ -218,7 +218,7 @@
            colMaterialName.FieldName = "MaterialName";
            colMaterialName.Name = "colMaterialName";
            colMaterialName.Visible = true;
            colMaterialName.VisibleIndex = 3;
            colMaterialName.VisibleIndex = 4;
            colMaterialName.Width = 79;
            // 
            // colAngle
@@ -233,14 +233,21 @@
            colElbowLengthType.FieldName = "ElbowLengthType";
            colElbowLengthType.Name = "colElbowLengthType";
            colElbowLengthType.Visible = true;
            colElbowLengthType.VisibleIndex = 2;
            colElbowLengthType.VisibleIndex = 3;
            // 
            // colMinorLoss
            // 
            colMinorLoss.FieldName = "MinorLoss";
            colMinorLoss.Name = "colMinorLoss";
            colMinorLoss.Visible = true;
            colMinorLoss.VisibleIndex = 5;
            colMinorLoss.VisibleIndex = 1;
            // 
            // colKeyWord
            // 
            colKeyWord.FieldName = "KeyWord";
            colKeyWord.Name = "colKeyWord";
            colKeyWord.Visible = true;
            colKeyWord.VisibleIndex = 2;
            // 
            // dockManager1
            // 
@@ -279,13 +286,6 @@
            elbowTreeListCtrl1.Size = new Size(193, 491);
            elbowTreeListCtrl1.TabIndex = 0;
            // 
            // colKeyWord
            // 
            colKeyWord.FieldName = "KeyWord";
            colKeyWord.Name = "colKeyWord";
            colKeyWord.Visible = true;
            colKeyWord.VisibleIndex = 1;
            // 
            // ElbowManageMainPage
            // 
            Appearance.BackColor = SystemColors.Control;
@@ -296,14 +296,14 @@
            Controls.Add(dockPanel1);
            Name = "ElbowManageMainPage";
            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)elbowViewModelBindingSource).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).EndInit();
            ((ISupportInitialize)gridControl1).EndInit();
            ((ISupportInitialize)elbowViewModelBindingSource).EndInit();
            ((ISupportInitialize)gridView1).EndInit();
            ((ISupportInitialize)dockManager1).EndInit();
            dockPanel1.ResumeLayout(false);
            dockPanel1_Container.ResumeLayout(false);
            ResumeLayout(false);