From 3e2dd57ff0e7bddf72836d93208b53f0e3db22c4 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期三, 12 三月 2025 02:29:46 +0800 Subject: [PATCH] 颜色配置整改 --- WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.Designer.cs | 65 ++++++++++++++++++++------------ 1 files changed, 41 insertions(+), 24 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.Designer.cs index 15cc842..f015197 100644 --- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.Designer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.Designer.cs @@ -48,7 +48,6 @@ layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components); - pumpChartExcelImportCtrl1 = new PumpChartExcelImportCtrl(); bindingSource1 = new BindingSource(components); layoutControl2 = new DevExpress.XtraLayout.LayoutControl(); generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl(); @@ -57,11 +56,13 @@ textEditImportance = new DevExpress.XtraEditors.TextEdit(); layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); - layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem(); layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + panelControl1 = new DevExpress.XtraEditors.PanelControl(); + layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); + pumpChartExcelImportCtrl1 = new PumpChartExcelImportCtrl(); ((ISupportInitialize)dataLayoutControl1).BeginInit(); ((ISupportInitialize)Root).BeginInit(); ((ISupportInitialize)layoutControlGroup1).BeginInit(); @@ -75,11 +76,13 @@ ((ISupportInitialize)textEditImportance.Properties).BeginInit(); ((ISupportInitialize)layoutControlGroup2).BeginInit(); ((ISupportInitialize)layoutControlItem1).BeginInit(); - ((ISupportInitialize)layoutControlItem3).BeginInit(); ((ISupportInitialize)layoutControlItem2).BeginInit(); ((ISupportInitialize)layoutControlItem4).BeginInit(); ((ISupportInitialize)emptySpaceItem3).BeginInit(); ((ISupportInitialize)layoutControlItem5).BeginInit(); + ((ISupportInitialize)panelControl1).BeginInit(); + panelControl1.SuspendLayout(); + ((ISupportInitialize)layoutControlItem3).BeginInit(); SuspendLayout(); // // dataLayoutControl1 @@ -126,17 +129,10 @@ // dxErrorProvider1.ContainerControl = this; // - // pumpChartExcelImportCtrl1 - // - pumpChartExcelImportCtrl1.Location = new Point(12, 38); - pumpChartExcelImportCtrl1.Name = "pumpChartExcelImportCtrl1"; - pumpChartExcelImportCtrl1.Size = new Size(932, 505); - pumpChartExcelImportCtrl1.TabIndex = 4; - // // layoutControl2 // + layoutControl2.Controls.Add(panelControl1); layoutControl2.Controls.Add(generalOkAndCancelCtrl1); - layoutControl2.Controls.Add(pumpChartExcelImportCtrl1); layoutControl2.Controls.Add(btnExcelFilePath); layoutControl2.Controls.Add(textEditName); layoutControl2.Controls.Add(textEditImportance); @@ -198,7 +194,7 @@ // layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; layoutControlGroup2.GroupBordersVisible = false; - layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem3, layoutControlItem2, layoutControlItem4, emptySpaceItem3, layoutControlItem5 }); + layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem4, emptySpaceItem3, layoutControlItem5, layoutControlItem3 }); layoutControlGroup2.Name = "Root"; layoutControlGroup2.Size = new Size(956, 585); layoutControlGroup2.TextVisible = false; @@ -211,15 +207,6 @@ layoutControlItem1.Size = new Size(323, 26); layoutControlItem1.Text = "鏂囦欢璺緞:"; layoutControlItem1.TextSize = new Size(52, 14); - // - // layoutControlItem3 - // - layoutControlItem3.Control = pumpChartExcelImportCtrl1; - layoutControlItem3.Location = new Point(0, 26); - layoutControlItem3.Name = "layoutControlItem3"; - layoutControlItem3.Size = new Size(936, 509); - layoutControlItem3.TextSize = new Size(0, 0); - layoutControlItem3.TextVisible = false; // // layoutControlItem2 // @@ -256,6 +243,33 @@ layoutControlItem5.TextSize = new Size(0, 0); layoutControlItem5.TextVisible = false; // + // panelControl1 + // + panelControl1.Controls.Add(pumpChartExcelImportCtrl1); + panelControl1.Dock = DockStyle.Fill; + panelControl1.Location = new Point(12, 38); + panelControl1.Name = "panelControl1"; + panelControl1.Size = new Size(932, 505); + panelControl1.TabIndex = 7; + // + // layoutControlItem3 + // + layoutControlItem3.Control = panelControl1; + layoutControlItem3.Location = new Point(0, 26); + layoutControlItem3.Name = "layoutControlItem3"; + layoutControlItem3.Size = new Size(936, 509); + layoutControlItem3.TextSize = new Size(0, 0); + layoutControlItem3.TextVisible = false; + // + // pumpChartExcelImportCtrl1 + // + pumpChartExcelImportCtrl1.Dock = DockStyle.Fill; + pumpChartExcelImportCtrl1.Location = new Point(2, 2); + pumpChartExcelImportCtrl1.Margin = new Padding(2, 2, 2, 2); + pumpChartExcelImportCtrl1.Name = "pumpChartExcelImportCtrl1"; + pumpChartExcelImportCtrl1.Size = new Size(928, 501); + pumpChartExcelImportCtrl1.TabIndex = 0; + // // ImportPumpPerform2dByExcelDlg // AutoScaleDimensions = new SizeF(7F, 14F); @@ -279,11 +293,13 @@ ((ISupportInitialize)textEditImportance.Properties).EndInit(); ((ISupportInitialize)layoutControlGroup2).EndInit(); ((ISupportInitialize)layoutControlItem1).EndInit(); - ((ISupportInitialize)layoutControlItem3).EndInit(); ((ISupportInitialize)layoutControlItem2).EndInit(); ((ISupportInitialize)layoutControlItem4).EndInit(); ((ISupportInitialize)emptySpaceItem3).EndInit(); ((ISupportInitialize)layoutControlItem5).EndInit(); + ((ISupportInitialize)panelControl1).EndInit(); + panelControl1.ResumeLayout(false); + ((ISupportInitialize)layoutControlItem3).EndInit(); ResumeLayout(false); } @@ -295,18 +311,19 @@ private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1; private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1; private DevExpress.XtraLayout.LayoutControl layoutControl2; - private PumpChartExcelImportCtrl pumpChartExcelImportCtrl1; private DevExpress.XtraEditors.ButtonEdit btnExcelFilePath; private DevExpress.XtraEditors.TextEdit textEditName; private DevExpress.XtraEditors.TextEdit textEditImportance; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3; private BindingSource bindingSource1; private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraEditors.PanelControl panelControl1; + private PumpChartExcelImportCtrl pumpChartExcelImportCtrl1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; } } \ No newline at end of file -- Gitblit v1.9.3