From 9ce8cb1ee053fb5ad4b51d724a5736e0e27ff0aa Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 23 五月 2025 09:10:52 +0800
Subject: [PATCH] 仓库

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs |  372 +++++++++++++++++++++++++++++++++-------------------
 1 files changed, 233 insertions(+), 139 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index d1506cd..2c510ab 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -1,4 +1,15 @@
-锘縰sing System;
+锘縰sing DevExpress.XtraBars;
+using DevExpress.XtraEditors;
+using DevExpress.XtraGrid;
+using DevExpress.XtraGrid.Views.Grid;
+using DevExpress.XtraLayout;
+using Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.DevFrm.Sys;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Data;
@@ -7,19 +18,6 @@
 using System.Net;
 using System.Text;
 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;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace Gs.DevApp.UserControl
 {
@@ -58,10 +56,17 @@
             btnWg.ItemClick += BtnWg_ItemClick;
             btnHelp.ItemClick += BtnHelp_ItemClick;
             btnLayout.ItemClick += BtnLayout_ItemClick;
+            btnFont.ItemClick += BtnFont_ItemClick;
+            btnShouJian.ItemClick += BtnShouJian_ItemClick;
+            btnCaiWuChk.ItemClick += BtnCaiWuChk_ItemClick;
+            btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick;
+            btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
+            btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
+            btnOa.ItemClick += BtnOa_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;
         }
@@ -136,63 +141,41 @@
         {
             if (btnCaiGouFchkClick != null)
                 btnCaiGouFchkClick(this, e);
-            //if (string.IsNullOrEmpty(guidKey))
-            //{
-            //    MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-            //    return;
-            //}
-
-            //if (string.IsNullOrEmpty(chkParameter))
-            //{
-            //    MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
-            //    return;
-            //}
-
-            //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘鍙嶅鏍稿悧锛�"))
-            //    return;
-            //_ckService("-2");
         }
 
         private void BtnCaiGouChk_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (btnCaiGouChkClick != null)
                 btnCaiGouChkClick(this, e);
-            //if (string.IsNullOrEmpty(guidKey))
-            //{
-            //    MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-            //    return;
-            //}
+        }
 
-            //if (string.IsNullOrEmpty(chkParameter))
-            //{
-            //    MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
-            //    return;
-            //}
+        private void BtnCaiWuFchk_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            if (btnCaiWuFchkClick != null)
+                btnCaiWuFchkClick(this, e);
+        }
 
-            //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘瀹℃牳鍚楋紵"))
-            //    return;
-            //_ckService("2");
+        private void BtnCaiWuChk_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            if (btnCaiWuChkClick != null)
+                btnCaiWuChkClick(this, e);
+        }
+        private void BtnShouHouFchk_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            if (btnShouHouFchkClick != null)
+                btnShouHouFchkClick(this, e);
+        }
+
+        private void BtnShouHouChk_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            if (btnShouHouChkClick != null)
+                btnShouHouChkClick(this, e);
         }
 
         private void BtnZhiLiangFchk_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (btnZhiLiangFchkClick != null)
                 btnZhiLiangFchkClick(this, e);
-            //if (string.IsNullOrEmpty(guidKey))
-            //{
-            //    MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-            //    return;
-            //}
-
-            //if (string.IsNullOrEmpty(chkParameter))
-            //{
-            //    MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
-            //    return;
-            //}
-
-            //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺鍙嶅鏍稿悧锛�"))
-            //    return;
-            //_ckService("-3");
         }
 
         private void BtnZhiLiangChk_ItemClick(object sender, ItemClickEventArgs e)
@@ -281,21 +264,6 @@
                 btnFjianYanClick(this, e);
             else
                 return;
-            //if (string.IsNullOrEmpty(guidKey))
-            //{
-            //    MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-            //    return;
-            //}
-
-            //if (string.IsNullOrEmpty(chkParameter))
-            //{
-            //    MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
-            //    return;
-            //}
-
-            //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎾ゅ洖妫�楠屽悧锛�"))
-            //    return;
-            //_ckService(0.ToString());
         }
 
         private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e)
@@ -306,27 +274,13 @@
                 btnJianYanClick(this, e);
             else
                 return;
-
-            //if (string.IsNullOrEmpty(guidKey))
-            //{
-            //    MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-            //    return;
-            //}
-
-            //if (string.IsNullOrEmpty(chkParameter))
-            //{
-            //    MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
-            //    return;
-            //}
-
-            //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎻愪氦妫�楠屽悧锛�"))
-            //    return;
-            //var _obj = new
-            //{
-            //    guid = guidKey,
-            //    parameter = chkParameter
-            //};
-            //_ckService(1.ToString());
+        }
+        private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            if (btnShouJianClick != null)
+                btnShouJianClick(this, e);
+            else
+                return;
         }
 
         private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
@@ -336,38 +290,42 @@
                 MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎叆鏈嶅姟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
                 return;
             }
-
-            var openFileDialog = new OpenFileDialog();
-            //openFileDialog.InitialDirectory = "c:\\";
-            openFileDialog.Filter = "鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*";
-            openFileDialog.Title = "閫夋嫨鏂囦欢";
-            var result = openFileDialog.ShowDialog();
-            if (result == DialogResult.OK)
+            //鐢ㄤ簬鍒ゆ柇iqc,ipqc棣栨锛宨pqc宸℃锛宖qc
+            string strType = "";
+            string strService = "";
+            if (xlsInService.Contains("&"))
             {
-                var WebApiUrl = ConfigurationManager.AppSettings["WebApiUrl"] +
-                                "Upload/UploadFile";
-                var strJson =
-                    await UtilityHelper.UploadFileAsync(openFileDialog
-                        .FileName);
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                string filePath = _rtn.rtnData["filePath"].ToString();
-                if (_rtn.rtnCode > 0)
-                {
-                    var _obj = filePath;
-                    try
-                    {
-                        strJson = UtilityHelper.HttpPost("",
-                            "XlsInOut/" + xlsInService,
-                            JsonConvert.SerializeObject(_obj));
-                        _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                        MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
-                    }
-                    catch (Exception ex)
-                    {
-                        MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                    }
-                }
+                strType = xlsInService.Split('&')[1];
+                strService = xlsInService.Split('&')[0];
             }
+            else {
+                 strType = "";
+                 strService = xlsInService;
+            }
+            //杩欐槸涓�涓殢鏈哄�硷紝灏嗕細琚綋浣滅埗浜瞘uid瀛樺埌file琛ㄤ腑锛屾湇鍔$鏍规嵁杩欎釜guid璇诲彇鐩稿簲鐨勬枃浠�
+            string upGuid = Guid.NewGuid().ToString();
+            Gs.DevApp.UserControl.ShowUp frm = new Gs.DevApp.UserControl.ShowUp(upGuid);
+            frm.UpdateParent += (ss, ee) =>
+            {
+                var _obj = new
+                {
+                    tmpGuid = upGuid,
+                    strType = strType,
+                };
+                try
+                {
+                    string strJson = UtilityHelper.HttpPost("",
+                          "XlsInOut/" + strService,
+                          JsonConvert.SerializeObject(_obj));
+                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                    MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+                catch (Exception ex)
+                {
+                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                }
+            };
+            frm.ShowDialog();
         }
 
         private void BtnOut_ItemClick(object sender, ItemClickEventArgs e)
@@ -470,6 +428,16 @@
             if (btnQueryClick != null) btnQueryClick(this, e);
         }
 
+        private void BtnOa_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            if (btnOaClick != null) btnOaClick(this, e);
+        }
+
+        /// <summary>
+        /// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (MsgHelper.AskQuestion("纭畾瑕佽鍙栨秷鍚�?"))
@@ -492,11 +460,18 @@
                 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);
                 lst.Add(btnWg.Name);
                 lst.Add(btnZhongTai.Name);
+                lst.Add(btnCaiWuChk.Name);
+                lst.Add(btnCaiWuFchk.Name);
+                lst.Add(btnCaiGouChk.Name);
+                lst.Add(btnCaiGouFchk.Name);
+                lst.Add(btnShouHouChk.Name);
+                lst.Add(btnShouHouFchk.Name);
                 _enabledBtn(lst);
                 this.currentAction = "esc";
                 if (btnEscClick != null) btnEscClick(this, e);
@@ -504,7 +479,11 @@
         }
 
 
-
+        /// <summary>
+        /// 淇濆瓨鎴愬姛鍚庯紝杩樺師鎸夐挳鍙敤鎬�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void BtnSave_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (btnSaveClick != null)
@@ -515,7 +494,6 @@
                     var lst = new List<string>();
                     lst.Add(btnAdd.Name);
                     lst.Add(btnEdit.Name);
-                    lst.Add(btnEsc.Name);
                     lst.Add(btnChk.Name);
                     lst.Add(btnFchk.Name);
                     lst.Add(btnDel.Name);
@@ -534,10 +512,20 @@
                     lst.Add(btnZhongTai.Name);
                     lst.Add(btnHelp.Name);
                     lst.Add(btnLayout.Name);
+                    lst.Add(btnFont.Name);
                     lst.Add(btnLoad.Name);
                     lst.Add(btnTzbl.Name);
+                    lst.Add(btnZhongTai.Name);
+                    lst.Add(btnCaiWuChk.Name);
+                    lst.Add(btnCaiWuFchk.Name);
+                    lst.Add(btnCaiGouChk.Name);
+                    lst.Add(btnCaiGouFchk.Name);
+                    lst.Add(btnShouHouChk.Name);
+                    lst.Add(btnShouHouFchk.Name);
                     _enabledBtn(lst);
                 }
+
+
             }
         }
 
@@ -559,6 +547,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);
@@ -585,6 +574,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);
@@ -613,8 +603,6 @@
         {
             if (btnWgClick != null) btnWgClick(this, e);
         }
-
-
 
         private void BtnbZhongTai_ItemClick(object sender, ItemClickEventArgs e)
         {
@@ -662,6 +650,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)
             {
@@ -671,7 +661,11 @@
                 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)
         {
@@ -716,6 +710,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)
                 {
@@ -799,6 +807,7 @@
                 _enabledList.Add(btnLoad.Name);
                 _enabledList.Add(btnHelp.Name);
                 _enabledList.Add(btnLayout.Name);
+                _enabledList.Add(btnFont.Name);
                 _enabledBtn(_enabledList);
             }
             catch (Exception ex)
@@ -841,7 +850,7 @@
             catch (Exception ex)
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                return true;
+                return false;
             }
             return false;
         }
@@ -945,6 +954,29 @@
         /// </summary>
         public event EventHandler btnZhiLiangFchkClick;
 
+
+        /// <summary>
+        ///   璐㈠姟瀹℃牳
+        /// </summary>
+        public event EventHandler btnCaiWuChkClick;
+
+
+        /// <summary>
+        ///  璐㈠姟鍙嶅鏍�
+        /// </summary>
+        public event EventHandler btnCaiWuFchkClick;
+
+        /// <summary>
+        ///   鍞悗瀹℃牳
+        /// </summary>
+        public event EventHandler btnShouHouChkClick;
+
+
+        /// <summary>
+        /// 鍞悗鍙嶅鏍�
+        /// </summary>
+        public event EventHandler btnShouHouFchkClick;
+
         /// <summary>
         ///   椹冲洖
         /// </summary>
@@ -991,8 +1023,15 @@
         /// </summary>
         public event EventHandler btnWgClick;
 
+        /// <summary>
+        /// 鐢熸垚棣栨
+        /// </summary>
+        public event EventHandler btnShouJianClick;
 
-        //public event EventHandler btnLayoutClick;
+        /// <summary>
+        /// 鍙戦�丱A
+        /// </summary>
+        public event EventHandler btnOaClick;
 
         #endregion
 
@@ -1034,6 +1073,8 @@
         /// 褰撳墠鐘舵��
         /// </summary>
         public string currentAction { get; set; }
+
+        public string defaultActions { get; set; }
         #endregion
 
 
@@ -1044,7 +1085,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();
@@ -1082,7 +1127,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)
@@ -1098,7 +1147,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,14 +1166,22 @@
             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();
-            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 +1203,6 @@
                     }
                     foreach (GridView gv in gvList)
                     {
-                       
-
                         JToken john = array.FirstOrDefault(t => t["controlId"].ToString().ToUpper() == gv.Name.ToString().Trim().ToUpper());
                         if (john != null)
                         {
@@ -1177,13 +1236,48 @@
                         {
                             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;
+
                         }
                     }
+                    //璁剧疆鏌ヨ鏉′欢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