From d5a2d7e66f9c8046bd88b8269e61aac5a2a265e2 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 10:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI/01-place/00-core/BuildWizardForm.Designer.cs | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI/01-place/00-core/BuildWizardForm.Designer.cs b/WinFrmUI/PBS.WinFrmUI/01-place/00-core/BuildWizardForm.Designer.cs
index 79499ea..4d49224 100644
--- a/WinFrmUI/PBS.WinFrmUI/01-place/00-core/BuildWizardForm.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/01-place/00-core/BuildWizardForm.Designer.cs
@@ -30,7 +30,6 @@
{
components = new System.ComponentModel.Container();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- cbPropertyType = new DevExpress.XtraEditors.ComboBoxEdit();
txtCompletionTime = new DevExpress.XtraEditors.TextEdit();
txtProperTyYears = new DevExpress.XtraEditors.TextEdit();
txtTotalHouseHolds = new DevExpress.XtraEditors.TextEdit();
@@ -49,9 +48,9 @@
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+ cbPropertyType = new DevExpress.XtraEditors.ImageComboBoxEdit();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)cbPropertyType.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)txtCompletionTime.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)txtProperTyYears.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)txtTotalHouseHolds.Properties).BeginInit();
@@ -70,11 +69,11 @@
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)cbPropertyType.Properties).BeginInit();
SuspendLayout();
//
// layoutControl1
//
- layoutControl1.Controls.Add(cbPropertyType);
layoutControl1.Controls.Add(txtCompletionTime);
layoutControl1.Controls.Add(txtProperTyYears);
layoutControl1.Controls.Add(txtTotalHouseHolds);
@@ -82,6 +81,7 @@
layoutControl1.Controls.Add(txtPlotRatio);
layoutControl1.Controls.Add(txtDeveloper);
layoutControl1.Controls.Add(textGreeningRate);
+ layoutControl1.Controls.Add(cbPropertyType);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Margin = new Padding(3, 4, 3, 4);
@@ -91,20 +91,6 @@
layoutControl1.Size = new Size(925, 321);
layoutControl1.TabIndex = 91;
layoutControl1.Text = "layoutControl1";
- //
- // cbPropertyType
- //
- cbPropertyType.Location = new Point(121, 52);
- cbPropertyType.Margin = new Padding(2, 3, 2, 3);
- cbPropertyType.MinimumSize = new Size(0, 36);
- cbPropertyType.Name = "cbPropertyType";
- cbPropertyType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
- cbPropertyType.Properties.Items.AddRange(new object[] { "鍏瘬浣忓畢" });
- cbPropertyType.Properties.NullText = "璇烽�夋嫨";
- cbPropertyType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- cbPropertyType.Size = new Size(339, 36);
- cbPropertyType.StyleController = layoutControl1;
- cbPropertyType.TabIndex = 6;
//
// txtCompletionTime
//
@@ -292,6 +278,19 @@
//
dxErrorProvider1.ContainerControl = this;
//
+ // cbPropertyType
+ //
+ cbPropertyType.Location = new Point(121, 52);
+ cbPropertyType.Margin = new Padding(2, 3, 2, 3);
+ cbPropertyType.MinimumSize = new Size(0, 36);
+ cbPropertyType.Name = "cbPropertyType";
+ cbPropertyType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ cbPropertyType.Properties.NullText = "璇烽�夋嫨";
+ cbPropertyType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ cbPropertyType.Size = new Size(339, 36);
+ cbPropertyType.StyleController = layoutControl1;
+ cbPropertyType.TabIndex = 6;
+ //
// BuildWizardForm
//
AutoScaleDimensions = new SizeF(8F, 18F);
@@ -300,9 +299,8 @@
Margin = new Padding(2, 3, 2, 3);
Name = "BuildWizardForm";
Size = new Size(925, 321);
- ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)cbPropertyType.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)txtCompletionTime.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)txtProperTyYears.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)txtTotalHouseHolds.Properties).EndInit();
@@ -321,12 +319,12 @@
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)cbPropertyType.Properties).EndInit();
ResumeLayout(false);
}
#endregion
private DevExpress.XtraLayout.LayoutControl layoutControl1;
- private DevExpress.XtraEditors.ComboBoxEdit cbPropertyType;
private DevExpress.XtraEditors.TextEdit txtCompletionTime;
private DevExpress.XtraEditors.TextEdit txtProperTyYears;
private DevExpress.XtraEditors.TextEdit txtTotalHouseHolds;
@@ -345,5 +343,6 @@
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
private DevExpress.XtraEditors.TextEdit textGreeningRate;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraEditors.ImageComboBoxEdit cbPropertyType;
}
}
--
Gitblit v1.9.3