冲突处理

lixiaojun

2025-01-20 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4

 WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UserMgrPage.Designer.cs

@@ -72,6 +72,7 @@
            barBtnDown = new DevExpress.XtraBars.BarButtonItem();
            barCkDrag = new DevExpress.XtraBars.BarCheckItem();
            BtnEditAdminType = new DevExpress.XtraBars.BarButtonItem();
            BtnEditStatus = new DevExpress.XtraBars.BarButtonItem();
            ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
            ribPageGroupForBasic = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -79,14 +80,18 @@
            panelControl1 = new DevExpress.XtraEditors.PanelControl();
            flyoutPanel2 = new DevExpress.Utils.FlyoutPanel();
            gridControl3 = new DevExpress.XtraGrid.GridControl();
            userRoleHaveViewModelBindingSource = new BindingSource(components);
            userAccountViewModelBindingSource = new BindingSource(components);
            gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
            colEditPwd = new DevExpress.XtraGrid.Columns.GridColumn();
            repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            colResetPwd = new DevExpress.XtraGrid.Columns.GridColumn();
            repositoryItemButtonEdit5 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            colIdentifier = new DevExpress.XtraGrid.Columns.GridColumn();
            colIfVerified = new DevExpress.XtraGrid.Columns.GridColumn();
            colLoginType = new DevExpress.XtraGrid.Columns.GridColumn();
            flyoutPanel1 = new DevExpress.Utils.FlyoutPanel();
            gridControl2 = new DevExpress.XtraGrid.GridControl();
            userRoleHaveViewModelBindingSource = new BindingSource(components);
            gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            colName1 = new DevExpress.XtraGrid.Columns.GridColumn();
            colCode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -109,23 +114,20 @@
            repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(components);
            dragDropEvents1 = new DevExpress.Utils.DragDrop.DragDropEvents(components);
            userAccountViewModelBindingSource = new BindingSource(components);
            colIdentifier = new DevExpress.XtraGrid.Columns.GridColumn();
            colIfVerified = new DevExpress.XtraGrid.Columns.GridColumn();
            colLoginType = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)ribbonControl1).BeginInit();
            ((ISupportInitialize)panelControl1).BeginInit();
            panelControl1.SuspendLayout();
            ((ISupportInitialize)flyoutPanel2).BeginInit();
            flyoutPanel2.SuspendLayout();
            ((ISupportInitialize)gridControl3).BeginInit();
            ((ISupportInitialize)userRoleHaveViewModelBindingSource).BeginInit();
            ((ISupportInitialize)userAccountViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView3).BeginInit();
            ((ISupportInitialize)repositoryItemButtonEdit4).BeginInit();
            ((ISupportInitialize)repositoryItemButtonEdit5).BeginInit();
            ((ISupportInitialize)flyoutPanel1).BeginInit();
            flyoutPanel1.SuspendLayout();
            ((ISupportInitialize)gridControl2).BeginInit();
            ((ISupportInitialize)userRoleHaveViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView2).BeginInit();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)UserViewModelBindingSource).BeginInit();
@@ -134,16 +136,15 @@
            ((ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
            ((ISupportInitialize)repositoryItemButtonEdit2).BeginInit();
            ((ISupportInitialize)behaviorManager1).BeginInit();
            ((ISupportInitialize)userAccountViewModelBindingSource).BeginInit();
            SuspendLayout();
            // 
            // ribbonControl1
            // 
            ribbonControl1.ExpandCollapseItem.Id = 0;
            ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnAdd, barBtnEdit, barBtnDelete, barBtnInfo, barBtnSearch, barBtnRefresh, barBtnUp, barBtnDown, barCkDrag, BtnEditAdminType });
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnAdd, barBtnEdit, barBtnDelete, barBtnInfo, barBtnSearch, barBtnRefresh, barBtnUp, barBtnDown, barCkDrag, BtnEditAdminType, BtnEditStatus });
            ribbonControl1.Location = new Point(1, 1);
            ribbonControl1.MaxItemId = 23;
            ribbonControl1.MaxItemId = 24;
            ribbonControl1.Name = "ribbonControl1";
            ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
            ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
@@ -236,6 +237,14 @@
            BtnEditAdminType.Name = "BtnEditAdminType";
            BtnEditAdminType.ItemClick += BtnEditAdminType_ItemClick;
            // 
            // BtnEditStatus
            // 
            BtnEditStatus.Caption = "使用状态";
            BtnEditStatus.Id = 23;
            BtnEditStatus.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnEditStatus.ImageOptions.SvgImage");
            BtnEditStatus.Name = "BtnEditStatus";
            BtnEditStatus.ItemClick += BtnEditStatus_ItemClick;
            // 
            // ribbonPage1
            // 
            ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribPageGroupForBasic, ribbonPageGroup1, ribPageGroupForMore });
@@ -264,6 +273,7 @@
            ribPageGroupForMore.ItemLinks.Add(barBtnSearch);
            ribPageGroupForMore.ItemLinks.Add(barBtnRefresh);
            ribPageGroupForMore.ItemLinks.Add(BtnEditAdminType);
            ribPageGroupForMore.ItemLinks.Add(BtnEditStatus);
            ribPageGroupForMore.Name = "ribPageGroupForMore";
            ribPageGroupForMore.Text = "更多";
            // 
@@ -285,6 +295,7 @@
            flyoutPanel2.Controls.Add(gridControl3);
            flyoutPanel2.Location = new Point(642, 191);
            flyoutPanel2.Name = "flyoutPanel2";
            flyoutPanel2.Options.AnchorType = DevExpress.Utils.Win.PopupToolWindowAnchor.Right;
            buttonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("buttonImageOptions1.SvgImage");
            flyoutPanel2.OptionsButtonPanel.Buttons.AddRange(new DevExpress.XtraEditors.ButtonPanel.IBaseButton[] { new DevExpress.Utils.PeekFormButton("关闭", true, buttonImageOptions1, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, null, true, false, true, null, -1, false) });
            flyoutPanel2.OptionsButtonPanel.ShowButtonPanel = true;
@@ -307,9 +318,9 @@
            gridControl3.TabIndex = 0;
            gridControl3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView3 });
            // 
            // userRoleHaveViewModelBindingSource
            // userAccountViewModelBindingSource
            // 
            userRoleHaveViewModelBindingSource.DataSource = typeof(UserRoleHaveViewModel);
            userAccountViewModelBindingSource.DataSource = typeof(UserAccountViewModel);
            // 
            // gridView3
            // 
@@ -317,7 +328,6 @@
            gridView3.GridControl = gridControl3;
            gridView3.Name = "gridView3";
            gridView3.OptionsView.ShowGroupPanel = false;
            gridView3.RowClick += gridView3_RowClick;
            gridView3.RowCellClick += gridView3_RowCellClick;
            // 
            // colEditPwd
@@ -354,11 +364,34 @@
            repositoryItemButtonEdit5.Name = "repositoryItemButtonEdit5";
            repositoryItemButtonEdit5.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            // 
            // colIdentifier
            // 
            colIdentifier.FieldName = "Identifier";
            colIdentifier.Name = "colIdentifier";
            colIdentifier.Visible = true;
            colIdentifier.VisibleIndex = 1;
            // 
            // colIfVerified
            // 
            colIfVerified.FieldName = "IfVerified";
            colIfVerified.Name = "colIfVerified";
            colIfVerified.Visible = true;
            colIfVerified.VisibleIndex = 2;
            // 
            // colLoginType
            // 
            colLoginType.FieldName = "LoginType";
            colLoginType.Name = "colLoginType";
            colLoginType.Visible = true;
            colLoginType.VisibleIndex = 0;
            // 
            // flyoutPanel1
            // 
            flyoutPanel1.Controls.Add(gridControl2);
            flyoutPanel1.Location = new Point(145, 191);
            flyoutPanel1.Name = "flyoutPanel1";
            flyoutPanel1.Options.AnchorType = DevExpress.Utils.Win.PopupToolWindowAnchor.Right;
            flyoutPanel1.Options.Location = new Point(200, 200);
            buttonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("buttonImageOptions2.SvgImage");
            buttonImageOptions3.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("buttonImageOptions3.SvgImage");
            flyoutPanel1.OptionsButtonPanel.Buttons.AddRange(new DevExpress.XtraEditors.ButtonPanel.IBaseButton[] { new DevExpress.Utils.PeekFormButton("保存", true, buttonImageOptions2, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, null, true, false, true, null, -1, false), new DevExpress.Utils.PeekFormButton("关闭", true, buttonImageOptions3, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, null, true, false, true, null, -1, false) });
@@ -381,8 +414,14 @@
            gridControl2.TabIndex = 0;
            gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView2 });
            // 
            // userRoleHaveViewModelBindingSource
            // 
            userRoleHaveViewModelBindingSource.DataSource = typeof(UserRoleHaveViewModel);
            // 
            // gridView2
            // 
            gridView2.Appearance.HeaderPanel.Options.UseTextOptions = true;
            gridView2.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName1, colCode, colUseStatus1, colSortCode, colDescription1 });
            gridView2.GridControl = gridControl2;
            gridView2.Name = "gridView2";
@@ -396,6 +435,8 @@
            // 
            // colName1
            // 
            colName1.AppearanceCell.Options.UseTextOptions = true;
            colName1.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colName1.FieldName = "Name";
            colName1.Name = "colName1";
            colName1.OptionsColumn.AllowEdit = false;
@@ -404,6 +445,8 @@
            // 
            // colCode
            // 
            colCode.AppearanceCell.Options.UseTextOptions = true;
            colCode.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colCode.FieldName = "Code";
            colCode.Name = "colCode";
            colCode.OptionsColumn.AllowEdit = false;
@@ -412,6 +455,8 @@
            // 
            // colUseStatus1
            // 
            colUseStatus1.AppearanceCell.Options.UseTextOptions = true;
            colUseStatus1.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colUseStatus1.FieldName = "UseStatus";
            colUseStatus1.Name = "colUseStatus1";
            colUseStatus1.OptionsColumn.AllowEdit = false;
@@ -420,6 +465,8 @@
            // 
            // colSortCode
            // 
            colSortCode.AppearanceCell.Options.UseTextOptions = true;
            colSortCode.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colSortCode.FieldName = "SortCode";
            colSortCode.Name = "colSortCode";
            colSortCode.OptionsColumn.AllowEdit = false;
@@ -428,6 +475,8 @@
            // 
            // colDescription1
            // 
            colDescription1.AppearanceCell.Options.UseTextOptions = true;
            colDescription1.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            colDescription1.FieldName = "Description";
            colDescription1.Name = "colDescription1";
            colDescription1.OptionsColumn.AllowEdit = false;
@@ -467,7 +516,7 @@
            colAccount.MinWidth = 60;
            colAccount.Name = "colAccount";
            colAccount.Visible = true;
            colAccount.VisibleIndex = 7;
            colAccount.VisibleIndex = 6;
            colAccount.Width = 60;
            // 
            // repositoryItemButtonEdit3
@@ -487,7 +536,7 @@
            colDetail.MinWidth = 60;
            colDetail.Name = "colDetail";
            colDetail.Visible = true;
            colDetail.VisibleIndex = 5;
            colDetail.VisibleIndex = 7;
            colDetail.Width = 60;
            // 
            // repositoryItemButtonEdit1
@@ -528,7 +577,7 @@
            colAdminType.FieldName = "AdminType";
            colAdminType.Name = "colAdminType";
            colAdminType.Visible = true;
            colAdminType.VisibleIndex = 2;
            colAdminType.VisibleIndex = 1;
            colAdminType.Width = 157;
            // 
            // colTag
@@ -536,7 +585,7 @@
            colTag.FieldName = "Tag";
            colTag.Name = "colTag";
            colTag.Visible = true;
            colTag.VisibleIndex = 1;
            colTag.VisibleIndex = 2;
            colTag.Width = 157;
            // 
            // colRole
@@ -547,7 +596,7 @@
            colRole.MinWidth = 60;
            colRole.Name = "colRole";
            colRole.Visible = true;
            colRole.VisibleIndex = 6;
            colRole.VisibleIndex = 5;
            colRole.Width = 60;
            // 
            // repositoryItemButtonEdit2
@@ -562,31 +611,6 @@
            // dragDropEvents1
            // 
            dragDropEvents1.DragDrop += dragDropEvents1_DragDrop;
            // 
            // userAccountViewModelBindingSource
            // 
            userAccountViewModelBindingSource.DataSource = typeof(UserAccountViewModel);
            // 
            // colIdentifier
            // 
            colIdentifier.FieldName = "Identifier";
            colIdentifier.Name = "colIdentifier";
            colIdentifier.Visible = true;
            colIdentifier.VisibleIndex = 1;
            // 
            // colIfVerified
            // 
            colIfVerified.FieldName = "IfVerified";
            colIfVerified.Name = "colIfVerified";
            colIfVerified.Visible = true;
            colIfVerified.VisibleIndex = 2;
            // 
            // colLoginType
            // 
            colLoginType.FieldName = "LoginType";
            colLoginType.Name = "colLoginType";
            colLoginType.Visible = true;
            colLoginType.VisibleIndex = 0;
            // 
            // UserMgrPage
            // 
@@ -605,13 +629,14 @@
            ((ISupportInitialize)flyoutPanel2).EndInit();
            flyoutPanel2.ResumeLayout(false);
            ((ISupportInitialize)gridControl3).EndInit();
            ((ISupportInitialize)userRoleHaveViewModelBindingSource).EndInit();
            ((ISupportInitialize)userAccountViewModelBindingSource).EndInit();
            ((ISupportInitialize)gridView3).EndInit();
            ((ISupportInitialize)repositoryItemButtonEdit4).EndInit();
            ((ISupportInitialize)repositoryItemButtonEdit5).EndInit();
            ((ISupportInitialize)flyoutPanel1).EndInit();
            flyoutPanel1.ResumeLayout(false);
            ((ISupportInitialize)gridControl2).EndInit();
            ((ISupportInitialize)userRoleHaveViewModelBindingSource).EndInit();
            ((ISupportInitialize)gridView2).EndInit();
            ((ISupportInitialize)gridControl1).EndInit();
            ((ISupportInitialize)UserViewModelBindingSource).EndInit();
@@ -620,7 +645,6 @@
            ((ISupportInitialize)repositoryItemButtonEdit1).EndInit();
            ((ISupportInitialize)repositoryItemButtonEdit2).EndInit();
            ((ISupportInitialize)behaviorManager1).EndInit();
            ((ISupportInitialize)userAccountViewModelBindingSource).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }
@@ -681,5 +705,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn colIdentifier;
        private DevExpress.XtraGrid.Columns.GridColumn colIfVerified;
        private DevExpress.XtraGrid.Columns.GridColumn colLoginType;
        private DevExpress.XtraBars.BarButtonItem BtnEditStatus;
    }
}