From 247cc1010a4967a24d2d0eaeb092acc24c08ba96 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 05 四月 2025 14:25:12 +0800
Subject: [PATCH] fqc

---
 DevApp/Gs.DevApp/DevFrm/FrmMain.cs |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 5804dc2..206cd38 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -11,7 +11,6 @@
 using DevExpress.XtraBars.Navigation;
 using DevExpress.XtraTab;
 using DevExpress.XtraTab.ViewInfo;
-using Gs.DevApp.DevFrm.Sys;
 using Gs.DevApp.DevFrm.User;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
@@ -95,24 +94,26 @@
                     MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
                 }
             };
+            barMenu.ItemClick += (s, e) =>
+            {
+                Gs.DevApp.DevFrm.User.SysMenu frm = new SysMenu();
+                frm.ShowDialog();
+            };
+          //  tab.ContextMenuStrip = cms1;
         }
 
         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 = cms1;
+                cms1.Show(tab, e.Location);
             }
         }
 
         private void BarEasy_ItemClick(object sender, ItemClickEventArgs e)
         {
-            var frm = new EasyCode();
-            frm.ShowDialog();
+            //var frm = new EasyCode();
+            //frm.ShowDialog();
         }
 
         private void FrmMain_FormClosing(object sender, FormClosingEventArgs e)
@@ -185,7 +186,11 @@
             {
                 var strJson = UtilityHelper.HttpPost("",
                     "User/GetUserLoginInfo", JsonConvert.SerializeObject(_obj));
-                DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("鎷煎懡鍔犺浇涓紝璇风◢鍚�......", "鍙嬫儏鎻愮ず");
+                Size _size; string _caption; Color _color; Padding _pad;
+                (_size, _caption, _color, _pad) =Gs.DevApp.ToolBox.UtilityHelper.getLoading();
+                DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("鍔犺浇杩涘害:", _caption, _size);
+                wdf.BackColor = _color;
+                wdf.Padding = _pad;
                 var _job = JObject.Parse(strJson);
                 var rtnCode = _job["rtnCode"].ToString();
                 if (int.Parse(rtnCode) > 0)
@@ -220,6 +225,8 @@
                         foreach (var _dy2 in drItem)
                         {
                             var _itm = acrd.AddItem();
+                            _itm.Appearance.Hovered.Options.UseFont = true;
+                            _itm.Appearance.Normal.Options.UseFont = true;
                             _itm.ImageOptions.Image =
                                 UtilityHelper.GetImgFromResource(
                                     _dy2["icon"].ToString(), 2);
@@ -227,8 +234,6 @@
                             _itm.Style = ElementStyle.Item;
                             _itm.Text = _dy2["name"].ToString();
                             wdf.SetCaption("鍔犺浇杩涘害:" + _dy2["name"].ToString());
-                            _itm.Appearance.Normal.Font =
-                                new Font("Tahoma", 10F);
                             _itm.Tag = _dy2["formPath"].ToString(); //瀛樿矾寰勶紝绫诲悕
                             _itm.Click += _grp_Click;
                             _grp.Elements.Add(_itm);

--
Gitblit v1.9.3