From d1807075581920a8c94a409b11a9c88dd869be1e Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期四, 20 三月 2025 16:57:33 +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/SchoolWizardForm.Designer.cs |  190 ++++++++---------------------------------------
 1 files changed, 32 insertions(+), 158 deletions(-)

diff --git a/WinFrmUI/PBS.WinFrmUI/01-place/00-core/SchoolWizardForm.Designer.cs b/WinFrmUI/PBS.WinFrmUI/01-place/00-core/SchoolWizardForm.Designer.cs
index 7738f30..3e84fc3 100644
--- a/WinFrmUI/PBS.WinFrmUI/01-place/00-core/SchoolWizardForm.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/01-place/00-core/SchoolWizardForm.Designer.cs
@@ -32,35 +32,19 @@
             layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             cbLevel = new DevExpress.XtraEditors.ComboBoxEdit();
             cbSchoolType = new DevExpress.XtraEditors.ComboBoxEdit();
-            txtAddress = new DevExpress.XtraEditors.TextEdit();
-            cbArea = new DevExpress.XtraEditors.ImageComboBoxEdit();
-            cbCity = new DevExpress.XtraEditors.ImageComboBoxEdit();
-            cbDist = new DevExpress.XtraEditors.ImageComboBoxEdit();
             Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
+            layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
             ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
             layoutControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)cbLevel.Properties).BeginInit();
             ((System.ComponentModel.ISupportInitialize)cbSchoolType.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)txtAddress.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)cbArea.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)cbCity.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)cbDist.Properties).BeginInit();
             ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
             ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
             ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
             SuspendLayout();
             // 
@@ -68,91 +52,42 @@
             // 
             layoutControl1.Controls.Add(cbLevel);
             layoutControl1.Controls.Add(cbSchoolType);
-            layoutControl1.Controls.Add(txtAddress);
-            layoutControl1.Controls.Add(cbArea);
-            layoutControl1.Controls.Add(cbCity);
-            layoutControl1.Controls.Add(cbDist);
             layoutControl1.Dock = DockStyle.Fill;
             layoutControl1.Location = new Point(0, 0);
+            layoutControl1.Margin = new Padding(3, 4, 3, 4);
             layoutControl1.Name = "layoutControl1";
             layoutControl1.Root = Root;
-            layoutControl1.Size = new Size(734, 123);
+            layoutControl1.Size = new Size(839, 158);
             layoutControl1.TabIndex = 118;
             layoutControl1.Text = "layoutControl1";
             // 
             // cbLevel
             // 
-            cbLevel.Location = new Point(445, 12);
-            cbLevel.Margin = new Padding(2);
-            cbLevel.MinimumSize = new Size(0, 28);
+            cbLevel.Location = new Point(512, 12);
+            cbLevel.Margin = new Padding(2, 3, 2, 3);
+            cbLevel.MinimumSize = new Size(0, 36);
             cbLevel.Name = "cbLevel";
             cbLevel.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
             cbLevel.Properties.Items.AddRange(new object[] { "骞煎効鍥�", "灏忓", "涓", "楂樺", "澶у" });
             cbLevel.Properties.NullText = "璇烽�夋嫨";
             cbLevel.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            cbLevel.Size = new Size(277, 28);
+            cbLevel.Size = new Size(315, 36);
             cbLevel.StyleController = layoutControl1;
             cbLevel.TabIndex = 129;
             // 
             // cbSchoolType
             // 
-            cbSchoolType.Location = new Point(445, 76);
-            cbSchoolType.Margin = new Padding(2);
-            cbSchoolType.MinimumSize = new Size(0, 28);
+            cbSchoolType.Location = new Point(89, 12);
+            cbSchoolType.Margin = new Padding(2, 3, 2, 3);
+            cbSchoolType.MinimumSize = new Size(0, 36);
             cbSchoolType.Name = "cbSchoolType";
             cbSchoolType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
             cbSchoolType.Properties.Items.AddRange(new object[] { "鍔炲叕", "绉佸姙" });
             cbSchoolType.Properties.NullText = "璇烽�夋嫨";
             cbSchoolType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            cbSchoolType.Size = new Size(277, 28);
+            cbSchoolType.Size = new Size(251, 36);
             cbSchoolType.StyleController = layoutControl1;
             cbSchoolType.TabIndex = 121;
-            // 
-            // txtAddress
-            // 
-            txtAddress.Location = new Point(76, 76);
-            txtAddress.MinimumSize = new Size(0, 28);
-            txtAddress.Name = "txtAddress";
-            txtAddress.Size = new Size(221, 28);
-            txtAddress.StyleController = layoutControl1;
-            txtAddress.TabIndex = 132;
-            // 
-            // cbArea
-            // 
-            cbArea.Location = new Point(76, 12);
-            cbArea.Margin = new Padding(2);
-            cbArea.MinimumSize = new Size(0, 28);
-            cbArea.Name = "cbArea";
-            cbArea.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
-            cbArea.Properties.NullText = "璇烽�夋嫨";
-            cbArea.Size = new Size(221, 28);
-            cbArea.StyleController = layoutControl1;
-            cbArea.TabIndex = 127;
-            // 
-            // cbCity
-            // 
-            cbCity.Location = new Point(445, 44);
-            cbCity.Margin = new Padding(2);
-            cbCity.MinimumSize = new Size(0, 28);
-            cbCity.Name = "cbCity";
-            cbCity.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
-            cbCity.Properties.NullText = "璇烽�夋嫨";
-            cbCity.Size = new Size(277, 28);
-            cbCity.StyleController = layoutControl1;
-            cbCity.TabIndex = 125;
-            // 
-            // cbDist
-            // 
-            cbDist.Location = new Point(76, 44);
-            cbDist.Margin = new Padding(2);
-            cbDist.MinimumSize = new Size(0, 28);
-            cbDist.Name = "cbDist";
-            cbDist.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
-            cbDist.Properties.NullText = "璇烽�夋嫨";
-            cbDist.Size = new Size(221, 28);
-            cbDist.StyleController = layoutControl1;
-            cbDist.TabIndex = 123;
-            cbDist.SelectedIndexChanged += cbDist_SelectedIndexChanged;
             // 
             // Root
             // 
@@ -160,82 +95,37 @@
             Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
             Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             Root.GroupBordersVisible = false;
-            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5, layoutControlItem3, layoutControlItem7, layoutControlItem9, layoutControlItem11, emptySpaceItem1, layoutControlItem2 });
+            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3, emptySpaceItem1, layoutControlItem11 });
             Root.Name = "Root";
-            Root.Size = new Size(734, 123);
+            Root.Size = new Size(839, 158);
             Root.TextVisible = false;
-            // 
-            // layoutControlItem5
-            // 
-            layoutControlItem5.AllowHtmlStringInCaption = true;
-            layoutControlItem5.Control = cbArea;
-            layoutControlItem5.Location = new Point(0, 0);
-            layoutControlItem5.Name = "layoutControlItem5";
-            layoutControlItem5.Size = new Size(289, 32);
-            layoutControlItem5.Text = "<color=red>*</color>鎵�灞炵渷浠�:";
-            layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            layoutControlItem5.TextSize = new Size(59, 14);
-            layoutControlItem5.TextToControlDistance = 5;
             // 
             // layoutControlItem3
             // 
             layoutControlItem3.Control = cbLevel;
             layoutControlItem3.CustomizationFormText = "灞傛:";
-            layoutControlItem3.Location = new Point(369, 0);
+            layoutControlItem3.Location = new Point(423, 0);
             layoutControlItem3.Name = "layoutControlItem3";
-            layoutControlItem3.Size = new Size(345, 32);
+            layoutControlItem3.Size = new Size(396, 138);
             layoutControlItem3.Text = "瀛︽牎灞傛:";
-            layoutControlItem3.TextSize = new Size(52, 14);
-            // 
-            // layoutControlItem7
-            // 
-            layoutControlItem7.AllowHtmlStringInCaption = true;
-            layoutControlItem7.Control = cbCity;
-            layoutControlItem7.Location = new Point(369, 32);
-            layoutControlItem7.Name = "layoutControlItem7";
-            layoutControlItem7.Size = new Size(345, 32);
-            layoutControlItem7.Text = "<color=red>*</color>鎵�灞炲煄甯�:";
-            layoutControlItem7.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            layoutControlItem7.TextSize = new Size(59, 14);
-            layoutControlItem7.TextToControlDistance = 5;
-            // 
-            // layoutControlItem9
-            // 
-            layoutControlItem9.AllowHtmlStringInCaption = true;
-            layoutControlItem9.Control = cbDist;
-            layoutControlItem9.Location = new Point(0, 32);
-            layoutControlItem9.Name = "layoutControlItem9";
-            layoutControlItem9.Size = new Size(289, 32);
-            layoutControlItem9.Text = "<color=red>*</color>鎵�灞炲尯鍘�:";
-            layoutControlItem9.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            layoutControlItem9.TextSize = new Size(59, 14);
-            layoutControlItem9.TextToControlDistance = 5;
-            // 
-            // layoutControlItem2
-            // 
-            layoutControlItem2.Control = txtAddress;
-            layoutControlItem2.Location = new Point(0, 64);
-            layoutControlItem2.Name = "layoutControlItem2";
-            layoutControlItem2.Size = new Size(289, 39);
-            layoutControlItem2.Text = "璇︾粏鍦板潃:";
-            layoutControlItem2.TextSize = new Size(52, 14);
-            // 
-            // layoutControlItem11
-            // 
-            layoutControlItem11.Control = cbSchoolType;
-            layoutControlItem11.Location = new Point(369, 64);
-            layoutControlItem11.Name = "layoutControlItem11";
-            layoutControlItem11.Size = new Size(345, 39);
-            layoutControlItem11.Text = "瀛︽牎绫诲瀷:";
-            layoutControlItem11.TextSize = new Size(52, 14);
+            layoutControlItem3.TextSize = new Size(65, 18);
             // 
             // emptySpaceItem1
             // 
             emptySpaceItem1.AllowHotTrack = false;
-            emptySpaceItem1.Location = new Point(289, 0);
+            emptySpaceItem1.Location = new Point(332, 0);
             emptySpaceItem1.Name = "emptySpaceItem1";
-            emptySpaceItem1.Size = new Size(80, 103);
+            emptySpaceItem1.Size = new Size(91, 138);
             emptySpaceItem1.TextSize = new Size(0, 0);
+            // 
+            // layoutControlItem11
+            // 
+            layoutControlItem11.Control = cbSchoolType;
+            layoutControlItem11.Location = new Point(0, 0);
+            layoutControlItem11.Name = "layoutControlItem11";
+            layoutControlItem11.Size = new Size(332, 138);
+            layoutControlItem11.Text = "瀛︽牎绫诲瀷:";
+            layoutControlItem11.TextSize = new Size(65, 18);
             // 
             // dxErrorProvider1
             // 
@@ -243,29 +133,21 @@
             // 
             // SchoolWizardForm
             // 
-            AutoScaleDimensions = new SizeF(7F, 14F);
+            AutoScaleDimensions = new SizeF(8F, 18F);
             AutoScaleMode = AutoScaleMode.Font;
             Controls.Add(layoutControl1);
-            Margin = new Padding(2);
+            Margin = new Padding(2, 3, 2, 3);
             Name = "SchoolWizardForm";
-            Size = new Size(734, 123);
+            Size = new Size(839, 158);
             Load += SchoolWizardForm_Load;
             ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
             layoutControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)cbLevel.Properties).EndInit();
             ((System.ComponentModel.ISupportInitialize)cbSchoolType.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)txtAddress.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)cbArea.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)cbCity.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)cbDist.Properties).EndInit();
             ((System.ComponentModel.ISupportInitialize)Root).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
-            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
             ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
             ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
             ResumeLayout(false);
         }
@@ -276,16 +158,8 @@
         private DevExpress.XtraEditors.ComboBoxEdit cbSchoolType;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
-        public DevExpress.XtraEditors.TextEdit txtAddress;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
         private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
-        private DevExpress.XtraEditors.ImageComboBoxEdit cbArea;
-        private DevExpress.XtraEditors.ImageComboBoxEdit cbCity;
-        private DevExpress.XtraEditors.ImageComboBoxEdit cbDist;
     }
 }

--
Gitblit v1.9.3