Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

Shuxia Ning

2025-01-15 facdda630bc2a16c2a61e5db6e4387e257202d44

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.Designer.cs

@@ -33,7 +33,6 @@
            TextEditHazenValue = new DevExpress.XtraEditors.TextEdit();
            txtCaliber = new DevExpress.XtraEditors.TextEdit();
            txtMaterial = new DevExpress.XtraEditors.TextEdit();
            TextEditMinorLoss = new DevExpress.XtraEditors.TextEdit();
            txtKeyWord = new DevExpress.XtraEditors.TextEdit();
            txtTagName = new DevExpress.XtraEditors.TextEdit();
            setFlagsEditCtrl1 = new SetFlagsEditCtrl();
@@ -48,7 +47,6 @@
            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
@@ -57,7 +55,6 @@
            ((ISupportInitialize)TextEditHazenValue.Properties).BeginInit();
            ((ISupportInitialize)txtCaliber.Properties).BeginInit();
            ((ISupportInitialize)txtMaterial.Properties).BeginInit();
            ((ISupportInitialize)TextEditMinorLoss.Properties).BeginInit();
            ((ISupportInitialize)txtKeyWord.Properties).BeginInit();
            ((ISupportInitialize)txtTagName.Properties).BeginInit();
            ((ISupportInitialize)txtDescription.Properties).BeginInit();
@@ -70,7 +67,6 @@
            ((ISupportInitialize)layoutControlItem8).BeginInit();
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            ((ISupportInitialize)layoutControlItem3).BeginInit();
            ((ISupportInitialize)layoutControlItem11).BeginInit();
            ((ISupportInitialize)layoutControlItem4).BeginInit();
            ((ISupportInitialize)layoutControlItem9).BeginInit();
            ((ISupportInitialize)dxErrorProvider1).BeginInit();
@@ -81,7 +77,6 @@
            layoutControl1.Controls.Add(TextEditHazenValue);
            layoutControl1.Controls.Add(txtCaliber);
            layoutControl1.Controls.Add(txtMaterial);
            layoutControl1.Controls.Add(TextEditMinorLoss);
            layoutControl1.Controls.Add(txtKeyWord);
            layoutControl1.Controls.Add(txtTagName);
            layoutControl1.Controls.Add(setFlagsEditCtrl1);
@@ -99,64 +94,56 @@
            // 
            // TextEditHazenValue
            // 
            TextEditHazenValue.Location = new Point(100, 84);
            TextEditHazenValue.Location = new Point(107, 60);
            TextEditHazenValue.Name = "TextEditHazenValue";
            TextEditHazenValue.Size = new Size(230, 20);
            TextEditHazenValue.Size = new Size(223, 20);
            TextEditHazenValue.StyleController = layoutControl1;
            TextEditHazenValue.TabIndex = 7;
            // 
            // txtCaliber
            // 
            txtCaliber.Location = new Point(422, 36);
            txtCaliber.Location = new Point(429, 36);
            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(231, 20);
            txtCaliber.Size = new Size(224, 20);
            txtCaliber.StyleController = layoutControl1;
            txtCaliber.TabIndex = 4;
            // 
            // txtMaterial
            // txtDN
            // 
            txtMaterial.Location = new Point(100, 36);
            txtMaterial.Location = new Point(107, 36);
            txtMaterial.Name = "txtMaterial";
            txtMaterial.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
            txtMaterial.Size = new Size(230, 20);
            txtMaterial.Size = new Size(223, 20);
            txtMaterial.StyleController = layoutControl1;
            txtMaterial.TabIndex = 3;
            // 
            // TextEditMinorLoss
            // 
            TextEditMinorLoss.Location = new Point(100, 60);
            TextEditMinorLoss.Name = "TextEditMinorLoss";
            TextEditMinorLoss.Size = new Size(230, 20);
            TextEditMinorLoss.StyleController = layoutControl1;
            TextEditMinorLoss.TabIndex = 5;
            // 
            // txtKeyWord
            // 
            txtKeyWord.Location = new Point(422, 12);
            txtKeyWord.Location = new Point(429, 12);
            txtKeyWord.Name = "txtKeyWord";
            txtKeyWord.Properties.NullValuePrompt = ",分隔 例如 A,B";
            txtKeyWord.Size = new Size(231, 20);
            txtKeyWord.Size = new Size(224, 20);
            txtKeyWord.StyleController = layoutControl1;
            txtKeyWord.TabIndex = 2;
            // 
            // txtTagName
            // 
            txtTagName.Location = new Point(422, 84);
            txtTagName.Location = new Point(429, 60);
            txtTagName.Name = "txtTagName";
            txtTagName.Size = new Size(231, 20);
            txtTagName.Size = new Size(224, 20);
            txtTagName.StyleController = layoutControl1;
            txtTagName.TabIndex = 8;
            // 
            // setFlagsEditCtrl1
            // 
            setFlagsEditCtrl1.Location = new Point(422, 60);
            setFlagsEditCtrl1.Location = new Point(107, 84);
            setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
            setFlagsEditCtrl1.Size = new Size(231, 20);
            setFlagsEditCtrl1.Size = new Size(546, 20);
            setFlagsEditCtrl1.TabIndex = 6;
            // 
            // generalOkAndCancelCtrl1
@@ -172,18 +159,18 @@
            // 
            // txtDescription
            // 
            txtDescription.Location = new Point(100, 108);
            txtDescription.Location = new Point(107, 108);
            txtDescription.Name = "txtDescription";
            txtDescription.Size = new Size(553, 231);
            txtDescription.Size = new Size(546, 231);
            txtDescription.StyleController = layoutControl1;
            txtDescription.TabIndex = 9;
            // 
            // txtName
            // 
            txtName.Location = new Point(100, 12);
            txtName.Location = new Point(107, 12);
            txtName.Name = "txtName";
            txtName.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
            txtName.Size = new Size(230, 20);
            txtName.Size = new Size(223, 20);
            txtName.StyleController = layoutControl1;
            txtName.TabIndex = 0;
            // 
@@ -193,7 +180,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, layoutControlItem10, layoutControlItem8, layoutControlItem2, layoutControlItem3, layoutControlItem11, layoutControlItem4, layoutControlItem9 });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem6, layoutControlItem7, layoutControlItem10, layoutControlItem8, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem9 });
            Root.Name = "Root";
            Root.Size = new Size(665, 381);
            Root.TextVisible = false;
@@ -206,7 +193,7 @@
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(322, 24);
            layoutControlItem1.Text = "<color=red>*</color>名称:";
            layoutControlItem1.TextSize = new Size(76, 14);
            layoutControlItem1.TextSize = new Size(83, 14);
            // 
            // layoutControlItem6
            // 
@@ -215,7 +202,7 @@
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Size = new Size(645, 235);
            layoutControlItem6.Text = "说明:";
            layoutControlItem6.TextSize = new Size(76, 14);
            layoutControlItem6.TextSize = new Size(83, 14);
            // 
            // layoutControlItem7
            // 
@@ -233,16 +220,16 @@
            layoutControlItem10.Name = "layoutControlItem10";
            layoutControlItem10.Size = new Size(323, 24);
            layoutControlItem10.Text = "关键字:";
            layoutControlItem10.TextSize = new Size(76, 14);
            layoutControlItem10.TextSize = new Size(83, 14);
            // 
            // layoutControlItem8
            // 
            layoutControlItem8.Control = setFlagsEditCtrl1;
            layoutControlItem8.Location = new Point(322, 48);
            layoutControlItem8.Location = new Point(0, 72);
            layoutControlItem8.Name = "layoutControlItem8";
            layoutControlItem8.Size = new Size(323, 24);
            layoutControlItem8.Size = new Size(645, 24);
            layoutControlItem8.Text = "标签:";
            layoutControlItem8.TextSize = new Size(76, 14);
            layoutControlItem8.TextSize = new Size(83, 14);
            // 
            // layoutControlItem2
            // 
@@ -252,7 +239,7 @@
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(322, 24);
            layoutControlItem2.Text = "材质:";
            layoutControlItem2.TextSize = new Size(76, 14);
            layoutControlItem2.TextSize = new Size(83, 14);
            // 
            // layoutControlItem3
            // 
@@ -261,35 +248,26 @@
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(323, 24);
            layoutControlItem3.Text = "口径:";
            layoutControlItem3.TextSize = new Size(76, 14);
            // 
            // layoutControlItem11
            // 
            layoutControlItem11.AllowHtmlStringInCaption = true;
            layoutControlItem11.Control = TextEditMinorLoss;
            layoutControlItem11.Location = new Point(0, 48);
            layoutControlItem11.Name = "layoutControlItem11";
            layoutControlItem11.Size = new Size(322, 24);
            layoutControlItem11.Text = "<color=red>*</color>喷射系数:";
            layoutControlItem11.TextSize = new Size(76, 14);
            layoutControlItem3.TextSize = new Size(83, 14);
            // 
            // layoutControlItem4
            // 
            layoutControlItem4.AllowHtmlStringInCaption = true;
            layoutControlItem4.Control = TextEditHazenValue;
            layoutControlItem4.Location = new Point(0, 72);
            layoutControlItem4.Location = new Point(0, 48);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(322, 24);
            layoutControlItem4.Text = "威廉姆斯系数:";
            layoutControlItem4.TextSize = new Size(76, 14);
            layoutControlItem4.Text = "<color=red>*</color>威廉姆斯系数:";
            layoutControlItem4.TextSize = new Size(83, 14);
            // 
            // layoutControlItem9
            // 
            layoutControlItem9.Control = txtTagName;
            layoutControlItem9.Location = new Point(322, 72);
            layoutControlItem9.Location = new Point(322, 48);
            layoutControlItem9.Name = "layoutControlItem9";
            layoutControlItem9.Size = new Size(323, 24);
            layoutControlItem9.Text = "标志:";
            layoutControlItem9.TextSize = new Size(76, 14);
            layoutControlItem9.TextSize = new Size(83, 14);
            // 
            // dxErrorProvider1
            // 
@@ -309,7 +287,6 @@
            ((ISupportInitialize)TextEditHazenValue.Properties).EndInit();
            ((ISupportInitialize)txtCaliber.Properties).EndInit();
            ((ISupportInitialize)txtMaterial.Properties).EndInit();
            ((ISupportInitialize)TextEditMinorLoss.Properties).EndInit();
            ((ISupportInitialize)txtKeyWord.Properties).EndInit();
            ((ISupportInitialize)txtTagName.Properties).EndInit();
            ((ISupportInitialize)txtDescription.Properties).EndInit();
@@ -322,7 +299,6 @@
            ((ISupportInitialize)layoutControlItem8).EndInit();
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ((ISupportInitialize)layoutControlItem3).EndInit();
            ((ISupportInitialize)layoutControlItem11).EndInit();
            ((ISupportInitialize)layoutControlItem4).EndInit();
            ((ISupportInitialize)layoutControlItem9).EndInit();
            ((ISupportInitialize)dxErrorProvider1).EndInit();
@@ -347,8 +323,6 @@
        private DevExpress.XtraEditors.TextEdit txtTagName;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraEditors.TextEdit TextEditMinorLoss;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraEditors.TextEdit txtMaterial;
        private DevExpress.XtraEditors.TextEdit txtCaliber;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;