duheng
2025-03-01 3fa53a1e9e6e320ecdf15c7a633b0c4a1ad41c34
修改个人中心界面,修复报表报错
已修改13个文件
已添加2个文件
1358 ■■■■ 文件已修改
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/AddPhoneNumberDlg.Designer.cs 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/AddPhoneNumberDlg.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.Designer.cs 538 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.cs 212 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.resx 93 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/report/SimulationCommonReport.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/PBS.WinFrmUI/01-place/00-core/PlaceViewModel.cs 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.Designer.cs 287 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.resx 57 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/PBS.WinFrmUI/Properties/DataSources/PlaceViewModel.datasource 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/PBS.WinFrmUI/Properties/Resources.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Division.Core/Yw.WinFrmUI.Division.Core.csproj 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Division.Core/Yw.WinFrmUI.Division.Core.csproj.user 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/AddPhoneNumberDlg.Designer.cs
@@ -32,14 +32,14 @@
            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            generalOkAndCancelCtrl1 = new Yw.WinFrmUI.GeneralOkAndCancelCtrl();
            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            txtEditPhoneNumber = new DevExpress.XtraEditors.TextEdit();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtEditPhoneNumber.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)txtEditPhoneNumber.Properties).BeginInit();
            SuspendLayout();
            // 
            // Root
@@ -83,6 +83,14 @@
            layoutControlItem8.Text = "<color=red>*</color>手机号:";
            layoutControlItem8.TextSize = new Size(47, 14);
            // 
            // txtEditPhoneNumber
            //
            txtEditPhoneNumber.Location = new Point(71, 12);
            txtEditPhoneNumber.Name = "txtEditPhoneNumber";
            txtEditPhoneNumber.Size = new Size(295, 20);
            txtEditPhoneNumber.StyleController = layoutControl1;
            txtEditPhoneNumber.TabIndex = 3;
            //
            // layoutControl1
            // 
            layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
@@ -96,14 +104,6 @@
            layoutControl1.TabIndex = 2;
            layoutControl1.Text = "layoutControl1";
            // 
            // txtEditPhoneNumber
            //
            txtEditPhoneNumber.Location = new Point(71, 12);
            txtEditPhoneNumber.Name = "txtEditPhoneNumber";
            txtEditPhoneNumber.Size = new Size(295, 20);
            txtEditPhoneNumber.StyleController = layoutControl1;
            txtEditPhoneNumber.TabIndex = 3;
            //
            // AddPhoneNumberDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
@@ -112,13 +112,13 @@
            Controls.Add(layoutControl1);
            Name = "AddPhoneNumberDlg";
            StartPosition = FormStartPosition.CenterScreen;
            Text = "管理类型";
            Text = "新增手机号";
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtEditPhoneNumber.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)txtEditPhoneNumber.Properties).EndInit();
            ResumeLayout(false);
        }
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/AddPhoneNumberDlg.cs
@@ -12,6 +12,7 @@
        public AddPhoneNumberDlg()
        {
            InitializeComponent();
            this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
            this.generalOkAndCancelCtrl1.OkEvent += GeneralOkAndCancelCtrl1_OkEvent; ;
        }
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.Designer.cs
@@ -28,65 +28,28 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PersonalCenterDlg));
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions10 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject37 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject38 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject39 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject40 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions11 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject41 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject42 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject43 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject44 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions12 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject45 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject46 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject47 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject48 = new DevExpress.Utils.SerializableAppearanceObject();
            navigationPage3 = new DevExpress.XtraBars.Navigation.NavigationPage();
            layoutControl3 = new DevExpress.XtraLayout.LayoutControl();
            btnAddWx = new DevExpress.XtraEditors.SimpleButton();
            gridControl2 = new DevExpress.XtraGrid.GridControl();
            gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            colWxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            repositoryItemButtonEdit5 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            repositoryItemButtonEdit6 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            navigationPage2 = new DevExpress.XtraBars.Navigation.NavigationPage();
            layoutControl2 = new DevExpress.XtraLayout.LayoutControl();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            colDel = new DevExpress.XtraGrid.Columns.GridColumn();
            repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            btnAddPhone = new DevExpress.XtraEditors.SimpleButton();
            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
            layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            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();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
            gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
            navigationPage1 = new DevExpress.XtraBars.Navigation.NavigationPage();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            BtnSave = new DevExpress.XtraEditors.SimpleButton();
@@ -95,6 +58,8 @@
            txtAccountName = new DevExpress.XtraEditors.TextEdit();
            textAccountType = new DevExpress.XtraEditors.TextEdit();
            txtEditAdminType = new DevExpress.XtraEditors.TextEdit();
            buttonEditPhone = new DevExpress.XtraEditors.ButtonEdit();
            buttonEditWeChat = new DevExpress.XtraEditors.ButtonEdit();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -103,31 +68,10 @@
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            navigationPane1 = new DevExpress.XtraBars.Navigation.NavigationPane();
            navigationPage3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)layoutControl3).BeginInit();
            layoutControl3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)gridControl2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridView2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit5).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit6).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
            navigationPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)layoutControl2).BeginInit();
            layoutControl2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridView3).BeginInit();
            navigationPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
@@ -135,6 +79,8 @@
            ((System.ComponentModel.ISupportInitialize)txtAccountName.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textAccountType.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtEditAdminType.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)buttonEditPhone.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)buttonEditWeChat.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
@@ -143,268 +89,15 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
            ((System.ComponentModel.ISupportInitialize)navigationPane1).BeginInit();
            navigationPane1.SuspendLayout();
            SuspendLayout();
            // 
            // navigationPage3
            // gridView3
            // 
            navigationPage3.Caption = "微信绑定";
            navigationPage3.Controls.Add(layoutControl3);
            navigationPage3.ImageOptions.Image = (Image)resources.GetObject("navigationPage3.ImageOptions.Image");
            navigationPage3.Name = "navigationPage3";
            navigationPage3.Size = new Size(536, 302);
            //
            // layoutControl3
            //
            layoutControl3.Controls.Add(btnAddWx);
            layoutControl3.Controls.Add(gridControl2);
            layoutControl3.Dock = DockStyle.Fill;
            layoutControl3.Location = new Point(0, 0);
            layoutControl3.Name = "layoutControl3";
            layoutControl3.Root = layoutControlGroup2;
            layoutControl3.Size = new Size(536, 302);
            layoutControl3.TabIndex = 0;
            layoutControl3.Text = "layoutControl3";
            //
            // btnAddWx
            //
            btnAddWx.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("btnAddWx.ImageOptions.SvgImage");
            btnAddWx.ImageOptions.SvgImageSize = new Size(20, 20);
            btnAddWx.Location = new Point(464, 12);
            btnAddWx.Name = "btnAddWx";
            btnAddWx.Size = new Size(60, 24);
            btnAddWx.StyleController = layoutControl3;
            btnAddWx.TabIndex = 3;
            btnAddWx.Text = "添加";
            btnAddWx.Click += btnAddWx_Click;
            //
            // gridControl2
            //
            gridControl2.Location = new Point(12, 40);
            gridControl2.MainView = gridView2;
            gridControl2.Name = "gridControl2";
            gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit5, repositoryItemButtonEdit4, repositoryItemButtonEdit6 });
            gridControl2.Size = new Size(512, 250);
            gridControl2.TabIndex = 9;
            gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView2 });
            //
            // gridView2
            //
            gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { gridColumn2, colWxDel });
            gridView2.GridControl = gridControl2;
            gridView2.Name = "gridView2";
            gridView2.OptionsView.ShowGroupPanel = false;
            gridView2.RowCellClick += gridView2_RowCellClick;
            //
            // gridColumn2
            //
            gridColumn2.Caption = "微信标识";
            gridColumn2.FieldName = "Wxid";
            gridColumn2.Name = "gridColumn2";
            gridColumn2.Visible = true;
            gridColumn2.VisibleIndex = 0;
            //
            // colWxDel
            //
            colWxDel.Caption = "删除";
            colWxDel.ColumnEdit = repositoryItemButtonEdit4;
            colWxDel.MaxWidth = 60;
            colWxDel.MinWidth = 60;
            colWxDel.Name = "colWxDel";
            colWxDel.Visible = true;
            colWxDel.VisibleIndex = 1;
            colWxDel.Width = 60;
            //
            // repositoryItemButtonEdit4
            //
            repositoryItemButtonEdit4.AutoHeight = false;
            editorButtonImageOptions7.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions7.SvgImage");
            editorButtonImageOptions7.SvgImageSize = new Size(20, 20);
            repositoryItemButtonEdit4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
            repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4";
            repositoryItemButtonEdit4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            //
            // repositoryItemButtonEdit5
            //
            repositoryItemButtonEdit5.AutoHeight = false;
            editorButtonImageOptions8.SvgImageSize = new Size(20, 20);
            repositoryItemButtonEdit5.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
            repositoryItemButtonEdit5.Name = "repositoryItemButtonEdit5";
            repositoryItemButtonEdit5.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            //
            // repositoryItemButtonEdit6
            //
            repositoryItemButtonEdit6.AutoHeight = false;
            editorButtonImageOptions9.SvgImageSize = new Size(20, 20);
            repositoryItemButtonEdit6.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
            repositoryItemButtonEdit6.Name = "repositoryItemButtonEdit6";
            repositoryItemButtonEdit6.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            //
            // layoutControlGroup2
            //
            layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            layoutControlGroup2.GroupBordersVisible = false;
            layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem7, emptySpaceItem3, layoutControlItem8 });
            layoutControlGroup2.Name = "layoutControlGroup2";
            layoutControlGroup2.Size = new Size(536, 302);
            layoutControlGroup2.TextVisible = false;
            //
            // layoutControlItem7
            //
            layoutControlItem7.Control = gridControl2;
            layoutControlItem7.Location = new Point(0, 28);
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(516, 254);
            layoutControlItem7.TextSize = new Size(0, 0);
            layoutControlItem7.TextVisible = false;
            //
            // emptySpaceItem3
            //
            emptySpaceItem3.AllowHotTrack = false;
            emptySpaceItem3.Location = new Point(0, 0);
            emptySpaceItem3.Name = "emptySpaceItem3";
            emptySpaceItem3.Size = new Size(452, 28);
            emptySpaceItem3.TextSize = new Size(0, 0);
            //
            // layoutControlItem8
            //
            layoutControlItem8.Control = btnAddWx;
            layoutControlItem8.Location = new Point(452, 0);
            layoutControlItem8.Name = "layoutControlItem8";
            layoutControlItem8.Size = new Size(64, 28);
            layoutControlItem8.TextSize = new Size(0, 0);
            layoutControlItem8.TextVisible = false;
            //
            // navigationPage2
            //
            navigationPage2.Caption = "手机绑定";
            navigationPage2.Controls.Add(layoutControl2);
            navigationPage2.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navigationPage2.ImageOptions.SvgImage");
            navigationPage2.ImageOptions.SvgImageSize = new Size(20, 20);
            navigationPage2.Name = "navigationPage2";
            navigationPage2.Size = new Size(536, 302);
            //
            // layoutControl2
            //
            layoutControl2.Controls.Add(gridControl1);
            layoutControl2.Controls.Add(btnAddPhone);
            layoutControl2.Dock = DockStyle.Fill;
            layoutControl2.Location = new Point(0, 0);
            layoutControl2.Name = "layoutControl2";
            layoutControl2.Root = layoutControlGroup1;
            layoutControl2.Size = new Size(536, 302);
            layoutControl2.TabIndex = 0;
            layoutControl2.Text = "layoutControl2";
            //
            // gridControl1
            //
            gridControl1.Location = new Point(12, 40);
            gridControl1.MainView = gridView1;
            gridControl1.Name = "gridControl1";
            gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit1, repositoryItemButtonEdit2, repositoryItemButtonEdit3 });
            gridControl1.Size = new Size(512, 250);
            gridControl1.TabIndex = 1;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            //
            // gridView1
            //
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { gridColumn1, colDel });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsView.ShowGroupPanel = false;
            gridView1.RowCellClick += gridView1_RowCellClick;
            //
            // gridColumn1
            //
            gridColumn1.Caption = "手机号";
            gridColumn1.FieldName = "Phone";
            gridColumn1.Name = "gridColumn1";
            gridColumn1.Visible = true;
            gridColumn1.VisibleIndex = 0;
            //
            // colDel
            //
            colDel.Caption = "删除";
            colDel.ColumnEdit = repositoryItemButtonEdit2;
            colDel.MaxWidth = 60;
            colDel.MinWidth = 60;
            colDel.Name = "colDel";
            colDel.Visible = true;
            colDel.VisibleIndex = 1;
            colDel.Width = 60;
            //
            // repositoryItemButtonEdit2
            //
            repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions10.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions10.SvgImage");
            editorButtonImageOptions10.SvgImageSize = new Size(20, 20);
            repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
            repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            //
            // repositoryItemButtonEdit1
            //
            repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions11.SvgImageSize = new Size(20, 20);
            repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
            repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            //
            // repositoryItemButtonEdit3
            //
            repositoryItemButtonEdit3.AutoHeight = false;
            editorButtonImageOptions12.SvgImageSize = new Size(20, 20);
            repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
            repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
            repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            //
            // btnAddPhone
            //
            btnAddPhone.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("btnAddPhone.ImageOptions.SvgImage");
            btnAddPhone.ImageOptions.SvgImageSize = new Size(20, 20);
            btnAddPhone.Location = new Point(464, 12);
            btnAddPhone.Name = "btnAddPhone";
            btnAddPhone.Size = new Size(60, 24);
            btnAddPhone.StyleController = layoutControl2;
            btnAddPhone.TabIndex = 2;
            btnAddPhone.Text = "添加";
            btnAddPhone.Click += btnAddPhone_Click;
            //
            // layoutControlGroup1
            //
            layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            layoutControlGroup1.GroupBordersVisible = false;
            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem12, emptySpaceItem2, layoutControlItem11 });
            layoutControlGroup1.Name = "layoutControlGroup1";
            layoutControlGroup1.Size = new Size(536, 302);
            layoutControlGroup1.TextVisible = false;
            //
            // layoutControlItem12
            //
            layoutControlItem12.Control = btnAddPhone;
            layoutControlItem12.Location = new Point(452, 0);
            layoutControlItem12.Name = "layoutControlItem12";
            layoutControlItem12.Size = new Size(64, 28);
            layoutControlItem12.TextSize = new Size(0, 0);
            layoutControlItem12.TextVisible = false;
            //
            // emptySpaceItem2
            //
            emptySpaceItem2.AllowHotTrack = false;
            emptySpaceItem2.Location = new Point(0, 0);
            emptySpaceItem2.Name = "emptySpaceItem2";
            emptySpaceItem2.Size = new Size(452, 28);
            emptySpaceItem2.TextSize = new Size(0, 0);
            //
            // layoutControlItem11
            //
            layoutControlItem11.Control = gridControl1;
            layoutControlItem11.Location = new Point(0, 28);
            layoutControlItem11.Name = "layoutControlItem11";
            layoutControlItem11.Size = new Size(516, 254);
            layoutControlItem11.TextSize = new Size(0, 0);
            layoutControlItem11.TextVisible = false;
            gridView3.Name = "gridView3";
            // 
            // navigationPage1
            // 
@@ -423,6 +116,8 @@
            layoutControl1.Controls.Add(txtAccountName);
            layoutControl1.Controls.Add(textAccountType);
            layoutControl1.Controls.Add(txtEditAdminType);
            layoutControl1.Controls.Add(buttonEditPhone);
            layoutControl1.Controls.Add(buttonEditWeChat);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Name = "layoutControl1";
@@ -436,68 +131,100 @@
            // 
            BtnSave.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            BtnSave.Appearance.Options.UseBackColor = true;
            BtnSave.Location = new Point(473, 108);
            BtnSave.Location = new Point(474, 162);
            BtnSave.Name = "BtnSave";
            BtnSave.Size = new Size(51, 22);
            BtnSave.Size = new Size(50, 22);
            BtnSave.StyleController = layoutControl1;
            BtnSave.TabIndex = 6;
            BtnSave.TabIndex = 8;
            BtnSave.Text = "保存";
            // 
            // BtnEditPwd
            // 
            BtnEditPwd.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
            BtnEditPwd.Appearance.Options.UseBackColor = true;
            BtnEditPwd.Location = new Point(414, 108);
            BtnEditPwd.Location = new Point(415, 162);
            BtnEditPwd.Name = "BtnEditPwd";
            BtnEditPwd.Size = new Size(55, 22);
            BtnEditPwd.StyleController = layoutControl1;
            BtnEditPwd.TabIndex = 5;
            BtnEditPwd.TabIndex = 7;
            BtnEditPwd.Text = "修改密码";
            BtnEditPwd.Click += BtnEditPwd_Click;
            // 
            // txtEditUserName
            // 
            txtEditUserName.Location = new Point(76, 12);
            txtEditUserName.Location = new Point(88, 12);
            txtEditUserName.Name = "txtEditUserName";
            txtEditUserName.Size = new Size(448, 20);
            txtEditUserName.Size = new Size(436, 20);
            txtEditUserName.StyleController = layoutControl1;
            txtEditUserName.TabIndex = 0;
            // 
            // txtAccountName
            // 
            txtAccountName.Location = new Point(76, 60);
            txtAccountName.Location = new Point(88, 60);
            txtAccountName.Name = "txtAccountName";
            txtAccountName.Properties.ReadOnly = true;
            txtAccountName.Properties.UseReadOnlyAppearance = false;
            txtAccountName.Size = new Size(448, 20);
            txtAccountName.Size = new Size(436, 20);
            txtAccountName.StyleController = layoutControl1;
            txtAccountName.TabIndex = 3;
            // 
            // textAccountType
            // 
            textAccountType.Location = new Point(76, 84);
            textAccountType.Location = new Point(88, 84);
            textAccountType.Name = "textAccountType";
            textAccountType.Properties.ReadOnly = true;
            textAccountType.Properties.UseReadOnlyAppearance = false;
            textAccountType.Size = new Size(448, 20);
            textAccountType.Size = new Size(436, 20);
            textAccountType.StyleController = layoutControl1;
            textAccountType.TabIndex = 4;
            // 
            // txtEditAdminType
            // 
            txtEditAdminType.Location = new Point(76, 36);
            txtEditAdminType.Location = new Point(88, 36);
            txtEditAdminType.Name = "txtEditAdminType";
            txtEditAdminType.Properties.ReadOnly = true;
            txtEditAdminType.Properties.UseReadOnlyAppearance = false;
            txtEditAdminType.Size = new Size(448, 20);
            txtEditAdminType.Size = new Size(436, 20);
            txtEditAdminType.StyleController = layoutControl1;
            txtEditAdminType.TabIndex = 2;
            //
            // buttonEditPhone
            //
            buttonEditPhone.Location = new Point(88, 108);
            buttonEditPhone.Name = "buttonEditPhone";
            editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
            editorButtonImageOptions1.SvgImageSize = new Size(15, 15);
            editorButtonImageOptions2.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions2.SvgImage");
            editorButtonImageOptions2.SvgImageSize = new Size(15, 15);
            buttonEditPhone.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, "", "import", 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, "", "delete", null, DevExpress.Utils.ToolTipAnchor.Default) });
            buttonEditPhone.Properties.ReadOnly = true;
            buttonEditPhone.Properties.UseReadOnlyAppearance = false;
            buttonEditPhone.Size = new Size(436, 23);
            buttonEditPhone.StyleController = layoutControl1;
            buttonEditPhone.TabIndex = 5;
            buttonEditPhone.ButtonClick += buttonEditPhone_ButtonClick;
            //
            // buttonEditWeChat
            //
            buttonEditWeChat.Location = new Point(88, 135);
            buttonEditWeChat.Name = "buttonEditWeChat";
            editorButtonImageOptions3.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions3.SvgImage");
            editorButtonImageOptions3.SvgImageSize = new Size(15, 15);
            editorButtonImageOptions4.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions4.SvgImage");
            editorButtonImageOptions4.SvgImageSize = new Size(15, 15);
            buttonEditWeChat.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", "import", null, DevExpress.Utils.ToolTipAnchor.Default), new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", "delete", null, DevExpress.Utils.ToolTipAnchor.Default) });
            buttonEditWeChat.Properties.ReadOnly = true;
            buttonEditWeChat.Properties.UseReadOnlyAppearance = false;
            buttonEditWeChat.Size = new Size(436, 23);
            buttonEditWeChat.StyleController = layoutControl1;
            buttonEditWeChat.TabIndex = 6;
            buttonEditWeChat.ButtonClick += buttonEditWeChat_ButtonClick;
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, emptySpaceItem1, layoutControlItem4, layoutControlItem6, layoutControlItem5 });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, emptySpaceItem1, layoutControlItem4, layoutControlItem6, layoutControlItem5, layoutControlItem9, layoutControlItem7 });
            Root.Name = "Root";
            Root.Size = new Size(536, 302);
            Root.TextVisible = false;
@@ -509,7 +236,7 @@
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(516, 24);
            layoutControlItem1.Text = "用户名:";
            layoutControlItem1.TextSize = new Size(52, 14);
            layoutControlItem1.TextSize = new Size(64, 14);
            // 
            // layoutControlItem2
            // 
@@ -518,7 +245,7 @@
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(516, 24);
            layoutControlItem2.Text = "管理类型:";
            layoutControlItem2.TextSize = new Size(52, 14);
            layoutControlItem2.TextSize = new Size(64, 14);
            // 
            // layoutControlItem3
            // 
@@ -527,14 +254,14 @@
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(516, 24);
            layoutControlItem3.Text = "账户类型:";
            layoutControlItem3.TextSize = new Size(52, 14);
            layoutControlItem3.TextSize = new Size(64, 14);
            // 
            // emptySpaceItem1
            // 
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 96);
            emptySpaceItem1.Location = new Point(0, 150);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(402, 186);
            emptySpaceItem1.Size = new Size(403, 132);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // layoutControlItem4
@@ -544,37 +271,53 @@
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(516, 24);
            layoutControlItem4.Text = "账户名:";
            layoutControlItem4.TextSize = new Size(52, 14);
            layoutControlItem4.TextSize = new Size(64, 14);
            // 
            // layoutControlItem6
            // 
            layoutControlItem6.Control = BtnSave;
            layoutControlItem6.Location = new Point(461, 96);
            layoutControlItem6.Location = new Point(462, 150);
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Size = new Size(55, 186);
            layoutControlItem6.Size = new Size(54, 132);
            layoutControlItem6.TextSize = new Size(0, 0);
            layoutControlItem6.TextVisible = false;
            // 
            // layoutControlItem5
            // 
            layoutControlItem5.Control = BtnEditPwd;
            layoutControlItem5.Location = new Point(402, 96);
            layoutControlItem5.Location = new Point(403, 150);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(59, 186);
            layoutControlItem5.Size = new Size(59, 132);
            layoutControlItem5.TextSize = new Size(0, 0);
            layoutControlItem5.TextVisible = false;
            //
            // layoutControlItem9
            //
            layoutControlItem9.Control = buttonEditPhone;
            layoutControlItem9.Location = new Point(0, 96);
            layoutControlItem9.Name = "layoutControlItem9";
            layoutControlItem9.Size = new Size(516, 27);
            layoutControlItem9.Text = "手机号绑定:";
            layoutControlItem9.TextSize = new Size(64, 14);
            //
            // layoutControlItem7
            //
            layoutControlItem7.Control = buttonEditWeChat;
            layoutControlItem7.Location = new Point(0, 123);
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(516, 27);
            layoutControlItem7.Text = "微信绑定:";
            layoutControlItem7.TextSize = new Size(64, 14);
            // 
            // navigationPane1
            // 
            navigationPane1.AllowHtmlDraw = false;
            navigationPane1.Controls.Add(navigationPage1);
            navigationPane1.Controls.Add(navigationPage2);
            navigationPane1.Controls.Add(navigationPage3);
            navigationPane1.Dock = DockStyle.Fill;
            navigationPane1.Location = new Point(0, 0);
            navigationPane1.Name = "navigationPane1";
            navigationPane1.PageProperties.ShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText;
            navigationPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navigationPage1, navigationPage2, navigationPage3 });
            navigationPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navigationPage1 });
            navigationPane1.RegularSize = new Size(661, 375);
            navigationPane1.SelectedPage = navigationPage1;
            navigationPane1.Size = new Size(661, 375);
@@ -590,30 +333,7 @@
            Name = "PersonalCenterDlg";
            StartPosition = FormStartPosition.CenterScreen;
            Text = "个人中心";
            navigationPage3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)layoutControl3).EndInit();
            layoutControl3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)gridControl2).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridView2).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit4).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit5).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit6).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup2).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem3).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
            navigationPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)layoutControl2).EndInit();
            layoutControl2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit2).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit1).EndInit();
            ((System.ComponentModel.ISupportInitialize)repositoryItemButtonEdit3).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem2).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridView3).EndInit();
            navigationPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
@@ -621,6 +341,8 @@
            ((System.ComponentModel.ISupportInitialize)txtAccountName.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textAccountType.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtEditAdminType.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)buttonEditPhone.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)buttonEditWeChat.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
@@ -629,6 +351,8 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
            ((System.ComponentModel.ISupportInitialize)navigationPane1).EndInit();
            navigationPane1.ResumeLayout(false);
            ResumeLayout(false);
@@ -636,16 +360,7 @@
        #endregion
        private DevExpress.XtraBars.Navigation.NavigationPage navigationPage3;
        private DevExpress.XtraLayout.LayoutControl layoutControl3;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3;
        private DevExpress.XtraBars.Navigation.NavigationPage navigationPage2;
        private DevExpress.XtraLayout.LayoutControl layoutControl2;
        private DevExpress.XtraEditors.SimpleButton btnAddPhone;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
        private DevExpress.XtraBars.Navigation.NavigationPage navigationPage1;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraEditors.SimpleButton BtnSave;
@@ -663,23 +378,12 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraBars.Navigation.NavigationPane navigationPane1;
        private DevExpress.XtraGrid.GridControl gridControl1;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn colDel;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraEditors.SimpleButton btnAddWx;
        private DevExpress.XtraGrid.GridControl gridControl2;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn colWxDel;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit5;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraEditors.TextEdit textEditPhone;
        private DevExpress.XtraEditors.TextEdit textEditWeChat;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraEditors.ButtonEdit buttonEditPhone;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraEditors.ButtonEdit buttonEditWeChat;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
    }
}
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.cs
@@ -13,26 +13,36 @@
        {
            InitializeComponent();
            this.Load += PersonalCenterDlg_Load;
            this.gridView1.SetNormalView(20);
            this.gridView2.SetNormalView(20);
            this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
        }
        private const string _smsTemplate = "hzkw_sms_template";//手机号登录模板
        private const string _vxTemplate = "hzkw_wx_template";//微信登录模板
        private const string _software = "HStation_XHS_DESKTOP";//软件编码
        private List<PhoneData> _phoneNuberBinding;
        private List<WxData> _WxBinding;
        private long _wxId;
        private long _phoneId;
        //初始化
        private void PersonalCenterDlg_Load(object? sender, EventArgs e)
        private async void PersonalCenterDlg_Load(object? sender, EventArgs e)
        {
            this.txtEditUserName.Text = GlobalParas._GlobalParas.LoginName;
            this.txtEditAdminType.Text = GlobalParas._GlobalParas.AdminType;
            this.txtAccountName.Text = GlobalParas._GlobalParas.AccountName;
            this.textAccountType.Text = GlobalParas._GlobalParas.LoginType;
            phoneInitialize();
            wxInitialize();
            var allPhones = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.GetSmsByUserID(GlobalParas._GlobalParas.UserID);
            var allWeChat = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.GetWechatByUserID(GlobalParas._GlobalParas.UserID);
            if (allPhones!=null&&allPhones.Any())
            {
                _phoneId = allPhones.First().ID;
                this.buttonEditPhone.EditValue = allPhones.First().Credential;
            }
            if (allWeChat!=null&&allWeChat.Any())
            {
                _wxId = allWeChat.First().ID;
                this.buttonEditWeChat.EditValue = allWeChat.First().Credential;
            }
        }
        public class PhoneData
@@ -45,44 +55,6 @@
        {
            public long ID { get; set; }
            public string Wxid { get; set; }
        }
        //手机号初始化
        private async void phoneInitialize()
        {
            _phoneNuberBinding = new List<PhoneData>();
            var allPhones = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.GetSmsByUserID(GlobalParas._GlobalParas.UserID);
            if (allPhones != null)
            {
                foreach (var item in allPhones)
                {
                    _phoneNuberBinding.Add(new PhoneData
                    {
                        Phone = item.Credential,
                        ID = item.ID
                    });
                }
            }
            this.gridControl1.DataSource = _phoneNuberBinding;
        }
        //微信绑定初始化
        private async void wxInitialize()
        {
            _WxBinding = new List<WxData>();
            var allPhones = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.GetWechatByUserID(GlobalParas._GlobalParas.UserID);
            if (allPhones != null)
            {
                foreach (var item in allPhones)
                {
                    _WxBinding.Add(new WxData
                    {
                        Wxid = item.Credential,
                        ID = item.ID
                    });
                }
            }
            this.gridControl2.DataSource = _WxBinding;
        }
        //修改密码
@@ -208,81 +180,115 @@
            }
        }
        //添加手机号
        private void btnAddPhone_Click(object sender, EventArgs e)
        {
            var dlg = new AddPhoneNumberDlg();
            dlg.ReloadDataEvent += async (phoneNumber) =>
            {
                var id = await PhoneBinding(phoneNumber);
                if (id > 0)
        /*
                //添加手机号
                private void btnAddPhone_Click(object sender, EventArgs e)
                {
                    _phoneNuberBinding.Add(new PhoneData { Phone = phoneNumber, ID = id });
                    this.gridControl1.RefreshDataSource();
                }
            };
            dlg.ShowDialog();
        }
                    var dlg = new AddPhoneNumberDlg();
                    dlg.ReloadDataEvent += async (phoneNumber) =>
                    {
                        var id = await PhoneBinding(phoneNumber);
                        if (id > 0)
                        {
                            _phoneNuberBinding.Add(new PhoneData { Phone = phoneNumber, ID = id });
                            this.gridControl1.RefreshDataSource();
                        }
                    };
                    dlg.ShowDialog();
                }*/
        //手机号单元格点击事件
        private async void gridView1_RowCellClick(object sender, DevExpress.XtraGrid.Views.Grid.RowCellClickEventArgs e)
        /*     //添加微信
             private void btnAddWx_Click(object sender, EventArgs e)
             {
                 var dlg = new WechatBindingDlg();
                 dlg.SetBindingData();
                 dlg.CodeReloadData += async (code) =>
                 {
                     var id = await WechatBinding(code);
                     if (id > 0)
                     {
                         _WxBinding.Add(new WxData { Wxid = code, ID = id });
                         this.gridControl2.RefreshDataSource();
                     }
                 };
                 dlg.ShowDialog();
             }*/
        private async void buttonEditPhone_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var vm = this.gridView1.GetCurrentViewModel(_phoneNuberBinding);
            if (vm == null)
            if (e.Button.Tag.ToString() == "import")
            {
                return;
            }
            if (e.Column == this.colDel)
            {
                var bol = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.DeleteByID(vm.ID);
                if (!bol)
                if (this.buttonEditPhone.EditValue != null)
                {
                    TipFormHelper.ShowError("删除失败!");
                    TipFormHelper.ShowWarn("已存在手机号");
                    return;
                }
                TipFormHelper.ShowSucceed("删除成功!");
                _phoneNuberBinding.Remove(vm);
                this.gridControl1.RefreshDataSource();
                var dlg = new AddPhoneNumberDlg();
                dlg.ReloadDataEvent += async (phoneNumber) =>
                {
                    var id = await PhoneBinding(phoneNumber);
                    if (id > 0)
                    {
                        _phoneId = id;
                        this.buttonEditPhone.EditValue = phoneNumber;
                    }
                };
                dlg.ShowDialog();
            }
            else if (e.Button.Tag.ToString() == "delete")
            {
                if (_phoneId > 0)
                {
                    var bol = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.DeleteByID(_phoneId);
                    if (!bol)
                    {
                        TipFormHelper.ShowError("删除失败!");
                        return;
                    }
                    TipFormHelper.ShowSucceed("删除成功!");
                    _phoneId = default;
                    this.buttonEditPhone.EditValue = null;
                }
            }
        }
        //微信单元格点击事件
        private async void gridView2_RowCellClick(object sender, DevExpress.XtraGrid.Views.Grid.RowCellClickEventArgs e)
        private async void buttonEditWeChat_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var vm = this.gridView2.GetCurrentViewModel(_WxBinding);
            if (vm == null)
            if (e.Button.Tag.ToString() == "import")
            {
                return;
            }
            if (e.Column == this.colWxDel)
            {
                var bol = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.DeleteByID(vm.ID);
                if (!bol)
                if (this.buttonEditWeChat.EditValue != null)
                {
                    TipFormHelper.ShowError("删除失败!");
                    TipFormHelper.ShowWarn("已存在微信");
                    return;
                }
                TipFormHelper.ShowSucceed("删除成功!");
                _WxBinding.Remove(vm);
                this.gridControl2.RefreshDataSource();
            }
        }
        //添加微信
        private void btnAddWx_Click(object sender, EventArgs e)
        {
            var dlg = new WechatBindingDlg();
            dlg.SetBindingData();
            dlg.CodeReloadData += async (code) =>
            {
                var id = await WechatBinding(code);
                if (id > 0)
                var dlg = new WechatBindingDlg();
                dlg.SetBindingData();
                dlg.CodeReloadData += async (code) =>
                {
                    _WxBinding.Add(new WxData { Wxid = code, ID = id });
                    this.gridControl2.RefreshDataSource();
                    var id = await WechatBinding(code);
                    if (id > 0)
                    {
                        _wxId = id;
                        this.buttonEditWeChat.EditValue = id;
                    }
                };
                dlg.ShowDialog();
            }
            else if (e.Button.Tag.ToString() == "delete")
            {
                if (_wxId > 0)
                {
                    var bol = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.DeleteByID(_wxId);
                    if (!bol)
                    {
                        TipFormHelper.ShowError("删除失败!");
                        return;
                    }
                    TipFormHelper.ShowSucceed("删除成功!");
                    _wxId = default;
                    this.buttonEditWeChat.EditValue = null;
                }
            };
            dlg.ShowDialog();
            }
        }
    }
}
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.resx
@@ -117,53 +117,29 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="navigationPage3.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAIAAAAC64paAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
        vAAADrwBlbxySQAABKVJREFUOE8dk3lMk3cYx58eWCjI6YHO6ZRFnU7jMpVMFOh90VeBDkYABXTbP1u2
        ZS5L5rYsXh1XaQvt2+vtxVVACU5FJU5cFGNwGeJERYwaRHAwKIXSlstnr0u+fz3J5/skv9/zgWf46tc+
        157L3yy/UAKNSjirWn/hSFJt3jZ3wZbaggSnamVbEdeTv6L18Goqf6O9aLO9mN969JcnTd04DqU91vdO
        yuCHD9gN2XAuB1xSJinmagRxZaJlegWblIFF+n/kHINyhfnjqEp5XKks2f7ZT089sJPKX1Oj5DoIcMuh
        Zi8Y09nWjIhqaYw+g6MTQzUfrCI4o4J6Akge6FK5riymVhhRLkr+7StYSWaEadJBz2NQcjal5JqIxOqs
        ddqsd3TZ68jcSJIAmwJMPLDywcbntGSBXQomIUMvSGorgWhKEWORhZenRR5P3a7PKT5/3Py47frc/dZ/
        b1Q8apI0ff2uKRfUKQkeVZhDArpdQO6lW8AkePtcITAdUq5ZsrJKmt36XftM9xB6J3B6GEdHcfo5+rrx
        RcVw29oqJVudEmZIZ1jSWW5xWIMMyLRlzdkAdRlQ/tH7VH7D1I1h9F37+/qlrsszOPcSp+p7rlwLPuzC
        lz8O1K7VKhKM0nCTAIypLKcE9Clx9fsB3MoY24GSm+UD6PWhn6qzaWq0vsXZCcTCE0crf28cQP9dHEvW
        5K5XixMqhVCZEllLcKySxOZciHdkJ1YpTUPtIzjtfz2NuBiYf+1HHEMcQWy7f/tMb2fH4G3P40ult2yp
        5KHIMgHbJI92ZUY59kMcpYpVS7QDbcPoD+FcMBgMIU4hPluYa+7uGsTQPxiawNAY+vtxuBtf5t/RhlWK
        OFpp0pkjwK7P5RoyP+lQ9+P0OIaCuDg2F6ThrqcD/YGpFwsBXYub7u2ZeX6sRdeLky3Yv8VWFHtats3z
        OYCTgGrZmtID5OCVIfRPvtkzS8NXe//0IQ7OeB3nm0cx+Hh21Nnd/sfC0zvoLej8Nakie7MxD8AoirYd
        2Ejm7VLnPMGJgcWhSfSPLIxfv3drcnE6gCFvwDuL8zM478P5IQzcQ29Jh3pTWebW6hx462wBlKbElfL3
        OIvb8UFx07FvL5Q5H1383lN2f2FwHAM+nKHfguZfTY2OYagDH+42FK4+LtpdfxhAvSvRSSRYZQkWxdrG
        vOVUJqdSGHaSF3dKmtNx+jw+6MNxmgniHOL8CI5/2VkVe1IQXSHa1HQINrhUUVU8rkkc4coAAy1GKm0I
        y02E2wiGOj3JkHe4s4IauqrvavjL139zoT/+hIBTI4q3EbEUARsMWfEa6VILscS9n1bqDUyfvkXIMggj
        jJIYsyKWVMRoJPHl4qQa1damIrDsgwZxlFO+pjEHtlsORp8SQRkPLLS6YqBETKeCZRIuMfLosMx8hlXw
        xipjGpMUsF1SqE0DUzKnat8Oz0H4os+yo+5T+tOZVgU4MsApY9rlDCM/0iqmL5mGWXSdQwo2EQ0zjekc
        C5+rSdlpzj12l4SLOFjYo1vlygt3ZYKLALuEQcnozUutEq5FtMQipE3k1CnpRNjl9GSVXflhQ/7PveY+
        fPUf/gFdzgJ2mhUAAAAASUVORK5CYII=
</value>
  </data>
  <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="btnAddWx.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="editorButtonImageOptions1.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAB4DAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZENpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0xNiw0
        QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHogTTI0
        LDE4aC02djZoLTR2LTZIOHYtNGg2VjhoNHY2aDZWMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N
        Cjwvc3ZnPgs=
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD
        MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls
        bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl
        Pg0KICA8ZyBpZD0iUGhvbmUiPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDIzLjZsLTUuMy01LjNjLTAuNC0w
        LjQtMS0wLjQtMS40LDBsLTIuOCwyLjhjLTMuMi0xLjUtNS44LTQuMS03LjMtNy4zbDIuOC0yLjhjMC40
        LTAuNCwwLjQtMSwwLTEuNCAgIEw4LjQsNC4zYy0wLjQtMC40LTEtMC40LTEuNSwwTDQuMyw2LjlDNC4x
        LDcuMiw0LDcuNCw0LDcuN0M0LDE4LjksMTMuMSwyOCwyNC4zLDI4YzAuMywwLDAuNS0wLjEsMC43LTAu
        M2wyLjYtMi42ICAgQzI4LjEsMjQuNiwyOC4xLDI0LDI3LjcsMjMuNnoiIGNsYXNzPSJCbGFjayIgLz4N
        CiAgPC9nPg0KPC9zdmc+Cw==
</value>
  </data>
  <data name="editorButtonImageOptions7.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="editorButtonImageOptions2.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -184,32 +160,25 @@
        LDE2eiIgY2xhc3M9IlJlZCIgLz4NCiAgICA8L2c+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
  </data>
  <data name="navigationPage2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="editorButtonImageOptions3.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAADAEAAAC77u/
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
        aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
        c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
        O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
        ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
        c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJQaG9uZSI+DQogICAg
        PHBhdGggZD0iTTI3LjcsMjMuNmwtNS4zLTUuM2MtMC40LTAuNC0xLTAuNC0xLjQsMGwtMi44LDIuOGMt
        My4yLTEuNS01LjgtNC4xLTcuMy03LjNsMi44LTIuOGMwLjQtMC40LDAuNC0xLDAtMS40ICAgTDguNCw0
        LjNjLTAuNC0wLjQtMS0wLjQtMS41LDBMNC4zLDYuOUM0LjEsNy4yLDQsNy40LDQsNy43QzQsMTguOSwx
        My4xLDI4LDI0LjMsMjhjMC4zLDAsMC41LTAuMSwwLjctMC4zbDIuNi0yLjYgICBDMjguMSwyNC42LDI4
        LjEsMjQsMjcuNywyMy42eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZENpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0xNiw0
        QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHogTTI0
        LDE4aC02djZoLTR2LTZIOHYtNGg2VjhoNHY2aDZWMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N
        Cjwvc3ZnPgs=
</value>
  </data>
  <data name="editorButtonImageOptions10.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="editorButtonImageOptions4.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -228,24 +197,6 @@
        MC40LDAuNC0wLjQsMSwwLDEuNGwxLjQsMS40YzAuNCwwLjQsMSwwLjQsMS40LDBsNi45LTYuOWw2Ljks
        Ni45ICAgIGMwLjQsMC40LDEsMC40LDEuNCwwbDEuNC0xLjRjMC40LTAuNCwwLjQtMSwwLTEuNEwxOC44
        LDE2eiIgY2xhc3M9IlJlZCIgLz4NCiAgICA8L2c+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
  </data>
  <data name="btnAddPhone.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZENpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0xNiw0
        QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHogTTI0
        LDE4aC02djZoLTR2LTZIOHYtNGg2VjhoNHY2aDZWMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N
        Cjwvc3ZnPgs=
</value>
  </data>
  <data name="navigationPage1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/13-print/report/SimulationCommonReport.cs
@@ -569,7 +569,7 @@
                            foreach (var valve in item)
                            {
                                if (valve.Items.Count > 0)
                                if (valve.Items != null && valve.Items.Count > 0)
                                {
                                    foreach (var curve in valve.Items)
                                    {
WinFrmUI/PBS.WinFrmUI/01-place/00-core/PlaceViewModel.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,108 @@
using System.ComponentModel;
namespace HStation.WinFrmUI.PBS
{
    public class PlaceViewModel
    {
        public PlaceViewModel()
        {
        }
        /*
                public PlaceViewModel(PBS.Vmo rhs)
                {
                    this.ID = rhs.ID;
                    this.RegionID = rhs.RegionID;
                    this.Name = rhs.Name;
                    this.PlaceType = rhs.PlaceType;
                    this.PlaceInfo = rhs.PlaceInfo;
                    this.Address = rhs.Address;
                    this.Flags = rhs.Flags?.ToList();
                }
        */
        /// <summary>
        /// åœºæ‰€
        ///</summary>
        [DisplayName("场所")]
        [Browsable(true)]
        public long ID { get; set; }
        /// <summary>
        /// è¡Œæ”¿åŒºåŸŸæ ‡è¯†
        ///</summary>
        [DisplayName("行政区域标识")]
        [Browsable(false)]
        public long RegionID { get; set; }
        /// <summary>
        /// åç§°
        ///</summary>
        [DisplayName("名称")]
        [Browsable(false)]
        public string Name { get; set; }
        /// <summary>
        /// åœºæ‰€ç±»åž‹
        ///</summary>
        [DisplayName("场所类型")]
        [Browsable(true)]
        public int PlaceType { get; set; }
        /// <summary>
        /// åœºæ‰€ä¿¡æ¯
        ///</summary>
        [DisplayName("场所信息")]
        [Browsable(true)]
        public string PlaceInfo { get; set; }
        /// <summary>
        /// åœ°å€
        ///</summary>
        [DisplayName("地址")]
        [Browsable(true)]
        public string Address { get; set; }
        /// <summary>
        /// å‚æ•°
        ///</summary>
        [DisplayName("参数")]
        [Browsable(true)]
        public Dictionary<string, string> Paras { get; set; }
        /// <summary>
        /// æ ‡ç­¾
        ///</summary>
        [DisplayName("标签")]
        [Browsable(true)]
        public string Flags { get; set; }
        /// <summary>
        /// æ ‡å¿—
        ///</summary>
        [DisplayName("标志")]
        [Browsable(true)]
        public string TagName { get; set; }
        /// <summary>
        /// ä½¿ç”¨çŠ¶æ€
        ///</summary>
        [DisplayName("使用状态")]
        [Browsable(true)]
        public int UseStatus { get; set; }
        /// <summary>
        /// æŽ’序码
        ///</summary>
        [DisplayName("排序码")]
        [Browsable(true)]
        public int SortCode { get; set; }
        /// <summary>
        /// è¯´æ˜Ž
        ///</summary>
        [DisplayName("说明")]
        [Browsable(true)]
        public string Description { get; set; }
    }
}
WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.Designer.cs
@@ -1,11 +1,18 @@
namespace HStation.WinFrmUI.PBS
using DevExpress.Utils;
using DevExpress.XtraGrid.Views.Grid;
using System;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms;
namespace HStation.WinFrmUI.PBS
{
    partial class PlaceMgrPage
    {
        /// <summary> 
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        private IContainer components = null;
        /// <summary> 
        /// Clean up any resources being used.
@@ -28,10 +35,282 @@
        /// </summary>
        private void InitializeComponent()
        {
            components = new System.ComponentModel.Container();
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            components = new Container();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            gridView1 = new GridView();
            ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
            barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
            barBtnEdit = new DevExpress.XtraBars.BarButtonItem();
            barBtnRefresh = new DevExpress.XtraBars.BarButtonItem();
            barBtnDelete = new DevExpress.XtraBars.BarButtonItem();
            barBtnUpdateSortCode = new DevExpress.XtraBars.BarButtonItem();
            barBtnDetail = new DevExpress.XtraBars.BarButtonItem();
            barBtnUpdateTagName = new DevExpress.XtraBars.BarButtonItem();
            barBtnUpdateUseStatus = new DevExpress.XtraBars.BarButtonItem();
            barCekSearch = new DevExpress.XtraBars.BarCheckItem();
            ribbonPage = new DevExpress.XtraBars.Ribbon.RibbonPage();
            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            placeViewModelBindingSource = new BindingSource(components);
            colID = new DevExpress.XtraGrid.Columns.GridColumn();
            colRegionID = new DevExpress.XtraGrid.Columns.GridColumn();
            colName = new DevExpress.XtraGrid.Columns.GridColumn();
            colPlaceType = new DevExpress.XtraGrid.Columns.GridColumn();
            colPlaceInfo = new DevExpress.XtraGrid.Columns.GridColumn();
            colAddress = new DevExpress.XtraGrid.Columns.GridColumn();
            colParas = new DevExpress.XtraGrid.Columns.GridColumn();
            colFlags = new DevExpress.XtraGrid.Columns.GridColumn();
            colTagName = new DevExpress.XtraGrid.Columns.GridColumn();
            colUseStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            colSortCode = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
            ((ISupportInitialize)ribbonControl1).BeginInit();
            ((ISupportInitialize)placeViewModelBindingSource).BeginInit();
            SuspendLayout();
            //
            // gridControl1
            //
            gridControl1.DataSource = placeViewModelBindingSource;
            gridControl1.Dock = DockStyle.Fill;
            gridControl1.Location = new Point(0, 104);
            gridControl1.MainView = gridView1;
            gridControl1.Name = "gridControl1";
            gridControl1.Size = new Size(818, 577);
            gridControl1.TabIndex = 18;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            //
            // gridView1
            //
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colID, colRegionID, colName, colPlaceType, colPlaceInfo, colAddress, colParas, colFlags, colTagName, colUseStatus, colSortCode, colDescription });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsDetail.EnableMasterViewMode = false;
            //
            // ribbonControl1
            //
            ribbonControl1.DrawGroupsBorderMode = DefaultBoolean.False;
            ribbonControl1.ExpandCollapseItem.Id = 0;
            ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnAdd, barBtnEdit, barBtnRefresh, barBtnDelete, barBtnUpdateSortCode, barBtnDetail, barBtnUpdateTagName, barBtnUpdateUseStatus, barCekSearch });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.MaxItemId = 28;
            ribbonControl1.Name = "ribbonControl1";
            ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage });
            ribbonControl1.ShowApplicationButton = DefaultBoolean.False;
            ribbonControl1.ShowExpandCollapseButton = DefaultBoolean.False;
            ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
            ribbonControl1.Size = new Size(818, 104);
            ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
            //
            // barBtnAdd
            //
            barBtnAdd.Caption = "添加";
            barBtnAdd.Id = 16;
            barBtnAdd.Name = "barBtnAdd";
            barBtnAdd.ItemClick += barBtnAdd_ItemClick;
            //
            // barBtnEdit
            //
            barBtnEdit.Caption = "编辑";
            barBtnEdit.Id = 17;
            barBtnEdit.Name = "barBtnEdit";
            //
            // barBtnRefresh
            //
            barBtnRefresh.Caption = "刷新";
            barBtnRefresh.Id = 18;
            barBtnRefresh.Name = "barBtnRefresh";
            //
            // barBtnDelete
            //
            barBtnDelete.Caption = "删除";
            barBtnDelete.Id = 19;
            barBtnDelete.Name = "barBtnDelete";
            //
            // barBtnUpdateSortCode
            //
            barBtnUpdateSortCode.Caption = "排序码";
            barBtnUpdateSortCode.Id = 20;
            barBtnUpdateSortCode.Name = "barBtnUpdateSortCode";
            //
            // barBtnDetail
            //
            barBtnDetail.Caption = "详情";
            barBtnDetail.Id = 22;
            barBtnDetail.Name = "barBtnDetail";
            //
            // barBtnUpdateTagName
            //
            barBtnUpdateTagName.Caption = "标签名称";
            barBtnUpdateTagName.Id = 23;
            barBtnUpdateTagName.Name = "barBtnUpdateTagName";
            //
            // barBtnUpdateUseStatus
            //
            barBtnUpdateUseStatus.Caption = "使用状态";
            barBtnUpdateUseStatus.Id = 24;
            barBtnUpdateUseStatus.Name = "barBtnUpdateUseStatus";
            //
            // barCekSearch
            //
            barCekSearch.Caption = "检索";
            barCekSearch.Id = 25;
            barCekSearch.Name = "barCekSearch";
            //
            // ribbonPage
            //
            ribbonPage.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1 });
            ribbonPage.Name = "ribbonPage";
            ribbonPage.Text = "基础操作";
            //
            // ribbonPageGroup1
            //
            ribbonPageGroup1.ItemLinks.Add(barBtnAdd);
            ribbonPageGroup1.ItemLinks.Add(barBtnEdit);
            ribbonPageGroup1.ItemLinks.Add(barBtnDelete);
            ribbonPageGroup1.ItemLinks.Add(barBtnDetail);
            ribbonPageGroup1.ItemLinks.Add(barBtnUpdateTagName, true);
            ribbonPageGroup1.ItemLinks.Add(barBtnUpdateSortCode);
            ribbonPageGroup1.ItemLinks.Add(barBtnUpdateUseStatus);
            ribbonPageGroup1.ItemLinks.Add(barCekSearch);
            ribbonPageGroup1.ItemLinks.Add(barBtnRefresh);
            ribbonPageGroup1.Name = "ribbonPageGroup1";
            ribbonPageGroup1.Text = "基础";
            //
            // placeViewModelBindingSource
            //
            placeViewModelBindingSource.DataSource = typeof(PlaceViewModel);
            //
            // colID
            //
            colID.FieldName = "ID";
            colID.Name = "colID";
            colID.Visible = true;
            colID.VisibleIndex = 0;
            //
            // colRegionID
            //
            colRegionID.FieldName = "RegionID";
            colRegionID.Name = "colRegionID";
            colRegionID.Visible = true;
            colRegionID.VisibleIndex = 1;
            //
            // colName
            //
            colName.FieldName = "Name";
            colName.Name = "colName";
            colName.Visible = true;
            colName.VisibleIndex = 2;
            //
            // colPlaceType
            //
            colPlaceType.FieldName = "PlaceType";
            colPlaceType.Name = "colPlaceType";
            colPlaceType.Visible = true;
            colPlaceType.VisibleIndex = 3;
            //
            // colPlaceInfo
            //
            colPlaceInfo.FieldName = "PlaceInfo";
            colPlaceInfo.Name = "colPlaceInfo";
            colPlaceInfo.Visible = true;
            colPlaceInfo.VisibleIndex = 4;
            //
            // colAddress
            //
            colAddress.FieldName = "Address";
            colAddress.Name = "colAddress";
            colAddress.Visible = true;
            colAddress.VisibleIndex = 5;
            //
            // colParas
            //
            colParas.FieldName = "Paras";
            colParas.Name = "colParas";
            colParas.Visible = true;
            colParas.VisibleIndex = 6;
            //
            // colFlags
            //
            colFlags.FieldName = "Flags";
            colFlags.Name = "colFlags";
            colFlags.Visible = true;
            colFlags.VisibleIndex = 7;
            //
            // colTagName
            //
            colTagName.FieldName = "TagName";
            colTagName.Name = "colTagName";
            colTagName.Visible = true;
            colTagName.VisibleIndex = 8;
            //
            // colUseStatus
            //
            colUseStatus.FieldName = "UseStatus";
            colUseStatus.Name = "colUseStatus";
            colUseStatus.Visible = true;
            colUseStatus.VisibleIndex = 9;
            //
            // colSortCode
            //
            colSortCode.FieldName = "SortCode";
            colSortCode.Name = "colSortCode";
            colSortCode.Visible = true;
            colSortCode.VisibleIndex = 10;
            //
            // colDescription
            //
            colDescription.FieldName = "Description";
            colDescription.Name = "colDescription";
            colDescription.Visible = true;
            colDescription.VisibleIndex = 11;
            //
            // PlaceMgrPage
            //
            Appearance.BackColor = SystemColors.Control;
            Appearance.Options.UseBackColor = true;
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(gridControl1);
            Controls.Add(ribbonControl1);
            Name = "PlaceMgrPage";
            Size = new Size(818, 681);
            ((ISupportInitialize)gridControl1).EndInit();
            ((ISupportInitialize)gridView1).EndInit();
            ((ISupportInitialize)ribbonControl1).EndInit();
            ((ISupportInitialize)placeViewModelBindingSource).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }
        #endregion
        private DevExpress.XtraGrid.GridControl gridControl1;
        private GridView gridView1;
        private DevExpress.XtraBars.Ribbon.RibbonControl ribbonControl1;
        private DevExpress.XtraBars.BarButtonItem barBtnAdd;
        private DevExpress.XtraBars.BarButtonItem barBtnEdit;
        private DevExpress.XtraBars.BarButtonItem barBtnRefresh;
        private DevExpress.XtraBars.BarButtonItem barBtnDelete;
        private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage;
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
        private DevExpress.XtraBars.BarButtonItem barBtnUpdateSortCode;
        private DevExpress.XtraBars.BarButtonItem barBtnDetail;
        private DevExpress.XtraBars.BarButtonItem barBtnUpdateTagName;
        private DevExpress.XtraBars.BarButtonItem barBtnUpdateUseStatus;
        private DevExpress.XtraBars.BarCheckItem barCekSearch;
        private BindingSource placeViewModelBindingSource;
        private DevExpress.XtraGrid.Columns.GridColumn colID;
        private DevExpress.XtraGrid.Columns.GridColumn colRegionID;
        private DevExpress.XtraGrid.Columns.GridColumn colName;
        private DevExpress.XtraGrid.Columns.GridColumn colPlaceType;
        private DevExpress.XtraGrid.Columns.GridColumn colPlaceInfo;
        private DevExpress.XtraGrid.Columns.GridColumn colAddress;
        private DevExpress.XtraGrid.Columns.GridColumn colParas;
        private DevExpress.XtraGrid.Columns.GridColumn colFlags;
        private DevExpress.XtraGrid.Columns.GridColumn colTagName;
        private DevExpress.XtraGrid.Columns.GridColumn colUseStatus;
        private DevExpress.XtraGrid.Columns.GridColumn colSortCode;
        private DevExpress.XtraGrid.Columns.GridColumn colDescription;
    }
}
WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.cs
@@ -9,7 +9,10 @@
            InitializeComponent();
        }
        private List<PlaceViewModel> _allBindingList;
        private void barBtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
        }
    }
}
}
WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.resx
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
  <!--
    Microsoft ResX Schema
    Version 2.0
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple
    There are any number of "resheader" rows that contain simple
    name/value pairs.
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
@@ -117,4 +117,7 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="placeViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
</root>
WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj
@@ -5,6 +5,7 @@
    <Nullable>disable</Nullable>
    <UseWindowsForms>true</UseWindowsForms>
    <ImplicitUsings>enable</ImplicitUsings>
    <RootNamespace>HStation.WinFrmUI.PBS</RootNamespace>
  </PropertyGroup>
  <ItemGroup>
@@ -55,6 +56,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\BLL\PBS.BLL\PBS.BLL.csproj" />
    <ProjectReference Include="..\..\Vmo\PBS.Vmo\PBS.Vmo.csproj" />
    <ProjectReference Include="..\Yw.WinFrmUI.Core\Yw.WinFrmUI.Core.csproj" />
  </ItemGroup>
WinFrmUI/PBS.WinFrmUI/Properties/DataSources/PlaceViewModel.datasource
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
    This file is automatically generated by Visual Studio. It is
    used to store generic object data source configuration information.
    Renaming the file extension or editing the content of this file may
    cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="PlaceViewModel" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
  <TypeInfo>HStation.WinFrmUI.PBS.PlaceViewModel, PBS.WinFrmUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
WinFrmUI/PBS.WinFrmUI/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
namespace PBS.WinFrmUI.Core.Properties {
namespace HStation.WinFrmUI.PBS.Properties {
    using System;
    
    
@@ -39,7 +39,7 @@
        internal static global::System.Resources.ResourceManager ResourceManager {
            get {
                if (object.ReferenceEquals(resourceMan, null)) {
                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PBS.WinFrmUI.Core.Properties.Resources", typeof(Resources).Assembly);
                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("HStation.WinFrmUI.PBS.Properties.Resources", typeof(Resources).Assembly);
                    resourceMan = temp;
                }
                return resourceMan;
WinFrmUI/Yw.WinFrmUI.Division.Core/Yw.WinFrmUI.Division.Core.csproj
@@ -7,17 +7,7 @@
  </PropertyGroup>
  <ItemGroup>
    <Compile Remove="04-building\BuildingMgr.cs" />
    <Compile Remove="04-building\BuildingMgr.designer.cs" />
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Remove="04-building\BuildingMgr.resx" />
  </ItemGroup>
  <ItemGroup>
    <Folder Include="00-core\" />
    <Folder Include="04-building\" />
  </ItemGroup>
  <ItemGroup>
WinFrmUI/Yw.WinFrmUI.Division.Core/Yw.WinFrmUI.Division.Core.csproj.user
@@ -26,5 +26,8 @@
    <Compile Update="03-buildingtype\EditBuildingTypeDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="04-building\BuildingMgr.cs">
      <SubType>UserControl</SubType>
    </Compile>
  </ItemGroup>
</Project>