From 3e2c9c862ebc0cd1c99947fb031dc2efdf7980a0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 28 二月 2025 17:39:46 +0800
Subject: [PATCH] 布局

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index aa42348..d1506cd 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -1047,10 +1047,28 @@
             Form parentForm = this.Parent as Form;
             List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
             //鏌ユ壘gridview,涓婚〉闈�
-            GridControl gcMain = parentForm.Controls.Find("gcMain", true).OfType<GridControl>().FirstOrDefault();
+            GridControl gcMain = parentForm.Controls.Find("gcMain1", true).OfType<GridControl>().FirstOrDefault();
             if (gcMain != null)
             {
                 GridView gv1 = gcMain.MainView as GridView;
+                if (gv1 != null)
+                {
+                    gvList.Add(gv1);
+                }
+            }
+            GridControl mx = parentForm.Controls.Find("gcMx1", true).OfType<GridControl>().FirstOrDefault();
+            if (mx != null)
+            {
+                GridView gv1 = mx.MainView as GridView;
+                if (gv1 != null)
+                {
+                    gvList.Add(gv1);
+                }
+            }
+            GridControl mx2 = parentForm.Controls.Find("gcMx2", true).OfType<GridControl>().FirstOrDefault();
+            if (mx2 != null)
+            {
+                GridView gv1 = mx2.MainView as GridView;
                 if (gv1 != null)
                 {
                     gvList.Add(gv1);
@@ -1066,12 +1084,7 @@
         {
             Form parentForm = this.Parent as Form;
             List<DevExpress.XtraLayout.LayoutControl> layList = new List<DevExpress.XtraLayout.LayoutControl>();
-            //DevExpress.XtraLayout.LayoutControl lay1 = parentForm.Controls.Find("lay1", true).OfType<DevExpress.XtraLayout.LayoutControl>().FirstOrDefault();
-            //if (lay1 != null)
-            //{
-            //    layList.Add(lay1);
-            //}
-            DevExpress.XtraLayout.LayoutControl lay2 = parentForm.Controls.Find("lay2", true).OfType<DevExpress.XtraLayout.LayoutControl>().FirstOrDefault();
+            DevExpress.XtraLayout.LayoutControl lay2 = parentForm.Controls.Find("layoutMx1", true).OfType<DevExpress.XtraLayout.LayoutControl>().FirstOrDefault();
             if (lay2 != null)
             {
                 layList.Add(lay2);
@@ -1087,8 +1100,8 @@
         {
             Form parentForm = this.Parent as Form;
             List<DevExpress.XtraEditors.SplitContainerControl> spcList = new List<DevExpress.XtraEditors.SplitContainerControl>();
-            DevExpress.XtraEditors.SplitContainerControl spc1 = parentForm.Controls.Find("spc1", true).OfType<DevExpress.XtraEditors.SplitContainerControl>().FirstOrDefault();
-            DevExpress.XtraEditors.SplitContainerControl spc2 = parentForm.Controls.Find("spc2", true).OfType<DevExpress.XtraEditors.SplitContainerControl>().FirstOrDefault();
+            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();
             if (spc1 != null)
             {
                 spcList.Add(spc1);
@@ -1129,6 +1142,8 @@
                     }
                     foreach (GridView gv in gvList)
                     {
+                       
+
                         JToken john = array.FirstOrDefault(t => t["controlId"].ToString().ToUpper() == gv.Name.ToString().Trim().ToUpper());
                         if (john != null)
                         {

--
Gitblit v1.9.3