lu
2024-12-04 0e83e666b4ea7a521f46835c6395395ea64a81ad
右箭关闭
已修改3个文件
169 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FrmMain.cs 49 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FrmMain.resx 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -75,12 +75,16 @@
            this.barSubItem4 = new DevExpress.XtraBars.BarSubItem();
            this.fluentFormDefaultManager1 = new DevExpress.XtraBars.FluentDesignSystem.FluentFormDefaultManager(this.components);
            this.acrd = new DevExpress.XtraBars.Navigation.AccordionControl();
            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
            this.tabCloseCurrent = new System.Windows.Forms.ToolStripMenuItem();
            this.tabCloseAll = new System.Windows.Forms.ToolStripMenuItem();
            this.fluentDesignFormContainer1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.tab)).BeginInit();
            this.statusStrip1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.fluentFormDefaultManager1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.acrd)).BeginInit();
            this.contextMenuStrip1.SuspendLayout();
            this.SuspendLayout();
            // 
            // fluentDesignFormContainer1
@@ -476,6 +480,29 @@
            this.acrd.TabIndex = 1;
            this.acrd.ViewType = DevExpress.XtraBars.Navigation.AccordionControlViewType.HamburgerMenu;
            // 
            // contextMenuStrip1
            //
            this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.tabCloseCurrent,
            this.tabCloseAll});
            this.contextMenuStrip1.Name = "contextMenuStrip1";
            this.contextMenuStrip1.Size = new System.Drawing.Size(158, 56);
            //
            // tabCloseCurrent
            //
            this.tabCloseCurrent.Image = global::Gs.DevApp.Properties.Resources.close_16x16;
            this.tabCloseCurrent.Name = "tabCloseCurrent";
            this.tabCloseCurrent.Size = new System.Drawing.Size(157, 26);
            this.tabCloseCurrent.Text = "关闭当前页";
            //
            // tabCloseAll
            //
            this.tabCloseAll.Image = global::Gs.DevApp.Properties.Resources.deletelist2_16x16;
            this.tabCloseAll.Name = "tabCloseAll";
            this.tabCloseAll.Size = new System.Drawing.Size(157, 26);
            this.tabCloseAll.Text = "关闭其它页";
            //
            // FrmMain
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -499,6 +526,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.fluentFormDefaultManager1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.acrd)).EndInit();
            this.contextMenuStrip1.ResumeLayout(false);
            this.ResumeLayout(false);
        }
@@ -548,5 +576,8 @@
        private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel5;
        private DevExpress.XtraBars.BarButtonItem barEasy;
        private DevExpress.XtraBars.BarSubItem barSubItem4;
        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
        private System.Windows.Forms.ToolStripMenuItem tabCloseCurrent;
        private System.Windows.Forms.ToolStripMenuItem tabCloseAll;
    }
}
DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -5,7 +5,6 @@
using System.Data;
using System.Drawing;
using System.Reflection;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraBars;
using DevExpress.XtraBars.FluentDesignSystem;
@@ -19,6 +18,7 @@
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using static DevExpress.XtraReports.Design.XtraTabControl;
namespace Gs.DevApp.DevFrm
{
@@ -38,6 +38,44 @@
            FormClosing += FrmMain_FormClosing;
            barEasy.ItemClick += BarEasy_ItemClick;
            getTree();
            tab.MouseDown += Tab_MouseDown;
            tabCloseCurrent.Click += (s, e) =>
            {
                string name = tab.SelectedTabPage.Tooltip;
                RemoveTabPage(tab, name);
            };
            tabCloseAll.Click += (s, e) =>
            {
                string _name = tab.SelectedTabPage.Tooltip;
                int _tabCount = tab.TabPages.Count;
                for (int i = _tabCount; i >= 0; i--)
                {
                    try
                    {
                        string name = tab.TabPages[i].Tooltip;
                        if (name != _name)
                        {
                            RemoveTabPage(tab, name);
                        }
                    }
                    catch (Exception)
                    {
                    }
                }
            };
        }
        private void Tab_MouseDown(object sender, MouseEventArgs e)
        {
            if (e.Button == MouseButtons.Right)
            {
                tab.ContextMenuStrip = null;
                //TreeListHitInfo hInfo = treeList1.CalcHitInfo(new Point(e.X, e.Y));
                //TreeListNode node = hInfo.Node;
                //treeList1.FocusedNode = node;
                tab.ContextMenuStrip = contextMenuStrip1;
            }
        }
        private void BarEasy_ItemClick(object sender, ItemClickEventArgs e)
@@ -215,7 +253,9 @@
        /// <param name="e"></param>
        private void Tab_CloseButtonClick(object sender, EventArgs e)
        {
            RemoveTabPage(tab, e);
            var args = (ClosePageButtonEventArgs)e;
            var name = args.Page.Tooltip;
            RemoveTabPage(tab, name);
        }
        /// <summary>
@@ -251,16 +291,13 @@
        /// <param name="tabControl"></param>
        /// <param name="tabPageName"></param>
        /// <param name="e"></param>
        public void RemoveTabPage(XtraTabControl tabControl, EventArgs e)
        public void RemoveTabPage(XtraTabControl tabControl, string name)
        {
            if (TabPageDic.Count <= 1)
            {
                MsgHelper.Warning("请至少保留一个功能!");
                return;
            }
            var args = (ClosePageButtonEventArgs)e;
            var name = args.Page.Tooltip;
            foreach (XtraTabPage item in tabControl.TabPages)
                if (item.Name == name)
                {
DevApp/Gs.DevApp/DevFrm/FrmMain.resx
@@ -59,8 +59,7 @@
              : using a System.ComponentModel.TypeConverter
              : and then encoded with base64 encoding.
      -->
    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
                xmlns="">
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
        <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
        <xsd:element name="root" msdata:IsDataSet="true">
            <xsd:complexType>
@@ -68,11 +67,9 @@
                    <xsd:element name="metadata">
                        <xsd:complexType>
                            <xsd:sequence>
                                <xsd:element name="value" type="xsd:string"
                                             minOccurs="0"/>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
                            </xsd:sequence>
                            <xsd:attribute name="name" use="required"
                                           type="xsd:string"/>
              <xsd:attribute name="name" use="required" type="xsd:string" />
                            <xsd:attribute name="type" type="xsd:string"/>
                            <xsd:attribute name="mimetype" type="xsd:string"/>
                            <xsd:attribute ref="xml:space"/>
@@ -87,28 +84,21 @@
                    <xsd:element name="data">
                        <xsd:complexType>
                            <xsd:sequence>
                                <xsd:element name="value" type="xsd:string"
                                             minOccurs="0" msdata:Ordinal="1"/>
                                <xsd:element name="comment" type="xsd:string"
                                             minOccurs="0" msdata:Ordinal="2"/>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
                            </xsd:sequence>
                            <xsd:attribute name="name" type="xsd:string"
                                           use="required" msdata:Ordinal="1"/>
                            <xsd:attribute name="type" type="xsd:string"
                                           msdata:Ordinal="3"/>
                            <xsd:attribute name="mimetype" type="xsd:string"
                                           msdata:Ordinal="4"/>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
                            <xsd:attribute ref="xml:space"/>
                        </xsd:complexType>
                    </xsd:element>
                    <xsd:element name="resheader">
                        <xsd:complexType>
                            <xsd:sequence>
                                <xsd:element name="value" type="xsd:string"
                                             minOccurs="0" msdata:Ordinal="1"/>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                            </xsd:sequence>
                            <xsd:attribute name="name" type="xsd:string"
                                           use="required"/>
              <xsd:attribute name="name" type="xsd:string" use="required" />
                        </xsd:complexType>
                    </xsd:element>
                </xsd:choice>
@@ -122,24 +112,16 @@
        <value>2.0</value>
    </resheader>
    <resheader name="reader">
        <value>System.Resources.ResXResourceReader, System.Windows.Forms,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
        </value>
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    </resheader>
    <resheader name="writer">
        <value>System.Resources.ResXResourceWriter, System.Windows.Forms,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
        </value>
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    </resheader>
    <metadata name="statusStrip1.TrayLocation"
              type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
        <value>284, 17</value>
    </metadata>
    <assembly alias="System.Drawing"
              name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
    <data name="barButtonItem4.ImageOptions.Image"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="barButtonItem4.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
            dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAFVzZXI7UGVyc29uO0y2ImUAAAJ+
@@ -156,9 +138,7 @@
            zlqWRc+WRUXimGC604x2xBBLGV+BIO5PZXLOifNM7/5mxHJZsN86BZo6ADxq2AAAAABJRU5ErkJggg==
        </value>
    </data>
    <data name="barButtonItem4.ImageOptions.LargeImage"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="barButtonItem4.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
            dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAFVzZXI7UGVyc29uO0y2ImUAAAdm
@@ -196,11 +176,8 @@
            vZQFYPH32kj0TNFuStr9mX71Z/3smTItmWTL3wkKX6j8B54pnZmRU85dAAAAAElFTkSuQmCC
        </value>
    </data>
    <assembly alias="DevExpress.Data.v22.2"
              name="DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a"/>
    <data name="barSubItem2.ImageOptions.SvgImage"
          type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <assembly alias="DevExpress.Data.v22.2" name="DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="barSubItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi4z
            LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -223,9 +200,7 @@
            LjR6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw==
        </value>
    </data>
    <data name="barAbout.ImageOptions.Image"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="barAbout.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
            dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAOdEVYdFRpdGxlAERldGFpbHM7NJb/TAAAAxBJREFU
@@ -245,9 +220,7 @@
            4c3590llwYcAAAAASUVORK5CYII=
        </value>
    </data>
    <data name="barAbout.ImageOptions.LargeImage"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="barAbout.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
            dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAOdEVYdFRpdGxlAERldGFpbHM7NJb/TAAACa9JREFU
@@ -295,9 +268,7 @@
            nWBePMOJP74+Pw0AnP8AExOfJqp7hEIAAAAASUVORK5CYII=
        </value>
    </data>
    <data name="barMy.ImageOptions.Image"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="barMy.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
            dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAFVzZXI7UGVyc29uO0y2ImUAAAJ+
@@ -314,9 +285,7 @@
            zlqWRc+WRUXimGC604x2xBBLGV+BIO5PZXLOifNM7/5mxHJZsN86BZo6ADxq2AAAAABJRU5ErkJggg==
        </value>
    </data>
    <data name="barMy.ImageOptions.LargeImage"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="barMy.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
            dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAASdEVYdFRpdGxlAFVzZXI7UGVyc29uO0y2ImUAAAdm
@@ -354,9 +323,7 @@
            vZQFYPH32kj0TNFuStr9mX71Z/3smTItmWTL3wkKX6j8B54pnZmRU85dAAAAAElFTkSuQmCC
        </value>
    </data>
    <data name="barButtonItem5.ImageOptions.Image"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="barButtonItem5.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABR0RVh0VGl0
            bGUASW1hZ2U7SW1nO1NlbmSUgA8GAAACl0lEQVQ4T32QWU9TURRGG3wQHBPhtkCQMFR+j++mwIsMVhKM
@@ -373,9 +340,7 @@
            yn4UlHeZ9wyRViJxhDj2D47vgn0nEQk7ApXkDxuzc6jTlOltAAAAAElFTkSuQmCC
        </value>
    </data>
    <data name="barButtonItem5.ImageOptions.LargeImage"
          type="System.Drawing.Bitmap, System.Drawing"
          mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="barButtonItem5.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>
            iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABR0RVh0VGl0
            bGUASW1hZ2U7SW1nO1NlbmSUgA8GAAAHoUlEQVRYR8WW+1OU1x3Gibk0SavmIgh2vLeTNk00muT/SGfa
@@ -414,8 +379,10 @@
            I+mqZChHAAAAAElFTkSuQmCC
        </value>
    </data>
    <metadata name="fluentFormDefaultManager1.TrayLocation"
              type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="fluentFormDefaultManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
        <value>17, 17</value>
    </metadata>
  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>431, 17</value>
  </metadata>
</root>