冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

 WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/02-main/AssetsExchangerMainMgrPage.Designer.cs

@@ -46,6 +46,7 @@
            barBtnDown = new DevExpress.XtraBars.BarButtonItem();
            barCkDrag = new DevExpress.XtraBars.BarCheckItem();
            barBtnFactor = new DevExpress.XtraBars.BarButtonItem();
            barBtnCurve = new DevExpress.XtraBars.BarButtonItem();
            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
            ribPageGroupForBasic = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -68,7 +69,6 @@
            repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(components);
            dragDropEvents1 = new DevExpress.Utils.DragDrop.DragDropEvents(components);
            barBtnCurve = new DevExpress.XtraBars.BarButtonItem();
            ((ISupportInitialize)ribbonControl1).BeginInit();
            ((ISupportInitialize)panelControl1).BeginInit();
            panelControl1.SuspendLayout();
@@ -92,7 +92,7 @@
            ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
            ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
            ribbonControl1.ShowToolbarCustomizeItem = false;
            ribbonControl1.Size = new Size(1107, 128);
            ribbonControl1.Size = new Size(1107, 101);
            ribbonControl1.Toolbar.ShowCustomizeItem = false;
            ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
            // 
@@ -178,6 +178,14 @@
            barBtnFactor.Name = "barBtnFactor";
            barBtnFactor.ItemClick += barBtnFactor_ItemClick;
            // 
            // barBtnCurve
            // 
            barBtnCurve.Caption = "水头损失曲线";
            barBtnCurve.Id = 19;
            barBtnCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurve.ImageOptions.SvgImage");
            barBtnCurve.Name = "barBtnCurve";
            barBtnCurve.ItemClick += barBtnCurve_ItemClick;
            // 
            // ribbonPage1
            // 
            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribPageGroupForBasic, ribbonPageGroup1, ribPageGroupForMore });
@@ -215,10 +223,10 @@
            panelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
            panelControl1.Controls.Add(gridControl1);
            panelControl1.Dock = DockStyle.Fill;
            panelControl1.Location = new Point(1, 129);
            panelControl1.Location = new Point(1, 102);
            panelControl1.Name = "panelControl1";
            panelControl1.Padding = new Padding(0, 1, 0, 0);
            panelControl1.Size = new Size(1107, 540);
            panelControl1.Size = new Size(1107, 567);
            panelControl1.TabIndex = 3;
            // 
            // gridControl1
@@ -230,7 +238,7 @@
            gridControl1.MenuManager = ribbonControl1;
            gridControl1.Name = "gridControl1";
            gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit1 });
            gridControl1.Size = new Size(1107, 539);
            gridControl1.Size = new Size(1107, 566);
            gridControl1.TabIndex = 0;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
@@ -270,7 +278,7 @@
            colMaterial.MinWidth = 150;
            colMaterial.Name = "colMaterial";
            colMaterial.Visible = true;
            colMaterial.VisibleIndex = 1;
            colMaterial.VisibleIndex = 2;
            colMaterial.Width = 150;
            // 
            // colDiameter
@@ -280,7 +288,7 @@
            colDiameter.MinWidth = 100;
            colDiameter.Name = "colDiameter";
            colDiameter.Visible = true;
            colDiameter.VisibleIndex = 2;
            colDiameter.VisibleIndex = 1;
            colDiameter.Width = 100;
            // 
            // colMinorLoss
@@ -360,14 +368,6 @@
            // dragDropEvents1
            // 
            dragDropEvents1.DragDrop += dragDropEvents1_DragDrop;
            // 
            // barBtnCurve
            // 
            barBtnCurve.Caption = "水头损失曲线";
            barBtnCurve.Id = 19;
            barBtnCurve.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnCurve.ImageOptions.SvgImage");
            barBtnCurve.Name = "barBtnCurve";
            barBtnCurve.ItemClick += barBtnCurve_ItemClick;
            // 
            // AssetsExchangerMainMgrPage
            //