冲突

duheng

2024-07-23 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.Designer.cs

@@ -32,7 +32,6 @@
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            txtDescription = new DevExpress.XtraEditors.MemoEdit();
            txtTagNme = new DevExpress.XtraEditors.TextEdit();
            txtFlags = new DevExpress.XtraEditors.TextEdit();
            txtAddress = new DevExpress.XtraEditors.TextEdit();
            txtCustomer = new DevExpress.XtraEditors.TextEdit();
            txtName = new DevExpress.XtraEditors.TextEdit();
@@ -42,15 +41,15 @@
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            setFlagsEditCtrl1 = new SetFlagsEditCtrl();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)txtDescription.Properties).BeginInit();
            ((ISupportInitialize)txtTagNme.Properties).BeginInit();
            ((ISupportInitialize)txtFlags.Properties).BeginInit();
            ((ISupportInitialize)txtAddress.Properties).BeginInit();
            ((ISupportInitialize)txtCustomer.Properties).BeginInit();
            ((ISupportInitialize)txtName.Properties).BeginInit();
@@ -60,17 +59,17 @@
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            ((ISupportInitialize)layoutControlItem3).BeginInit();
            ((ISupportInitialize)layoutControlItem4).BeginInit();
            ((ISupportInitialize)layoutControlItem5).BeginInit();
            ((ISupportInitialize)layoutControlItem6).BeginInit();
            ((ISupportInitialize)layoutControlItem7).BeginInit();
            ((ISupportInitialize)dxErrorProvider1).BeginInit();
            ((ISupportInitialize)layoutControlItem5).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(setFlagsEditCtrl1);
            layoutControl1.Controls.Add(txtDescription);
            layoutControl1.Controls.Add(txtTagNme);
            layoutControl1.Controls.Add(txtFlags);
            layoutControl1.Controls.Add(txtAddress);
            layoutControl1.Controls.Add(txtCustomer);
            layoutControl1.Controls.Add(txtName);
@@ -78,6 +77,7 @@
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1200, 175, 650, 400);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(859, 464);
            layoutControl1.TabIndex = 0;
@@ -85,57 +85,49 @@
            // 
            // txtDescription
            // 
            txtDescription.Location = new Point(84, 84);
            txtDescription.Location = new Point(67, 84);
            txtDescription.Name = "txtDescription";
            txtDescription.Size = new Size(763, 368);
            txtDescription.Size = new Size(780, 368);
            txtDescription.StyleController = layoutControl1;
            txtDescription.TabIndex = 10;
            // 
            // txtTagNme
            // 
            txtTagNme.Location = new Point(503, 60);
            txtTagNme.Location = new Point(486, 60);
            txtTagNme.Name = "txtTagNme";
            txtTagNme.Size = new Size(344, 20);
            txtTagNme.Size = new Size(361, 20);
            txtTagNme.StyleController = layoutControl1;
            txtTagNme.TabIndex = 9;
            // 
            // txtFlags
            // 
            txtFlags.Location = new Point(84, 60);
            txtFlags.Name = "txtFlags";
            txtFlags.Size = new Size(343, 20);
            txtFlags.StyleController = layoutControl1;
            txtFlags.TabIndex = 8;
            // 
            // txtAddress
            // 
            txtAddress.Location = new Point(503, 36);
            txtAddress.Location = new Point(486, 36);
            txtAddress.Name = "txtAddress";
            txtAddress.Size = new Size(344, 20);
            txtAddress.Size = new Size(361, 20);
            txtAddress.StyleController = layoutControl1;
            txtAddress.TabIndex = 7;
            // 
            // txtCustomer
            // 
            txtCustomer.Location = new Point(84, 36);
            txtCustomer.Location = new Point(67, 36);
            txtCustomer.Name = "txtCustomer";
            txtCustomer.Size = new Size(343, 20);
            txtCustomer.Size = new Size(360, 20);
            txtCustomer.StyleController = layoutControl1;
            txtCustomer.TabIndex = 6;
            // 
            // txtName
            // 
            txtName.Location = new Point(503, 12);
            txtName.Location = new Point(486, 12);
            txtName.Name = "txtName";
            txtName.Size = new Size(344, 20);
            txtName.Size = new Size(361, 20);
            txtName.StyleController = layoutControl1;
            txtName.TabIndex = 5;
            // 
            // txtNO
            // 
            txtNO.Location = new Point(84, 12);
            txtNO.Location = new Point(67, 12);
            txtNO.Name = "txtNO";
            txtNO.Size = new Size(343, 20);
            txtNO.Size = new Size(360, 20);
            txtNO.StyleController = layoutControl1;
            txtNO.TabIndex = 4;
            // 
@@ -145,7 +137,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[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem5, layoutControlItem6, layoutControlItem7 });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem6, layoutControlItem7, layoutControlItem5 });
            Root.Name = "Root";
            Root.Size = new Size(859, 464);
            Root.TextVisible = false;
@@ -157,7 +149,7 @@
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(419, 24);
            layoutControlItem1.Text = "编号：";
            layoutControlItem1.TextSize = new Size(60, 14);
            layoutControlItem1.TextSize = new Size(43, 14);
            // 
            // layoutControlItem2
            // 
@@ -167,7 +159,7 @@
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(420, 24);
            layoutControlItem2.Text = "<color=red>*</color>名称：";
            layoutControlItem2.TextSize = new Size(60, 14);
            layoutControlItem2.TextSize = new Size(43, 14);
            // 
            // layoutControlItem3
            // 
@@ -176,7 +168,7 @@
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(419, 24);
            layoutControlItem3.Text = "客户：";
            layoutControlItem3.TextSize = new Size(60, 14);
            layoutControlItem3.TextSize = new Size(43, 14);
            // 
            // layoutControlItem4
            // 
@@ -184,17 +176,8 @@
            layoutControlItem4.Location = new Point(419, 24);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(420, 24);
            layoutControlItem4.Text = "详细地址：";
            layoutControlItem4.TextSize = new Size(60, 14);
            // 
            // layoutControlItem5
            // 
            layoutControlItem5.Control = txtFlags;
            layoutControlItem5.Location = new Point(0, 48);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(419, 24);
            layoutControlItem5.Text = "标签：";
            layoutControlItem5.TextSize = new Size(60, 14);
            layoutControlItem4.Text = "地址：";
            layoutControlItem4.TextSize = new Size(43, 14);
            // 
            // layoutControlItem6
            // 
@@ -203,7 +186,7 @@
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Size = new Size(420, 24);
            layoutControlItem6.Text = "标志：";
            layoutControlItem6.TextSize = new Size(60, 14);
            layoutControlItem6.TextSize = new Size(43, 14);
            // 
            // layoutControlItem7
            // 
@@ -212,11 +195,27 @@
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(839, 372);
            layoutControlItem7.Text = "说明";
            layoutControlItem7.TextSize = new Size(60, 14);
            layoutControlItem7.TextSize = new Size(43, 14);
            // 
            // dxErrorProvider1
            // 
            dxErrorProvider1.ContainerControl = this;
            // 
            // setFlagsEditCtrl1
            // 
            setFlagsEditCtrl1.Location = new Point(67, 60);
            setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
            setFlagsEditCtrl1.Size = new Size(360, 20);
            setFlagsEditCtrl1.TabIndex = 11;
            // 
            // layoutControlItem5
            // 
            layoutControlItem5.Control = setFlagsEditCtrl1;
            layoutControlItem5.Location = new Point(0, 48);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(419, 24);
            layoutControlItem5.Text = "标签：";
            layoutControlItem5.TextSize = new Size(43, 14);
            // 
            // InputXhsProjectInfoWizardPage
            // 
@@ -229,7 +228,6 @@
            layoutControl1.ResumeLayout(false);
            ((ISupportInitialize)txtDescription.Properties).EndInit();
            ((ISupportInitialize)txtTagNme.Properties).EndInit();
            ((ISupportInitialize)txtFlags.Properties).EndInit();
            ((ISupportInitialize)txtAddress.Properties).EndInit();
            ((ISupportInitialize)txtCustomer.Properties).EndInit();
            ((ISupportInitialize)txtName.Properties).EndInit();
@@ -239,10 +237,10 @@
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ((ISupportInitialize)layoutControlItem3).EndInit();
            ((ISupportInitialize)layoutControlItem4).EndInit();
            ((ISupportInitialize)layoutControlItem5).EndInit();
            ((ISupportInitialize)layoutControlItem6).EndInit();
            ((ISupportInitialize)layoutControlItem7).EndInit();
            ((ISupportInitialize)dxErrorProvider1).EndInit();
            ((ISupportInitialize)layoutControlItem5).EndInit();
            ResumeLayout(false);
        }

@@ -258,12 +256,12 @@
        private DevExpress.XtraEditors.TextEdit txtCustomer;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraEditors.TextEdit txtTagNme;
        private DevExpress.XtraEditors.TextEdit txtFlags;
        private DevExpress.XtraEditors.TextEdit txtAddress;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraEditors.MemoEdit txtDescription;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private SetFlagsEditCtrl setFlagsEditCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
    }
}