From ad4360df5a1245151efc826bee69b63946426891 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 23 十二月 2024 17:50:18 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.Designer.cs | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 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 ea061f6..e72eb21 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
@@ -102,7 +102,6 @@
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(956, 585);
Root.TextVisible = false;
//
@@ -113,14 +112,14 @@
layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { emptySpaceItem1 });
layoutControlGroup1.Location = new Point(0, 0);
layoutControlGroup1.Name = "autoGeneratedGroup0";
- layoutControlGroup1.Size = new Size(956, 585);
+ layoutControlGroup1.Size = new Size(936, 565);
//
// emptySpaceItem1
//
emptySpaceItem1.AllowHotTrack = false;
emptySpaceItem1.Location = new Point(0, 0);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(956, 585);
+ emptySpaceItem1.Size = new Size(936, 565);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// dxErrorProvider1
@@ -129,10 +128,10 @@
//
// pumpChartExcelImportCtrl1
//
- pumpChartExcelImportCtrl1.Location = new Point(2, 28);
+ pumpChartExcelImportCtrl1.Location = new Point(12, 38);
pumpChartExcelImportCtrl1.Margin = new Padding(1);
pumpChartExcelImportCtrl1.Name = "pumpChartExcelImportCtrl1";
- pumpChartExcelImportCtrl1.Size = new Size(952, 524);
+ pumpChartExcelImportCtrl1.Size = new Size(932, 505);
pumpChartExcelImportCtrl1.TabIndex = 4;
//
// layoutControl2
@@ -158,14 +157,14 @@
generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26);
generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26);
generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26);
- generalOkAndCancelCtrl1.Location = new Point(2, 556);
+ generalOkAndCancelCtrl1.Location = new Point(12, 547);
generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
- generalOkAndCancelCtrl1.Size = new Size(952, 27);
+ 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";
editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
@@ -173,23 +172,23 @@
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(262, 22);
+ btnExcelFilePath.Size = new Size(255, 22);
btnExcelFilePath.StyleController = layoutControl2;
btnExcelFilePath.TabIndex = 0;
btnExcelFilePath.ButtonClick += btnExcelFilePath_ButtonClick;
//
// textEditName
//
- textEditName.Location = new Point(396, 2);
+ textEditName.Location = new Point(399, 12);
textEditName.Margin = new Padding(2);
textEditName.Name = "textEditName";
- textEditName.Size = new Size(166, 20);
+ textEditName.Size = new Size(161, 20);
textEditName.StyleController = layoutControl2;
textEditName.TabIndex = 2;
//
// textEditImportance
//
- textEditImportance.Location = new Point(630, 2);
+ textEditImportance.Location = new Point(628, 12);
textEditImportance.Margin = new Padding(2);
textEditImportance.Name = "textEditImportance";
textEditImportance.Size = new Size(50, 20);
@@ -202,7 +201,6 @@
layoutControlGroup2.GroupBordersVisible = false;
layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem3, layoutControlItem2, layoutControlItem4, emptySpaceItem3, layoutControlItem5 });
layoutControlGroup2.Name = "Root";
- layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
layoutControlGroup2.Size = new Size(956, 585);
layoutControlGroup2.TextVisible = false;
//
@@ -211,7 +209,7 @@
layoutControlItem1.Control = btnExcelFilePath;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(330, 26);
+ layoutControlItem1.Size = new Size(323, 26);
layoutControlItem1.Text = "鏂囦欢璺緞:";
layoutControlItem1.TextSize = new Size(52, 14);
//
@@ -220,23 +218,23 @@
layoutControlItem3.Control = pumpChartExcelImportCtrl1;
layoutControlItem3.Location = new Point(0, 26);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(956, 528);
+ layoutControlItem3.Size = new Size(936, 509);
layoutControlItem3.TextSize = new Size(0, 0);
layoutControlItem3.TextVisible = false;
//
// layoutControlItem2
//
layoutControlItem2.Control = textEditName;
- layoutControlItem2.Location = new Point(330, 0);
+ layoutControlItem2.Location = new Point(323, 0);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(234, 26);
+ layoutControlItem2.Size = new Size(229, 26);
layoutControlItem2.Text = "鍚嶇О:";
layoutControlItem2.TextSize = new Size(52, 14);
//
// layoutControlItem4
//
layoutControlItem4.Control = textEditImportance;
- layoutControlItem4.Location = new Point(564, 0);
+ layoutControlItem4.Location = new Point(552, 0);
layoutControlItem4.Name = "layoutControlItem4";
layoutControlItem4.Size = new Size(118, 26);
layoutControlItem4.Text = "閲嶈搴�:";
@@ -245,17 +243,17 @@
// emptySpaceItem3
//
emptySpaceItem3.AllowHotTrack = false;
- emptySpaceItem3.Location = new Point(682, 0);
+ emptySpaceItem3.Location = new Point(670, 0);
emptySpaceItem3.Name = "emptySpaceItem3";
- emptySpaceItem3.Size = new Size(274, 26);
+ emptySpaceItem3.Size = new Size(266, 26);
emptySpaceItem3.TextSize = new Size(0, 0);
//
// layoutControlItem5
//
layoutControlItem5.Control = generalOkAndCancelCtrl1;
- layoutControlItem5.Location = new Point(0, 554);
+ layoutControlItem5.Location = new Point(0, 535);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(956, 31);
+ layoutControlItem5.Size = new Size(936, 30);
layoutControlItem5.TextSize = new Size(0, 0);
layoutControlItem5.TextVisible = false;
//
--
Gitblit v1.9.3