From 185565a8eb30c0546746aad52aac0926d395a76d Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期五, 14 三月 2025 11:01:41 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI/02-facility/AddFacilityDlg.Designer.cs | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI/02-facility/AddPlaceDlg.Designer.cs b/WinFrmUI/PBS.WinFrmUI/02-facility/AddFacilityDlg.Designer.cs
similarity index 90%
rename from WinFrmUI/PBS.WinFrmUI/02-facility/AddPlaceDlg.Designer.cs
rename to WinFrmUI/PBS.WinFrmUI/02-facility/AddFacilityDlg.Designer.cs
index f66e5e4..7dc2bee 100644
--- a/WinFrmUI/PBS.WinFrmUI/02-facility/AddPlaceDlg.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/02-facility/AddFacilityDlg.Designer.cs
@@ -31,14 +31,14 @@
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
generalOkAndCancelCtrl1 = new Yw.WinFrmUI.GeneralOkAndCancelCtrl();
- layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- facilitiesCtrl = new FacilitiesCtrl();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ facilitiesCtrl = new FacilitiesCtrl();
+ layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
SuspendLayout();
//
// Root
@@ -49,15 +49,15 @@
Root.GroupBordersVisible = false;
Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem7, layoutControlItem1 });
Root.Name = "Root";
- Root.Size = new Size(779, 347);
+ Root.Size = new Size(753, 287);
Root.TextVisible = false;
//
// layoutControlItem7
//
layoutControlItem7.Control = generalOkAndCancelCtrl1;
- layoutControlItem7.Location = new Point(0, 290);
+ layoutControlItem7.Location = new Point(0, 230);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(759, 37);
+ layoutControlItem7.Size = new Size(733, 37);
layoutControlItem7.TextSize = new Size(0, 0);
layoutControlItem7.TextVisible = false;
//
@@ -67,11 +67,28 @@
generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(114, 33);
generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(131, 42);
generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(114, 33);
- generalOkAndCancelCtrl1.Location = new Point(12, 302);
+ generalOkAndCancelCtrl1.Location = new Point(12, 242);
generalOkAndCancelCtrl1.Margin = new Padding(3, 5, 3, 5);
generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
- generalOkAndCancelCtrl1.Size = new Size(755, 33);
+ generalOkAndCancelCtrl1.Size = new Size(729, 33);
generalOkAndCancelCtrl1.TabIndex = 0;
+ //
+ // layoutControlItem1
+ //
+ layoutControlItem1.Control = facilitiesCtrl;
+ layoutControlItem1.Location = new Point(0, 0);
+ layoutControlItem1.Name = "layoutControlItem1";
+ layoutControlItem1.Size = new Size(733, 230);
+ layoutControlItem1.TextSize = new Size(0, 0);
+ layoutControlItem1.TextVisible = false;
+ //
+ // facilitiesCtrl
+ //
+ facilitiesCtrl.Location = new Point(12, 12);
+ facilitiesCtrl.Margin = new Padding(2, 3, 2, 3);
+ facilitiesCtrl.Name = "facilitiesCtrl";
+ facilitiesCtrl.Size = new Size(729, 226);
+ facilitiesCtrl.TabIndex = 4;
//
// layoutControl1
//
@@ -83,32 +100,15 @@
layoutControl1.Name = "layoutControl1";
layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(826, 220, 650, 400);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(779, 347);
+ layoutControl1.Size = new Size(753, 287);
layoutControl1.TabIndex = 2;
layoutControl1.Text = "layoutControl1";
- //
- // facilitiesWizardForm1
- //
- facilitiesCtrl.Location = new Point(12, 12);
- facilitiesCtrl.Margin = new Padding(2, 3, 2, 3);
- facilitiesCtrl.Name = "facilitiesWizardForm1";
- facilitiesCtrl.Size = new Size(755, 286);
- facilitiesCtrl.TabIndex = 4;
- //
- // layoutControlItem1
- //
- layoutControlItem1.Control = facilitiesCtrl;
- layoutControlItem1.Location = new Point(0, 0);
- layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(759, 290);
- layoutControlItem1.TextSize = new Size(0, 0);
- layoutControlItem1.TextVisible = false;
//
// AddFacilityDlg
//
AutoScaleDimensions = new SizeF(8F, 18F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(779, 347);
+ ClientSize = new Size(753, 287);
Controls.Add(layoutControl1);
Margin = new Padding(3, 4, 3, 4);
Name = "AddFacilityDlg";
@@ -116,9 +116,9 @@
Text = "鏂板";
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
ResumeLayout(false);
}
--
Gitblit v1.9.3