冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

 WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/02-main/ViewAssetsSprinklerMainDlg.Designer.cs

@@ -29,6 +29,10 @@
        private void InitializeComponent()
        {
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            txtCaliber = new DevExpress.XtraEditors.TextEdit();
            TextEditAngle = new DevExpress.XtraEditors.TextEdit();
            txtMaterial = new DevExpress.XtraEditors.TextEdit();
            txtEditFlowMinorLoss = new DevExpress.XtraEditors.TextEdit();
            txtTagName = new DevExpress.XtraEditors.TextEdit();
            txtFlags = new DevExpress.XtraEditors.TextEdit();
            txtKeyWord = new DevExpress.XtraEditors.TextEdit();
@@ -39,19 +43,17 @@
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            txtCaliber = new DevExpress.XtraEditors.TextEdit();
            TextEditAngle = new DevExpress.XtraEditors.TextEdit();
            txtMaterial = new DevExpress.XtraEditors.TextEdit();
            TextEditMinorLoss = new DevExpress.XtraEditors.TextEdit();
            txtEditFlowMinorLoss = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)txtCaliber.Properties).BeginInit();
            ((ISupportInitialize)TextEditAngle.Properties).BeginInit();
            ((ISupportInitialize)txtMaterial.Properties).BeginInit();
            ((ISupportInitialize)txtEditFlowMinorLoss.Properties).BeginInit();
            ((ISupportInitialize)txtTagName.Properties).BeginInit();
            ((ISupportInitialize)txtFlags.Properties).BeginInit();
            ((ISupportInitialize)txtKeyWord.Properties).BeginInit();
@@ -62,17 +64,11 @@
            ((ISupportInitialize)layoutControlItem6).BeginInit();
            ((ISupportInitialize)layoutControlItem10).BeginInit();
            ((ISupportInitialize)layoutControlItem9).BeginInit();
            ((ISupportInitialize)layoutControlItem8).BeginInit();
            ((ISupportInitialize)txtCaliber.Properties).BeginInit();
            ((ISupportInitialize)TextEditAngle.Properties).BeginInit();
            ((ISupportInitialize)txtMaterial.Properties).BeginInit();
            ((ISupportInitialize)TextEditMinorLoss.Properties).BeginInit();
            ((ISupportInitialize)txtEditFlowMinorLoss.Properties).BeginInit();
            ((ISupportInitialize)layoutControlItem4).BeginInit();
            ((ISupportInitialize)layoutControlItem7).BeginInit();
            ((ISupportInitialize)layoutControlItem11).BeginInit();
            ((ISupportInitialize)layoutControlItem12).BeginInit();
            ((ISupportInitialize)layoutControlItem13).BeginInit();
            ((ISupportInitialize)layoutControlItem7).BeginInit();
            ((ISupportInitialize)layoutControlItem8).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
@@ -80,7 +76,6 @@
            layoutControl1.Controls.Add(txtCaliber);
            layoutControl1.Controls.Add(TextEditAngle);
            layoutControl1.Controls.Add(txtMaterial);
            layoutControl1.Controls.Add(TextEditMinorLoss);
            layoutControl1.Controls.Add(txtEditFlowMinorLoss);
            layoutControl1.Controls.Add(txtTagName);
            layoutControl1.Controls.Add(txtFlags);
@@ -96,13 +91,61 @@
            layoutControl1.TabIndex = 1;
            layoutControl1.Text = "layoutControl1";
            // 
            // txtCaliber
            // 
            txtCaliber.Location = new Point(398, 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.Properties.ReadOnly = true;
            txtCaliber.Properties.UseReadOnlyAppearance = false;
            txtCaliber.Size = new Size(255, 20);
            txtCaliber.StyleController = layoutControl1;
            txtCaliber.TabIndex = 4;
            // 
            // TextEditAngle
            // 
            TextEditAngle.Location = new Point(76, 84);
            TextEditAngle.Name = "TextEditAngle";
            TextEditAngle.Properties.ReadOnly = true;
            TextEditAngle.Properties.UseReadOnlyAppearance = false;
            TextEditAngle.Size = new Size(254, 20);
            TextEditAngle.StyleController = layoutControl1;
            TextEditAngle.TabIndex = 7;
            // 
            // txtMaterial
            // 
            txtMaterial.Location = new Point(76, 36);
            txtMaterial.Name = "txtMaterial";
            txtMaterial.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
            txtMaterial.Properties.ReadOnly = true;
            txtMaterial.Properties.UseReadOnlyAppearance = false;
            txtMaterial.Size = new Size(254, 20);
            txtMaterial.StyleController = layoutControl1;
            txtMaterial.TabIndex = 3;
            // 
            // txtEditFlowMinorLoss
            // 
            txtEditFlowMinorLoss.Location = new Point(76, 60);
            txtEditFlowMinorLoss.Name = "txtEditFlowMinorLoss";
            txtEditFlowMinorLoss.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
            txtEditFlowMinorLoss.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
            txtEditFlowMinorLoss.Properties.ReadOnly = true;
            txtEditFlowMinorLoss.Properties.UseReadOnlyAppearance = false;
            txtEditFlowMinorLoss.Size = new Size(254, 20);
            txtEditFlowMinorLoss.StyleController = layoutControl1;
            txtEditFlowMinorLoss.TabIndex = 5;
            // 
            // txtTagName
            // 
            txtTagName.Location = new Point(76, 108);
            txtTagName.Location = new Point(398, 84);
            txtTagName.Name = "txtTagName";
            txtTagName.Properties.ReadOnly = true;
            txtTagName.Properties.UseReadOnlyAppearance = false;
            txtTagName.Size = new Size(577, 20);
            txtTagName.Size = new Size(255, 20);
            txtTagName.StyleController = layoutControl1;
            txtTagName.TabIndex = 8;
            // 
@@ -114,7 +157,7 @@
            txtFlags.Properties.UseReadOnlyAppearance = false;
            txtFlags.Size = new Size(255, 20);
            txtFlags.StyleController = layoutControl1;
            txtFlags.TabIndex = 7;
            txtFlags.TabIndex = 6;
            // 
            // txtKeyWord
            // 
@@ -128,9 +171,9 @@
            // 
            // txtDescription
            // 
            txtDescription.Location = new Point(76, 132);
            txtDescription.Location = new Point(76, 108);
            txtDescription.Name = "txtDescription";
            txtDescription.Size = new Size(577, 237);
            txtDescription.Size = new Size(577, 261);
            txtDescription.StyleController = layoutControl1;
            txtDescription.TabIndex = 9;
            // 
@@ -151,7 +194,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, layoutControlItem10, layoutControlItem9, layoutControlItem4, layoutControlItem12, layoutControlItem13, layoutControlItem7, layoutControlItem11, layoutControlItem8 });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem6, layoutControlItem10, layoutControlItem4, layoutControlItem12, layoutControlItem13, layoutControlItem7, layoutControlItem8, layoutControlItem9 });
            Root.Name = "Root";
            Root.Size = new Size(665, 381);
            Root.TextVisible = false;
@@ -162,15 +205,15 @@
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(322, 24);
            layoutControlItem1.Text = "名称:";
            layoutControlItem1.Text = "型号:";
            layoutControlItem1.TextSize = new Size(52, 14);
            // 
            // layoutControlItem6
            // 
            layoutControlItem6.Control = txtDescription;
            layoutControlItem6.Location = new Point(0, 120);
            layoutControlItem6.Location = new Point(0, 96);
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Size = new Size(645, 241);
            layoutControlItem6.Size = new Size(645, 265);
            layoutControlItem6.Text = "说明:";
            layoutControlItem6.TextSize = new Size(52, 14);
            // 
@@ -186,78 +229,11 @@
            // layoutControlItem9
            // 
            layoutControlItem9.Control = txtTagName;
            layoutControlItem9.Location = new Point(0, 96);
            layoutControlItem9.Location = new Point(322, 72);
            layoutControlItem9.Name = "layoutControlItem9";
            layoutControlItem9.Size = new Size(645, 24);
            layoutControlItem9.Size = new Size(323, 24);
            layoutControlItem9.Text = "标志:";
            layoutControlItem9.TextSize = new Size(52, 14);
            // 
            // layoutControlItem8
            // 
            layoutControlItem8.Control = txtFlags;
            layoutControlItem8.Location = new Point(322, 48);
            layoutControlItem8.Name = "layoutControlItem8";
            layoutControlItem8.Size = new Size(323, 24);
            layoutControlItem8.Text = "标签:";
            layoutControlItem8.TextSize = new Size(52, 14);
            // 
            // txtCaliber
            // 
            txtCaliber.Location = new Point(398, 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.Properties.ReadOnly = true;
            txtCaliber.Properties.UseReadOnlyAppearance = false;
            txtCaliber.Size = new Size(255, 20);
            txtCaliber.StyleController = layoutControl1;
            txtCaliber.TabIndex = 17;
            // 
            // TextEditAngle
            // 
            TextEditAngle.Location = new Point(398, 84);
            TextEditAngle.Name = "TextEditAngle";
            TextEditAngle.Properties.ReadOnly = true;
            TextEditAngle.Properties.UseReadOnlyAppearance = false;
            TextEditAngle.Size = new Size(255, 20);
            TextEditAngle.StyleController = layoutControl1;
            TextEditAngle.TabIndex = 19;
            // 
            // txtMaterial
            // 
            txtMaterial.Location = new Point(76, 36);
            txtMaterial.Name = "txtMaterial";
            txtMaterial.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
            txtMaterial.Properties.ReadOnly = true;
            txtMaterial.Properties.UseReadOnlyAppearance = false;
            txtMaterial.Size = new Size(254, 20);
            txtMaterial.StyleController = layoutControl1;
            txtMaterial.TabIndex = 15;
            // 
            // TextEditMinorLoss
            // 
            TextEditMinorLoss.Location = new Point(76, 84);
            TextEditMinorLoss.Name = "TextEditMinorLoss";
            TextEditMinorLoss.Properties.ReadOnly = true;
            TextEditMinorLoss.Properties.UseReadOnlyAppearance = false;
            TextEditMinorLoss.Size = new Size(254, 20);
            TextEditMinorLoss.StyleController = layoutControl1;
            TextEditMinorLoss.TabIndex = 18;
            // 
            // txtEditFlowMinorLoss
            // 
            txtEditFlowMinorLoss.Location = new Point(76, 60);
            txtEditFlowMinorLoss.Name = "txtEditFlowMinorLoss";
            txtEditFlowMinorLoss.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
            txtEditFlowMinorLoss.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
            txtEditFlowMinorLoss.Properties.ReadOnly = true;
            txtEditFlowMinorLoss.Properties.UseReadOnlyAppearance = false;
            txtEditFlowMinorLoss.Size = new Size(254, 20);
            txtEditFlowMinorLoss.StyleController = layoutControl1;
            txtEditFlowMinorLoss.TabIndex = 16;
            // 
            // layoutControlItem4
            // 
@@ -268,30 +244,12 @@
            layoutControlItem4.Text = "材质:";
            layoutControlItem4.TextSize = new Size(52, 14);
            // 
            // layoutControlItem7
            // 
            layoutControlItem7.Control = txtEditFlowMinorLoss;
            layoutControlItem7.Location = new Point(0, 48);
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(322, 24);
            layoutControlItem7.Text = "流量系数:";
            layoutControlItem7.TextSize = new Size(52, 14);
            // 
            // layoutControlItem11
            // 
            layoutControlItem11.Control = TextEditMinorLoss;
            layoutControlItem11.Location = new Point(0, 72);
            layoutControlItem11.Name = "layoutControlItem11";
            layoutControlItem11.Size = new Size(322, 24);
            layoutControlItem11.Text = "喷射系数:";
            layoutControlItem11.TextSize = new Size(52, 14);
            // 
            // layoutControlItem12
            // 
            layoutControlItem12.Control = TextEditAngle;
            layoutControlItem12.Location = new Point(322, 72);
            layoutControlItem12.Location = new Point(0, 72);
            layoutControlItem12.Name = "layoutControlItem12";
            layoutControlItem12.Size = new Size(323, 24);
            layoutControlItem12.Size = new Size(322, 24);
            layoutControlItem12.Text = "角度:";
            layoutControlItem12.TextSize = new Size(52, 14);
            // 
@@ -304,6 +262,24 @@
            layoutControlItem13.Text = "口径:";
            layoutControlItem13.TextSize = new Size(52, 14);
            // 
            // layoutControlItem7
            // 
            layoutControlItem7.Control = txtEditFlowMinorLoss;
            layoutControlItem7.Location = new Point(0, 48);
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(322, 24);
            layoutControlItem7.Text = "流量系数:";
            layoutControlItem7.TextSize = new Size(52, 14);
            // 
            // layoutControlItem8
            // 
            layoutControlItem8.Control = txtFlags;
            layoutControlItem8.Location = new Point(322, 48);
            layoutControlItem8.Name = "layoutControlItem8";
            layoutControlItem8.Size = new Size(323, 24);
            layoutControlItem8.Text = "标签:";
            layoutControlItem8.TextSize = new Size(52, 14);
            // 
            // ViewAssetsSprinklerMainDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
@@ -315,6 +291,10 @@
            Text = "详细信息";
            ((ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((ISupportInitialize)txtCaliber.Properties).EndInit();
            ((ISupportInitialize)TextEditAngle.Properties).EndInit();
            ((ISupportInitialize)txtMaterial.Properties).EndInit();
            ((ISupportInitialize)txtEditFlowMinorLoss.Properties).EndInit();
            ((ISupportInitialize)txtTagName.Properties).EndInit();
            ((ISupportInitialize)txtFlags.Properties).EndInit();
            ((ISupportInitialize)txtKeyWord.Properties).EndInit();
@@ -325,17 +305,11 @@
            ((ISupportInitialize)layoutControlItem6).EndInit();
            ((ISupportInitialize)layoutControlItem10).EndInit();
            ((ISupportInitialize)layoutControlItem9).EndInit();
            ((ISupportInitialize)layoutControlItem8).EndInit();
            ((ISupportInitialize)txtCaliber.Properties).EndInit();
            ((ISupportInitialize)TextEditAngle.Properties).EndInit();
            ((ISupportInitialize)txtMaterial.Properties).EndInit();
            ((ISupportInitialize)TextEditMinorLoss.Properties).EndInit();
            ((ISupportInitialize)txtEditFlowMinorLoss.Properties).EndInit();
            ((ISupportInitialize)layoutControlItem4).EndInit();
            ((ISupportInitialize)layoutControlItem7).EndInit();
            ((ISupportInitialize)layoutControlItem11).EndInit();
            ((ISupportInitialize)layoutControlItem12).EndInit();
            ((ISupportInitialize)layoutControlItem13).EndInit();
            ((ISupportInitialize)layoutControlItem7).EndInit();
            ((ISupportInitialize)layoutControlItem8).EndInit();
            ResumeLayout(false);
        }

@@ -359,12 +333,10 @@
        private DevExpress.XtraEditors.TextEdit txtCaliber;
        private DevExpress.XtraEditors.TextEdit TextEditAngle;
        private DevExpress.XtraEditors.TextEdit txtMaterial;
        private DevExpress.XtraEditors.TextEdit TextEditMinorLoss;
        private DevExpress.XtraEditors.TextEdit txtEditFlowMinorLoss;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
    }
}