From cba77e299f9bc1ec613d6153e9a11c328e45e0e4 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期六, 31 八月 2024 10:32:37 +0800
Subject: [PATCH] 无

---
 DevApp/Gs.DevApp/DevFrm/FrmMain.cs |   94 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 69 insertions(+), 25 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 8155287..270fdae 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -19,13 +19,30 @@
         public FrmMain()
         {
             InitializeComponent();
-            this.Text = this.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
+            this.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
+            tab.CloseButtonClick += Tab_CloseButtonClick;
             getTree();
+            tooLoading.Click += TooLoading_Click;
+        }
+
+        private void TooLoading_Click(object sender, EventArgs e)
+        {
+            int i = 100;
+            Gs.DevApp.UserControl.ShowDialogForm sdf = new Gs.DevApp.UserControl.ShowDialogForm("鎻愮ず", "", "璇疯�愬績绛夊�欙紝姝e湪鎿嶄綔涓紒");
+            for (int j = 0; j < i; j++) {
+                sdf.SetCaption("鎵ц杩涘害锛�" + (j) + "/" +i.ToString() + "锛�");
+            }
+           sdf.Close();
+        }
+
+        private void Tab_CloseButtonClick(object sender, EventArgs e)
+        {
+            RemoveTabPage(tab, e);
         }
 
         private void getTree()
         {
-            toolTime.Text = "鐧诲綍鏃堕棿"+ LoginInfoModel.CurrentUser.LoginTime;
+            toolTime.Text = "鐧诲綍鏃堕棿" + LoginInfoModel.CurrentUser.LoginTime;
             var _obj = new
             {
                 userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
@@ -34,7 +51,7 @@
             string strJson = "";
             try
             {
-                strJson = UtilityHelper.HttpPost("", "User/GetUserInfo", JsonConvert.SerializeObject(_obj));
+                strJson = UtilityHelper.HttpPost("", "User/GetUserLoginInfo", JsonConvert.SerializeObject(_obj));
                 JObject _job = JObject.Parse(strJson);
                 string rtnCode = _job["rtnCode"].ToString();
                 string rtnMsg = _job["rtnMsg"].ToString();
@@ -48,27 +65,39 @@
                 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
                 DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                 DataRow[] drGrp = dt.Select("upGuid is null");
+                int idx = 0;
                 foreach (DataRow _dy in drGrp)
                 {
                     AccordionControlElement _grp = this.acrd.AddGroup();
-                    _grp.ImageOptions.Image = UtilityHelper.GetImgFromResource(_dy["icon"].ToString(),1);
+                    _grp.ImageOptions.Image = UtilityHelper.GetImgFromResource(_dy["icon"].ToString(), 1);
                     _grp.Name = _dy["guid"].ToString();
                     _grp.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
                     _grp.Text = _dy["name"].ToString();
-                    _grp.Tag = _dy["fromPath"].ToString();
+                    _grp.Tag = _dy["formPath"].ToString();//瀛樿矾寰勶紝绫诲悕
                     _grp.Click += _grp_Click;
                     DataRow[] drItem = dt.Select("upGuid='" + _dy["guid"].ToString() + "'");
                     foreach (DataRow _dy2 in drItem)
                     {
                         AccordionControlElement _itm = this.acrd.AddItem();
-                        _itm.ImageOptions.Image = UtilityHelper.GetImgFromResource(_dy2["icon"].ToString(),2);
+                        _itm.ImageOptions.Image = UtilityHelper.GetImgFromResource(_dy2["icon"].ToString(), 2);
                         _itm.Name = _dy2["guid"].ToString();
                         _itm.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
                         _itm.Text = _dy2["name"].ToString();
                         _itm.Appearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
-                        _itm.Tag = _dy2["fromPath"].ToString();
+                        _itm.Tag = _dy2["formPath"].ToString();//瀛樿矾寰勶紝绫诲悕
                         _itm.Click += _grp_Click;
                         _grp.Elements.Add(_itm);
+                        //
+                        if (idx == 0)
+                        {
+                            string tabPageName = _itm.Name + "_page";
+                            string tabText = _itm.Text;//褰撳墠閫夐」鍗¢〉Text鏍囬
+                            string newFormName = _itm.Tag.ToString();//瀛樿矾寰勶紝绫诲悕
+                            Image imgIcon = _itm.Image;
+                            AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon);
+                        }
+                        idx++;
+                        //
                     };
                 }
             }
@@ -83,9 +112,9 @@
             AccordionControlElement _acd = (AccordionControlElement)sender;
             if (_acd.Elements.Count > 0) return;
             string tabPageName = _acd.Name + "_page";
-            string tabText = _acd.Text;
-            string newFormName = _acd.Tag.ToString();
-            Image imgIcon= _acd.Image;
+            string tabText = _acd.Text;//褰撳墠閫夐」鍗¢〉Text鏍囬
+            string newFormName = _acd.Tag.ToString();//瀛樿矾寰勶紝绫诲悕
+            Image imgIcon = _acd.Image;
             AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon);
         }
 
@@ -95,8 +124,8 @@
         /// <param name="tabControl">閫夐」鍗℃帶浠�</param>
         /// <param name="tabPageName">褰撴湡閫夐」鍗¢〉name鍚嶇О</param>
         /// <param name="tabText">褰撳墠閫夐」鍗¢〉Text鏍囬</param>
-        /// <param name="newFormName">褰撳墠閫夐」鍗′腑鐨勬柊绐椾綋</param>
-        public void AddTabpage(XtraTabControl tabControl, string tabPageName, string tabText, string newFormName,Image imgIcon)
+        /// <param name="newFormName">褰撳墠閫夐」鍗′腑鐨勬柊绐椾綋璺緞锛岀被鍚�</param>
+        public void AddTabpage(XtraTabControl tabControl, string tabPageName, string tabText, string newFormName, Image imgIcon)
         {
             if (IsTabpageExsit(tabControl, tabPageName))
             {
@@ -105,10 +134,13 @@
             XtraTabPage newPage = new XtraTabPage();
             newPage.Name = tabPageName;
             newPage.Text = tabText;
-            newPage.Tooltip = (tabText + ":" + tabPageName);
+            newPage.Tooltip = newPage.Name;
+            newPage.Appearance.Header.Font = (tab.Appearance.Font);
             newPage.ImageOptions.Image = imgIcon;
-            if (AddNewForm(newFormName) != null) {
-                newPage.Controls.Add(AddNewForm(newFormName));
+            Form fm = AddNewForm(newFormName);
+            if (fm != null)
+            {
+                newPage.Controls.Add(fm);
                 tabControl.TabPages.Add(newPage);
                 TabPageDic.Add(tabPageName, newPage);
                 tabControl.SelectedTabPage = newPage;
@@ -123,6 +155,11 @@
         /// <param name="e"></param>
         public void RemoveTabPage(XtraTabControl tabControl, EventArgs e)
         {
+            if (TabPageDic.Count <= 1)
+            {
+                ToolBox.MsgHelper.Warning("璇疯嚦灏戜繚鐣欎竴涓姛鑳斤紒");
+                return;
+            }
             DevExpress.XtraTab.ViewInfo.ClosePageButtonEventArgs args = (DevExpress.XtraTab.ViewInfo.ClosePageButtonEventArgs)e;
             string name = args.Page.Tooltip;
             foreach (XtraTabPage item in tabControl.TabPages)
@@ -162,19 +199,26 @@
         /// <param name="form">绐椾綋鍚嶇О</param>
         private Form AddNewForm(string formName)
         {
-            Form newForm = (Form)Assembly.GetExecutingAssembly().CreateInstance(formName);
-            if (newForm == null)
+            try
+            {
+                Form newForm = (Form)Assembly.GetExecutingAssembly().CreateInstance(formName);
+                if (newForm == null)
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒");
+                    return null;
+                }
+                newForm.FormBorderStyle = FormBorderStyle.None;
+                newForm.TopLevel = false;
+                newForm.ControlBox = false;
+                newForm.Dock = DockStyle.Fill;
+                newForm.Visible = true;
+                return newForm;
+            }
+            catch (Exception)
             {
                 Gs.DevApp.ToolBox.MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒");
-                return null;
             }
-            newForm.FormBorderStyle = FormBorderStyle.None;
-            newForm.TopLevel = false;
-            //newForm.Parent = ((XtraTabControl)sender).SelectedTabPage;
-            newForm.ControlBox = false;
-            newForm.Dock = DockStyle.Fill;
-            newForm.Visible = true;
-            return newForm;
+            return null;
         }
     }
 }

--
Gitblit v1.9.3