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

lixiaojun

2024-10-25 a3b2b3aefc721034d63144a3cfc835d3c19c490d

 WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/EditExchangerMainDlg.Designer.cs

@@ -34,7 +34,6 @@
            simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
            TextEditName = new DevExpress.XtraEditors.TextEdit();
            DescriptionTextEdit = new DevExpress.XtraEditors.MemoEdit();
            TextEditCaliber = new DevExpress.XtraEditors.ImageComboBoxEdit();
            TextEditMaterial = new DevExpress.XtraEditors.ImageComboBoxEdit();
            TextEditCoefficient = new DevExpress.XtraEditors.TextEdit();
            TextEditKeyWorld = new DevExpress.XtraEditors.TextEdit();
@@ -43,7 +42,6 @@
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlGroup5 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -65,7 +63,6 @@
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)TextEditName.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)TextEditCaliber.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)TextEditCoefficient.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)TextEditKeyWorld.Properties).BeginInit();
@@ -74,7 +71,6 @@
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup5).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit();
@@ -99,7 +95,6 @@
            layoutControl1.Controls.Add(simpleButton1);
            layoutControl1.Controls.Add(TextEditName);
            layoutControl1.Controls.Add(DescriptionTextEdit);
            layoutControl1.Controls.Add(TextEditCaliber);
            layoutControl1.Controls.Add(TextEditMaterial);
            layoutControl1.Controls.Add(TextEditCoefficient);
            layoutControl1.Controls.Add(TextEditKeyWorld);
@@ -120,7 +115,7 @@
            BtnOk.Name = "BtnOk";
            BtnOk.Size = new Size(81, 22);
            BtnOk.StyleController = layoutControl1;
            BtnOk.TabIndex = 9;
            BtnOk.TabIndex = 6;
            BtnOk.Text = "完成";
            BtnOk.Click += BtnOk_ClickAsync;
            // 
@@ -133,7 +128,7 @@
            simpleButton1.Name = "simpleButton1";
            simpleButton1.Size = new Size(73, 22);
            simpleButton1.StyleController = layoutControl1;
            simpleButton1.TabIndex = 10;
            simpleButton1.TabIndex = 7;
            simpleButton1.Text = "取消";
            // 
            // TextEditName
@@ -146,39 +141,30 @@
            // 
            // DescriptionTextEdit
            // 
            DescriptionTextEdit.Location = new Point(20, 113);
            DescriptionTextEdit.Location = new Point(20, 89);
            DescriptionTextEdit.Name = "DescriptionTextEdit";
            DescriptionTextEdit.Size = new Size(641, 323);
            DescriptionTextEdit.Size = new Size(641, 347);
            DescriptionTextEdit.StyleController = layoutControl1;
            DescriptionTextEdit.TabIndex = 8;
            // 
            // TextEditCaliber
            // 
            TextEditCaliber.Location = new Point(72, 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.StyleController = layoutControl1;
            TextEditCaliber.TabIndex = 3;
            DescriptionTextEdit.TabIndex = 5;
            // 
            // TextEditMaterial
            // 
            TextEditMaterial.Location = new Point(406, 32);
            TextEditMaterial.Location = new Point(72, 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(266, 20);
            TextEditMaterial.StyleController = layoutControl1;
            TextEditMaterial.TabIndex = 4;
            TextEditMaterial.TabIndex = 3;
            // 
            // TextEditCoefficient
            // 
            TextEditCoefficient.Location = new Point(72, 56);
            TextEditCoefficient.Location = new Point(406, 32);
            TextEditCoefficient.Name = "TextEditCoefficient";
            TextEditCoefficient.Size = new Size(601, 20);
            TextEditCoefficient.Size = new Size(267, 20);
            TextEditCoefficient.StyleController = layoutControl1;
            TextEditCoefficient.TabIndex = 2;
            TextEditCoefficient.TabIndex = 4;
            // 
            // TextEditKeyWord
            // TextEditKeyWorld
            // 
            TextEditKeyWorld.Location = new Point(406, 8);
            TextEditKeyWorld.Name = "TextEditKeyWorld";
@@ -192,7 +178,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, layoutControlItem9, layoutControlGroup5, layoutControlItem12, layoutControlItem7, layoutControlItem6 });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem1, layoutControlGroup5, layoutControlItem12, layoutControlItem7, layoutControlItem6 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
            Root.Size = new Size(681, 482);
@@ -234,21 +220,12 @@
            layoutControlItem1.Text = "<color=red>*</color>型号:";
            layoutControlItem1.TextSize = new Size(52, 14);
            // 
            // layoutControlItem9
            // 
            layoutControlItem9.Control = TextEditCaliber;
            layoutControlItem9.Location = new Point(0, 24);
            layoutControlItem9.Name = "layoutControlItem9";
            layoutControlItem9.Size = new Size(334, 24);
            layoutControlItem9.Text = "口径:";
            layoutControlItem9.TextSize = new Size(52, 14);
            // 
            // layoutControlGroup5
            // 
            layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
            layoutControlGroup5.Location = new Point(0, 72);
            layoutControlGroup5.Location = new Point(0, 48);
            layoutControlGroup5.Name = "layoutControlGroup5";
            layoutControlGroup5.Size = new Size(669, 372);
            layoutControlGroup5.Size = new Size(669, 396);
            layoutControlGroup5.Text = "说明";
            // 
            // layoutControlItem5
@@ -256,7 +233,7 @@
            layoutControlItem5.Control = DescriptionTextEdit;
            layoutControlItem5.Location = new Point(0, 0);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(645, 327);
            layoutControlItem5.Size = new Size(645, 351);
            layoutControlItem5.Text = "说明:";
            layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
            layoutControlItem5.TextSize = new Size(0, 0);
@@ -266,9 +243,9 @@
            // layoutControlItem12
            // 
            layoutControlItem12.Control = TextEditMaterial;
            layoutControlItem12.Location = new Point(334, 24);
            layoutControlItem12.Location = new Point(0, 24);
            layoutControlItem12.Name = "layoutControlItem12";
            layoutControlItem12.Size = new Size(335, 24);
            layoutControlItem12.Size = new Size(334, 24);
            layoutControlItem12.Text = "材料:";
            layoutControlItem12.TextSize = new Size(52, 14);
            // 
@@ -284,9 +261,9 @@
            // layoutControlItem6
            // 
            layoutControlItem6.Control = TextEditCoefficient;
            layoutControlItem6.Location = new Point(0, 48);
            layoutControlItem6.Location = new Point(334, 24);
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Size = new Size(669, 24);
            layoutControlItem6.Size = new Size(335, 24);
            layoutControlItem6.Text = "损失系数:";
            layoutControlItem6.TextSize = new Size(52, 14);
            // 
@@ -376,20 +353,19 @@
            layoutControlItem3.Text = "损失系数:";
            layoutControlItem3.TextSize = new Size(52, 14);
            // 
            // EditAssetsFourlinkMainDlg
            // EditExchangerMainDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(681, 482);
            Controls.Add(layoutControl1);
            Name = "EditAssetsFourlinkMainDlg";
            Name = "EditExchangerMainDlg";
            StartPosition = FormStartPosition.CenterScreen;
            Text = "编辑四通";
            Text = "编辑换热器";
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)TextEditName.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)TextEditCaliber.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)TextEditMaterial.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)TextEditCoefficient.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)TextEditKeyWorld.Properties).EndInit();
@@ -398,7 +374,6 @@
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup5).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit();
@@ -430,7 +405,6 @@
        private DevExpress.XtraEditors.SimpleButton simpleButton1;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraEditors.SimpleButton btnCancel;
@@ -446,7 +420,6 @@
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
        private DevExpress.XtraEditors.ImageComboBoxEdit TextEditCaliber;
        private DevExpress.XtraEditors.ImageComboBoxEdit TextEditMaterial;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup5;
        private DevExpress.Utils.ToolTipController toolTipController1;