主界面修改 Pbs

Shuxia Ning

2025-02-06 aac8f8fb4a9ec6b388117bd76f891195edfa7cab

主界面修改 Pbs

 Desktop/PBS.Desktop.Core/MainForm - ¸´ÖÆ(2).Designer.cs

ÎļþÒÑɾ³ý

 Desktop/PBS.Desktop.Core/MainForm - ¸´ÖÆ(2).cs

ÎļþÒÑɾ³ý

 Desktop/PBS.Desktop.Core/MainForm - ¸´ÖÆ(2).resx

ÎļþÒÑɾ³ý

 Desktop/PBS.Desktop.Core/MainForm.Designer.cs

@@ -42,19 +42,26 @@
            nbMin = new DevExpress.XtraBars.Navigation.NavButton();
            nbNormal = new DevExpress.XtraBars.Navigation.NavButton();
            nbClose = new DevExpress.XtraBars.Navigation.NavButton();
            documentManager1 = new DevExpress.XtraBars.Docking2010.DocumentManager(components);
            tabbedView1 = new DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView(components);
            dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
            flyoutPanel1 = new DevExpress.Utils.FlyoutPanel();
            flyoutPanelControl1 = new DevExpress.Utils.FlyoutPanelControl();
            svgImgItem32 = new DevExpress.Utils.SvgImageCollection(components);
            accordionControlFunction = new DevExpress.XtraBars.Navigation.AccordionControl();
            toolboxItem3 = new DevExpress.XtraToolbox.ToolboxItem();
            toolboxItem5 = new DevExpress.XtraToolbox.ToolboxItem();
            svgImgGroup32 = new DevExpress.Utils.SvgImageCollection(components);
            xtraTabContrl = new DevExpress.XtraTab.XtraTabControl();
            ((System.ComponentModel.ISupportInitialize)tileNavPane).BeginInit();
            ((System.ComponentModel.ISupportInitialize)documentManager1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)tabbedView1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)flyoutPanel1).BeginInit();
            flyoutPanel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)flyoutPanelControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)svgImgItem32).BeginInit();
            ((System.ComponentModel.ISupportInitialize)accordionControlFunction).BeginInit();
            ((System.ComponentModel.ISupportInitialize)svgImgGroup32).BeginInit();
            ((System.ComponentModel.ISupportInitialize)xtraTabContrl).BeginInit();
            SuspendLayout();
            // 
            // tileNavPane
@@ -107,10 +114,10 @@
            tileNavPane.DefaultCategory.Tile.AllowSelectAnimation = true;
            tileNavPane.DefaultCategory.Tile.DropDownOptions.BeakColor = Color.Empty;
            tileNavPane.Dock = DockStyle.Top;
            tileNavPane.Location = new Point(211, 0);
            tileNavPane.Location = new Point(0, 0);
            tileNavPane.Margin = new Padding(0);
            tileNavPane.Name = "tileNavPane";
            tileNavPane.Size = new Size(1876, 70);
            tileNavPane.Size = new Size(2087, 70);
            tileNavPane.TabIndex = 0;
            tileNavPane.Text = "tileNavPane1";
            tileNavPane.ElementClick += tileNavPane_ElementClick;
@@ -260,10 +267,53 @@
            nbClose.Name = "nbClose";
            nbClose.ElementClick += nabClose_ElementClick;
            // 
            // documentManager1
            // 
            documentManager1.ContainerControl = this;
            documentManager1.View = tabbedView1;
            documentManager1.ViewCollection.AddRange(new DevExpress.XtraBars.Docking2010.Views.BaseView[] { tabbedView1 });
            // 
            // tabbedView1
            // 
            tabbedView1.DocumentGroupProperties.AllowHtmlDraw = true;
            tabbedView1.DocumentGroupProperties.ClosePageButtonShowMode = DevExpress.XtraTab.ClosePageButtonShowMode.InActiveTabPageHeader;
            tabbedView1.DocumentGroupProperties.PinPageButtonShowMode = DevExpress.XtraTab.PinPageButtonShowMode.InActiveTabPageHeader;
            tabbedView1.DocumentProperties.AllowPin = true;
            tabbedView1.Style = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Light;
            tabbedView1.DocumentSelected += tabbedView1_DocumentSelected;
            tabbedView1.DocumentAdded += tabbedView1_DocumentAdded;
            tabbedView1.DocumentActivated += tabbedView1_DocumentActivated;
            tabbedView1.DocumentClosed += tabbedView1_DocumentClosed;
            // 
            // dockManager1
            // 
            dockManager1.Form = this;
            dockManager1.TopZIndexControls.AddRange(new string[] { "DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl" });
            // 
            // flyoutPanel1
            // 
            flyoutPanel1.AnimationRate = 100;
            flyoutPanel1.Controls.Add(flyoutPanelControl1);
            flyoutPanel1.Location = new Point(706, 209);
            flyoutPanel1.Margin = new Padding(4, 5, 4, 5);
            flyoutPanel1.Name = "flyoutPanel1";
            flyoutPanel1.Options.CloseOnOuterClick = true;
            flyoutPanel1.OptionsBeakPanel.BeakLocation = DevExpress.Utils.BeakPanelBeakLocation.Top;
            flyoutPanel1.OptionsButtonPanel.ButtonPanelHeight = 47;
            flyoutPanel1.ParentForm = this;
            flyoutPanel1.Size = new Size(286, 157);
            flyoutPanel1.TabIndex = 5;
            // 
            // flyoutPanelControl1
            // 
            flyoutPanelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
            flyoutPanelControl1.Dock = DockStyle.Fill;
            flyoutPanelControl1.FlyoutPanel = flyoutPanel1;
            flyoutPanelControl1.Location = new Point(0, 0);
            flyoutPanelControl1.Margin = new Padding(4, 5, 4, 5);
            flyoutPanelControl1.Name = "flyoutPanelControl1";
            flyoutPanelControl1.Size = new Size(286, 157);
            flyoutPanelControl1.TabIndex = 0;
            // 
            // svgImgItem32
            // 
@@ -296,10 +346,10 @@
            accordionControlFunction.Appearance.Item.Default.ForeColor = Color.Black;
            accordionControlFunction.Appearance.Item.Default.Options.UseForeColor = true;
            accordionControlFunction.Dock = DockStyle.Left;
            accordionControlFunction.Location = new Point(0, 0);
            accordionControlFunction.Location = new Point(0, 70);
            accordionControlFunction.Name = "accordionControlFunction";
            accordionControlFunction.ScrollBarMode = DevExpress.XtraBars.Navigation.ScrollBarMode.Fluent;
            accordionControlFunction.Size = new Size(211, 1131);
            accordionControlFunction.Size = new Size(211, 1061);
            accordionControlFunction.TabIndex = 17;
            accordionControlFunction.ViewType = DevExpress.XtraBars.Navigation.AccordionControlViewType.HamburgerMenu;
            // 
@@ -322,58 +372,6 @@
            svgImgGroup32.Add("ExploitProtectionSettings.svg", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImgGroup32.ExploitProtectionSettings.svg"));
            svgImgGroup32.Add("Admin.svg", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImgGroup32.Admin.svg"));
            // 
            // xtraTabContrl
            // 
            xtraTabContrl.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
            xtraTabContrl.Appearance.BackColor = Color.White;
            xtraTabContrl.Appearance.BorderColor = Color.White;
            xtraTabContrl.Appearance.ForeColor = Color.Black;
            xtraTabContrl.Appearance.Options.UseBackColor = true;
            xtraTabContrl.Appearance.Options.UseBorderColor = true;
            xtraTabContrl.Appearance.Options.UseForeColor = true;
            xtraTabContrl.AppearancePage.Header.BackColor = Color.White;
            xtraTabContrl.AppearancePage.Header.BorderColor = Color.White;
            xtraTabContrl.AppearancePage.Header.ForeColor = Color.Black;
            xtraTabContrl.AppearancePage.Header.Options.UseBackColor = true;
            xtraTabContrl.AppearancePage.Header.Options.UseBorderColor = true;
            xtraTabContrl.AppearancePage.Header.Options.UseForeColor = true;
            xtraTabContrl.AppearancePage.HeaderActive.BackColor = Color.White;
            xtraTabContrl.AppearancePage.HeaderActive.BorderColor = Color.White;
            xtraTabContrl.AppearancePage.HeaderActive.ForeColor = Color.Black;
            xtraTabContrl.AppearancePage.HeaderActive.Options.UseBackColor = true;
            xtraTabContrl.AppearancePage.HeaderActive.Options.UseBorderColor = true;
            xtraTabContrl.AppearancePage.HeaderActive.Options.UseForeColor = true;
            xtraTabContrl.AppearancePage.HeaderDisabled.BackColor = Color.White;
            xtraTabContrl.AppearancePage.HeaderDisabled.BorderColor = Color.White;
            xtraTabContrl.AppearancePage.HeaderDisabled.ForeColor = Color.Black;
            xtraTabContrl.AppearancePage.HeaderDisabled.Options.UseBackColor = true;
            xtraTabContrl.AppearancePage.HeaderDisabled.Options.UseBorderColor = true;
            xtraTabContrl.AppearancePage.HeaderDisabled.Options.UseForeColor = true;
            xtraTabContrl.AppearancePage.HeaderHotTracked.BackColor = Color.White;
            xtraTabContrl.AppearancePage.HeaderHotTracked.BorderColor = Color.White;
            xtraTabContrl.AppearancePage.HeaderHotTracked.ForeColor = Color.Black;
            xtraTabContrl.AppearancePage.HeaderHotTracked.Options.UseBackColor = true;
            xtraTabContrl.AppearancePage.HeaderHotTracked.Options.UseBorderColor = true;
            xtraTabContrl.AppearancePage.HeaderHotTracked.Options.UseForeColor = true;
            xtraTabContrl.AppearancePage.PageClient.BackColor = Color.White;
            xtraTabContrl.AppearancePage.PageClient.BorderColor = Color.White;
            xtraTabContrl.AppearancePage.PageClient.ForeColor = Color.Black;
            xtraTabContrl.AppearancePage.PageClient.Options.UseBackColor = true;
            xtraTabContrl.AppearancePage.PageClient.Options.UseBorderColor = true;
            xtraTabContrl.AppearancePage.PageClient.Options.UseForeColor = true;
            xtraTabContrl.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
            xtraTabContrl.BorderStylePage = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
            xtraTabContrl.ClosePageButtonShowMode = DevExpress.XtraTab.ClosePageButtonShowMode.InActiveTabPageHeader;
            xtraTabContrl.Dock = DockStyle.Fill;
            xtraTabContrl.Location = new Point(0, 0);
            xtraTabContrl.LookAndFeel.SkinMaskColor = Color.White;
            xtraTabContrl.LookAndFeel.UseDefaultLookAndFeel = false;
            xtraTabContrl.Name = "xtraTabContrl";
            xtraTabContrl.Size = new Size(2087, 1131);
            xtraTabContrl.TabIndex = 19;
            xtraTabContrl.SelectedPageChanged += xtraTabContrl_SelectedPageChanged;
            xtraTabContrl.CloseButtonClick += xtraTabContrl_CloseButtonClick;
            // 
            // MainForm
            // 
            Appearance.BackColor = Color.White;
@@ -381,9 +379,9 @@
            AutoScaleDimensions = new SizeF(10F, 22F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(2087, 1131);
            Controls.Add(tileNavPane);
            Controls.Add(accordionControlFunction);
            Controls.Add(xtraTabContrl);
            Controls.Add(tileNavPane);
            Controls.Add(flyoutPanel1);
            Margin = new Padding(4, 3, 4, 3);
            Name = "MainForm";
            Text = "Form1";
@@ -394,11 +392,15 @@
            Shown += MainForm_Shown;
            Resize += MainForm_Resize;
            ((System.ComponentModel.ISupportInitialize)tileNavPane).EndInit();
            ((System.ComponentModel.ISupportInitialize)documentManager1).EndInit();
            ((System.ComponentModel.ISupportInitialize)tabbedView1).EndInit();
            ((System.ComponentModel.ISupportInitialize)dockManager1).EndInit();
            ((System.ComponentModel.ISupportInitialize)flyoutPanel1).EndInit();
            flyoutPanel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)flyoutPanelControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)svgImgItem32).EndInit();
            ((System.ComponentModel.ISupportInitialize)accordionControlFunction).EndInit();
            ((System.ComponentModel.ISupportInitialize)svgImgGroup32).EndInit();
            ((System.ComponentModel.ISupportInitialize)xtraTabContrl).EndInit();
            ResumeLayout(false);
        }

@@ -406,11 +408,15 @@

        private DevExpress.XtraBars.Navigation.TileNavPane tileNavPane;
        private DevExpress.XtraBars.Navigation.NavButton nbTitle;
        private DevExpress.XtraBars.Docking2010.DocumentManager documentManager1;
        private DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView tabbedView1;
        private DevExpress.XtraBars.Navigation.NavButton nbMin;
        private DevExpress.XtraBars.Navigation.NavButton nbNormal;
        private DevExpress.XtraBars.Navigation.NavButton nbClose;
        private DevExpress.XtraBars.Navigation.NavButton nbBasicData;
        private DevExpress.XtraBars.Navigation.NavButton nbRapidModeling;
        private DevExpress.Utils.FlyoutPanel flyoutPanel1;
        private DevExpress.Utils.FlyoutPanelControl flyoutPanelControl1;
        private DevExpress.Utils.SvgImageCollection svgImgItem32;
        private DevExpress.XtraBars.Navigation.NavButton nbModelAnalysis;
        private DevExpress.XtraBars.Navigation.NavButton nbModelEvaluation;
@@ -422,6 +428,5 @@
        private DevExpress.Utils.SvgImageCollection svgImgGroup32;
        private DevExpress.XtraBars.Navigation.NavButton navButton2;
        private DevExpress.XtraBars.Navigation.NavButton navButton3;
        private DevExpress.XtraTab.XtraTabControl xtraTabContrl;
    }
}

 Desktop/PBS.Desktop.Core/MainForm.cs

@@ -1,14 +1,11 @@
using DevExpress.Utils.Svg;
using DevExpress.XtraBars.Docking;
using DevExpress.XtraBars.Docking2010.Views;
using DevExpress.XtraBars.Navigation;
using DevExpress.XtraBars.Ribbon;
using DevExpress.XtraEditors;
using DevExpress.XtraTab;
using DevExpress.XtraTab.ViewInfo;
using HStation.WinFrmUI;
using HStation.WinFrmUI.Assets;
using HStation.WinFrmUI.Xhs.PumpProduct;
using PBS.WinFrmUI.WE;
using PBS.Desktop;
using System.Drawing.Drawing2D;
using System.IO;
using Yw.WinFrmUI;
@@ -30,15 +27,22 @@

            this.accordionControlFunction.Appearance.AccordionControl.BackColor = Color.White;
            this.accordionControlFunction.Appearance.AccordionControl.BorderColor = Color.White;
            //this.accordionControlFunction.ResizeMode = AccordionControlResizeMode.None;
            this.accordionControlFunction.AllowHtmlText = true;
            this.accordionControlFunction.HtmlTemplates.HamburgerHeaderPanel.Template = @"<div class='hamburger-header-background'></div>";
            this.accordionControlFunction.HtmlTemplates.HamburgerHeaderPanel.Styles = @".hamburger-header-background {background-color: #ffffff; height: 100%;width: 100%;}";

            this.xtraTabContrl.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
        }
            this.tabbedView1.Style = DockingViewStyle.Classic;
            this.tabbedView1.Appearance.BackColor = Color.White;
            //this.tabbedView1.AppearancePage.Header.BackColor = Color.White;
            this.tabbedView1.AppearancePage.HeaderSelected.Font = new Font("微软雅黑", 10f, FontStyle.Bold);

        private HatchBrush myHatchBrush1 = new HatchBrush(HatchStyle.BackwardDiagonal, Color.LightGray, Color.AliceBlue);
           // this.tabbedView1.CustomDrawTabHeader += TabbedView1_CustomDrawTabHeader;


        } 

        HatchBrush myHatchBrush1 = new HatchBrush(HatchStyle.BackwardDiagonal, Color.LightGray, Color.AliceBlue);
        private void TabbedView1_CustomDrawTabHeader(object sender, DevExpress.XtraTab.TabHeaderCustomDrawEventArgs e)
        {
            e.Cache.FillRectangle(myHatchBrush1, e.Bounds);
@@ -115,9 +119,9 @@
            if (btn.Tag is not string tag)
                return;
            PageGuid pguid = null;
            if (this.xtraTabContrl.SelectedTabPage != null)
            if (this.tabbedView1.ActiveDocument != null)
            {
                pguid = this.xtraTabContrl.SelectedTabPage.Tag as PageGuid;
                pguid = this.tabbedView1.ActiveDocument.Tag as PageGuid;
            }
            SelectModular(tag, pguid);
        }
@@ -181,26 +185,40 @@
        #region TabbedView ç›¸å…³äº‹ä»¶å¤„理程序

        //选中
        private void xtraTabContrl_SelectedPageChanged(object sender, TabPageChangedEventArgs e)
        private void tabbedView1_DocumentSelected(object sender, DocumentEventArgs e)
        {
            if (e.Page == null)
            if (e.Document == null)
                return;
            var pguid = e.Page.Tag as PageGuid;
            var pguid = e.Document.Tag as PageGuid;
            if (pguid == null)
                return;
            SelectModular(pguid.Modular, pguid);
        }

        //关闭
        private void xtraTabContrl_CloseButtonClick(object sender, EventArgs e)
        //添加
        private void tabbedView1_DocumentAdded(object sender, DocumentEventArgs e)
        {
            var arg = e as ClosePageButtonEventArgs;
            var last_index = this.xtraTabContrl.SelectedTabPageIndex - 1;
            this.xtraTabContrl.TabPages.Remove(arg.Page as XtraTabPage);
            if (last_index > 0)
            if (this.tabbedView1.Documents.Count > 1)
            {
                this.xtraTabContrl.SelectedTabPageIndex = last_index;
                if (!this.tabbedView1.DocumentGroupProperties.ShowTabHeader)
                {
                }
            }
        }

        //激活
        private void tabbedView1_DocumentActivated(object sender, DocumentEventArgs e)
        {
            var page = e.Document.Control as DocumentPage;
            if (page == null)
            {
                return;
            }
        }

        //关闭 æ­¤æ—¶æŽ§ä»¶å·²ç»ä¸ºç©º
        private void tabbedView1_DocumentClosed(object sender, DocumentEventArgs e)
        {
        }

        #endregion TabbedView ç›¸å…³äº‹ä»¶å¤„理程序
@@ -235,9 +253,9 @@
                }
            }

            if (this.xtraTabContrl.TabPages != null && this.xtraTabContrl.TabPages.Count > 0)
            if (this.tabbedView1.Documents != null && this.tabbedView1.Documents.Count > 0)
            {
                foreach (XtraTabPage doc in this.xtraTabContrl.TabPages)
                foreach (BaseDocument doc in this.tabbedView1.Documents)
                {
                    if (doc.Tag != null)
                    {
@@ -247,7 +265,7 @@
                            {
                                if (isActivePage)
                                {
                                    this.xtraTabContrl.SelectedTabPage = doc;
                                    this.tabbedView1.Controller.Activate(doc);
                                }
                                return true;
                            }
@@ -283,12 +301,12 @@
                }
            }

            if (this.xtraTabContrl.TabPages != null && this.xtraTabContrl.TabPages.Count > 0)
            if (this.tabbedView1.Documents != null && this.tabbedView1.Documents.Count > 0)
            {
                var doc = this.xtraTabContrl.TabPages.ToList().Find(x => x.Tag != null && x.Tag is PageGuid && (x.Tag as PageGuid).ToString() == pguid.ToString());
                var doc = this.tabbedView1.Documents.ToList().Find(x => x.Tag != null && x.Tag is PageGuid && (x.Tag as PageGuid).ToString() == pguid.ToString());
                if (doc != null)
                {
                    var page = doc.Controls[0] as DocumentPage;
                    var page = doc.Control as DocumentPage;
                    if (page != null)
                    {
                        page.RefreshData();
@@ -325,16 +343,16 @@
                }
            }

            if (this.xtraTabContrl.TabPages != null && this.xtraTabContrl.TabPages.Count > 0)
            if (this.tabbedView1.Documents != null && this.tabbedView1.Documents.Count > 0)
            {
                var doc = this.xtraTabContrl.TabPages.ToList().Find(x => x.Tag != null && x.Tag is PageGuid && (x.Tag as PageGuid).ToString() == pguid.ToString());
                var doc = this.tabbedView1.Documents.ToList().Find(x => x.Tag != null && x.Tag is PageGuid && (x.Tag as PageGuid).ToString() == pguid.ToString());
                if (doc != null)
                {
                    doc.Text = title.Caption;
                    doc.Caption = title.Caption;
                    doc.ImageOptions.Image = title.HeaderImage;
                    doc.ImageOptions.SvgImage = title.HeaderSvgImage;
                    doc.ImageOptions.SvgImageSize = title.SvgImageSize;
                    var page = doc.Controls[0] as DocumentPage;
                    var page = doc.Control as DocumentPage;
                    if (page != null)
                    {
                        page.PageTitle = title;
@@ -392,20 +410,20 @@

                case eMoudingType.Tab:
                    {
                        var sel_page = new XtraTabPage();
                        page.Dock = DockStyle.Fill;
                        sel_page.Controls.Add(page);
                        this.xtraTabContrl.TabPages.Add(sel_page);
                        this.tabbedView1.BeginUpdate();
                        var doc = this.tabbedView1.AddDocument(page);
                        doc.Footer = Directory.GetCurrentDirectory();
                        if (page.PageTitle != null)
                        {
                            sel_page.Text = page.PageTitle.Caption;
                            sel_page.ImageOptions.Image = page.PageTitle.HeaderImage;
                            sel_page.ImageOptions.SvgImage = page.PageTitle.HeaderSvgImage;
                            sel_page.ImageOptions.SvgImageSize = page.PageTitle.SvgImageSize;
                            //doc.Properties.AllowClose = page.PageTitle.AllowClose ? DevExpress.Utils.DefaultBoolean.True : DevExpress.Utils.DefaultBoolean.False;
                            doc.Caption = page.PageTitle.Caption;
                            doc.ImageOptions.Image = page.PageTitle.HeaderImage;
                            doc.ImageOptions.SvgImage = page.PageTitle.HeaderSvgImage;
                            doc.ImageOptions.SvgImageSize = page.PageTitle.SvgImageSize;
                            doc.Properties.AllowClose = page.PageTitle.AllowClose ? DevExpress.Utils.DefaultBoolean.True : DevExpress.Utils.DefaultBoolean.False;
                        }
                        sel_page.Tag = pguid;
                        this.xtraTabContrl.SelectedTabPage = sel_page;
                        doc.Tag = pguid;
                        this.tabbedView1.EndUpdate();
                        this.tabbedView1.Controller.Activate(doc);
                    }
                    break;

@@ -437,12 +455,12 @@

                case eMoudingType.Tab:
                    {
                        if (this.xtraTabContrl.TabPages != null && this.xtraTabContrl.TabPages.Count > 0)
                        if (this.tabbedView1.Documents != null && this.tabbedView1.Documents.Count > 0)
                        {
                            var doc = this.xtraTabContrl.TabPages.ToList().Find(x => x.Tag != null && x.Tag is PageGuid && (x.Tag as PageGuid).ToString() == pguid.ToString());
                            var doc = this.tabbedView1.Documents.ToList().Find(x => x.Tag != null && x.Tag is PageGuid && (x.Tag as PageGuid).ToString() == pguid.ToString());
                            if (doc != null)
                            {
                                this.xtraTabContrl.TabPages.Remove(doc);
                                this.tabbedView1.Controller.Close(doc);//会触发正在关闭和关闭事件
                            }
                        }
                    }
@@ -564,6 +582,7 @@

            return false;
        }
 

        //获取
        private List<AccordionElement> GetAccordionElementList(string modular)
@@ -651,8 +670,6 @@
                        {
                            if (!IsExistPage(guid, true))
                            {
                                var page=new WaterUtensilMainPage();
                                CreatePage(page, guid);
                            }
                        }),
                        Get("用水当量",new PageGuid()
@@ -664,8 +681,6 @@
                        {
                            if (!IsExistPage(guid, true))
                            {
                                var page=new WaterWEMgr();
                                CreatePage(page, guid);
                            }
                        })
                    }
@@ -687,13 +702,13 @@
                        }, svgImgItem32[6], new Size(18, 18), (caption,guid,svg,size) =>
                        {
                            if (!IsExistPage(guid, true))
                            {
                             var page=new AssetsManufacturerMainPage();
                            {   
                                var page = new DocumentPage();
                                page.PageGuid = guid;
                                page.PageTitle.Caption = caption;
                                page.PageTitle.HeaderSvgImage = svg;
                                page.PageTitle.SvgImageSize = size;
                                CreatePage(page,guid);
                                CreatePage(page, guid);
                            }
                        }),
                        Get("水泵管理",new PageGuid()
@@ -722,13 +737,7 @@
                        {
                            if (!IsExistPage(guid, true))
                            {
                                var page=new PackageManageMainPage();
                                page.PageGuid = guid;
                                page.PageTitle.Caption = caption;
                                page.PageTitle.HeaderSvgImage = svg;
                                page.PageTitle.SvgImageSize = size;
                                CreatePage(page,guid);
                             }
                            }
                        })
                    }
                };

 Desktop/PBS.Desktop.Core/MainForm.resx

@@ -264,11 +264,14 @@
        LDE2eiIgY2xhc3M9IlJlZCIgLz4NCiAgICA8L2c+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
  </data>
  <metadata name="dockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="documentManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
  <metadata name="dockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>259, 17</value>
  </metadata>
  <metadata name="svgImgItem32.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>417, 17</value>
    <value>659, 17</value>
  </metadata>
  <data name="svgImgItem32.MapPin.svg" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
@@ -616,7 +619,7 @@
</value>
  </data>
  <metadata name="svgImgGroup32.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>213, 17</value>
    <value>455, 17</value>
  </metadata>
  <data name="svgImgGroup32.EMI.svg" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>

 Desktop/PBS.Desktop.Core/PBS.Desktop.Core.csproj

@@ -11,14 +11,18 @@
  </PropertyGroup>

  <ItemGroup>
    <Compile Remove="MainForm - å¤åˆ¶%282%29.cs" />
    <Compile Remove="MainForm - å¤åˆ¶%282%29.Designer.cs" />
    <Compile Remove="Login\**" />
    <EmbeddedResource Remove="Login\**" />
    <None Remove="Login\**" />
    <Page Remove="Login\**" />
  </ItemGroup>

  <ItemGroup>
    <Compile Remove="MainForm - å¤åˆ¶.cs" />
    <Compile Remove="MainForm - å¤åˆ¶.Designer.cs" />
  </ItemGroup>

  <ItemGroup>
    <EmbeddedResource Remove="MainForm - å¤åˆ¶%282%29.resx" />
    <EmbeddedResource Remove="MainForm - å¤åˆ¶.resx" />
  </ItemGroup>

@@ -28,7 +32,7 @@

  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.1.8" />
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.6.3" />
  </ItemGroup>

  <ItemGroup>
@@ -41,7 +45,6 @@
  </ItemGroup>

  <ItemGroup>
    <Compile Update="Login\LoginFrm.cs" />
    <Compile Update="Properties\Resources.Designer.cs">
      <DesignTime>True</DesignTime>
      <AutoGen>True</AutoGen>

 Desktop/PBS.Desktop.Core/Program.cs

@@ -1,10 +1,12 @@
using DevExpress.LookAndFeel;
using HStation.WinFrmUI;
using Mapster;
using System.Reflection;

namespace PBS.Desktop
{
    internal static class Program
    {
    { 
        /// <summary>
        ///  The main entry point for the application.
        /// </summary>
@@ -21,8 +23,8 @@
                }

                //DevExpress.UserSkins.BonusSkins.Register();
                DevExpress.LookAndFeel.UserLookAndFeel.Default.SetSkinStyle("Bezier");//Visual Studio 2013 Light
                DevExpress.LookAndFeel.UserLookAndFeel.Default.SetSkinStyle(SkinSvgPalette.Bezier.OfficeColorful);
                //DevExpress.LookAndFeel.UserLookAndFeel.Default.SetSkinStyle("Bezier");//Visual Studio 2013 Light
                //DevExpress.LookAndFeel.UserLookAndFeel.Default.SetSkinStyle(SkinSvgPalette.Bezier.OfficeColorful);
                DevExpress.Skins.SkinManager.EnableFormSkins();
                System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("zh-Hans");
                System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("zh-Hans");
@@ -48,52 +50,90 @@
                System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("zh-Hans");

                //皮肤
                DevExpress.LookAndFeel.UserLookAndFeel.Default.SetSkinStyle(SkinStyle.WXICompact);
                DevExpress.LookAndFeel.UserLookAndFeel.Default.SetSkinStyle(SkinStyle.WXICompact); 

                // To customize application configuration such as set high DPI settings or default font,
                // see https://aka.ms/applicationconfiguration.
                ApplicationConfiguration.Initialize();
                Yw.WinFrmUI.GlobalParas.AppIcon = PBS.Desktop.Core.Properties.Resources.app;

                //#region éªŒè¯å‡çº§

                //try
                //{

                //    if (AutoUpdateHelper.NeedExist())
                //        return;
                //}
                //catch (Exception ex)
                //{
                //    LogHelper.Error("验证升级错误", ex);
                //}

                //#endregion

                //if (!LoginHelper.Login())
                //{
                //    return;
                //}


 
                //扫描全局DTO映射
                TypeAdapterConfig.GlobalSettings.Scan
                    (
                    //Assembly.Load("Yw.BLL.Auth.Core"),
                    //Assembly.Load("Yw.BLL.Bimface.Core"),
                    //Assembly.Load("Yw.BLL.Hydro.Core"),
                    //Assembly.Load("Yw.BLL.Map.Core"),
                    //Assembly.Load("PBS.BLL.Core")
                        //Assembly.Load("Yw.BLL.Auth.Core"),
                        //Assembly.Load("Yw.BLL.Bimface.Core"),
                        //Assembly.Load("Yw.BLL.Hydro.Core"),
                        //Assembly.Load("Yw.BLL.Map.Core"),
                        //Assembly.Load("HStation.BLL.Xhs.Core")
                    );
                DbFirstHelper.Initial();
                Yw.WinFrmUI.GlobalParas.AppIcon = PBS.Desktop.Core.Properties.Resources.app;
                //DbFirstHelper.Initial();
                Application.Run(new MainForm());
            }
        }


        ///<summary>
        ///  è¿™å°±æ˜¯æˆ‘们要在发生未处理异常时处理的方法，我这是写出错详细信息到文本，如出错后弹出一个漂亮的出错提示窗体，给大家做个参考
        ///  åšæ³•å¾ˆå¤šï¼Œå¯ä»¥æ˜¯æŠŠå‡ºé”™è¯¦ç»†ä¿¡æ¯è®°å½•åˆ°æ–‡æœ¬ã€æ•°æ®åº“，发送出错邮件到作者信箱或出错后重新初始化等等
        ///  è¿™å°±æ˜¯ä»è€…见仁智者见智，大家自己做了。
        ///</summary>
        ///</summary>d
        ///<param name="sender"> </param>
        ///<param name="e"> </param>
        private static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
        {
            var ex = e.Exception;
            Yw.LogHelper.Error("系统出现未知异常,ERROR:249", ex);
            MessageBox.Show($"系统出现未知异常，请重启系统！\r\n{ex.Message}");
            if (ex is Yw.Vmo.VException internalEx)
            {
                Yw.LogHelper.Error("系统出现内部异常,ERROR:249", internalEx);
                var dlg = new Yw.WinFrmUI.VmoExceptionInfoDlg();
                dlg.SetBindingData(internalEx);
                dlg.ShowDialog();
            }
            else
            {
                Yw.LogHelper.Error("系统出现未知异常,ERROR:249", ex);
                MessageBoxHelper.ShowError($"系统出现未知异常，请重启系统！\r\n{ex.Message}");
            }
        }

        private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
        {
            var ex = e.ExceptionObject as Exception;
            Yw.LogHelper.Error("系统出现未知异常,ERROR:255", ex);
            MessageBox.Show($"系统出现未知异常，请重启系统！\r\n{ex.Message}");
            if (ex is Yw.Vmo.VException internalEx)
            {
                Yw.LogHelper.Error("系统出现内部异常,ERROR:249", internalEx);
                var dlg = new Yw.WinFrmUI.VmoExceptionInfoDlg();
                dlg.SetBindingData(internalEx);
                dlg.ShowDialog();
            }
            else
            {
                Yw.LogHelper.Error("系统出现未知异常,ERROR:255", ex);
                MessageBoxHelper.ShowError($"系统出现未知异常，请重启系统！\r\n{ex.Message}");
            }
        }


    }
}