lu
2025-03-03 da93f01e79ae4e4cd34ef728396f43a055837ee3
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -9,11 +9,9 @@
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 Gs.DevApp.DevFrm.QC.Models;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
using Gs.DevApp.Entity;
@@ -1119,8 +1117,8 @@
            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,
@@ -1142,8 +1140,6 @@
                    }
                    foreach (GridView gv in gvList)
                    {
                        JToken john = array.FirstOrDefault(t => t["controlId"].ToString().ToUpper() == gv.Name.ToString().Trim().ToUpper());
                        if (john != null)
                        {
@@ -1177,11 +1173,23 @@
                        {
                            string controlId = john["controlId"].ToString();
                            string controlXml = john["controlXml"].ToString();
                            // string splitterPosition = john["splitterPosition"].ToString();
                            byte[] byteArray = Encoding.UTF8.GetBytes(controlXml);
                            using (var stream = new MemoryStream(byteArray))
                            {
                                spt.RestoreLayoutFromStream(stream);
                            }
                            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;
                            if (spt.Name.Contains("Mx"))
                                spt.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel1;
                            else
                                spt.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
                        }
                    }
                }