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 | 92 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 84 insertions(+), 8 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 45ece90..d5c256c 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,13 +58,16 @@
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)
- if (!string.IsNullOrEmpty(item.Caption) && item.Caption != "淇濆瓨" && item.Caption != "鍒锋柊")
+ if (!string.IsNullOrEmpty(item.Caption) && item.Caption != "淇濆瓨" && item.Caption != "鍒锋柊" && item.Caption != "甯姪" && item.Caption != "淇濆瓨鐗堥潰" && item.Caption != "鍙栨秷")
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);
@@ -532,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);
@@ -557,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);
@@ -583,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);
@@ -660,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)
{
@@ -669,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)
@@ -714,6 +730,20 @@
JsonConvert.SerializeObject(_obj));
var dd = UtilityHelper.ReturnToList(strReturn);
var dt = dd.rtnData;
+
+ if (!string.IsNullOrEmpty(defaultActions) && defaultActions.Contains("鏌ヨ"))
+ {
+ if (dt == null || dt.Rows.Count <= 0)
+ {
+ dt.Columns.Add("guid", typeof(string));
+ dt.Columns.Add("name", typeof(string));
+ }
+ DataRow newRow = dt.NewRow();
+ newRow["guid"] = Guid.NewGuid().ToString();
+ newRow["name"] = "鏌ヨ";
+ dt.Rows.Add(newRow);
+ }
+
var _enabledList = new List<string>();
foreach (BarItem item in barManager1.Items)
{
@@ -797,6 +827,7 @@
_enabledList.Add(btnLoad.Name);
_enabledList.Add(btnHelp.Name);
_enabledList.Add(btnLayout.Name);
+ _enabledList.Add(btnFont.Name);
_enabledBtn(_enabledList);
}
catch (Exception ex)
@@ -839,7 +870,7 @@
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- return true;
+ return false;
}
return false;
}
@@ -1032,6 +1063,8 @@
/// 褰撳墠鐘舵��
/// </summary>
public string currentAction { get; set; }
+
+ public string defaultActions { get; set; }
#endregion
@@ -1042,7 +1075,11 @@
/// <returns></returns>
private List<DevExpress.XtraGrid.Views.Grid.GridView> getGvList()
{
- Form parentForm = this.Parent as Form;
+ Form parentForm;
+ if (this.Parent is Form)
+ parentForm = this.Parent as Form;
+ else
+ parentForm = this.Parent.Parent as Form;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
//鏌ユ壘gridview,涓婚〉闈�
GridControl gcMain = parentForm.Controls.Find("gcMain1", true).OfType<GridControl>().FirstOrDefault();
@@ -1080,7 +1117,11 @@
/// <returns></returns>
private List<DevExpress.XtraLayout.LayoutControl> getLayList()
{
- Form parentForm = this.Parent as Form;
+ Form parentForm;
+ if (this.Parent is Form)
+ parentForm = this.Parent as Form;
+ else
+ parentForm = this.Parent.Parent as Form;
List<DevExpress.XtraLayout.LayoutControl> layList = new List<DevExpress.XtraLayout.LayoutControl>();
DevExpress.XtraLayout.LayoutControl lay2 = parentForm.Controls.Find("layoutMx1", true).OfType<DevExpress.XtraLayout.LayoutControl>().FirstOrDefault();
if (lay2 != null)
@@ -1096,7 +1137,11 @@
/// <returns></returns>
private List<DevExpress.XtraEditors.SplitContainerControl> getSpcList()
{
- Form parentForm = this.Parent as Form;
+ Form parentForm;
+ if (this.Parent is Form)
+ parentForm = this.Parent as Form;
+ else
+ parentForm = this.Parent.Parent as Form;
List<DevExpress.XtraEditors.SplitContainerControl> spcList = new List<DevExpress.XtraEditors.SplitContainerControl>();
DevExpress.XtraEditors.SplitContainerControl spc1 = parentForm.Controls.Find("split1", true).OfType<DevExpress.XtraEditors.SplitContainerControl>().FirstOrDefault();
DevExpress.XtraEditors.SplitContainerControl spc2 = parentForm.Controls.Find("splitMx1", true).OfType<DevExpress.XtraEditors.SplitContainerControl>().FirstOrDefault();
@@ -1111,9 +1156,17 @@
return spcList;
}
+ /// <summary>
+ /// 璇诲彇xml閰嶇疆锛岀洰鍓嶉厤缃甮cMain1,layoutMx1,鍔犳煡璇㈡潯浠�
+ /// </summary>
public void getXmlConfig()
{
- Form parentForm = this.Parent as Form;
+ Form parentForm;
+ if (this.Parent is Form)
+ parentForm = this.Parent as Form;
+ else
+ parentForm = this.Parent.Parent as Form;
+
string _formNamespace = parentForm.GetType().FullName;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = getGvList();
List<DevExpress.XtraLayout.LayoutControl> layList = getLayList();
@@ -1179,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);
@@ -1192,6 +1245,29 @@
}
}
+ //璁剧疆鏌ヨ鏉′欢beg
+ GridControl gcMain = parentForm.Controls.Find("gcMain1", true).OfType<GridControl>().FirstOrDefault();
+ if (gcMain != null)
+ {
+ GridView gv1 = gcMain.MainView as GridView;
+ if (gv1 != null)
+ {
+ foreach (var a in _job["rtnData"]["list2"])
+ {
+ 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;
+ }
+ }
+ }
+ }
+ //璁剧疆鏌ヨ鏉′欢end
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
--
Gitblit v1.9.3