From aa77240aba2a41a9a653f6400ed1ff54310f92d4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 03 四月 2025 13:03:31 +0800
Subject: [PATCH] 字典
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 65d36f0..9c514a6 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -9,9 +9,11 @@
using System.Windows.Forms;
using DevExpress.XtraBars;
using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.TextEditController;
using DevExpress.XtraGrid;
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;
@@ -56,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)
@@ -63,6 +66,8 @@
lst.Add(item.Caption);
actions = lst;
}
+
+
/// <summary>
@@ -490,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);
@@ -500,7 +506,6 @@
if (btnEscClick != null) btnEscClick(this, e);
}
}
-
private void BtnSave_ItemClick(object sender, ItemClickEventArgs e)
@@ -532,6 +537,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);
@@ -557,6 +563,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 +590,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 +619,6 @@
{
if (btnWgClick != null) btnWgClick(this, e);
}
-
-
private void BtnbZhongTai_ItemClick(object sender, ItemClickEventArgs e)
{
@@ -660,6 +666,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)
{
@@ -669,7 +677,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)
{
@@ -811,6 +823,7 @@
_enabledList.Add(btnLoad.Name);
_enabledList.Add(btnHelp.Name);
_enabledList.Add(btnLayout.Name);
+ _enabledList.Add(btnFont.Name);
_enabledBtn(_enabledList);
}
catch (Exception ex)
@@ -1215,7 +1228,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);
@@ -1239,11 +1252,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