From 97c16ca7943f36d1631a843df27628d5eada9eb2 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 07 三月 2025 16:09:20 +0800
Subject: [PATCH] 受托
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 00da511..a108e5e 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;
}
@@ -1042,7 +1042,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 +1084,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 +1104,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();
@@ -1113,12 +1125,17 @@
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();
- List<DevExpress.XtraEditors.SplitContainerControl> spcList=getSpcList();
- JArray array = new JArray();
+ List<DevExpress.XtraEditors.SplitContainerControl> spcList = getSpcList();
+ JArray array = new JArray();
var _obj = new
{
formPath = _formNamespace,
@@ -1173,7 +1190,7 @@
{
string controlId = john["controlId"].ToString();
string controlXml = john["controlXml"].ToString();
- // string splitterPosition = john["splitterPosition"].ToString();
+ // string splitterPosition = john["splitterPosition"].ToString();
byte[] byteArray = Encoding.UTF8.GetBytes(controlXml);
using (var stream = new MemoryStream(byteArray))
{
@@ -1182,8 +1199,14 @@
spt.Horizontal = false;
spt.Panel1.AutoScroll = false;
spt.Panel2.AutoScroll = false;
+ //spt.Panel1.MaximumSize = new System.Drawing.Size(spt.Panel1.Width, 100);
+ // spt.SplitterPosition = int.Parse( splitterPosition);
spt.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- // spt.SplitterPosition = int.Parse( splitterPosition);
+ if (spt.Name.Contains("Mx"))
+ spt.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel1;
+ else
+ spt.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+
}
}
}
--
Gitblit v1.9.3