From 5e789cd1ae9a9b22a6ab66a970457c372e9001de Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 18 十月 2024 11:15:31 +0800
Subject: [PATCH] 增加资产匹配需要的额外约束字段,增加基础模块的排序功能(未完成)
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.Designer.cs | 114 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 83 insertions(+), 31 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.Designer.cs
index 5fb90e0..1977f25 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/AddThreeLinkMainDlg.Designer.cs
@@ -59,6 +59,10 @@
layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
toolTipController1 = new DevExpress.Utils.ToolTipController(components);
+ textEditRunThroughCoefficient = new DevExpress.XtraEditors.TextEdit();
+ layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ textEditBranchThroughCoefficient = new DevExpress.XtraEditors.TextEdit();
+ layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)TextEditName.Properties).BeginInit();
@@ -87,12 +91,18 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditRunThroughCoefficient.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditBranchThroughCoefficient.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
SuspendLayout();
//
// layoutControl1
//
layoutControl1.Controls.Add(BtnOk);
layoutControl1.Controls.Add(simpleButton1);
+ layoutControl1.Controls.Add(textEditBranchThroughCoefficient);
+ layoutControl1.Controls.Add(textEditRunThroughCoefficient);
layoutControl1.Controls.Add(TextEditName);
layoutControl1.Controls.Add(DescriptionTextEdit);
layoutControl1.Controls.Add(TextEditCaliber);
@@ -112,9 +122,9 @@
//
BtnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
BtnOk.Appearance.Options.UseBackColor = true;
- BtnOk.Location = new Point(495, 452);
+ BtnOk.Location = new Point(231, 452);
BtnOk.Name = "BtnOk";
- BtnOk.Size = new Size(89, 22);
+ BtnOk.Size = new Size(219, 22);
BtnOk.StyleController = layoutControl1;
BtnOk.TabIndex = 9;
BtnOk.Text = "瀹屾垚";
@@ -125,60 +135,60 @@
simpleButton1.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
simpleButton1.Appearance.Options.UseBackColor = true;
simpleButton1.DialogResult = DialogResult.Cancel;
- simpleButton1.Location = new Point(588, 452);
+ simpleButton1.Location = new Point(454, 452);
simpleButton1.Name = "simpleButton1";
- simpleButton1.Size = new Size(85, 22);
+ simpleButton1.Size = new Size(219, 22);
simpleButton1.StyleController = layoutControl1;
simpleButton1.TabIndex = 10;
simpleButton1.Text = "鍙栨秷";
//
// TextEditName
//
- TextEditName.Location = new Point(72, 8);
+ TextEditName.Location = new Point(120, 8);
TextEditName.Name = "TextEditName";
- TextEditName.Size = new Size(266, 20);
+ TextEditName.Size = new Size(218, 20);
TextEditName.StyleController = layoutControl1;
TextEditName.TabIndex = 0;
//
// DescriptionTextEdit
//
- DescriptionTextEdit.Location = new Point(20, 113);
+ DescriptionTextEdit.Location = new Point(20, 137);
DescriptionTextEdit.Name = "DescriptionTextEdit";
- DescriptionTextEdit.Size = new Size(641, 323);
+ DescriptionTextEdit.Size = new Size(641, 299);
DescriptionTextEdit.StyleController = layoutControl1;
DescriptionTextEdit.TabIndex = 8;
//
// TextEditCaliber
//
- TextEditCaliber.Location = new Point(72, 32);
+ TextEditCaliber.Location = new Point(120, 32);
TextEditCaliber.Name = "TextEditCaliber";
TextEditCaliber.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
- TextEditCaliber.Size = new Size(266, 20);
+ TextEditCaliber.Size = new Size(218, 20);
TextEditCaliber.StyleController = layoutControl1;
TextEditCaliber.TabIndex = 3;
//
// TextEditMaterial
//
- TextEditMaterial.Location = new Point(406, 32);
+ TextEditMaterial.Location = new Point(454, 32);
TextEditMaterial.Name = "TextEditMaterial";
TextEditMaterial.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
- TextEditMaterial.Size = new Size(267, 20);
+ TextEditMaterial.Size = new Size(219, 20);
TextEditMaterial.StyleController = layoutControl1;
TextEditMaterial.TabIndex = 4;
//
// TextEditCoefficient
//
- TextEditCoefficient.Location = new Point(72, 56);
+ TextEditCoefficient.Location = new Point(120, 80);
TextEditCoefficient.Name = "TextEditCoefficient";
- TextEditCoefficient.Size = new Size(601, 20);
+ TextEditCoefficient.Size = new Size(553, 20);
TextEditCoefficient.StyleController = layoutControl1;
TextEditCoefficient.TabIndex = 2;
//
// TextEditKeyWorld
//
- TextEditKeyWorld.Location = new Point(406, 8);
+ TextEditKeyWorld.Location = new Point(454, 8);
TextEditKeyWorld.Name = "TextEditKeyWorld";
- TextEditKeyWorld.Size = new Size(267, 20);
+ TextEditKeyWorld.Size = new Size(219, 20);
TextEditKeyWorld.StyleController = layoutControl1;
TextEditKeyWorld.TabIndex = 2;
//
@@ -188,7 +198,7 @@
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem1, layoutControlItem12, layoutControlGroup5, layoutControlItem9, layoutControlItem2, layoutControlItem3 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem1, layoutControlItem12, layoutControlGroup5, layoutControlItem9, layoutControlItem2, layoutControlItem3, layoutControlItem6, layoutControlItem7 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
Root.Size = new Size(681, 482);
@@ -197,9 +207,9 @@
// layoutControlItem4
//
layoutControlItem4.Control = BtnOk;
- layoutControlItem4.Location = new Point(487, 444);
+ layoutControlItem4.Location = new Point(223, 444);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(93, 26);
+ layoutControlItem4.Size = new Size(223, 26);
layoutControlItem4.TextSize = new Size(0, 0);
layoutControlItem4.TextVisible = false;
//
@@ -208,15 +218,15 @@
emptySpaceItem1.AllowHotTrack = false;
emptySpaceItem1.Location = new Point(0, 444);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(487, 26);
+ emptySpaceItem1.Size = new Size(223, 26);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// layoutControlItem8
//
layoutControlItem8.Control = simpleButton1;
- layoutControlItem8.Location = new Point(580, 444);
+ layoutControlItem8.Location = new Point(446, 444);
layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(89, 26);
+ layoutControlItem8.Size = new Size(223, 26);
layoutControlItem8.TextSize = new Size(0, 0);
layoutControlItem8.TextVisible = false;
//
@@ -228,7 +238,7 @@
layoutControlItem1.Name = "layoutControlItem1";
layoutControlItem1.Size = new Size(334, 24);
layoutControlItem1.Text = "<color=red>*</color>鍨嬪彿:";
- layoutControlItem1.TextSize = new Size(52, 14);
+ layoutControlItem1.TextSize = new Size(100, 14);
//
// layoutControlItem12
//
@@ -237,16 +247,16 @@
layoutControlItem12.Name = "layoutControlItem12";
layoutControlItem12.Size = new Size(335, 24);
layoutControlItem12.Text = "鏉愭枡:";
- layoutControlItem12.TextSize = new Size(52, 14);
+ layoutControlItem12.TextSize = new Size(100, 14);
//
// layoutControlGroup5
//
layoutControlGroup5.AppearanceGroup.FontSizeDelta = 1;
layoutControlGroup5.AppearanceGroup.Options.UseFont = true;
layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
- layoutControlGroup5.Location = new Point(0, 72);
+ layoutControlGroup5.Location = new Point(0, 96);
layoutControlGroup5.Name = "layoutControlGroup5";
- layoutControlGroup5.Size = new Size(669, 372);
+ layoutControlGroup5.Size = new Size(669, 348);
layoutControlGroup5.Text = "璇存槑";
//
// layoutControlItem5
@@ -254,7 +264,7 @@
layoutControlItem5.Control = DescriptionTextEdit;
layoutControlItem5.Location = new Point(0, 0);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(645, 327);
+ layoutControlItem5.Size = new Size(645, 303);
layoutControlItem5.Text = "璇存槑:";
layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
layoutControlItem5.TextSize = new Size(0, 0);
@@ -268,7 +278,7 @@
layoutControlItem9.Name = "layoutControlItem9";
layoutControlItem9.Size = new Size(334, 24);
layoutControlItem9.Text = "鍙ｅ緞:";
- layoutControlItem9.TextSize = new Size(52, 14);
+ layoutControlItem9.TextSize = new Size(100, 14);
//
// layoutControlItem2
//
@@ -277,16 +287,16 @@
layoutControlItem2.Name = "layoutControlItem2";
layoutControlItem2.Size = new Size(335, 24);
layoutControlItem2.Text = "鍏抽敭瀛�:";
- layoutControlItem2.TextSize = new Size(52, 14);
+ layoutControlItem2.TextSize = new Size(100, 14);
//
// layoutControlItem3
//
layoutControlItem3.Control = TextEditCoefficient;
- layoutControlItem3.Location = new Point(0, 48);
+ layoutControlItem3.Location = new Point(0, 72);
layoutControlItem3.Name = "layoutControlItem3";
layoutControlItem3.Size = new Size(669, 24);
layoutControlItem3.Text = "鎹熷け绯绘暟:";
- layoutControlItem3.TextSize = new Size(52, 14);
+ layoutControlItem3.TextSize = new Size(100, 14);
//
// dxErrorProvider1
//
@@ -358,6 +368,40 @@
layoutControlItem27.Text = "璇存槑:";
layoutControlItem27.TextSize = new Size(59, 14);
//
+ // textEditRunThroughCoefficient
+ //
+ textEditRunThroughCoefficient.Location = new Point(120, 56);
+ textEditRunThroughCoefficient.Name = "textEditRunThroughCoefficient";
+ textEditRunThroughCoefficient.Size = new Size(218, 20);
+ textEditRunThroughCoefficient.StyleController = layoutControl1;
+ textEditRunThroughCoefficient.TabIndex = 0;
+ //
+ // layoutControlItem6
+ //
+ layoutControlItem6.Control = textEditRunThroughCoefficient;
+ layoutControlItem6.Location = new Point(0, 48);
+ layoutControlItem6.Name = "layoutControlItem6";
+ layoutControlItem6.Size = new Size(334, 24);
+ layoutControlItem6.Text = "杩愯閫氳繃鎹熷け绯绘暟:";
+ layoutControlItem6.TextSize = new Size(100, 14);
+ //
+ // textEditBranchThroughCoefficient
+ //
+ textEditBranchThroughCoefficient.Location = new Point(454, 56);
+ textEditBranchThroughCoefficient.Name = "textEditBranchThroughCoefficient";
+ textEditBranchThroughCoefficient.Size = new Size(219, 20);
+ textEditBranchThroughCoefficient.StyleController = layoutControl1;
+ textEditBranchThroughCoefficient.TabIndex = 0;
+ //
+ // layoutControlItem7
+ //
+ layoutControlItem7.Control = textEditBranchThroughCoefficient;
+ layoutControlItem7.Location = new Point(334, 48);
+ layoutControlItem7.Name = "layoutControlItem7";
+ layoutControlItem7.Size = new Size(335, 24);
+ layoutControlItem7.Text = "鏀閫氳繃鎹熷け绯绘暟:";
+ layoutControlItem7.TextSize = new Size(100, 14);
+ //
// AddAssetsThreelinkMainDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -395,6 +439,10 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditRunThroughCoefficient.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditBranchThroughCoefficient.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
ResumeLayout(false);
}
@@ -434,5 +482,9 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraEditors.TextEdit TextEditCoefficient;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraEditors.TextEdit textEditBranchThroughCoefficient;
+ private DevExpress.XtraEditors.TextEdit textEditRunThroughCoefficient;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
}
}
\ No newline at end of file
--
Gitblit v1.9.3