From a44e14cc44c5beea13cfa0accd2237c3a8a07202 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 01 四月 2025 16:56:35 +0800
Subject: [PATCH] 现场修理

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 45f9da6..d5c256c 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -7,13 +7,13 @@
 using System.Net;
 using System.Text;
 using System.Windows.Forms;
-using DevExpress.Utils.Text.Internal;
 using DevExpress.XtraBars;
 using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.TextEditController;
 using DevExpress.XtraGrid;
-using DevExpress.XtraGrid.Columns;
 using DevExpress.XtraGrid.Views.Grid;
 using DevExpress.XtraLayout;
+using DevExpress.XtraRichEdit.Export.Rtf;
 using Gs.DevApp.DevFrm.Rpt;
 using Gs.DevApp.DevFrm.Sys;
 using Gs.DevApp.Entity;
@@ -58,6 +58,7 @@
             btnWg.ItemClick += BtnWg_ItemClick;
             btnHelp.ItemClick += BtnHelp_ItemClick;
             btnLayout.ItemClick += BtnLayout_ItemClick;
+            btnFont.ItemClick += BtnFont_ItemClick;
             var lst = new List<string>();
             foreach (BarItem item in barManager1.Items)
                 if (item is BarLargeButtonItem largeButtonItem)
@@ -65,6 +66,8 @@
                         lst.Add(item.Caption);
             actions = lst;
         }
+
+     
 
 
         /// <summary>
@@ -492,6 +495,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);
@@ -534,6 +538,7 @@
                     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);
@@ -559,6 +564,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);
@@ -585,6 +591,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);
@@ -662,6 +669,8 @@
         private void BtnLayout_ItemClick(object sender, ItemClickEventArgs ee)
         {
             Form parentForm = this.Parent as Form;
+            if (parentForm == null)
+                parentForm = this.Parent.Parent as Form;
             string _formNamespace = parentForm.GetType().FullName;
             if (parentForm != null)
             {
@@ -671,8 +680,13 @@
                 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)
         {
             foreach (BarItem item in barManager1.Items)
@@ -813,6 +827,7 @@
                 _enabledList.Add(btnLoad.Name);
                 _enabledList.Add(btnHelp.Name);
                 _enabledList.Add(btnLayout.Name);
+                _enabledList.Add(btnFont.Name);
                 _enabledBtn(_enabledList);
             }
             catch (Exception ex)
@@ -1217,7 +1232,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);
@@ -1241,11 +1256,13 @@
                             {
                                 string _gvColName = a["gvColName"].ToString();
                                 string _sqlField = a["sqlField"].ToString();
+                                string _sqlFieldType = a["sqlFieldType"].ToString();
                                 var column = gv1.Columns.Cast<DevExpress.XtraGrid.Columns.GridColumn>()
                                                 .FirstOrDefault(c => c.Name == _gvColName);
                                 if (column != null)
                                 {
                                     column.Tag = _sqlField;
+                                    column.UnboundExpression = _sqlFieldType;
                                 }
                             }
                         }

--
Gitblit v1.9.3