From ca4c6a573fa25869ea93bd3bcb0345a06f29d0ef Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 27 三月 2025 15:15:30 +0800
Subject: [PATCH] 受托
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index d2b3ada..5479d9c 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -59,7 +59,7 @@
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;
}
@@ -660,6 +660,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)
{
@@ -714,6 +716,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)
{
@@ -839,7 +855,7 @@
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- return true;
+ return false;
}
return false;
}
@@ -1032,6 +1048,8 @@
/// 褰撳墠鐘舵��
/// </summary>
public string currentAction { get; set; }
+
+ public string defaultActions { get; set; }
#endregion
@@ -1123,6 +1141,9 @@
return spcList;
}
+ /// <summary>
+ /// 璇诲彇xml閰嶇疆锛岀洰鍓嶉厤缃甮cMain1,layoutMx1,鍔犳煡璇㈡潯浠�
+ /// </summary>
public void getXmlConfig()
{
Form parentForm;
@@ -1209,6 +1230,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