From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AddAssetsPipeFactorDlg.Designer.cs | 118 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 87 insertions(+), 31 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AddAssetsPipeFactorDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AddAssetsPipeFactorDlg.Designer.cs
index ef755f0..aa93724 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AddAssetsPipeFactorDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AddAssetsPipeFactorDlg.Designer.cs
@@ -33,23 +33,31 @@
generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl();
txtDescription = new DevExpress.XtraEditors.MemoEdit();
txtMinorLoss = new DevExpress.XtraEditors.TextEdit();
+ txtCaliber = new DevExpress.XtraEditors.TextEdit();
+ txtMaterial = new DevExpress.XtraEditors.TextEdit();
txtName = new DevExpress.XtraEditors.TextEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)txtDescription.Properties).BeginInit();
((ISupportInitialize)txtMinorLoss.Properties).BeginInit();
+ ((ISupportInitialize)txtCaliber.Properties).BeginInit();
+ ((ISupportInitialize)txtMaterial.Properties).BeginInit();
((ISupportInitialize)txtName.Properties).BeginInit();
((ISupportInitialize)Root).BeginInit();
((ISupportInitialize)layoutControlItem1).BeginInit();
- ((ISupportInitialize)layoutControlItem4).BeginInit();
+ ((ISupportInitialize)layoutControlItem2).BeginInit();
((ISupportInitialize)layoutControlItem6).BeginInit();
((ISupportInitialize)layoutControlItem7).BeginInit();
+ ((ISupportInitialize)layoutControlItem3).BeginInit();
+ ((ISupportInitialize)layoutControlItem4).BeginInit();
((ISupportInitialize)dxErrorProvider1).BeginInit();
SuspendLayout();
//
@@ -58,6 +66,8 @@
layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
layoutControl1.Controls.Add(txtDescription);
layoutControl1.Controls.Add(txtMinorLoss);
+ layoutControl1.Controls.Add(txtCaliber);
+ layoutControl1.Controls.Add(txtMaterial);
layoutControl1.Controls.Add(txtName);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
@@ -65,7 +75,7 @@
layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(826, 220, 650, 400);
layoutControl1.Root = Root;
layoutControl1.Size = new Size(380, 262);
- layoutControl1.TabIndex = 0;
+ layoutControl1.TabIndex = 1;
layoutControl1.Text = "layoutControl1";
//
// generalOkAndCancelCtrl1
@@ -74,35 +84,57 @@
generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26);
generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26);
generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26);
- generalOkAndCancelCtrl1.Location = new Point(12, 217);
+ generalOkAndCancelCtrl1.Location = new Point(12, 224);
generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
- generalOkAndCancelCtrl1.Size = new Size(356, 33);
+ generalOkAndCancelCtrl1.Size = new Size(356, 26);
generalOkAndCancelCtrl1.TabIndex = 8;
//
// txtDescription
//
txtDescription.Location = new Point(83, 60);
txtDescription.Name = "txtDescription";
- txtDescription.Size = new Size(285, 153);
+ txtDescription.Size = new Size(285, 160);
txtDescription.StyleController = layoutControl1;
txtDescription.TabIndex = 7;
//
// txtMinorLoss
//
- txtMinorLoss.Location = new Point(83, 36);
+ txtMinorLoss.Location = new Point(263, 36);
txtMinorLoss.Name = "txtMinorLoss";
txtMinorLoss.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
txtMinorLoss.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
- txtMinorLoss.Size = new Size(285, 20);
+ txtMinorLoss.Size = new Size(105, 20);
txtMinorLoss.StyleController = layoutControl1;
txtMinorLoss.TabIndex = 5;
+ //
+ // txtCaliber
+ //
+ txtCaliber.Location = new Point(263, 12);
+ txtCaliber.Name = "txtCaliber";
+ txtCaliber.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
+ txtCaliber.Properties.DisplayFormat.FormatString = "{0}mm";
+ txtCaliber.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Custom;
+ txtCaliber.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+ txtCaliber.Properties.NullValuePrompt = "mm";
+ txtCaliber.Size = new Size(105, 20);
+ txtCaliber.StyleController = layoutControl1;
+ txtCaliber.TabIndex = 4;
+ //
+ // txtMaterial
+ //
+ txtMaterial.Location = new Point(83, 36);
+ txtMaterial.Name = "txtMaterial";
+ txtMaterial.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
+ txtMaterial.Size = new Size(105, 20);
+ txtMaterial.StyleController = layoutControl1;
+ txtMaterial.TabIndex = 3;
//
// txtName
//
txtName.Location = new Point(83, 12);
txtName.Name = "txtName";
txtName.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
- txtName.Size = new Size(285, 20);
+ txtName.Size = new Size(105, 20);
txtName.StyleController = layoutControl1;
txtName.TabIndex = 0;
//
@@ -112,7 +144,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[] { layoutControlItem1, layoutControlItem6, layoutControlItem7, layoutControlItem4 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem6, layoutControlItem7, layoutControlItem3, layoutControlItem4 });
Root.Name = "Root";
Root.Size = new Size(380, 262);
Root.TextVisible = false;
@@ -123,37 +155,56 @@
layoutControlItem1.Control = txtName;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(360, 24);
+ layoutControlItem1.Size = new Size(180, 24);
layoutControlItem1.Text = "<color=red>*</color>鍚嶇О:";
layoutControlItem1.TextSize = new Size(59, 14);
//
- // layoutControlItem4
+ // layoutControlItem2
//
- layoutControlItem4.AllowHtmlStringInCaption = true;
- layoutControlItem4.Control = txtMinorLoss;
- layoutControlItem4.Location = new Point(0, 24);
- layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(360, 24);
- layoutControlItem4.Text = "<color=red>*</color>灞�闃荤郴鏁�:";
- layoutControlItem4.TextSize = new Size(59, 14);
+ layoutControlItem2.AllowHtmlStringInCaption = true;
+ layoutControlItem2.Control = txtMaterial;
+ layoutControlItem2.Location = new Point(0, 24);
+ layoutControlItem2.Name = "layoutControlItem2";
+ layoutControlItem2.Size = new Size(180, 24);
+ layoutControlItem2.Text = "鏉愯川:";
+ layoutControlItem2.TextSize = new Size(59, 14);
//
// layoutControlItem6
//
layoutControlItem6.Control = txtDescription;
layoutControlItem6.Location = new Point(0, 48);
layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(360, 157);
+ layoutControlItem6.Size = new Size(360, 164);
layoutControlItem6.Text = "璇存槑:";
layoutControlItem6.TextSize = new Size(59, 14);
//
// layoutControlItem7
//
layoutControlItem7.Control = generalOkAndCancelCtrl1;
- layoutControlItem7.Location = new Point(0, 205);
+ layoutControlItem7.Location = new Point(0, 212);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(360, 37);
+ layoutControlItem7.Size = new Size(360, 30);
layoutControlItem7.TextSize = new Size(0, 0);
layoutControlItem7.TextVisible = false;
+ //
+ // layoutControlItem3
+ //
+ layoutControlItem3.Control = txtCaliber;
+ layoutControlItem3.Location = new Point(180, 0);
+ layoutControlItem3.Name = "layoutControlItem3";
+ layoutControlItem3.Size = new Size(180, 24);
+ layoutControlItem3.Text = "鍙ｅ緞:";
+ layoutControlItem3.TextSize = new Size(59, 14);
+ //
+ // layoutControlItem4
+ //
+ layoutControlItem4.AllowHtmlStringInCaption = true;
+ layoutControlItem4.Control = txtMinorLoss;
+ layoutControlItem4.Location = new Point(180, 24);
+ layoutControlItem4.Name = "layoutControlItem4";
+ layoutControlItem4.Size = new Size(180, 24);
+ layoutControlItem4.Text = "<color=red>*</color>灞�闃荤郴鏁�:";
+ layoutControlItem4.TextSize = new Size(59, 14);
//
// dxErrorProvider1
//
@@ -172,32 +223,37 @@
layoutControl1.ResumeLayout(false);
((ISupportInitialize)txtDescription.Properties).EndInit();
((ISupportInitialize)txtMinorLoss.Properties).EndInit();
+ ((ISupportInitialize)txtCaliber.Properties).EndInit();
+ ((ISupportInitialize)txtMaterial.Properties).EndInit();
((ISupportInitialize)txtName.Properties).EndInit();
((ISupportInitialize)Root).EndInit();
((ISupportInitialize)layoutControlItem1).EndInit();
- ((ISupportInitialize)layoutControlItem4).EndInit();
+ ((ISupportInitialize)layoutControlItem2).EndInit();
((ISupportInitialize)layoutControlItem6).EndInit();
((ISupportInitialize)layoutControlItem7).EndInit();
+ ((ISupportInitialize)layoutControlItem3).EndInit();
+ ((ISupportInitialize)layoutControlItem4).EndInit();
((ISupportInitialize)dxErrorProvider1).EndInit();
ResumeLayout(false);
}
#endregion
-
- private DevExpress.XtraLayout.LayoutControl layoutControl1;
- private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraEditors.TextEdit txtName;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraEditors.TextEdit txtMinorLoss;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
+ private DevExpress.XtraLayout.LayoutControl layoutControl1;
private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1;
private DevExpress.XtraEditors.MemoEdit txtDescription;
+ private DevExpress.XtraEditors.TextEdit txtMinorLoss;
+ private DevExpress.XtraEditors.TextEdit txtCaliber;
+ private DevExpress.XtraEditors.TextEdit txtMaterial;
+ private DevExpress.XtraEditors.TextEdit txtName;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3