From ad8f813f5eddd66740b4e09801e4ea02ddf70a4a Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 19 二月 2025 15:58:22 +0800
Subject: [PATCH] 继续优化报表
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.Designer.cs | 151 +++++++++++++++++++++++++++----------------------
1 files changed, 83 insertions(+), 68 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 ca1c1cc..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
@@ -30,25 +30,24 @@
private void InitializeComponent()
{
components = new Container();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
ComponentResourceManager resources = new ComponentResourceManager(typeof(ImportPumpPerform2dByExcelDlg));
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SuperToolTip superToolTip3 = new DevExpress.Utils.SuperToolTip();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SuperToolTip superToolTip4 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
dataLayoutControl1 = new DevExpress.XtraDataLayout.DataLayoutControl();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
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
@@ -90,7 +93,7 @@
dataLayoutControl1.Name = "dataLayoutControl1";
dataLayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(859, 142, 650, 400);
dataLayoutControl1.Root = Root;
- dataLayoutControl1.Size = new Size(808, 563);
+ dataLayoutControl1.Size = new Size(956, 585);
dataLayoutControl1.TabIndex = 0;
dataLayoutControl1.Text = "dataLayoutControl1";
//
@@ -102,8 +105,7 @@
Root.GroupBordersVisible = false;
Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 });
Root.Name = "Root";
- Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- Root.Size = new Size(808, 563);
+ Root.Size = new Size(956, 585);
Root.TextVisible = false;
//
// layoutControlGroup1
@@ -113,32 +115,24 @@
layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { emptySpaceItem1 });
layoutControlGroup1.Location = new Point(0, 0);
layoutControlGroup1.Name = "autoGeneratedGroup0";
- layoutControlGroup1.Size = new Size(808, 563);
+ layoutControlGroup1.Size = new Size(936, 565);
//
// emptySpaceItem1
//
emptySpaceItem1.AllowHotTrack = false;
emptySpaceItem1.Location = new Point(0, 0);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(808, 563);
+ emptySpaceItem1.Size = new Size(936, 565);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// dxErrorProvider1
//
dxErrorProvider1.ContainerControl = this;
//
- // pumpChartExcelImportCtrl1
- //
- pumpChartExcelImportCtrl1.Location = new Point(2, 28);
- pumpChartExcelImportCtrl1.Margin = new Padding(1);
- pumpChartExcelImportCtrl1.Name = "pumpChartExcelImportCtrl1";
- pumpChartExcelImportCtrl1.Size = new Size(804, 503);
- 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);
@@ -148,7 +142,7 @@
layoutControl2.Name = "layoutControl2";
layoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(565, 257, 650, 400);
layoutControl2.Root = layoutControlGroup2;
- layoutControl2.Size = new Size(808, 563);
+ layoutControl2.Size = new Size(956, 585);
layoutControl2.TabIndex = 4;
layoutControl2.Text = "layoutControl2";
//
@@ -158,40 +152,41 @@
generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26);
generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26);
generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26);
- generalOkAndCancelCtrl1.Location = new Point(2, 535);
+ generalOkAndCancelCtrl1.Location = new Point(12, 547);
generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
- generalOkAndCancelCtrl1.Size = new Size(804, 26);
+ generalOkAndCancelCtrl1.Size = new Size(932, 26);
generalOkAndCancelCtrl1.TabIndex = 6;
//
// btnExcelFilePath
//
- btnExcelFilePath.Location = new Point(66, 2);
+ btnExcelFilePath.Location = new Point(76, 12);
btnExcelFilePath.Margin = new Padding(2);
btnExcelFilePath.Name = "btnExcelFilePath";
- editorButtonImageOptions3.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions3.SvgImage");
- editorButtonImageOptions3.SvgImageSize = new Size(14, 14);
- editorButtonImageOptions4.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions4.SvgImage");
- editorButtonImageOptions4.SvgImageSize = new Size(14, 14);
- btnExcelFilePath.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "瀵煎叆鏂囦欢", "Import", superToolTip3, DevExpress.Utils.ToolTipAnchor.Default), new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "妯℃澘涓嬭浇", "Download", superToolTip4, DevExpress.Utils.ToolTipAnchor.Default) });
- btnExcelFilePath.Size = new Size(211, 22);
+ editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
+ editorButtonImageOptions1.SvgImageSize = new Size(14, 14);
+ editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage");
+ editorButtonImageOptions2.SvgImageSize = new Size(14, 14);
+ btnExcelFilePath.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "瀵煎叆鏂囦欢", "Import", superToolTip1, DevExpress.Utils.ToolTipAnchor.Default), new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "妯℃澘涓嬭浇", "Download", superToolTip2, DevExpress.Utils.ToolTipAnchor.Default) });
+ btnExcelFilePath.Size = new Size(255, 22);
btnExcelFilePath.StyleController = layoutControl2;
btnExcelFilePath.TabIndex = 0;
+ btnExcelFilePath.ButtonClick += btnExcelFilePath_ButtonClick;
//
// textEditName
//
- textEditName.Location = new Point(345, 2);
+ textEditName.Location = new Point(399, 12);
textEditName.Margin = new Padding(2);
textEditName.Name = "textEditName";
- textEditName.Size = new Size(77, 20);
+ textEditName.Size = new Size(161, 20);
textEditName.StyleController = layoutControl2;
textEditName.TabIndex = 2;
//
// textEditImportance
//
- textEditImportance.Location = new Point(490, 2);
+ textEditImportance.Location = new Point(628, 12);
textEditImportance.Margin = new Padding(2);
textEditImportance.Name = "textEditImportance";
- textEditImportance.Size = new Size(78, 20);
+ textEditImportance.Size = new Size(50, 20);
textEditImportance.StyleController = layoutControl2;
textEditImportance.TabIndex = 3;
//
@@ -199,10 +194,9 @@
//
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.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlGroup2.Size = new Size(808, 563);
+ layoutControlGroup2.Size = new Size(956, 585);
layoutControlGroup2.TextVisible = false;
//
// layoutControlItem1
@@ -210,59 +204,77 @@
layoutControlItem1.Control = btnExcelFilePath;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(279, 26);
+ 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(808, 507);
- layoutControlItem3.TextSize = new Size(0, 0);
- layoutControlItem3.TextVisible = false;
//
// layoutControlItem2
//
layoutControlItem2.Control = textEditName;
- layoutControlItem2.Location = new Point(279, 0);
+ layoutControlItem2.Location = new Point(323, 0);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(145, 26);
+ layoutControlItem2.Size = new Size(229, 26);
layoutControlItem2.Text = "鍚嶇О:";
layoutControlItem2.TextSize = new Size(52, 14);
//
// layoutControlItem4
//
layoutControlItem4.Control = textEditImportance;
- layoutControlItem4.Location = new Point(424, 0);
+ layoutControlItem4.Location = new Point(552, 0);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(146, 26);
+ layoutControlItem4.Size = new Size(118, 26);
layoutControlItem4.Text = "閲嶈搴�:";
layoutControlItem4.TextSize = new Size(52, 14);
//
// emptySpaceItem3
//
emptySpaceItem3.AllowHotTrack = false;
- emptySpaceItem3.Location = new Point(570, 0);
+ emptySpaceItem3.Location = new Point(670, 0);
emptySpaceItem3.Name = "emptySpaceItem3";
- emptySpaceItem3.Size = new Size(238, 26);
+ emptySpaceItem3.Size = new Size(266, 26);
emptySpaceItem3.TextSize = new Size(0, 0);
//
// layoutControlItem5
//
layoutControlItem5.Control = generalOkAndCancelCtrl1;
- layoutControlItem5.Location = new Point(0, 533);
+ layoutControlItem5.Location = new Point(0, 535);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(808, 30);
+ layoutControlItem5.Size = new Size(936, 30);
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);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(808, 563);
+ ClientSize = new Size(956, 585);
Controls.Add(layoutControl2);
Controls.Add(dataLayoutControl1);
Name = "ImportPumpPerform2dByExcelDlg";
@@ -281,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);
}
@@ -297,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