From 72b1cd95bc6b8e4956e7f6b8ea1968d0db1a969b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 26 四月 2025 13:12:21 +0800
Subject: [PATCH] 巡检

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs |   56 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 5479d9c..95227ab 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -1,13 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Windows.Forms;
-using DevExpress.XtraBars;
+锘縰sing DevExpress.XtraBars;
 using DevExpress.XtraEditors;
 using DevExpress.XtraGrid;
 using DevExpress.XtraGrid.Views.Grid;
@@ -18,6 +9,15 @@
 using Gs.DevApp.ToolBox;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Windows.Forms;
 
 namespace Gs.DevApp.UserControl
 {
@@ -56,6 +56,8 @@
             btnWg.ItemClick += BtnWg_ItemClick;
             btnHelp.ItemClick += BtnHelp_ItemClick;
             btnLayout.ItemClick += BtnLayout_ItemClick;
+            btnFont.ItemClick += BtnFont_ItemClick;
+            btnShouJian.ItemClick += BtnShouJian_ItemClick;
             var lst = new List<string>();
             foreach (BarItem item in barManager1.Items)
                 if (item is BarLargeButtonItem largeButtonItem)
@@ -64,7 +66,7 @@
             actions = lst;
         }
 
-
+     
         /// <summary>
         ///     鍒濆鍖栨寜閽姸鎬�
         /// </summary>
@@ -326,6 +328,13 @@
             //};
             //_ckService(1.ToString());
         }
+        private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            if (btnShouJianClick != null)
+                btnShouJianClick(this, e);
+            else
+                return;
+        }
 
         private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
         {
@@ -490,6 +499,7 @@
                 lst.Add(btnPiZhun.Name);
                 lst.Add(btnHelp.Name);
                 lst.Add(btnLayout.Name);
+                lst.Add(btnFont.Name);
                 lst.Add(btnBoHui.Name);
                 lst.Add(btnTzbl.Name);
                 lst.Add(btnKg.Name);
@@ -502,7 +512,6 @@
         }
 
 
-
         private void BtnSave_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (btnSaveClick != null)
@@ -513,7 +522,7 @@
                     var lst = new List<string>();
                     lst.Add(btnAdd.Name);
                     lst.Add(btnEdit.Name);
-                    lst.Add(btnEsc.Name);
+                    //lst.Add(btnEsc.Name);
                     lst.Add(btnChk.Name);
                     lst.Add(btnFchk.Name);
                     lst.Add(btnDel.Name);
@@ -532,10 +541,13 @@
                     lst.Add(btnZhongTai.Name);
                     lst.Add(btnHelp.Name);
                     lst.Add(btnLayout.Name);
+                    lst.Add(btnFont.Name);
                     lst.Add(btnLoad.Name);
                     lst.Add(btnTzbl.Name);
                     _enabledBtn(lst);
                 }
+
+
             }
         }
 
@@ -557,6 +569,7 @@
             lst.Add(btnEsc.Name);
             lst.Add(btnHelp.Name);
             lst.Add(btnLayout.Name);
+            lst.Add(btnFont.Name);
             _enabledBtn(lst);
             this.currentAction = "edit";
             if (btnEdtClick != null) btnEdtClick(this, e);
@@ -583,6 +596,7 @@
             lst.Add(btnEsc.Name);
             lst.Add(btnHelp.Name);
             lst.Add(btnLayout.Name);
+            lst.Add(btnFont.Name);
             _enabledBtn(lst);
             this.currentAction = "add";
             if (btnAddClick != null) btnAddClick(this, e);
@@ -611,8 +625,6 @@
         {
             if (btnWgClick != null) btnWgClick(this, e);
         }
-
-
 
         private void BtnbZhongTai_ItemClick(object sender, ItemClickEventArgs e)
         {
@@ -671,7 +683,11 @@
                 Gs.DevApp.UserControl.showLayOut DevFrm = new showLayOut(_formNamespace, gvList, layList, spcList);
                 DevFrm.ShowDialog();
             }
-            //if (btnLayoutClick != null) btnLayoutClick(this, ee);
+        }
+        private void BtnFont_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            Gs.DevApp.UserControl.SelectFont DevFrm = new SelectFont();
+            DevFrm.ShowDialog();
         }
         private void _enabledBtn(List<string> lstBtn)
         {
@@ -813,6 +829,7 @@
                 _enabledList.Add(btnLoad.Name);
                 _enabledList.Add(btnHelp.Name);
                 _enabledList.Add(btnLayout.Name);
+                _enabledList.Add(btnFont.Name);
                 _enabledBtn(_enabledList);
             }
             catch (Exception ex)
@@ -1005,7 +1022,10 @@
         /// </summary>
         public event EventHandler btnWgClick;
 
-
+        /// <summary>
+        /// 鐢熸垚棣栨
+        /// </summary>
+        public event EventHandler btnShouJianClick;
         //public event EventHandler btnLayoutClick;
 
         #endregion
@@ -1217,7 +1237,7 @@
                             {
                                 spt.RestoreLayoutFromStream(stream);
                             }
-                            spt.Horizontal = false;
+                            // spt.Horizontal = false;
                             spt.Panel1.AutoScroll = false;
                             spt.Panel2.AutoScroll = false;
                             //spt.Panel1.MaximumSize = new System.Drawing.Size(spt.Panel1.Width, 100);

--
Gitblit v1.9.3