From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/UserInfoPage.Designer.cs | 406 +++++++++++++++++++++++++++------------------------------
1 files changed, 193 insertions(+), 213 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/UserInfoPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/UserInfoPage.Designer.cs
index e6f0b86..5637b73 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/UserInfoPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/UserInfoPage.Designer.cs
@@ -29,26 +29,33 @@
private void InitializeComponent()
{
components = new System.ComponentModel.Container();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UserInfoPage));
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- txtMobileNumber = new DevExpress.XtraEditors.TextEdit();
- txtEditAdminType = new DevExpress.XtraEditors.ImageComboBoxEdit();
txtEditUserName = new DevExpress.XtraEditors.TextEdit();
- txtAccount = new DevExpress.XtraEditors.TextEdit();
- textEdit3 = new DevExpress.XtraEditors.TextEdit();
+ txtAccountName = new DevExpress.XtraEditors.TextEdit();
+ textAccountType = new DevExpress.XtraEditors.TextEdit();
BtnResetPwd = new DevExpress.XtraEditors.SimpleButton();
BtnEditPwd = new DevExpress.XtraEditors.SimpleButton();
- BtnPhoneBinding = new DevExpress.XtraEditors.SimpleButton();
- BtnWechatBinding = new DevExpress.XtraEditors.SimpleButton();
+ txtMobileNumber = new DevExpress.XtraEditors.TextEdit();
+ txtEditAdminType = new DevExpress.XtraEditors.TextEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
- emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
- emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
- layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- emptySpaceItem5 = new DevExpress.XtraLayout.EmptySpaceItem();
- emptySpaceItem6 = new DevExpress.XtraLayout.EmptySpaceItem();
- layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -57,27 +64,23 @@
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ buttonEditBinding = new DevExpress.XtraEditors.ButtonEdit();
+ layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)txtEditUserName.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)txtAccountName.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textAccountType.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)txtMobileNumber.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)txtEditAdminType.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)txtEditUserName.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)txtAccount.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEdit3.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
- ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)emptySpaceItem2).BeginInit();
((System.ComponentModel.ISupportInitialize)tabbedControlGroup1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
- ((System.ComponentModel.ISupportInitialize)emptySpaceItem5).BeginInit();
- ((System.ComponentModel.ISupportInitialize)emptySpaceItem6).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
@@ -86,210 +89,146 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem3).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlGroup2).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem4).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)buttonEditBinding.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit();
SuspendLayout();
//
// layoutControl1
//
- layoutControl1.Controls.Add(txtMobileNumber);
- layoutControl1.Controls.Add(txtEditAdminType);
+ layoutControl1.Controls.Add(buttonEditBinding);
layoutControl1.Controls.Add(txtEditUserName);
- layoutControl1.Controls.Add(txtAccount);
- layoutControl1.Controls.Add(textEdit3);
+ layoutControl1.Controls.Add(txtAccountName);
+ layoutControl1.Controls.Add(textAccountType);
layoutControl1.Controls.Add(BtnResetPwd);
layoutControl1.Controls.Add(BtnEditPwd);
- layoutControl1.Controls.Add(BtnPhoneBinding);
- layoutControl1.Controls.Add(BtnWechatBinding);
+ layoutControl1.Controls.Add(txtMobileNumber);
+ layoutControl1.Controls.Add(txtEditAdminType);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(692, 467);
+ layoutControl1.Size = new Size(946, 549);
layoutControl1.TabIndex = 0;
layoutControl1.Text = "layoutControl1";
//
- // txtMobileNumber
- //
- txtMobileNumber.Location = new Point(88, 145);
- txtMobileNumber.Name = "txtMobileNumber";
- txtMobileNumber.Properties.Appearance.Font = new Font("Tahoma", 12F, FontStyle.Regular, GraphicsUnit.Point);
- txtMobileNumber.Properties.Appearance.Options.UseFont = true;
- txtMobileNumber.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
- txtMobileNumber.Properties.NullValuePrompt = "鎵嬫満鍙风爜";
- txtMobileNumber.Size = new Size(411, 24);
- txtMobileNumber.StyleController = layoutControl1;
- txtMobileNumber.TabIndex = 5;
- //
- // txtEditAdminType
- //
- txtEditAdminType.Location = new Point(88, 169);
- txtEditAdminType.Name = "txtEditAdminType";
- txtEditAdminType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
- txtEditAdminType.Size = new Size(580, 20);
- txtEditAdminType.StyleController = layoutControl1;
- txtEditAdminType.TabIndex = 2;
- //
// txtEditUserName
//
- txtEditUserName.Location = new Point(88, 145);
+ txtEditUserName.Location = new Point(340, 154);
txtEditUserName.Name = "txtEditUserName";
- txtEditUserName.Size = new Size(580, 20);
+ txtEditUserName.Properties.ReadOnly = true;
+ txtEditUserName.Properties.UseReadOnlyAppearance = false;
+ txtEditUserName.Size = new Size(329, 20);
txtEditUserName.StyleController = layoutControl1;
txtEditUserName.TabIndex = 0;
//
- // txtAccount
+ // txtAccountName
//
- txtAccount.Location = new Point(88, 193);
- txtAccount.Name = "txtAccount";
- txtAccount.Size = new Size(580, 20);
- txtAccount.StyleController = layoutControl1;
- txtAccount.TabIndex = 3;
+ txtAccountName.Location = new Point(340, 202);
+ txtAccountName.Name = "txtAccountName";
+ txtAccountName.Properties.ReadOnly = true;
+ txtAccountName.Properties.UseReadOnlyAppearance = false;
+ txtAccountName.Size = new Size(329, 20);
+ txtAccountName.StyleController = layoutControl1;
+ txtAccountName.TabIndex = 3;
//
- // textEdit3
+ // textAccountType
//
- textEdit3.Location = new Point(88, 217);
- textEdit3.Name = "textEdit3";
- textEdit3.Size = new Size(580, 20);
- textEdit3.StyleController = layoutControl1;
- textEdit3.TabIndex = 4;
+ textAccountType.Location = new Point(340, 226);
+ textAccountType.Name = "textAccountType";
+ textAccountType.Properties.ReadOnly = true;
+ textAccountType.Properties.UseReadOnlyAppearance = false;
+ textAccountType.Size = new Size(329, 20);
+ textAccountType.StyleController = layoutControl1;
+ textAccountType.TabIndex = 4;
//
// BtnResetPwd
//
BtnResetPwd.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
BtnResetPwd.Appearance.Options.UseBackColor = true;
- BtnResetPwd.Location = new Point(583, 241);
+ BtnResetPwd.Location = new Point(614, 250);
BtnResetPwd.Name = "BtnResetPwd";
- BtnResetPwd.Size = new Size(85, 22);
+ BtnResetPwd.Size = new Size(55, 22);
BtnResetPwd.StyleController = layoutControl1;
BtnResetPwd.TabIndex = 5;
BtnResetPwd.Text = "閲嶇疆瀵嗙爜";
+ BtnResetPwd.Click += BtnResetPwd_Click;
//
// BtnEditPwd
//
BtnEditPwd.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
BtnEditPwd.Appearance.Options.UseBackColor = true;
- BtnEditPwd.Location = new Point(494, 241);
+ BtnEditPwd.Location = new Point(555, 250);
BtnEditPwd.Name = "BtnEditPwd";
- BtnEditPwd.Size = new Size(85, 22);
+ BtnEditPwd.Size = new Size(55, 22);
BtnEditPwd.StyleController = layoutControl1;
BtnEditPwd.TabIndex = 6;
BtnEditPwd.Text = "淇敼瀵嗙爜";
BtnEditPwd.Click += BtnEditPwd_Click;
//
- // BtnPhoneBinding
+ // txtMobileNumber
//
- BtnPhoneBinding.Location = new Point(24, 241);
- BtnPhoneBinding.Name = "BtnPhoneBinding";
- BtnPhoneBinding.Size = new Size(475, 22);
- BtnPhoneBinding.StyleController = layoutControl1;
- BtnPhoneBinding.TabIndex = 11;
- BtnPhoneBinding.Text = "鎵嬫満缁戝畾";
- BtnPhoneBinding.Click += BtnPhoneBinding_Click;
+ txtMobileNumber.Location = new Point(340, 154);
+ txtMobileNumber.Name = "txtMobileNumber";
+ txtMobileNumber.Size = new Size(173, 20);
+ txtMobileNumber.StyleController = layoutControl1;
+ txtMobileNumber.TabIndex = 13;
//
- // BtnWechatBinding
+ // txtEditAdminType
//
- BtnWechatBinding.Location = new Point(24, 215);
- BtnWechatBinding.Name = "BtnWechatBinding";
- BtnWechatBinding.Size = new Size(475, 22);
- BtnWechatBinding.StyleController = layoutControl1;
- BtnWechatBinding.TabIndex = 12;
- BtnWechatBinding.Text = "寰俊缁戝畾";
- BtnWechatBinding.Click += btnWechatBinding_Click;
+ txtEditAdminType.Location = new Point(340, 178);
+ txtEditAdminType.Name = "txtEditAdminType";
+ txtEditAdminType.Properties.ReadOnly = true;
+ txtEditAdminType.Properties.UseReadOnlyAppearance = false;
+ txtEditAdminType.Size = new Size(329, 20);
+ txtEditAdminType.StyleController = layoutControl1;
+ txtEditAdminType.TabIndex = 2;
//
// Root
//
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { emptySpaceItem1, emptySpaceItem2, tabbedControlGroup1 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { tabbedControlGroup1, emptySpaceItem1 });
+ Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
Root.Name = "Root";
- Root.Size = new Size(692, 467);
+ columnDefinition1.SizeType = SizeType.Percent;
+ columnDefinition1.Width = 60D;
+ columnDefinition2.SizeType = SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = SizeType.Percent;
+ columnDefinition3.Width = 60D;
+ Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { columnDefinition1, columnDefinition2, columnDefinition3 });
+ rowDefinition1.Height = 40D;
+ rowDefinition1.SizeType = SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = SizeType.Percent;
+ rowDefinition3.Height = 60D;
+ rowDefinition3.SizeType = SizeType.Percent;
+ Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3 });
+ Root.Size = new Size(946, 549);
Root.TextVisible = false;
- //
- // emptySpaceItem1
- //
- emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(0, 0);
- emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(672, 97);
- emptySpaceItem1.TextSize = new Size(0, 0);
- //
- // emptySpaceItem2
- //
- emptySpaceItem2.AllowHotTrack = false;
- emptySpaceItem2.Location = new Point(0, 267);
- emptySpaceItem2.Name = "emptySpaceItem2";
- emptySpaceItem2.Size = new Size(672, 180);
- emptySpaceItem2.TextSize = new Size(0, 0);
//
// tabbedControlGroup1
//
- tabbedControlGroup1.Location = new Point(0, 97);
+ tabbedControlGroup1.Location = new Point(252, 106);
tabbedControlGroup1.Name = "tabbedControlGroup1";
+ tabbedControlGroup1.OptionsTableLayoutItem.ColumnIndex = 1;
+ tabbedControlGroup1.OptionsTableLayoutItem.RowIndex = 1;
tabbedControlGroup1.SelectedTabPage = layoutControlGroup4;
- tabbedControlGroup1.Size = new Size(672, 170);
- tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1, layoutControlGroup2, layoutControlGroup4 });
- //
- // layoutControlGroup4
- //
- layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem9, emptySpaceItem5, emptySpaceItem6, layoutControlItem11, layoutControlItem8 });
- layoutControlGroup4.Location = new Point(0, 0);
- layoutControlGroup4.Name = "layoutControlGroup4";
- layoutControlGroup4.Size = new Size(648, 122);
- layoutControlGroup4.Text = "淇℃伅缁戝畾";
- //
- // layoutControlItem9
- //
- layoutControlItem9.Control = txtMobileNumber;
- layoutControlItem9.Location = new Point(0, 0);
- layoutControlItem9.Name = "layoutControlItem9";
- layoutControlItem9.Size = new Size(479, 28);
- layoutControlItem9.Text = "鎵嬫満鍙�:";
- layoutControlItem9.TextSize = new Size(52, 14);
- //
- // emptySpaceItem5
- //
- emptySpaceItem5.AllowHotTrack = false;
- emptySpaceItem5.Location = new Point(0, 28);
- emptySpaceItem5.Name = "emptySpaceItem5";
- emptySpaceItem5.Size = new Size(479, 42);
- emptySpaceItem5.TextSize = new Size(0, 0);
- //
- // emptySpaceItem6
- //
- emptySpaceItem6.AllowHotTrack = false;
- emptySpaceItem6.Location = new Point(479, 0);
- emptySpaceItem6.Name = "emptySpaceItem6";
- emptySpaceItem6.Size = new Size(169, 122);
- emptySpaceItem6.TextSize = new Size(0, 0);
- //
- // layoutControlItem11
- //
- layoutControlItem11.Control = BtnPhoneBinding;
- layoutControlItem11.Location = new Point(0, 96);
- layoutControlItem11.Name = "layoutControlItem11";
- layoutControlItem11.Size = new Size(479, 26);
- layoutControlItem11.Text = "鎵嬫満缁戝畾";
- layoutControlItem11.TextSize = new Size(0, 0);
- layoutControlItem11.TextVisible = false;
- //
- // layoutControlItem8
- //
- layoutControlItem8.Control = BtnWechatBinding;
- layoutControlItem8.Location = new Point(0, 70);
- layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(479, 26);
- layoutControlItem8.TextSize = new Size(0, 0);
- layoutControlItem8.TextVisible = false;
+ tabbedControlGroup1.Size = new Size(421, 264);
+ tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1, layoutControlGroup4 });
//
// layoutControlGroup1
//
layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem5, emptySpaceItem3, layoutControlItem6 });
layoutControlGroup1.Location = new Point(0, 0);
layoutControlGroup1.Name = "layoutControlGroup1";
- layoutControlGroup1.Size = new Size(648, 122);
+ layoutControlGroup1.Size = new Size(397, 216);
layoutControlGroup1.Text = "鍩虹淇℃伅";
//
// layoutControlItem1
@@ -298,7 +237,7 @@
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- layoutControlItem1.Size = new Size(648, 24);
+ layoutControlItem1.Size = new Size(397, 24);
layoutControlItem1.Text = "鐢ㄦ埛鍚�:";
layoutControlItem1.TextSize = new Size(52, 14);
//
@@ -307,34 +246,34 @@
layoutControlItem2.Control = txtEditAdminType;
layoutControlItem2.Location = new Point(0, 24);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(648, 24);
+ layoutControlItem2.Size = new Size(397, 24);
layoutControlItem2.Text = "绠＄悊绫诲瀷:";
layoutControlItem2.TextSize = new Size(52, 14);
//
// layoutControlItem3
//
- layoutControlItem3.Control = txtAccount;
+ layoutControlItem3.Control = txtAccountName;
layoutControlItem3.Location = new Point(0, 48);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(648, 24);
+ layoutControlItem3.Size = new Size(397, 24);
layoutControlItem3.Text = "璐︽埛鍚�:";
layoutControlItem3.TextSize = new Size(52, 14);
//
// layoutControlItem4
//
- layoutControlItem4.Control = textEdit3;
+ layoutControlItem4.Control = textAccountType;
layoutControlItem4.Location = new Point(0, 72);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(648, 24);
+ layoutControlItem4.Size = new Size(397, 24);
layoutControlItem4.Text = "璐︽埛绫诲瀷:";
layoutControlItem4.TextSize = new Size(52, 14);
//
// layoutControlItem5
//
layoutControlItem5.Control = BtnResetPwd;
- layoutControlItem5.Location = new Point(559, 96);
+ layoutControlItem5.Location = new Point(338, 96);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(89, 26);
+ layoutControlItem5.Size = new Size(59, 120);
layoutControlItem5.TextSize = new Size(0, 0);
layoutControlItem5.TextVisible = false;
//
@@ -343,24 +282,42 @@
emptySpaceItem3.AllowHotTrack = false;
emptySpaceItem3.Location = new Point(0, 96);
emptySpaceItem3.Name = "emptySpaceItem3";
- emptySpaceItem3.Size = new Size(470, 26);
+ emptySpaceItem3.Size = new Size(279, 120);
emptySpaceItem3.TextSize = new Size(0, 0);
//
// layoutControlItem6
//
layoutControlItem6.Control = BtnEditPwd;
- layoutControlItem6.Location = new Point(470, 96);
+ layoutControlItem6.Location = new Point(279, 96);
layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(89, 26);
+ layoutControlItem6.Size = new Size(59, 120);
layoutControlItem6.TextSize = new Size(0, 0);
layoutControlItem6.TextVisible = false;
//
- // layoutControlGroup2
+ // layoutControlGroup4
//
- layoutControlGroup2.Location = new Point(0, 0);
- layoutControlGroup2.Name = "layoutControlGroup2";
- layoutControlGroup2.Size = new Size(648, 122);
- layoutControlGroup2.Text = "淇敼瀵嗙爜";
+ layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem9, layoutControlItem12 });
+ layoutControlGroup4.Location = new Point(0, 0);
+ layoutControlGroup4.Name = "layoutControlGroup4";
+ layoutControlGroup4.Size = new Size(397, 216);
+ layoutControlGroup4.Text = "淇℃伅缁戝畾";
+ //
+ // layoutControlItem9
+ //
+ layoutControlItem9.Control = txtMobileNumber;
+ layoutControlItem9.Location = new Point(0, 0);
+ layoutControlItem9.Name = "layoutControlItem9";
+ layoutControlItem9.Size = new Size(241, 216);
+ layoutControlItem9.Text = "鎵嬫満鍙�:";
+ layoutControlItem9.TextSize = new Size(52, 14);
+ //
+ // emptySpaceItem1
+ //
+ emptySpaceItem1.AllowHotTrack = false;
+ emptySpaceItem1.Location = new Point(0, 0);
+ emptySpaceItem1.Name = "emptySpaceItem1";
+ emptySpaceItem1.Size = new Size(252, 106);
+ emptySpaceItem1.TextSize = new Size(0, 0);
//
// dxErrorProvider1
//
@@ -386,6 +343,39 @@
layoutControlItem7.TextSize = new Size(0, 0);
layoutControlItem7.TextVisible = false;
//
+ // buttonEditBinding
+ //
+ buttonEditBinding.Location = new Point(517, 154);
+ buttonEditBinding.Margin = new Padding(2);
+ buttonEditBinding.Name = "buttonEditBinding";
+ buttonEditBinding.Properties.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.False;
+ buttonEditBinding.Properties.AllowHtmlDraw = DevExpress.Utils.DefaultBoolean.False;
+ buttonEditBinding.Properties.BeepOnError = true;
+ editorButtonImageOptions1.EnableTransparency = false;
+ editorButtonImageOptions1.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
+ editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
+ editorButtonImageOptions1.SvgImageSize = new Size(14, 14);
+ editorButtonImageOptions2.EnableTransparency = false;
+ editorButtonImageOptions2.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
+ editorButtonImageOptions2.SvgImageSize = new Size(14, 14);
+ buttonEditBinding.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鎵嬫満缁戝畾", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "鎵嬫満鍙风粦瀹�", "Phone", null, DevExpress.Utils.ToolTipAnchor.Default), new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "寰俊缁戝畾", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "寰俊缁戝畾", "Wechat", null, DevExpress.Utils.ToolTipAnchor.Default) });
+ buttonEditBinding.Properties.ContextImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.False;
+ buttonEditBinding.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ buttonEditBinding.Properties.UseMaskAsDisplayFormat = true;
+ buttonEditBinding.Size = new Size(152, 23);
+ buttonEditBinding.StyleController = layoutControl1;
+ buttonEditBinding.TabIndex = 7;
+ buttonEditBinding.ButtonClick += buttonEditBinding_ButtonClick;
+ //
+ // layoutControlItem12
+ //
+ layoutControlItem12.Control = buttonEditBinding;
+ layoutControlItem12.Location = new Point(241, 0);
+ layoutControlItem12.Name = "layoutControlItem12";
+ layoutControlItem12.Size = new Size(156, 216);
+ layoutControlItem12.TextSize = new Size(0, 0);
+ layoutControlItem12.TextVisible = false;
+ //
// UserInfoPage
//
Appearance.BackColor = SystemColors.Control;
@@ -394,24 +384,16 @@
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(layoutControl1);
Name = "UserInfoPage";
- Size = new Size(692, 467);
+ Size = new Size(946, 549);
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)txtEditUserName.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)txtAccountName.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textAccountType.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)txtMobileNumber.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)txtEditAdminType.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)txtEditUserName.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)txtAccount.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEdit3.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
- ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
- ((System.ComponentModel.ISupportInitialize)emptySpaceItem2).EndInit();
((System.ComponentModel.ISupportInitialize)tabbedControlGroup1).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
- ((System.ComponentModel.ISupportInitialize)emptySpaceItem5).EndInit();
- ((System.ComponentModel.ISupportInitialize)emptySpaceItem6).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
@@ -420,10 +402,14 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem3).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlGroup2).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
+ ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem4).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
+ ((System.ComponentModel.ISupportInitialize)buttonEditBinding.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit();
ResumeLayout(false);
}
@@ -432,34 +418,28 @@
private DevExpress.XtraLayout.LayoutControl layoutControl1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraEditors.TextEdit txtEditUserName;
- private DevExpress.XtraEditors.ImageComboBoxEdit txtEditAdminType;
- private DevExpress.XtraEditors.TextEdit txtAccount;
- private DevExpress.XtraEditors.TextEdit textEdit3;
+ private DevExpress.XtraEditors.TextEdit txtAccountName;
+ private DevExpress.XtraEditors.TextEdit textAccountType;
+ private DevExpress.XtraEditors.SimpleButton BtnResetPwd;
+ private DevExpress.XtraEditors.SimpleButton BtnEditPwd;
+ private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
+ private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.TabbedControlGroup tabbedControlGroup1;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
- private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
- private DevExpress.XtraLayout.TabbedControlGroup tabbedControlGroup1;
- private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
- private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraEditors.SimpleButton BtnResetPwd;
- private DevExpress.XtraEditors.SimpleButton BtnEditPwd;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
- private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
- private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem5;
- private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraEditors.TextEdit txtMobileNumber;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem6;
- private DevExpress.XtraEditors.SimpleButton BtnPhoneBinding;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraEditors.SimpleButton BtnWechatBinding;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraEditors.TextEdit txtEditAdminType;
+ private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
+ private DevExpress.XtraEditors.ButtonEdit buttonEditBinding;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
}
}
--
Gitblit v1.9.3