冲突处理

lixiaojun

2025-01-20 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/ViewAssetsPipeFactorDlg.Designer.cs

@@ -36,6 +36,10 @@
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            txtCaliber = new DevExpress.XtraEditors.TextEdit();
            txtMaterial = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)txtDescription.Properties).BeginInit();
@@ -45,10 +49,16 @@
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)layoutControlItem4).BeginInit();
            ((ISupportInitialize)layoutControlItem6).BeginInit();
            ((ISupportInitialize)txtCaliber.Properties).BeginInit();
            ((ISupportInitialize)txtMaterial.Properties).BeginInit();
            ((ISupportInitialize)layoutControlItem7).BeginInit();
            ((ISupportInitialize)layoutControlItem8).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(txtCaliber);
            layoutControl1.Controls.Add(txtMaterial);
            layoutControl1.Controls.Add(txtDescription);
            layoutControl1.Controls.Add(txtMinorLoss);
            layoutControl1.Controls.Add(txtName);
@@ -73,13 +83,13 @@
            // 
            // txtMinorLoss
            // 
            txtMinorLoss.Location = new Point(76, 36);
            txtMinorLoss.Location = new Point(265, 36);
            txtMinorLoss.Name = "txtMinorLoss";
            txtMinorLoss.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
            txtMinorLoss.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
            txtMinorLoss.Properties.ReadOnly = true;
            txtMinorLoss.Properties.UseReadOnlyAppearance = false;
            txtMinorLoss.Size = new Size(311, 20);
            txtMinorLoss.Size = new Size(122, 20);
            txtMinorLoss.StyleController = layoutControl1;
            txtMinorLoss.TabIndex = 5;
            // 
@@ -90,7 +100,7 @@
            txtName.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
            txtName.Properties.ReadOnly = true;
            txtName.Properties.UseReadOnlyAppearance = false;
            txtName.Size = new Size(311, 20);
            txtName.Size = new Size(121, 20);
            txtName.StyleController = layoutControl1;
            txtName.TabIndex = 0;
            // 
@@ -100,7 +110,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, layoutControlItem4, layoutControlItem6 });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem4, layoutControlItem6, layoutControlItem7, layoutControlItem8 });
            Root.Name = "Root";
            Root.Size = new Size(399, 299);
            Root.TextVisible = false;
@@ -110,16 +120,16 @@
            layoutControlItem1.Control = txtName;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(379, 24);
            layoutControlItem1.Size = new Size(189, 24);
            layoutControlItem1.Text = "名称:";
            layoutControlItem1.TextSize = new Size(52, 14);
            // 
            // layoutControlItem4
            // 
            layoutControlItem4.Control = txtMinorLoss;
            layoutControlItem4.Location = new Point(0, 24);
            layoutControlItem4.Location = new Point(189, 24);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(379, 24);
            layoutControlItem4.Size = new Size(190, 24);
            layoutControlItem4.Text = "局阻系数:";
            layoutControlItem4.TextSize = new Size(52, 14);
            // 
@@ -131,6 +141,50 @@
            layoutControlItem6.Size = new Size(379, 231);
            layoutControlItem6.Text = "说明:";
            layoutControlItem6.TextSize = new Size(52, 14);
            // 
            // txtCaliber
            // 
            txtCaliber.Location = new Point(76, 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(121, 20);
            txtCaliber.StyleController = layoutControl1;
            txtCaliber.TabIndex = 6;
            // 
            // txtMaterial
            // 
            txtMaterial.Location = new Point(265, 12);
            txtMaterial.Name = "txtMaterial";
            txtMaterial.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.False;
            txtMaterial.Properties.ReadOnly = true;
            txtMaterial.Properties.UseReadOnlyAppearance = false;
            txtMaterial.Size = new Size(122, 20);
            txtMaterial.StyleController = layoutControl1;
            txtMaterial.TabIndex = 5;
            // 
            // layoutControlItem7
            // 
            layoutControlItem7.Control = txtMaterial;
            layoutControlItem7.Location = new Point(189, 0);
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(190, 24);
            layoutControlItem7.Text = "材质:";
            layoutControlItem7.TextSize = new Size(52, 14);
            // 
            // layoutControlItem8
            // 
            layoutControlItem8.Control = txtCaliber;
            layoutControlItem8.Location = new Point(0, 24);
            layoutControlItem8.Name = "layoutControlItem8";
            layoutControlItem8.Size = new Size(189, 24);
            layoutControlItem8.Text = "口径:";
            layoutControlItem8.TextSize = new Size(52, 14);
            // 
            // ViewAssetsPipeFactorDlg
            // 
@@ -150,6 +204,10 @@
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)layoutControlItem4).EndInit();
            ((ISupportInitialize)layoutControlItem6).EndInit();
            ((ISupportInitialize)txtCaliber.Properties).EndInit();
            ((ISupportInitialize)txtMaterial.Properties).EndInit();
            ((ISupportInitialize)layoutControlItem7).EndInit();
            ((ISupportInitialize)layoutControlItem8).EndInit();
            ResumeLayout(false);
        }

@@ -167,5 +225,9 @@
        private DevExpress.XtraEditors.MemoEdit txtDescription;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
        private DevExpress.XtraEditors.TextEdit txtCaliber;
        private DevExpress.XtraEditors.TextEdit txtMaterial;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
    }
}