From be65218617cab71a90a9a05cf488fbb6e206b5c5 Mon Sep 17 00:00:00 2001 From: duheng <2286773002@qq.com> Date: 星期一, 31 三月 2025 15:47:00 +0800 Subject: [PATCH] 下拉选项增加逻辑分组 --- WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs | 249 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 211 insertions(+), 38 deletions(-) diff --git a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs index 34ef2f3..dd78133 100644 --- a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs +++ b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs @@ -29,7 +29,10 @@ private void InitializeComponent() { components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FacilitiesCtrl)); FacilitiesWizardFormlayoutControl1ConvertedLayout = new DevExpress.XtraLayout.LayoutControl(); + setFlagsEditCtrl1 = new Yw.WinFrmUI.SetFlagsEditCtrl(); + txtTagName = new DevExpress.XtraEditors.TextEdit(); txtEditPlace = new DevExpress.XtraEditors.TreeListLookUpEdit(); treeListLookUpEdit1TreeList = new DevExpress.XtraTreeList.TreeList(); treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn(); @@ -43,6 +46,10 @@ txtFloorHouseHolds = new DevExpress.XtraEditors.TextEdit(); txtConstantP = new DevExpress.XtraEditors.TextEdit(); textEditWaterModel = new DevExpress.XtraEditors.ImageComboBoxEdit(); + imageComboBoxConnectionType = new DevExpress.XtraEditors.ImageComboBoxEdit(); + textEditConnectionAddress = new DevExpress.XtraEditors.TextEdit(); + textEditMaxHeight = new DevExpress.XtraEditors.TextEdit(); + txtDescription = new DevExpress.XtraEditors.MemoEdit(); layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); txtFlooritem = new DevExpress.XtraLayout.LayoutControlItem(); comboBoxCompletePlantitem = new DevExpress.XtraLayout.LayoutControlItem(); @@ -55,9 +62,17 @@ layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); txtWaterPressureitem = new DevExpress.XtraLayout.LayoutControlItem(); + layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); + layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); + layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); + layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); + layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components); + imageCollection1 = new DevExpress.Utils.ImageCollection(components); ((System.ComponentModel.ISupportInitialize)FacilitiesWizardFormlayoutControl1ConvertedLayout).BeginInit(); FacilitiesWizardFormlayoutControl1ConvertedLayout.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)txtTagName.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)txtEditPlace.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1TreeList).BeginInit(); ((System.ComponentModel.ISupportInitialize)txtFloorHeight.Properties).BeginInit(); @@ -70,6 +85,10 @@ ((System.ComponentModel.ISupportInitialize)txtFloorHouseHolds.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)txtConstantP.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)textEditWaterModel.Properties).BeginInit(); + ((System.ComponentModel.ISupportInitialize)imageComboBoxConnectionType.Properties).BeginInit(); + ((System.ComponentModel.ISupportInitialize)textEditConnectionAddress.Properties).BeginInit(); + ((System.ComponentModel.ISupportInitialize)textEditMaxHeight.Properties).BeginInit(); + ((System.ComponentModel.ISupportInitialize)txtDescription.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit(); ((System.ComponentModel.ISupportInitialize)txtFlooritem).BeginInit(); ((System.ComponentModel.ISupportInitialize)comboBoxCompletePlantitem).BeginInit(); @@ -82,11 +101,20 @@ ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit(); ((System.ComponentModel.ISupportInitialize)txtWaterPressureitem).BeginInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit(); ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)imageCollection1).BeginInit(); SuspendLayout(); // // FacilitiesWizardFormlayoutControl1ConvertedLayout // + FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(setFlagsEditCtrl1); + FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtTagName); FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtEditPlace); FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtFloorHeight); FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtFloor); @@ -98,18 +126,41 @@ FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtFloorHouseHolds); FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtConstantP); FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEditWaterModel); + FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(imageComboBoxConnectionType); + FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEditConnectionAddress); + FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEditMaxHeight); + FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(txtDescription); FacilitiesWizardFormlayoutControl1ConvertedLayout.Dock = DockStyle.Fill; FacilitiesWizardFormlayoutControl1ConvertedLayout.Location = new Point(0, 0); FacilitiesWizardFormlayoutControl1ConvertedLayout.Margin = new Padding(3, 4, 3, 4); FacilitiesWizardFormlayoutControl1ConvertedLayout.Name = "FacilitiesWizardFormlayoutControl1ConvertedLayout"; FacilitiesWizardFormlayoutControl1ConvertedLayout.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(586, 265, 755, 663); FacilitiesWizardFormlayoutControl1ConvertedLayout.Root = layoutControlGroup1; - FacilitiesWizardFormlayoutControl1ConvertedLayout.Size = new Size(889, 396); + FacilitiesWizardFormlayoutControl1ConvertedLayout.Size = new Size(858, 423); FacilitiesWizardFormlayoutControl1ConvertedLayout.TabIndex = 146; + // + // setFlagsEditCtrl1 + // + setFlagsEditCtrl1.Location = new Point(158, 292); + setFlagsEditCtrl1.Margin = new Padding(3, 5, 3, 5); + setFlagsEditCtrl1.MinimumSize = new Size(0, 36); + setFlagsEditCtrl1.Name = "setFlagsEditCtrl1"; + setFlagsEditCtrl1.Size = new Size(269, 36); + setFlagsEditCtrl1.TabIndex = 147; + // + // txtTagName + // + txtTagName.Location = new Point(577, 292); + txtTagName.Margin = new Padding(3, 4, 3, 4); + txtTagName.MinimumSize = new Size(0, 36); + txtTagName.Name = "txtTagName"; + txtTagName.Size = new Size(269, 36); + txtTagName.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; + txtTagName.TabIndex = 148; // // txtEditPlace // - txtEditPlace.Location = new Point(592, 12); + txtEditPlace.Location = new Point(577, 12); txtEditPlace.Margin = new Padding(3, 4, 3, 4); txtEditPlace.MinimumSize = new Size(0, 36); txtEditPlace.Name = "txtEditPlace"; @@ -118,7 +169,7 @@ txtEditPlace.Properties.NullText = ""; txtEditPlace.Properties.TreeList = treeListLookUpEdit1TreeList; txtEditPlace.Properties.ValueMember = "ID"; - txtEditPlace.Size = new Size(285, 36); + txtEditPlace.Size = new Size(269, 36); txtEditPlace.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; txtEditPlace.TabIndex = 2; // @@ -130,6 +181,7 @@ treeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true; treeListLookUpEdit1TreeList.Size = new Size(400, 200); treeListLookUpEdit1TreeList.TabIndex = 0; + treeListLookUpEdit1TreeList.BeforeFocusNode += treeListLookUpEdit1TreeList_BeforeFocusNode; // // treeListColumn1 // @@ -141,12 +193,12 @@ // // txtFloorHeight // - txtFloorHeight.Location = new Point(592, 132); + txtFloorHeight.Location = new Point(577, 132); txtFloorHeight.Margin = new Padding(2, 3, 2, 3); txtFloorHeight.MinimumSize = new Size(0, 36); txtFloorHeight.Name = "txtFloorHeight"; txtFloorHeight.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager)); - txtFloorHeight.Size = new Size(285, 36); + txtFloorHeight.Size = new Size(269, 36); txtFloorHeight.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; txtFloorHeight.TabIndex = 8; // @@ -157,7 +209,7 @@ txtFloor.MinimumSize = new Size(0, 36); txtFloor.Name = "txtFloor"; txtFloor.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager)); - txtFloor.Size = new Size(284, 36); + txtFloor.Size = new Size(269, 36); txtFloor.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; txtFloor.TabIndex = 5; // @@ -167,7 +219,7 @@ txtName.Margin = new Padding(2, 3, 2, 3); txtName.MinimumSize = new Size(0, 36); txtName.Name = "txtName"; - txtName.Size = new Size(284, 36); + txtName.Size = new Size(269, 36); txtName.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; txtName.TabIndex = 0; // @@ -177,18 +229,18 @@ txtWaterPressure.Margin = new Padding(2, 3, 2, 3); txtWaterPressure.MinimumSize = new Size(0, 36); txtWaterPressure.Name = "txtWaterPressure"; - txtWaterPressure.Size = new Size(284, 36); + txtWaterPressure.Size = new Size(269, 36); txtWaterPressure.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; txtWaterPressure.TabIndex = 9; // // txtMaxWaterDemand // - txtMaxWaterDemand.Location = new Point(592, 92); + txtMaxWaterDemand.Location = new Point(577, 92); txtMaxWaterDemand.Margin = new Padding(2, 3, 2, 3); txtMaxWaterDemand.MinimumSize = new Size(0, 36); txtMaxWaterDemand.Name = "txtMaxWaterDemand"; txtMaxWaterDemand.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager)); - txtMaxWaterDemand.Size = new Size(285, 36); + txtMaxWaterDemand.Size = new Size(269, 36); txtMaxWaterDemand.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; txtMaxWaterDemand.TabIndex = 6; // @@ -200,29 +252,29 @@ comboBoxWaterSupply.Name = "comboBoxWaterSupply"; comboBoxWaterSupply.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) }); comboBoxWaterSupply.Properties.NullText = "璇烽�夋嫨"; - comboBoxWaterSupply.Size = new Size(284, 36); + comboBoxWaterSupply.Size = new Size(269, 36); comboBoxWaterSupply.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; comboBoxWaterSupply.TabIndex = 3; // - // comboBoxCompletePlant + // comboBoxPackages // comboBoxPackages.Location = new Point(158, 132); comboBoxPackages.Margin = new Padding(2, 3, 2, 3); comboBoxPackages.MinimumSize = new Size(0, 36); - comboBoxPackages.Name = "comboBoxCompletePlant"; + comboBoxPackages.Name = "comboBoxPackages"; comboBoxPackages.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) }); comboBoxPackages.Properties.NullText = "璇烽�夋嫨"; - comboBoxPackages.Size = new Size(284, 36); + comboBoxPackages.Size = new Size(269, 36); comboBoxPackages.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; comboBoxPackages.TabIndex = 7; // // txtFloorHouseHolds // - txtFloorHouseHolds.Location = new Point(592, 52); + txtFloorHouseHolds.Location = new Point(577, 52); txtFloorHouseHolds.Margin = new Padding(2, 3, 2, 3); txtFloorHouseHolds.MinimumSize = new Size(0, 36); txtFloorHouseHolds.Name = "txtFloorHouseHolds"; - txtFloorHouseHolds.Size = new Size(285, 36); + txtFloorHouseHolds.Size = new Size(269, 36); txtFloorHouseHolds.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; txtFloorHouseHolds.TabIndex = 4; // @@ -231,19 +283,55 @@ txtConstantP.Location = new Point(158, 212); txtConstantP.MinimumSize = new Size(0, 36); txtConstantP.Name = "txtConstantP"; - txtConstantP.Size = new Size(284, 36); + txtConstantP.Size = new Size(269, 36); txtConstantP.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; txtConstantP.TabIndex = 11; // // textEditWaterModel // - textEditWaterModel.Location = new Point(592, 172); + textEditWaterModel.Location = new Point(577, 172); textEditWaterModel.MinimumSize = new Size(0, 36); textEditWaterModel.Name = "textEditWaterModel"; textEditWaterModel.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) }); - textEditWaterModel.Size = new Size(285, 36); + textEditWaterModel.Size = new Size(269, 36); textEditWaterModel.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; textEditWaterModel.TabIndex = 10; + // + // imageComboBoxConnectionType + // + imageComboBoxConnectionType.Location = new Point(577, 212); + imageComboBoxConnectionType.MinimumSize = new Size(0, 36); + imageComboBoxConnectionType.Name = "imageComboBoxConnectionType"; + imageComboBoxConnectionType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) }); + imageComboBoxConnectionType.Size = new Size(269, 36); + imageComboBoxConnectionType.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; + imageComboBoxConnectionType.TabIndex = 12; + // + // textEditConnectionAddress + // + textEditConnectionAddress.Location = new Point(158, 252); + textEditConnectionAddress.MinimumSize = new Size(0, 36); + textEditConnectionAddress.Name = "textEditConnectionAddress"; + textEditConnectionAddress.Size = new Size(269, 36); + textEditConnectionAddress.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; + textEditConnectionAddress.TabIndex = 13; + // + // textEditMaxHeight + // + textEditMaxHeight.Location = new Point(577, 252); + textEditMaxHeight.MinimumSize = new Size(0, 36); + textEditMaxHeight.Name = "textEditMaxHeight"; + textEditMaxHeight.Size = new Size(269, 36); + textEditMaxHeight.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; + textEditMaxHeight.TabIndex = 14; + // + // txtDescription + // + txtDescription.Location = new Point(158, 332); + txtDescription.Name = "txtDescription"; + txtDescription.Size = new Size(688, 79); + txtDescription.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout; + txtDescription.TabIndex = 15; // // layoutControlGroup1 // @@ -251,9 +339,9 @@ layoutControlGroup1.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; layoutControlGroup1.GroupBordersVisible = false; - layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { txtFlooritem, comboBoxCompletePlantitem, txtNameitem, comboBoxWaterSupplyitem, txtWaterHeightitem, txtFloorHeightitem, layoutControlItem6, layoutControlItem5, layoutControlItem7, layoutControlItem2, txtWaterPressureitem }); + layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { txtFlooritem, comboBoxCompletePlantitem, txtNameitem, comboBoxWaterSupplyitem, txtWaterHeightitem, txtFloorHeightitem, layoutControlItem6, layoutControlItem5, layoutControlItem7, layoutControlItem2, txtWaterPressureitem, layoutControlItem4, layoutControlItem9, layoutControlItem10, layoutControlItem11, layoutControlItem12, layoutControlItem13 }); layoutControlGroup1.Name = "Root"; - layoutControlGroup1.Size = new Size(889, 396); + layoutControlGroup1.Size = new Size(858, 423); layoutControlGroup1.TextVisible = false; // // txtFlooritem @@ -262,7 +350,7 @@ txtFlooritem.Control = txtFloor; txtFlooritem.Location = new Point(0, 80); txtFlooritem.Name = "txtFlooritem"; - txtFlooritem.Size = new Size(434, 40); + txtFlooritem.Size = new Size(419, 40); txtFlooritem.Text = "<color=red>*</color>妤煎眰锛�"; txtFlooritem.TextLocation = DevExpress.Utils.Locations.Left; txtFlooritem.TextSize = new Size(134, 18); @@ -273,7 +361,7 @@ comboBoxCompletePlantitem.Control = comboBoxPackages; comboBoxCompletePlantitem.Location = new Point(0, 120); comboBoxCompletePlantitem.Name = "comboBoxCompletePlantitem"; - comboBoxCompletePlantitem.Size = new Size(434, 40); + comboBoxCompletePlantitem.Size = new Size(419, 40); comboBoxCompletePlantitem.Text = "<color=red>*</color>鎴愬璁惧锛�"; comboBoxCompletePlantitem.TextLocation = DevExpress.Utils.Locations.Left; comboBoxCompletePlantitem.TextSize = new Size(134, 18); @@ -284,7 +372,7 @@ txtNameitem.Control = txtName; txtNameitem.Location = new Point(0, 0); txtNameitem.Name = "txtNameitem"; - txtNameitem.Size = new Size(434, 40); + txtNameitem.Size = new Size(419, 40); txtNameitem.StartNewLine = true; txtNameitem.Text = "<color=red>*</color>璁炬柦鍚嶇О锛�"; txtNameitem.TextLocation = DevExpress.Utils.Locations.Left; @@ -296,7 +384,7 @@ comboBoxWaterSupplyitem.Control = comboBoxWaterSupply; comboBoxWaterSupplyitem.Location = new Point(0, 40); comboBoxWaterSupplyitem.Name = "comboBoxWaterSupplyitem"; - comboBoxWaterSupplyitem.Size = new Size(434, 40); + comboBoxWaterSupplyitem.Size = new Size(419, 40); comboBoxWaterSupplyitem.Text = "<color=red>*</color>渚涙按鍗曞厓锛�"; comboBoxWaterSupplyitem.TextLocation = DevExpress.Utils.Locations.Left; comboBoxWaterSupplyitem.TextSize = new Size(134, 18); @@ -305,9 +393,9 @@ // txtWaterHeightitem.AllowHtmlStringInCaption = true; txtWaterHeightitem.Control = txtMaxWaterDemand; - txtWaterHeightitem.Location = new Point(434, 80); + txtWaterHeightitem.Location = new Point(419, 80); txtWaterHeightitem.Name = "txtWaterHeightitem"; - txtWaterHeightitem.Size = new Size(435, 40); + txtWaterHeightitem.Size = new Size(419, 40); txtWaterHeightitem.Text = "<color=red>*</color>鏈�澶х敤姘撮噺(m鲁/h):"; txtWaterHeightitem.TextLocation = DevExpress.Utils.Locations.Left; txtWaterHeightitem.TextSize = new Size(134, 18); @@ -316,9 +404,9 @@ // txtFloorHeightitem.AllowHtmlStringInCaption = true; txtFloorHeightitem.Control = txtFloorHeight; - txtFloorHeightitem.Location = new Point(434, 120); + txtFloorHeightitem.Location = new Point(419, 120); txtFloorHeightitem.Name = "txtFloorHeightitem"; - txtFloorHeightitem.Size = new Size(435, 40); + txtFloorHeightitem.Size = new Size(419, 40); txtFloorHeightitem.Text = "<color=red>*</color>灞傞珮(m)锛�"; txtFloorHeightitem.TextLocation = DevExpress.Utils.Locations.Left; txtFloorHeightitem.TextSize = new Size(134, 18); @@ -329,7 +417,7 @@ layoutControlItem6.Control = txtConstantP; layoutControlItem6.Location = new Point(0, 200); layoutControlItem6.Name = "layoutControlItem6"; - layoutControlItem6.Size = new Size(434, 176); + layoutControlItem6.Size = new Size(419, 40); layoutControlItem6.Text = "<color=red>*</color>鎭掑畾鍘嬪姏:"; layoutControlItem6.TextSize = new Size(134, 18); // @@ -338,18 +426,18 @@ layoutControlItem5.AllowHtmlStringInCaption = true; layoutControlItem5.Control = txtFloorHouseHolds; layoutControlItem5.CustomizationFormText = "鎴锋暟锛�"; - layoutControlItem5.Location = new Point(434, 40); + layoutControlItem5.Location = new Point(419, 40); layoutControlItem5.Name = "layoutControlItem5"; - layoutControlItem5.Size = new Size(435, 40); + layoutControlItem5.Size = new Size(419, 40); layoutControlItem5.Text = "<color=red>*</color>鎴锋暟:"; layoutControlItem5.TextSize = new Size(134, 18); // // layoutControlItem7 // layoutControlItem7.Control = textEditWaterModel; - layoutControlItem7.Location = new Point(434, 160); + layoutControlItem7.Location = new Point(419, 160); layoutControlItem7.Name = "layoutControlItem7"; - layoutControlItem7.Size = new Size(435, 216); + layoutControlItem7.Size = new Size(419, 40); layoutControlItem7.Text = "渚涙按妯″紡:"; layoutControlItem7.TextSize = new Size(134, 18); // @@ -357,9 +445,9 @@ // layoutControlItem2.AllowHtmlStringInCaption = true; layoutControlItem2.Control = txtEditPlace; - layoutControlItem2.Location = new Point(434, 0); + layoutControlItem2.Location = new Point(419, 0); layoutControlItem2.Name = "layoutControlItem2"; - layoutControlItem2.Size = new Size(435, 40); + layoutControlItem2.Size = new Size(419, 40); layoutControlItem2.Text = "<color=red>*</color>鍦烘墍:"; layoutControlItem2.TextSize = new Size(134, 18); // @@ -369,14 +457,74 @@ txtWaterPressureitem.Control = txtWaterPressure; txtWaterPressureitem.Location = new Point(0, 160); txtWaterPressureitem.Name = "txtWaterPressureitem"; - txtWaterPressureitem.Size = new Size(434, 40); + txtWaterPressureitem.Size = new Size(419, 40); txtWaterPressureitem.Text = "<color=red>*</color>鏈鍘嬪姏(m):"; txtWaterPressureitem.TextLocation = DevExpress.Utils.Locations.Left; txtWaterPressureitem.TextSize = new Size(134, 18); // + // layoutControlItem4 + // + layoutControlItem4.Control = imageComboBoxConnectionType; + layoutControlItem4.Location = new Point(419, 200); + layoutControlItem4.Name = "layoutControlItem4"; + layoutControlItem4.Size = new Size(419, 40); + layoutControlItem4.Text = "杩炴帴绫诲瀷:"; + layoutControlItem4.TextSize = new Size(134, 18); + // + // layoutControlItem9 + // + layoutControlItem9.Control = textEditConnectionAddress; + layoutControlItem9.Location = new Point(0, 240); + layoutControlItem9.Name = "layoutControlItem9"; + layoutControlItem9.Size = new Size(419, 40); + layoutControlItem9.Text = "杩炴帴鍦板潃:"; + layoutControlItem9.TextSize = new Size(134, 18); + // + // layoutControlItem10 + // + layoutControlItem10.Control = textEditMaxHeight; + layoutControlItem10.Location = new Point(419, 240); + layoutControlItem10.Name = "layoutControlItem10"; + layoutControlItem10.Size = new Size(419, 40); + layoutControlItem10.Text = "鏈�楂樻ゼ灞傛爣楂�:"; + layoutControlItem10.TextSize = new Size(134, 18); + // + // layoutControlItem11 + // + layoutControlItem11.Control = txtDescription; + layoutControlItem11.Location = new Point(0, 320); + layoutControlItem11.Name = "layoutControlItem11"; + layoutControlItem11.Size = new Size(838, 83); + layoutControlItem11.Text = "璇存槑:"; + layoutControlItem11.TextSize = new Size(134, 18); + // + // layoutControlItem12 + // + layoutControlItem12.Control = setFlagsEditCtrl1; + layoutControlItem12.Location = new Point(0, 280); + layoutControlItem12.Name = "layoutControlItem12"; + layoutControlItem12.Size = new Size(419, 40); + layoutControlItem12.Text = "鏍囩:"; + layoutControlItem12.TextSize = new Size(134, 18); + // + // layoutControlItem13 + // + layoutControlItem13.Control = txtTagName; + layoutControlItem13.Location = new Point(419, 280); + layoutControlItem13.Name = "layoutControlItem13"; + layoutControlItem13.Size = new Size(419, 40); + layoutControlItem13.Text = "鏍囧織:"; + layoutControlItem13.TextSize = new Size(134, 18); + // // dxErrorProvider1 // dxErrorProvider1.ContainerControl = this; + // + // imageCollection1 + // + imageCollection1.ImageStream = (DevExpress.Utils.ImageCollectionStreamer)resources.GetObject("imageCollection1.ImageStream"); + imageCollection1.Images.SetKeyName(0, "涓嬭浇.png"); + imageCollection1.Images.SetKeyName(1, "涓嬭浇.png"); // // FacilitiesCtrl // @@ -385,9 +533,10 @@ Controls.Add(FacilitiesWizardFormlayoutControl1ConvertedLayout); Margin = new Padding(2, 3, 2, 3); Name = "FacilitiesCtrl"; - Size = new Size(889, 396); + Size = new Size(858, 423); ((System.ComponentModel.ISupportInitialize)FacilitiesWizardFormlayoutControl1ConvertedLayout).EndInit(); FacilitiesWizardFormlayoutControl1ConvertedLayout.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)txtTagName.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)txtEditPlace.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1TreeList).EndInit(); ((System.ComponentModel.ISupportInitialize)txtFloorHeight.Properties).EndInit(); @@ -400,6 +549,10 @@ ((System.ComponentModel.ISupportInitialize)txtFloorHouseHolds.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)txtConstantP.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)textEditWaterModel.Properties).EndInit(); + ((System.ComponentModel.ISupportInitialize)imageComboBoxConnectionType.Properties).EndInit(); + ((System.ComponentModel.ISupportInitialize)textEditConnectionAddress.Properties).EndInit(); + ((System.ComponentModel.ISupportInitialize)textEditMaxHeight.Properties).EndInit(); + ((System.ComponentModel.ISupportInitialize)txtDescription.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit(); ((System.ComponentModel.ISupportInitialize)txtFlooritem).EndInit(); ((System.ComponentModel.ISupportInitialize)comboBoxCompletePlantitem).EndInit(); @@ -412,7 +565,14 @@ ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit(); ((System.ComponentModel.ISupportInitialize)txtWaterPressureitem).EndInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit(); ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit(); + ((System.ComponentModel.ISupportInitialize)imageCollection1).EndInit(); ResumeLayout(false); } @@ -450,5 +610,18 @@ private DevExpress.XtraTreeList.TreeList treeListLookUpEdit1TreeList; private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraEditors.ImageComboBoxEdit imageComboBoxConnectionType; + private DevExpress.XtraEditors.TextEdit textEditConnectionAddress; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; + private DevExpress.XtraEditors.TextEdit textEditMaxHeight; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; + private DevExpress.Utils.ImageCollection imageCollection1; + private DevExpress.XtraEditors.MemoEdit txtDescription; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; + private Yw.WinFrmUI.SetFlagsEditCtrl setFlagsEditCtrl1; + private DevExpress.XtraEditors.TextEdit txtTagName; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; } } -- Gitblit v1.9.3