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/03-point/ImportPumpChartPoint.Designer.cs | 95 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 82 insertions(+), 13 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/03-point/ImportPumpChartPoint.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/03-point/ImportPumpChartPoint.Designer.cs
index dc36bc4..3bdceb8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/03-point/ImportPumpChartPoint.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/03-point/ImportPumpChartPoint.Designer.cs
@@ -30,33 +30,66 @@
{
components = new Container();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ textEditImportance = new DevExpress.XtraEditors.TextEdit();
+ textEditName = new DevExpress.XtraEditors.TextEdit();
generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl();
pumpChartPointImportCtrl1 = new PumpChartPointImportCtrl();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
+ ((ISupportInitialize)textEditImportance.Properties).BeginInit();
+ ((ISupportInitialize)textEditName.Properties).BeginInit();
((ISupportInitialize)Root).BeginInit();
((ISupportInitialize)layoutControlItem3).BeginInit();
((ISupportInitialize)layoutControlItem1).BeginInit();
+ ((ISupportInitialize)layoutControlItem4).BeginInit();
+ ((ISupportInitialize)layoutControlItem5).BeginInit();
+ ((ISupportInitialize)emptySpaceItem2).BeginInit();
((ISupportInitialize)emptySpaceItem1).BeginInit();
((ISupportInitialize)dxErrorProvider1).BeginInit();
SuspendLayout();
//
// layoutControl1
//
+ layoutControl1.Controls.Add(textEditImportance);
+ layoutControl1.Controls.Add(textEditName);
layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
layoutControl1.Controls.Add(pumpChartPointImportCtrl1);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
+ layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(733, 240, 650, 400);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(827, 516);
+ layoutControl1.Size = new Size(1001, 603);
layoutControl1.TabIndex = 11;
layoutControl1.Text = "layoutControl1";
+ //
+ // textEditImportance
+ //
+ textEditImportance.Location = new Point(374, 12);
+ textEditImportance.Name = "textEditImportance";
+ textEditImportance.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
+ textEditImportance.Properties.EditFormat.FormatString = "N0";
+ textEditImportance.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.Numeric;
+ textEditImportance.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ textEditImportance.Size = new Size(181, 20);
+ textEditImportance.StyleController = layoutControl1;
+ textEditImportance.TabIndex = 2;
+ //
+ // textEditName
+ //
+ textEditName.Location = new Point(64, 12);
+ textEditName.Name = "textEditName";
+ textEditName.Size = new Size(254, 20);
+ textEditName.StyleController = layoutControl1;
+ textEditName.TabIndex = 0;
//
// generalOkAndCancelCtrl1
//
@@ -64,45 +97,71 @@
generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26);
generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26);
generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26);
- generalOkAndCancelCtrl1.Location = new Point(12, 478);
+ generalOkAndCancelCtrl1.Location = new Point(12, 560);
generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
- generalOkAndCancelCtrl1.Size = new Size(803, 26);
- generalOkAndCancelCtrl1.TabIndex = 6;
+ generalOkAndCancelCtrl1.Size = new Size(977, 31);
+ generalOkAndCancelCtrl1.TabIndex = 4;
//
// pumpChartPointImportCtrl1
//
- pumpChartPointImportCtrl1.Location = new Point(12, 12);
+ pumpChartPointImportCtrl1.Location = new Point(12, 36);
pumpChartPointImportCtrl1.Margin = new Padding(2, 2, 2, 2);
pumpChartPointImportCtrl1.Name = "pumpChartPointImportCtrl1";
- pumpChartPointImportCtrl1.Size = new Size(803, 462);
+ pumpChartPointImportCtrl1.Size = new Size(977, 520);
pumpChartPointImportCtrl1.TabIndex = 3;
//
// Root
//
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3, layoutControlItem1 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3, layoutControlItem1, layoutControlItem4, layoutControlItem5, emptySpaceItem2 });
Root.Name = "Root";
- Root.Size = new Size(827, 516);
+ Root.Size = new Size(1001, 603);
Root.TextVisible = false;
//
// layoutControlItem3
//
layoutControlItem3.Control = pumpChartPointImportCtrl1;
- layoutControlItem3.Location = new Point(0, 0);
+ layoutControlItem3.Location = new Point(0, 24);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(807, 466);
+ layoutControlItem3.Size = new Size(981, 524);
layoutControlItem3.TextSize = new Size(0, 0);
layoutControlItem3.TextVisible = false;
//
// layoutControlItem1
//
layoutControlItem1.Control = generalOkAndCancelCtrl1;
- layoutControlItem1.Location = new Point(0, 466);
+ layoutControlItem1.Location = new Point(0, 548);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(807, 30);
+ layoutControlItem1.Size = new Size(981, 35);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
+ //
+ // layoutControlItem4
+ //
+ layoutControlItem4.Control = textEditName;
+ layoutControlItem4.Location = new Point(0, 0);
+ layoutControlItem4.Name = "layoutControlItem4";
+ layoutControlItem4.Size = new Size(310, 24);
+ layoutControlItem4.Text = "鍚嶇О:";
+ layoutControlItem4.TextSize = new Size(40, 14);
+ //
+ // layoutControlItem5
+ //
+ layoutControlItem5.Control = textEditImportance;
+ layoutControlItem5.Location = new Point(310, 0);
+ layoutControlItem5.Name = "layoutControlItem5";
+ layoutControlItem5.Size = new Size(237, 24);
+ layoutControlItem5.Text = "閲嶈搴�:";
+ layoutControlItem5.TextSize = new Size(40, 14);
+ //
+ // emptySpaceItem2
+ //
+ emptySpaceItem2.AllowHotTrack = false;
+ emptySpaceItem2.Location = new Point(547, 0);
+ emptySpaceItem2.Name = "emptySpaceItem2";
+ emptySpaceItem2.Size = new Size(434, 24);
+ emptySpaceItem2.TextSize = new Size(0, 0);
//
// emptySpaceItem1
//
@@ -120,16 +179,21 @@
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(827, 516);
+ ClientSize = new Size(1001, 603);
Controls.Add(layoutControl1);
Name = "ImportPumpChartPoint";
StartPosition = FormStartPosition.CenterScreen;
Text = "鍗曠偣鐢熸垚";
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
+ ((ISupportInitialize)textEditImportance.Properties).EndInit();
+ ((ISupportInitialize)textEditName.Properties).EndInit();
((ISupportInitialize)Root).EndInit();
((ISupportInitialize)layoutControlItem3).EndInit();
((ISupportInitialize)layoutControlItem1).EndInit();
+ ((ISupportInitialize)layoutControlItem4).EndInit();
+ ((ISupportInitialize)layoutControlItem5).EndInit();
+ ((ISupportInitialize)emptySpaceItem2).EndInit();
((ISupportInitialize)emptySpaceItem1).EndInit();
((ISupportInitialize)dxErrorProvider1).EndInit();
ResumeLayout(false);
@@ -144,5 +208,10 @@
private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
+ private DevExpress.XtraEditors.TextEdit textEditImportance;
+ private DevExpress.XtraEditors.TextEdit textEditName;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
}
}
\ No newline at end of file
--
Gitblit v1.9.3