From 2bc7800e9f02fed6652f6b0defe1d978f186e914 Mon Sep 17 00:00:00 2001 From: yangyin <1850366751@qq.com> Date: 星期一, 12 八月 2024 09:18:34 +0800 Subject: [PATCH] 冲突 --- WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/EmloyeeInfoCtrl.Designer.cs | 424 +++++++++++++++++++++++++++++++---------------------- 1 files changed, 248 insertions(+), 176 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/emloyeeFrom.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/EmloyeeInfoCtrl.Designer.cs similarity index 70% rename from WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/emloyeeFrom.Designer.cs rename to WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/EmloyeeInfoCtrl.Designer.cs index 9e8a0ca..56c10ce 100644 --- a/WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/emloyeeFrom.Designer.cs +++ b/WinFrmUI/HStation.WinFrmUI.Organize.Core/00-UserControl/EmloyeeInfoCtrl.Designer.cs @@ -1,6 +1,6 @@ -锘縩amespace HStation.WinFrmUI.Organize.Core._00_UserControl +锘縩amespace HStation.WinFrmUI.Organize { - partial class emloyeeFrom + partial class EmloyeeInfoCtrl { /// <summary> /// 蹇呴渶鐨勮璁″櫒鍙橀噺銆� @@ -31,10 +31,6 @@ components = new System.ComponentModel.Container(); DevExpress.XtraEditors.DXErrorProvider.ConditionValidationRule conditionValidationRule1 = new DevExpress.XtraEditors.DXErrorProvider.ConditionValidationRule(); DevExpress.XtraEditors.DXErrorProvider.ConditionValidationRule conditionValidationRule2 = new DevExpress.XtraEditors.DXErrorProvider.ConditionValidationRule(); - DevExpress.XtraEditors.DXErrorProvider.ConditionValidationRule conditionValidationRule3 = new DevExpress.XtraEditors.DXErrorProvider.ConditionValidationRule(); - DevExpress.XtraEditors.DXErrorProvider.ConditionValidationRule conditionValidationRule4 = new DevExpress.XtraEditors.DXErrorProvider.ConditionValidationRule(); - DevExpress.XtraEditors.DXErrorProvider.ConditionValidationRule conditionValidationRule5 = new DevExpress.XtraEditors.DXErrorProvider.ConditionValidationRule(); - DevExpress.XtraEditors.DXErrorProvider.ConditionValidationRule conditionValidationRule6 = new DevExpress.XtraEditors.DXErrorProvider.ConditionValidationRule(); layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); textEditQianMing = new DevExpress.XtraEditors.TextEdit(); EnglishNametextEdit = new DevExpress.XtraEditors.TextEdit(); @@ -42,10 +38,7 @@ ZhuangTaiimageComboBoxEdit = new DevExpress.XtraEditors.ImageComboBoxEdit(); comboBoxEdit1 = new DevExpress.XtraEditors.ComboBoxEdit(); checkedComboBoxEdit1 = new DevExpress.XtraEditors.CheckedComboBoxEdit(); - BianQiantextEdit = new DevExpress.XtraEditors.TextEdit(); ZhuangTaicheckedComboBoxEdit = new DevExpress.XtraEditors.CheckedComboBoxEdit(); - ChongZhicomboBoxEdit = new DevExpress.XtraEditors.ComboBoxEdit(); - textEdit1 = new DevExpress.XtraEditors.TextEdit(); TouXiangpictureEdit = new DevExpress.XtraEditors.PictureEdit(); ZhiWutextEdit = new DevExpress.XtraEditors.TextEdit(); YouXiangtextEdit = new DevExpress.XtraEditors.TextEdit(); @@ -62,7 +55,6 @@ Root = new DevExpress.XtraLayout.LayoutControlGroup(); layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); - layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -72,10 +64,21 @@ emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem(); emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem(); layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); - emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem(); + layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); + emptySpaceItem6 = new DevExpress.XtraLayout.EmptySpaceItem(); QianMingopenFileDialog = new OpenFileDialog(); dxValidationProviderBianHao = new DevExpress.XtraEditors.DXErrorProvider.DXValidationProvider(components); + groupControl1 = new DevExpress.XtraEditors.GroupControl(); + layoutControl = new DevExpress.XtraLayout.LayoutControl(); + groupControl2 = new DevExpress.XtraEditors.GroupControl(); + loginUserInfoCtrl = new LoginUserInfoCtrl(); + checkEditCreateLogin = new DevExpress.XtraEditors.CheckEdit(); + layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); + layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); + layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); + layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); + emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem(); ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit(); layoutControl1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)textEditQianMing.Properties).BeginInit(); @@ -84,10 +87,7 @@ ((System.ComponentModel.ISupportInitialize)ZhuangTaiimageComboBoxEdit.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)comboBoxEdit1.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)checkedComboBoxEdit1.Properties).BeginInit(); - ((System.ComponentModel.ISupportInitialize)BianQiantextEdit.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)ZhuangTaicheckedComboBoxEdit.Properties).BeginInit(); - ((System.ComponentModel.ISupportInitialize)ChongZhicomboBoxEdit.Properties).BeginInit(); - ((System.ComponentModel.ISupportInitialize)textEdit1.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)TouXiangpictureEdit.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)ZhiWutextEdit.Properties).BeginInit(); ((System.ComponentModel.ISupportInitialize)YouXiangtextEdit.Properties).BeginInit(); @@ -104,7 +104,6 @@ ((System.ComponentModel.ISupportInitialize)Root).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit(); - ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem14).BeginInit(); @@ -114,9 +113,22 @@ ((System.ComponentModel.ISupportInitialize)emptySpaceItem4).BeginInit(); ((System.ComponentModel.ISupportInitialize)emptySpaceItem5).BeginInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem15).BeginInit(); - ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit(); ((System.ComponentModel.ISupportInitialize)emptySpaceItem2).BeginInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit(); + ((System.ComponentModel.ISupportInitialize)emptySpaceItem6).BeginInit(); ((System.ComponentModel.ISupportInitialize)dxValidationProviderBianHao).BeginInit(); + ((System.ComponentModel.ISupportInitialize)groupControl1).BeginInit(); + groupControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)layoutControl).BeginInit(); + layoutControl.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)groupControl2).BeginInit(); + groupControl2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)checkEditCreateLogin.Properties).BeginInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem18).BeginInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem19).BeginInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem21).BeginInit(); + ((System.ComponentModel.ISupportInitialize)emptySpaceItem3).BeginInit(); SuspendLayout(); // // layoutControl1 @@ -127,10 +139,7 @@ layoutControl1.Controls.Add(ZhuangTaiimageComboBoxEdit); layoutControl1.Controls.Add(comboBoxEdit1); layoutControl1.Controls.Add(checkedComboBoxEdit1); - layoutControl1.Controls.Add(BianQiantextEdit); layoutControl1.Controls.Add(ZhuangTaicheckedComboBoxEdit); - layoutControl1.Controls.Add(ChongZhicomboBoxEdit); - layoutControl1.Controls.Add(textEdit1); layoutControl1.Controls.Add(TouXiangpictureEdit); layoutControl1.Controls.Add(ZhiWutextEdit); layoutControl1.Controls.Add(YouXiangtextEdit); @@ -139,59 +148,55 @@ layoutControl1.Controls.Add(NametextEdit); layoutControl1.Dock = DockStyle.Fill; layoutControl1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem8, layoutControlItem11, layoutControlItem12, layoutControlItem13, layoutControlItem9, layoutControlItem10, layoutControlItem16 }); - layoutControl1.Location = new Point(0, 0); + layoutControl1.Location = new Point(2, 23); layoutControl1.Name = "layoutControl1"; - layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(452, 344, 650, 400); + layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(999, 308, 650, 400); layoutControl1.Root = Root; - layoutControl1.Size = new Size(598, 216); + layoutControl1.Size = new Size(482, 221); layoutControl1.TabIndex = 1; layoutControl1.Text = "layoutControl1"; // // textEditQianMing // - textEditQianMing.Location = new Point(392, 60); + textEditQianMing.Location = new Point(333, 117); textEditQianMing.Name = "textEditQianMing"; - textEditQianMing.Size = new Size(184, 20); + textEditQianMing.Size = new Size(127, 20); textEditQianMing.StyleController = layoutControl1; textEditQianMing.TabIndex = 9; - conditionValidationRule1.ConditionOperator = DevExpress.XtraEditors.DXErrorProvider.ConditionOperator.IsNotBlank; - conditionValidationRule1.ErrorText = "This value is not valid"; - conditionValidationRule1.ErrorType = DevExpress.XtraEditors.DXErrorProvider.ErrorType.Information; - dxValidationProviderBianHao.SetValidationRule(textEditQianMing, conditionValidationRule1); // // EnglishNametextEdit // - EnglishNametextEdit.Location = new Point(392, 36); + EnglishNametextEdit.Location = new Point(333, 93); EnglishNametextEdit.Name = "EnglishNametextEdit"; - EnglishNametextEdit.Size = new Size(184, 20); + EnglishNametextEdit.Size = new Size(127, 20); EnglishNametextEdit.StyleController = layoutControl1; EnglishNametextEdit.TabIndex = 3; // // ChongZhiimageComboBoxEdit // ChongZhiimageComboBoxEdit.EditValue = "0"; - ChongZhiimageComboBoxEdit.Location = new Point(392, 132); + ChongZhiimageComboBoxEdit.Location = new Point(353, 189); ChongZhiimageComboBoxEdit.Name = "ChongZhiimageComboBoxEdit"; + ChongZhiimageComboBoxEdit.Properties.Appearance.Options.UseTextOptions = true; + ChongZhiimageComboBoxEdit.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; ChongZhiimageComboBoxEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) }); ChongZhiimageComboBoxEdit.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] { new DevExpress.XtraEditors.Controls.ImageComboBoxItem("鍚�", "0", -1), new DevExpress.XtraEditors.Controls.ImageComboBoxItem("鏄�", "1", -1) }); - ChongZhiimageComboBoxEdit.Size = new Size(50, 20); + ChongZhiimageComboBoxEdit.Size = new Size(107, 20); ChongZhiimageComboBoxEdit.StyleController = layoutControl1; ChongZhiimageComboBoxEdit.TabIndex = 8; // // ZhuangTaiimageComboBoxEdit // ZhuangTaiimageComboBoxEdit.EditValue = "1"; - ZhuangTaiimageComboBoxEdit.Location = new Point(104, 132); + ZhuangTaiimageComboBoxEdit.Location = new Point(104, 189); ZhuangTaiimageComboBoxEdit.Name = "ZhuangTaiimageComboBoxEdit"; + ZhuangTaiimageComboBoxEdit.Properties.Appearance.Options.UseTextOptions = true; + ZhuangTaiimageComboBoxEdit.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; ZhuangTaiimageComboBoxEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) }); - ZhuangTaiimageComboBoxEdit.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] { new DevExpress.XtraEditors.Controls.ImageComboBoxItem("绂昏亴", "0", -1), new DevExpress.XtraEditors.Controls.ImageComboBoxItem("鍦ㄨ亴", "1", -1) }); - ZhuangTaiimageComboBoxEdit.Size = new Size(50, 20); + ZhuangTaiimageComboBoxEdit.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] { new DevExpress.XtraEditors.Controls.ImageComboBoxItem("绂昏亴", "绂昏亴", -1), new DevExpress.XtraEditors.Controls.ImageComboBoxItem("鍦ㄨ亴", "鍦ㄨ亴", -1) }); + ZhuangTaiimageComboBoxEdit.Size = new Size(106, 20); ZhuangTaiimageComboBoxEdit.StyleController = layoutControl1; ZhuangTaiimageComboBoxEdit.TabIndex = 7; - conditionValidationRule2.ConditionOperator = DevExpress.XtraEditors.DXErrorProvider.ConditionOperator.IsNotBlank; - conditionValidationRule2.ErrorText = "This value is not valid"; - conditionValidationRule2.ErrorType = DevExpress.XtraEditors.DXErrorProvider.ErrorType.Information; - dxValidationProviderBianHao.SetValidationRule(ZhuangTaiimageComboBoxEdit, conditionValidationRule2); // // comboBoxEdit1 // @@ -211,131 +216,90 @@ checkedComboBoxEdit1.StyleController = layoutControl1; checkedComboBoxEdit1.TabIndex = 1; // - // BianQiantextEdit - // - BianQiantextEdit.Location = new Point(96, 134); - BianQiantextEdit.Name = "BianQiantextEdit"; - BianQiantextEdit.Size = new Size(281, 20); - BianQiantextEdit.StyleController = layoutControl1; - BianQiantextEdit.TabIndex = 1; - // // ZhuangTaicheckedComboBoxEdit // - ZhuangTaicheckedComboBoxEdit.EditValue = "璇烽�夋嫨...."; - ZhuangTaicheckedComboBoxEdit.Location = new Point(294, 110); + ZhuangTaicheckedComboBoxEdit.Location = new Point(0, 0); ZhuangTaicheckedComboBoxEdit.Name = "ZhuangTaicheckedComboBoxEdit"; - ZhuangTaicheckedComboBoxEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) }); - ZhuangTaicheckedComboBoxEdit.Size = new Size(87, 20); + ZhuangTaicheckedComboBoxEdit.Size = new Size(100, 20); ZhuangTaicheckedComboBoxEdit.StyleController = layoutControl1; - ZhuangTaicheckedComboBoxEdit.TabIndex = 1; - // - // ChongZhicomboBoxEdit - // - ChongZhicomboBoxEdit.EditValue = "璇烽�夋嫨..."; - ChongZhicomboBoxEdit.Location = new Point(136, 110); - ChongZhicomboBoxEdit.Name = "ChongZhicomboBoxEdit"; - ChongZhicomboBoxEdit.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) }); - ChongZhicomboBoxEdit.Size = new Size(50, 20); - ChongZhicomboBoxEdit.StyleController = layoutControl1; - ChongZhicomboBoxEdit.TabIndex = 1; - ChongZhicomboBoxEdit.ToolTip = "鏄痋r\n鍚�"; - // - // textEdit1 - // - textEdit1.Location = new Point(108, 110); - textEdit1.Name = "textEdit1"; - textEdit1.Size = new Size(84, 20); - textEdit1.StyleController = layoutControl1; - textEdit1.TabIndex = 1; + ZhuangTaicheckedComboBoxEdit.TabIndex = 10; // // TouXiangpictureEdit // - TouXiangpictureEdit.Location = new Point(104, 156); + TouXiangpictureEdit.Location = new Point(104, 12); TouXiangpictureEdit.Name = "TouXiangpictureEdit"; TouXiangpictureEdit.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; TouXiangpictureEdit.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.Auto; - TouXiangpictureEdit.Size = new Size(472, 48); + TouXiangpictureEdit.Size = new Size(95, 53); TouXiangpictureEdit.StyleController = layoutControl1; TouXiangpictureEdit.TabIndex = 1; TouXiangpictureEdit.Click += TouXiangpictureEdit_Click; // // ZhiWutextEdit // - ZhiWutextEdit.Location = new Point(104, 84); + ZhiWutextEdit.Location = new Point(104, 141); ZhiWutextEdit.Name = "ZhiWutextEdit"; - ZhiWutextEdit.Size = new Size(472, 20); + ZhiWutextEdit.Size = new Size(356, 20); ZhiWutextEdit.StyleController = layoutControl1; ZhiWutextEdit.TabIndex = 5; - conditionValidationRule3.ConditionOperator = DevExpress.XtraEditors.DXErrorProvider.ConditionOperator.IsNotBlank; - conditionValidationRule3.ErrorText = "This value is not valid"; - conditionValidationRule3.ErrorType = DevExpress.XtraEditors.DXErrorProvider.ErrorType.Information; - dxValidationProviderBianHao.SetValidationRule(ZhiWutextEdit, conditionValidationRule3); // // YouXiangtextEdit // - YouXiangtextEdit.Location = new Point(104, 108); + YouXiangtextEdit.Location = new Point(104, 165); YouXiangtextEdit.Name = "YouXiangtextEdit"; - YouXiangtextEdit.Size = new Size(472, 20); + YouXiangtextEdit.Size = new Size(356, 20); YouXiangtextEdit.StyleController = layoutControl1; YouXiangtextEdit.TabIndex = 6; // // DianHuatextEdit // - DianHuatextEdit.Location = new Point(104, 60); + DianHuatextEdit.Location = new Point(104, 117); DianHuatextEdit.Name = "DianHuatextEdit"; - DianHuatextEdit.Size = new Size(192, 20); + DianHuatextEdit.Size = new Size(133, 20); DianHuatextEdit.StyleController = layoutControl1; DianHuatextEdit.TabIndex = 4; - conditionValidationRule4.ConditionOperator = DevExpress.XtraEditors.DXErrorProvider.ConditionOperator.IsNotBlank; - conditionValidationRule4.ErrorText = "This value is not valid"; - conditionValidationRule4.ErrorType = DevExpress.XtraEditors.DXErrorProvider.ErrorType.Information; - dxValidationProviderBianHao.SetValidationRule(DianHuatextEdit, conditionValidationRule4); // // textEditBianHao // - textEditBianHao.Location = new Point(104, 12); + textEditBianHao.Location = new Point(104, 69); textEditBianHao.Name = "textEditBianHao"; textEditBianHao.Properties.Appearance.ForeColor = Color.Black; textEditBianHao.Properties.Appearance.Options.UseForeColor = true; - textEditBianHao.Size = new Size(248, 20); + textEditBianHao.Size = new Size(178, 20); textEditBianHao.StyleController = layoutControl1; textEditBianHao.TabIndex = 0; - conditionValidationRule5.ConditionOperator = DevExpress.XtraEditors.DXErrorProvider.ConditionOperator.IsNotBlank; - conditionValidationRule5.ErrorText = "This value is not valid"; - conditionValidationRule5.ErrorType = DevExpress.XtraEditors.DXErrorProvider.ErrorType.Information; - dxValidationProviderBianHao.SetValidationRule(textEditBianHao, conditionValidationRule5); + conditionValidationRule1.ConditionOperator = DevExpress.XtraEditors.DXErrorProvider.ConditionOperator.IsNotBlank; + conditionValidationRule1.ErrorText = "This value is not valid"; + conditionValidationRule1.ErrorType = DevExpress.XtraEditors.DXErrorProvider.ErrorType.Information; + dxValidationProviderBianHao.SetValidationRule(textEditBianHao, conditionValidationRule1); // // NametextEdit // NametextEdit.AllowHtmlTextInToolTip = DevExpress.Utils.DefaultBoolean.True; NametextEdit.EditValue = ""; - NametextEdit.Location = new Point(104, 36); + NametextEdit.Location = new Point(104, 93); NametextEdit.Name = "NametextEdit"; - NametextEdit.Size = new Size(192, 20); + NametextEdit.Size = new Size(133, 20); NametextEdit.StyleController = layoutControl1; NametextEdit.TabIndex = 2; - conditionValidationRule6.ConditionOperator = DevExpress.XtraEditors.DXErrorProvider.ConditionOperator.IsNotBlank; - conditionValidationRule6.ErrorText = "This value is not valid"; - conditionValidationRule6.ErrorType = DevExpress.XtraEditors.DXErrorProvider.ErrorType.Information; - dxValidationProviderBianHao.SetValidationRule(NametextEdit, conditionValidationRule6); + conditionValidationRule2.ConditionOperator = DevExpress.XtraEditors.DXErrorProvider.ConditionOperator.IsNotBlank; + conditionValidationRule2.ErrorText = "This value is not valid"; + conditionValidationRule2.ErrorType = DevExpress.XtraEditors.DXErrorProvider.ErrorType.Information; + dxValidationProviderBianHao.SetValidationRule(NametextEdit, conditionValidationRule2); // // layoutControlItem8 // - layoutControlItem8.Control = textEdit1; - layoutControlItem8.Location = new Point(0, 98); + layoutControlItem8.Location = new Point(0, 0); layoutControlItem8.Name = "layoutControlItem8"; - layoutControlItem8.Size = new Size(184, 48); - layoutControlItem8.Text = "鐧婚檰閲嶇疆瀵嗙爜锛�"; + layoutControlItem8.Size = new Size(0, 0); layoutControlItem8.TextSize = new Size(50, 20); // // layoutControlItem11 // - layoutControlItem11.Control = BianQiantextEdit; - layoutControlItem11.Location = new Point(0, 122); + layoutControlItem11.Location = new Point(0, 0); layoutControlItem11.Name = "layoutControlItem11"; - layoutControlItem11.Size = new Size(369, 47); - layoutControlItem11.Text = "鏍囩锛�"; - layoutControlItem11.TextSize = new Size(72, 14); + layoutControlItem11.Size = new Size(0, 0); + layoutControlItem11.TextSize = new Size(50, 20); // // layoutControlItem12 // @@ -355,12 +319,10 @@ // // layoutControlItem9 // - layoutControlItem9.Control = ChongZhicomboBoxEdit; - layoutControlItem9.Location = new Point(0, 98); + layoutControlItem9.Location = new Point(0, 0); layoutControlItem9.Name = "layoutControlItem9"; - layoutControlItem9.Size = new Size(178, 24); - layoutControlItem9.Text = "鐧诲綍閲嶇疆瀵嗙爜"; - layoutControlItem9.TextSize = new Size(72, 14); + layoutControlItem9.Size = new Size(0, 0); + layoutControlItem9.TextSize = new Size(50, 20); // // layoutControlItem10 // @@ -382,9 +344,9 @@ // Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; Root.GroupBordersVisible = false; - Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem5, layoutControlItem7, layoutControlItem1, layoutControlItem6, layoutControlItem14, layoutControlItem17, layoutControlItem2, layoutControlItem3, emptySpaceItem4, emptySpaceItem5, layoutControlItem15, emptySpaceItem1, emptySpaceItem2 }); + Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem5, layoutControlItem1, layoutControlItem6, layoutControlItem14, layoutControlItem17, layoutControlItem2, layoutControlItem3, emptySpaceItem4, emptySpaceItem5, layoutControlItem15, emptySpaceItem2, layoutControlItem7, emptySpaceItem6 }); Root.Name = "Root"; - Root.Size = new Size(598, 216); + Root.Size = new Size(482, 221); Root.TextVisible = false; // // layoutControlItem4 @@ -392,10 +354,10 @@ layoutControlItem4.AppearanceItemCaption.Options.UseTextOptions = true; layoutControlItem4.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; layoutControlItem4.Control = DianHuatextEdit; - layoutControlItem4.Location = new Point(0, 48); + layoutControlItem4.Location = new Point(0, 105); layoutControlItem4.Name = "layoutControlItem4"; - layoutControlItem4.Size = new Size(288, 24); - layoutControlItem4.Text = "*鐢� 璇�:"; + layoutControlItem4.Size = new Size(229, 24); + layoutControlItem4.Text = "鐢� 璇�:"; layoutControlItem4.TextSize = new Size(80, 14); // // layoutControlItem5 @@ -403,23 +365,11 @@ layoutControlItem5.AppearanceItemCaption.Options.UseTextOptions = true; layoutControlItem5.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; layoutControlItem5.Control = YouXiangtextEdit; - layoutControlItem5.Location = new Point(0, 96); + layoutControlItem5.Location = new Point(0, 153); layoutControlItem5.Name = "layoutControlItem5"; - layoutControlItem5.Size = new Size(568, 24); + layoutControlItem5.Size = new Size(452, 24); layoutControlItem5.Text = "閭� 绠�:"; layoutControlItem5.TextSize = new Size(80, 14); - // - // layoutControlItem7 - // - layoutControlItem7.AppearanceItemCaption.Options.UseTextOptions = true; - layoutControlItem7.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; - layoutControlItem7.AppearanceItemCaption.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center; - layoutControlItem7.Control = TouXiangpictureEdit; - layoutControlItem7.Location = new Point(0, 144); - layoutControlItem7.Name = "layoutControlItem7"; - layoutControlItem7.Size = new Size(568, 52); - layoutControlItem7.Text = "澶� 鍍�:"; - layoutControlItem7.TextSize = new Size(80, 14); // // layoutControlItem1 // @@ -427,9 +377,9 @@ layoutControlItem1.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; layoutControlItem1.Control = textEditBianHao; layoutControlItem1.ImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True; - layoutControlItem1.Location = new Point(0, 0); + layoutControlItem1.Location = new Point(0, 57); layoutControlItem1.Name = "layoutControlItem1"; - layoutControlItem1.Size = new Size(344, 24); + layoutControlItem1.Size = new Size(274, 24); layoutControlItem1.Text = "*缂� 鍙�:"; layoutControlItem1.TextSize = new Size(80, 14); // @@ -438,10 +388,10 @@ layoutControlItem6.AppearanceItemCaption.Options.UseTextOptions = true; layoutControlItem6.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; layoutControlItem6.Control = ZhiWutextEdit; - layoutControlItem6.Location = new Point(0, 72); + layoutControlItem6.Location = new Point(0, 129); layoutControlItem6.Name = "layoutControlItem6"; - layoutControlItem6.Size = new Size(568, 24); - layoutControlItem6.Text = "*鑱� 鍔�:"; + layoutControlItem6.Size = new Size(452, 24); + layoutControlItem6.Text = "鑱� 鍔�:"; layoutControlItem6.TextSize = new Size(80, 14); // // layoutControlItem14 @@ -449,9 +399,9 @@ layoutControlItem14.AppearanceItemCaption.Options.UseTextOptions = true; layoutControlItem14.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; layoutControlItem14.Control = ZhuangTaiimageComboBoxEdit; - layoutControlItem14.Location = new Point(0, 120); + layoutControlItem14.Location = new Point(0, 177); layoutControlItem14.Name = "layoutControlItem14"; - layoutControlItem14.Size = new Size(146, 24); + layoutControlItem14.Size = new Size(202, 24); layoutControlItem14.Text = "鍦ㄨ亴鐘舵��:"; layoutControlItem14.TextSize = new Size(80, 14); // @@ -460,9 +410,9 @@ layoutControlItem17.AppearanceItemCaption.Options.UseTextOptions = true; layoutControlItem17.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; layoutControlItem17.Control = ChongZhiimageComboBoxEdit; - layoutControlItem17.Location = new Point(288, 120); + layoutControlItem17.Location = new Point(249, 177); layoutControlItem17.Name = "layoutControlItem17"; - layoutControlItem17.Size = new Size(146, 24); + layoutControlItem17.Size = new Size(203, 24); layoutControlItem17.Text = " 鐧诲綍閲嶇疆瀵嗙爜:"; layoutControlItem17.TextSize = new Size(80, 14); // @@ -471,11 +421,11 @@ layoutControlItem2.AppearanceItemCaption.Options.UseTextOptions = true; layoutControlItem2.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; layoutControlItem2.Control = NametextEdit; - layoutControlItem2.Location = new Point(0, 24); + layoutControlItem2.Location = new Point(0, 81); layoutControlItem2.MaxSize = new Size(0, 24); layoutControlItem2.MinSize = new Size(150, 24); layoutControlItem2.Name = "layoutControlItem2"; - layoutControlItem2.Size = new Size(288, 24); + layoutControlItem2.Size = new Size(229, 24); layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; layoutControlItem2.Text = "*濮� 鍚�:"; layoutControlItem2.TextSize = new Size(80, 14); @@ -485,26 +435,26 @@ layoutControlItem3.AppearanceItemCaption.Options.UseTextOptions = true; layoutControlItem3.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; layoutControlItem3.Control = EnglishNametextEdit; - layoutControlItem3.Location = new Point(288, 24); + layoutControlItem3.Location = new Point(229, 81); layoutControlItem3.Name = "layoutControlItem3"; - layoutControlItem3.Size = new Size(280, 24); + layoutControlItem3.Size = new Size(223, 24); layoutControlItem3.Text = "LastName锛�"; layoutControlItem3.TextSize = new Size(80, 14); // // emptySpaceItem4 // emptySpaceItem4.AllowHotTrack = false; - emptySpaceItem4.Location = new Point(568, 0); + emptySpaceItem4.Location = new Point(452, 57); emptySpaceItem4.Name = "emptySpaceItem4"; - emptySpaceItem4.Size = new Size(10, 196); + emptySpaceItem4.Size = new Size(10, 144); emptySpaceItem4.TextSize = new Size(0, 0); // // emptySpaceItem5 // emptySpaceItem5.AllowHotTrack = false; - emptySpaceItem5.Location = new Point(344, 0); + emptySpaceItem5.Location = new Point(274, 57); emptySpaceItem5.Name = "emptySpaceItem5"; - emptySpaceItem5.Size = new Size(224, 24); + emptySpaceItem5.Size = new Size(178, 24); emptySpaceItem5.TextSize = new Size(0, 0); // // layoutControlItem15 @@ -516,40 +466,147 @@ layoutControlItem15.AppearanceItemCaptionDisabled.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; layoutControlItem15.AppearanceItemCaptionDisabled.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center; layoutControlItem15.Control = textEditQianMing; - layoutControlItem15.Location = new Point(288, 48); + layoutControlItem15.Location = new Point(229, 105); layoutControlItem15.Name = "layoutControlItem15"; - layoutControlItem15.Size = new Size(280, 24); - layoutControlItem15.Text = "*绛� 鍚嶏細"; + layoutControlItem15.Size = new Size(223, 24); + layoutControlItem15.Text = "绛� 鍚嶏細"; layoutControlItem15.TextSize = new Size(80, 14); - // - // emptySpaceItem1 - // - emptySpaceItem1.AllowHotTrack = false; - emptySpaceItem1.Location = new Point(434, 120); - emptySpaceItem1.Name = "emptySpaceItem1"; - emptySpaceItem1.Size = new Size(134, 24); - emptySpaceItem1.TextSize = new Size(0, 0); // // emptySpaceItem2 // emptySpaceItem2.AllowHotTrack = false; - emptySpaceItem2.Location = new Point(146, 120); + emptySpaceItem2.Location = new Point(202, 177); emptySpaceItem2.Name = "emptySpaceItem2"; - emptySpaceItem2.Size = new Size(142, 24); + emptySpaceItem2.Size = new Size(47, 24); emptySpaceItem2.TextSize = new Size(0, 0); + // + // layoutControlItem7 + // + layoutControlItem7.AppearanceItemCaption.Options.UseTextOptions = true; + layoutControlItem7.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far; + layoutControlItem7.AppearanceItemCaption.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center; + layoutControlItem7.Control = TouXiangpictureEdit; + layoutControlItem7.Location = new Point(0, 0); + layoutControlItem7.Name = "layoutControlItem7"; + layoutControlItem7.Size = new Size(191, 57); + layoutControlItem7.Text = "澶� 鍍�:"; + layoutControlItem7.TextSize = new Size(80, 14); + // + // emptySpaceItem6 + // + emptySpaceItem6.AllowHotTrack = false; + emptySpaceItem6.Location = new Point(191, 0); + emptySpaceItem6.Name = "emptySpaceItem6"; + emptySpaceItem6.Size = new Size(271, 57); + emptySpaceItem6.TextSize = new Size(0, 0); // // QianMingopenFileDialog // QianMingopenFileDialog.FileName = "QianMingopenFileDialog"; QianMingopenFileDialog.Filter = "(*.jpg|*.JPG|*.png|*.PNG|*.jpeg|*.JPEG)"; // - // emloyeeFrom + // groupControl1 + // + groupControl1.Controls.Add(layoutControl1); + groupControl1.Location = new Point(12, 12); + groupControl1.Name = "groupControl1"; + groupControl1.Size = new Size(486, 246); + groupControl1.TabIndex = 2; + groupControl1.Text = "鍛樺伐淇℃伅"; + // + // layoutControl + // + layoutControl.Controls.Add(groupControl2); + layoutControl.Controls.Add(checkEditCreateLogin); + layoutControl.Controls.Add(groupControl1); + layoutControl.Dock = DockStyle.Fill; + layoutControl.Location = new Point(0, 0); + layoutControl.Name = "layoutControl"; + layoutControl.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(890, 165, 650, 400); + layoutControl.Root = layoutControlGroup1; + layoutControl.Size = new Size(510, 426); + layoutControl.TabIndex = 3; + layoutControl.Text = "layoutControl2"; + // + // groupControl2 + // + groupControl2.Controls.Add(loginUserInfoCtrl); + groupControl2.Location = new Point(12, 286); + groupControl2.Name = "groupControl2"; + groupControl2.Size = new Size(486, 128); + groupControl2.TabIndex = 6; + groupControl2.Text = "鐢ㄦ埛淇℃伅"; + // + // loginUserInfoCtrl + // + loginUserInfoCtrl.Dock = DockStyle.Fill; + loginUserInfoCtrl.Location = new Point(2, 23); + loginUserInfoCtrl.Name = "loginUserInfoCtrl"; + loginUserInfoCtrl.Size = new Size(482, 103); + loginUserInfoCtrl.TabIndex = 5; + loginUserInfoCtrl.UseWaitCursor = true; + // + // checkEditCreateLogin + // + checkEditCreateLogin.Location = new Point(12, 262); + checkEditCreateLogin.Name = "checkEditCreateLogin"; + checkEditCreateLogin.Properties.Caption = "鍒涘缓鐢ㄦ埛"; + checkEditCreateLogin.Size = new Size(126, 20); + checkEditCreateLogin.StyleController = layoutControl; + checkEditCreateLogin.TabIndex = 4; + checkEditCreateLogin.CheckedChanged += checkEditCreateLogin_CheckedChanged; + // + // layoutControlGroup1 + // + layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + layoutControlGroup1.GroupBordersVisible = false; + layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem18, layoutControlItem19, layoutControlItem21, emptySpaceItem3 }); + layoutControlGroup1.Name = "Root"; + layoutControlGroup1.Size = new Size(510, 426); + layoutControlGroup1.TextVisible = false; + // + // layoutControlItem18 + // + layoutControlItem18.Control = groupControl1; + layoutControlItem18.Location = new Point(0, 0); + layoutControlItem18.Name = "layoutControlItem18"; + layoutControlItem18.Size = new Size(490, 250); + layoutControlItem18.TextSize = new Size(0, 0); + layoutControlItem18.TextVisible = false; + // + // layoutControlItem19 + // + layoutControlItem19.Control = checkEditCreateLogin; + layoutControlItem19.Location = new Point(0, 250); + layoutControlItem19.Name = "layoutControlItem19"; + layoutControlItem19.Size = new Size(130, 24); + layoutControlItem19.TextSize = new Size(0, 0); + layoutControlItem19.TextVisible = false; + // + // layoutControlItem21 + // + layoutControlItem21.Control = groupControl2; + layoutControlItem21.Location = new Point(0, 274); + layoutControlItem21.Name = "layoutControlItem21"; + layoutControlItem21.Size = new Size(490, 132); + layoutControlItem21.TextSize = new Size(0, 0); + layoutControlItem21.TextVisible = false; + // + // emptySpaceItem3 + // + emptySpaceItem3.AllowHotTrack = false; + emptySpaceItem3.Location = new Point(130, 250); + emptySpaceItem3.Name = "emptySpaceItem3"; + emptySpaceItem3.Size = new Size(360, 24); + emptySpaceItem3.TextSize = new Size(0, 0); + // + // EmloyeeInfoCtrl // AutoScaleDimensions = new SizeF(7F, 17F); AutoScaleMode = AutoScaleMode.Font; - Controls.Add(layoutControl1); - Name = "emloyeeFrom"; - Size = new Size(598, 216); + Controls.Add(layoutControl); + Name = "EmloyeeInfoCtrl"; + Size = new Size(510, 426); ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit(); layoutControl1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)textEditQianMing.Properties).EndInit(); @@ -558,10 +615,7 @@ ((System.ComponentModel.ISupportInitialize)ZhuangTaiimageComboBoxEdit.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)comboBoxEdit1.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)checkedComboBoxEdit1.Properties).EndInit(); - ((System.ComponentModel.ISupportInitialize)BianQiantextEdit.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)ZhuangTaicheckedComboBoxEdit.Properties).EndInit(); - ((System.ComponentModel.ISupportInitialize)ChongZhicomboBoxEdit.Properties).EndInit(); - ((System.ComponentModel.ISupportInitialize)textEdit1.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)TouXiangpictureEdit.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)ZhiWutextEdit.Properties).EndInit(); ((System.ComponentModel.ISupportInitialize)YouXiangtextEdit.Properties).EndInit(); @@ -578,7 +632,6 @@ ((System.ComponentModel.ISupportInitialize)Root).EndInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit(); - ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem14).EndInit(); @@ -588,9 +641,22 @@ ((System.ComponentModel.ISupportInitialize)emptySpaceItem4).EndInit(); ((System.ComponentModel.ISupportInitialize)emptySpaceItem5).EndInit(); ((System.ComponentModel.ISupportInitialize)layoutControlItem15).EndInit(); - ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit(); ((System.ComponentModel.ISupportInitialize)emptySpaceItem2).EndInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit(); + ((System.ComponentModel.ISupportInitialize)emptySpaceItem6).EndInit(); ((System.ComponentModel.ISupportInitialize)dxValidationProviderBianHao).EndInit(); + ((System.ComponentModel.ISupportInitialize)groupControl1).EndInit(); + groupControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)layoutControl).EndInit(); + layoutControl.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)groupControl2).EndInit(); + groupControl2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)checkEditCreateLogin.Properties).EndInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem18).EndInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem19).EndInit(); + ((System.ComponentModel.ISupportInitialize)layoutControlItem21).EndInit(); + ((System.ComponentModel.ISupportInitialize)emptySpaceItem3).EndInit(); ResumeLayout(false); } @@ -611,11 +677,8 @@ private OpenFileDialog QianMingopenFileDialog; private DevExpress.XtraEditors.PictureEdit TouXiangpictureEdit; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; - private DevExpress.XtraEditors.TextEdit textEdit1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; - private DevExpress.XtraEditors.TextEdit BianQiantextEdit; private DevExpress.XtraEditors.CheckedComboBoxEdit ZhuangTaicheckedComboBoxEdit; - private DevExpress.XtraEditors.ComboBoxEdit ChongZhicomboBoxEdit; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; @@ -625,7 +688,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; - //private DevExpress.XtraEditors.ImageComboBoxEdit ZhuangTaicheckedComboBox; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraEditors.ImageComboBoxEdit ChongZhiimageComboBoxEdit; private DevExpress.XtraEditors.ImageComboBoxEdit ZhuangTaiimageComboBoxEdit; @@ -637,7 +699,17 @@ private DevExpress.XtraEditors.TextEdit textEditQianMing; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem4; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem5; - private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2; + private DevExpress.XtraEditors.GroupControl groupControl1; + private DevExpress.XtraLayout.LayoutControl layoutControl; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; + private DevExpress.XtraEditors.CheckEdit checkEditCreateLogin; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19; + private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem6; + private LoginUserInfoCtrl loginUserInfoCtrl; + private DevExpress.XtraEditors.GroupControl groupControl2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; + private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3; } } -- Gitblit v1.9.3