From c62c421dbbc5cbf9841a6a07f86a500c2b70b5e2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 07 九月 2025 10:58:49 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/FrmMain.cs |   46 +++++++++++++++++-----------------------------
 1 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index bd2360f..5603fcc 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -4,6 +4,7 @@
 using DevExpress.XtraEditors;
 using DevExpress.XtraEditors.TextEditController;
 using DevExpress.XtraLayout;
+using DevExpress.XtraRichEdit.Model;
 using DevExpress.XtraTab;
 using DevExpress.XtraTab.ViewInfo;
 using Gs.DevApp.DevFrm.User;
@@ -100,12 +101,17 @@
                     MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
                 }
             };
-
             #region 鍔犱笂搴曢儴鎻愰啋
+            tab.SelectedPageChanged += (s, e) => {
+                string _strForm = e.Page.Tag != null ? e.Page.Tag.ToString() : "鏈煡";
+                toolForm.Text = ("绐椾綋:" + _strForm);
+            };
             string _webApiUrl = ConfigurationManager.AppSettings["WebApiUrl"];
             string _autoUpdate = (ConfigurationManager.AppSettings["IsAutoUpdater"]);
             string _version = ConfigurationManager.AppSettings["Version"];
             toolVersion.Text = "褰撳墠鐗堟湰:" + _version + ",鏈嶅姟Api:" + _webApiUrl;
+            string _strFont = Gs.DevApp.Properties.Settings.Default.fontSizeName;
+            toolFont.Text = (",瀛椾綋:" + _strFont);
             #endregion
         }
         /// <summary>
@@ -225,6 +231,7 @@
                         _grp.Style = ElementStyle.Group;
                         _grp.Text = _dy["name"].ToString();
                         _grp.Tag = _dy["formPath"].ToString(); //瀛樿矾寰勶紝绫诲悕
+                        _grp.AccessibleDescription = _dy["layoutVersion"].ToString();//鐗堥潰
                         _grp.Click += _grp_Click;
                         if (gdx == 0)
                             _grp.Expanded = true;
@@ -242,6 +249,7 @@
                             _itm.Text = _dy2["name"].ToString();
                             wdf.SetCaption("鍔犺浇杩涘害:" + _dy2["name"].ToString());
                             _itm.Tag = _dy2["formPath"].ToString(); //瀛樿矾寰勶紝绫诲悕
+                            _itm.AccessibleDescription = _dy2["layoutVersion"].ToString();//鐗堥潰
                             _itm.Click += _grp_Click;
                             _grp.Elements.Add(_itm);
                             if (idx == 0 && tab.TabPages.Count <= 0)
@@ -250,8 +258,11 @@
                                 var tabText = _itm.Text; //褰撳墠閫夐」鍗￠〉Text鏍囬
                                 var newFormName = _itm.Tag.ToString(); //瀛樿矾寰勶紝绫诲悕
                                 var imgIcon = _itm.Image;
+                                var layoutVersion = _itm.AccessibleDescription;
                                 AddTabpage(tab, tabPageName, tabText,
-                                    newFormName, imgIcon);
+                                    newFormName, imgIcon,"", layoutVersion);
+                                //绗�0涓紝涓嶄細瑙﹀彂浜嬩欢锛屾墜鍔ㄨ缃�
+                                toolForm.Text = ("绐椾綋:" + newFormName+ ",鐗堥潰:" + layoutVersion);
                             }
                             idx++;
                         }
@@ -268,7 +279,6 @@
             }
             catch (Exception ex)
             {
-
                 MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
@@ -286,7 +296,8 @@
             var tabText = _acd.Text;
             var newFormName = _acd.Tag.ToString();
             var imgIcon = _acd.Image;
-            AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon);
+            string _strLayout = _acd.AccessibleDescription;
+            AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon, "", _strLayout);
         }
 
         /// <summary>
@@ -311,7 +322,7 @@
         /// <param name="imgIcon">褰撳墠閫夐」鍗′腑鐨勬柊绐椾綋璺緞锛岀被鍚�</param>
         /// <param name="InitializeVal">鍒濆鍊硷紝鐢ㄤ簬瀛愮獥浣撲腑璋冪敤鐖剁獥浣撶殑鍊�</param>
         public void AddTabpage(XtraTabControl tabControl, string tabPageName,
-            string tabText, string newFormName, Image imgIcon, string InitializeVal = "")
+            string tabText, string newFormName, Image imgIcon, string InitializeVal = "", string strLayout = "")
         {
             if (IsTabpageExsit(tabControl, tabPageName)) return;
             var newPage = new XtraTabPage();
@@ -320,6 +331,7 @@
             newPage.Tooltip = newPage.Name;
             newPage.Appearance.Header.Font = tab.Appearance.Font;
             newPage.ImageOptions.Image = imgIcon;
+            newPage.Tag = newFormName + ",鐗堥潰:" + strLayout;
             var fm = AddNewForm(newFormName, InitializeVal);
             if (fm != null)
             {
@@ -405,30 +417,6 @@
                 newForm.Dock = DockStyle.Fill;
                 newForm.Visible = true;
                 shiXian(newForm, formName, InitializeVal);
-                #region 鍔犱笂搴曢儴鎻愰啋
-                string _strFont = Gs.DevApp.Properties.Settings.Default.fontSizeName;
-                string _ver = "";
-                var _obj = new
-                {
-                    formPath = formName,
-                };
-                try
-                {
-                    string strJson = UtilityHelper.HttpPost("", "Fm/GetModelByVersion", JsonConvert.SerializeObject(_obj));
-                    ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                    if (_rtn.rtnCode > 0)
-                    {
-                        _ver = _rtn.rtnData;
-                    }
-                    else
-                        _ver = _rtn.rtnMsg;
-                }
-                catch (Exception ex)
-                {
-                    _ver = ex.Message;
-                }
-                toolFont.Text = (",瀛椾綋:" + _strFont + ",绐椾綋:" + formName + ",鐗堥潰:" + _ver);
-                #endregion
                 return newForm;
             }
             catch (Exception)

--
Gitblit v1.9.3