冲突处理

lixiaojun

2025-01-20 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4

 WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/AssetsTranslationFactorMgrPage.Designer.cs

@@ -60,13 +60,12 @@
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            colDetail = new DevExpress.XtraGrid.Columns.GridColumn();
            repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            colDiameter = new DevExpress.XtraGrid.Columns.GridColumn();
            colEndDiameter = new DevExpress.XtraGrid.Columns.GridColumn();
            colStartDiameter = new DevExpress.XtraGrid.Columns.GridColumn();
            colTranslationType = new DevExpress.XtraGrid.Columns.GridColumn();
            colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
            behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(components);
            dragDropEvents1 = new DevExpress.Utils.DragDrop.DragDropEvents(components);
            colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)ribbonControl1).BeginInit();
            ((ISupportInitialize)panelControl1).BeginInit();
            panelControl1.SuspendLayout();
@@ -229,7 +228,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, colMinorLoss, colSortCode, colDescription, colDetail, colDiameter, colEndDiameter, colStartDiameter, colTranslationType, colMaterial });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colID, colName, colMinorLoss, colSortCode, colDescription, colDetail, colEndDiameter, colStartDiameter, colTranslationType, colMaterial });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.RowCellClick += gridView1_RowCellClick;
@@ -259,7 +258,7 @@
            colMinorLoss.MinWidth = 100;
            colMinorLoss.Name = "colMinorLoss";
            colMinorLoss.Visible = true;
            colMinorLoss.VisibleIndex = 6;
            colMinorLoss.VisibleIndex = 5;
            colMinorLoss.Width = 100;
            // 
            // colSortCode
@@ -276,7 +275,7 @@
            colDescription.MinWidth = 100;
            colDescription.Name = "colDescription";
            colDescription.Visible = true;
            colDescription.VisibleIndex = 7;
            colDescription.VisibleIndex = 6;
            colDescription.Width = 100;
            // 
            // colDetail
@@ -287,7 +286,7 @@
            colDetail.MinWidth = 60;
            colDetail.Name = "colDetail";
            colDetail.Visible = true;
            colDetail.VisibleIndex = 8;
            colDetail.VisibleIndex = 7;
            colDetail.Width = 60;
            // 
            // repositoryItemButtonEdit1
@@ -299,44 +298,37 @@
            repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            // 
            // colDiameter
            // 
            colDiameter.FieldName = "Diameter";
            colDiameter.Name = "colDiameter";
            colDiameter.Visible = true;
            colDiameter.VisibleIndex = 1;
            // 
            // colEndDiameter
            // 
            colEndDiameter.FieldName = "EndDiameter";
            colEndDiameter.Name = "colEndDiameter";
            colEndDiameter.Visible = true;
            colEndDiameter.VisibleIndex = 4;
            colEndDiameter.VisibleIndex = 3;
            // 
            // colStartDiameter
            // 
            colStartDiameter.FieldName = "StartDiameter";
            colStartDiameter.Name = "colStartDiameter";
            colStartDiameter.Visible = true;
            colStartDiameter.VisibleIndex = 3;
            colStartDiameter.VisibleIndex = 2;
            // 
            // colTranslationType
            // 
            colTranslationType.FieldName = "TranslationType";
            colTranslationType.Name = "colTranslationType";
            colTranslationType.Visible = true;
            colTranslationType.VisibleIndex = 5;
            // 
            // dragDropEvents1
            // 
            dragDropEvents1.DragDrop += dragDropEvents1_DragDrop;
            colTranslationType.VisibleIndex = 4;
            // 
            // colMaterial
            // 
            colMaterial.FieldName = "Material";
            colMaterial.Name = "colMaterial";
            colMaterial.Visible = true;
            colMaterial.VisibleIndex = 2;
            colMaterial.VisibleIndex = 1;
            // 
            // dragDropEvents1
            // 
            dragDropEvents1.DragDrop += dragDropEvents1_DragDrop;
            // 
            // AssetsTranslationFactorMgrPage
            //