From 0d721e907c394d1e8694da7bb5669a2feeb2f202 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 14 六月 2025 08:05:34 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs |  729 +++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 483 insertions(+), 246 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index dee8dcd..b70ed3b 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -1,17 +1,21 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Net;
-using System.Windows.Forms;
-using DevExpress.XtraBars;
+锘縰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.Data;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
 
 namespace Gs.DevApp.UserControl
 {
@@ -33,15 +37,11 @@
             btnIn.ItemClick += BtnIn_ItemClick;
             btnChk.ItemClick += BtnChk_ItemClick;
             btnFchk.ItemClick += BtnFchk_ItemClick;
-            btnJianYan.ItemClick += BtnJianYan_ItemClick;
-            btnFjianYan.ItemClick += BtnFjianYan_ItemClick;
             btnPiZhun.ItemClick += BtnPiZhun_ItemClick;
+            btnFPiZhun.ItemClick += BtnFPiZhun_ItemClick;
             btnLog.ItemClick += BtnLog_ItemClick;
-            btnZhiLiangChk.ItemClick += BtnZhiLiangChk_ItemClick;
-            btnZhiLiangFchk.ItemClick += BtnZhiLiangFchk_ItemClick;
             btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
             btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
-            btnBoHui.ItemClick += BtnBoHui_ItemClick;
             btnJieAn.ItemClick += BtnJieAn_ItemClick;
             btnFjieAn.ItemClick += BtnFjieAn_ItemClick;
             btnTzbl.ItemClick += BtnTzbl_ItemClick;
@@ -49,15 +49,22 @@
             btnZhongTai.ItemClick += BtnbZhongTai_ItemClick;
             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;
             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;
         }
 
-
+    
         /// <summary>
         ///     鍒濆鍖栨寜閽姸鎬�
         /// </summary>
@@ -67,129 +74,81 @@
             if (Parent != null) getNamespace();
         }
 
-        private bool _isCk() {
+        private bool _isCk(int _type)
+        {
             Form parentForm = this.FindForm();
             if (parentForm != null)
             {
                 PictureBox specificControl = (PictureBox)parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
-                if (specificControl != null)
+                if (specificControl == null)
+                    return false;
+                if (specificControl.Tag == null)
+                    return false;
+                if (_type == 1)
                 {
-                    if (specificControl.Tag.ToString() == "宸插鏍�")
+                    if (specificControl != null)
                     {
-                        Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ュ崟鎹凡琚鏍革紝鏃犳硶杩涜鎿嶄綔锛�");
-                        return true;
+                        if (specificControl.Tag.ToString() == "宸插鏍�")
+                        {
+                            Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ュ崟鎹凡琚鏍革紝鏃犳硶杩涜鎿嶄綔锛�");
+                            return true;
+                        }
+                    }
+                }
+                if (_type == 0)
+                {
+                    if (specificControl != null)
+                    {
+                        if (specificControl.Tag.ToString() == "鏈鏍�")
+                        {
+                            Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ュ崟鎹湭琚鏍革紝鏃犳硶杩涜鎿嶄綔锛�");
+                            return true;
+                        }
                     }
                 }
             }
             return false;
         }
-
-        private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e)
-        {
-            if (btnBoHuiClick != null)
-                btnBoHuiClick(this, e);
-            //if (string.IsNullOrEmpty(guidKey))
-            //{
-            //    MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-            //    return;
-            //}
-
-            //if (string.IsNullOrEmpty(chkParameter))
-            //{
-            //    MsgHelper.ShowError("娌℃湁鎸囧畾椹冲洖鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
-            //    return;
-            //}
-
-            //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾椹冲洖閲嶆鍚楋紵"))
-            //    return;
-            //_ckService("5");
-        }
+       
         private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
         {
             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;
-            //}
-
-            //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閲囪喘瀹℃牳鍚楋紵"))
-            //    return;
-            //_ckService("2");
         }
 
-        private void BtnZhiLiangFchk_ItemClick(object sender, ItemClickEventArgs e)
+        private void BtnCaiWuFchk_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");
+            if (btnCaiWuFchkClick != null)
+                btnCaiWuFchkClick(this, e);
         }
 
-        private void BtnZhiLiangChk_ItemClick(object sender, ItemClickEventArgs e)
+        private void BtnCaiWuChk_ItemClick(object sender, ItemClickEventArgs e)
         {
-            if (btnZhiLiangChkClick != null)
-                btnZhiLiangChkClick(this, e);
-            //if (string.IsNullOrEmpty(guidKey))
-            //{
-            //    MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-            //    return;
-            //}
-
-            //if (string.IsNullOrEmpty(chkParameter))
-            //{
-            //    MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
-            //    return;
-            //}
-
-            //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺瀹℃牳鍚楋紵"))
-            //    return;
-            //_ckService("3");
+            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 BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
         {
+            bool bl = _isCk(0);
+            if (bl) return;
             if (btnFChkClick != null)
             {
                 btnFChkClick(this, e);
@@ -199,7 +158,7 @@
 
         private void BtnChk_ItemClick(object sender, ItemClickEventArgs e)
         {
-            bool bl = _isCk();
+            bool bl = _isCk(1);
             if (bl) return;
             if (btnChkClick != null)
             {
@@ -223,7 +182,6 @@
                 return;
         }
 
-
         private void BtnLog_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (btnLogClick != null) btnLogClick(this, e);
@@ -242,59 +200,17 @@
         {
             if (btnPiZhunClick != null) btnPiZhunClick(this, e);
         }
-
-        private void BtnFjianYan_ItemClick(object sender, ItemClickEventArgs e)
+        private void BtnFPiZhun_ItemClick(object sender, ItemClickEventArgs e)
         {
-            if (btnFjianYanClick != null)
-                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());
+            if (btnFPiZhunClick != null) btnFPiZhunClick(this, e);
         }
 
-        private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e)
+        private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e)
         {
-            bool bl = _isCk();
-            if (bl) return;
-            if (btnJianYanClick != null)
-                btnJianYanClick(this, e);
+            if (btnShouJianClick != null)
+                btnShouJianClick(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 async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
@@ -304,81 +220,87 @@
                 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)
         {
-            if (string.IsNullOrEmpty(this.xlsOutParameter))
-            {
-                ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎嚭瀛樺偍杩囩▼锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
-                return;
-            }
-            using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
-            {
-                folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
-                DialogResult dialogResult = folderBrowserDialog.ShowDialog();
-                if (dialogResult == DialogResult.OK)
-                {
-                    string _folder = folderBrowserDialog.SelectedPath;
-                    var _obj = new Gs.DevApp.Entity.XlsOutModel(this.xlsOutParameter);
-                    try
-                    {
-                        string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView", JsonConvert.SerializeObject(_obj));
-                        ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                        if (_rtn.rtnCode > 0)
-                        {
-                            string _file = _rtn.rtnData.fileUrl.ToString();
-                            string _folderName = _folder + "\\" + _file.Replace("down/", "");
-                            string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
-                            using (WebClient client = new WebClient())
-                            {
-                                client.DownloadFile(_url, _folderName);
-                            }
-                            ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
-                        }
-                        else
-                        {
-                            ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                    }
-                }
-            }
+            if (btnOutClick != null) btnOutClick(this, e);
+
+            //if (string.IsNullOrEmpty(this.xlsOutParameter))
+            //{
+            //    ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎嚭瀛樺偍杩囩▼锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+            //    return;
+            //}
+            //using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
+            //{
+            //    folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
+            //    DialogResult dialogResult = folderBrowserDialog.ShowDialog();
+            //    if (dialogResult == DialogResult.OK)
+            //    {
+            //        string _folder = folderBrowserDialog.SelectedPath;
+            //        var _obj = new Gs.DevApp.Entity.XlsOutModel(this.xlsOutParameter);
+            //        try
+            //        {
+            //            string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView", JsonConvert.SerializeObject(_obj));
+            //            ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+            //            if (_rtn.rtnCode > 0)
+            //            {
+            //                string _file = _rtn.rtnData.fileUrl.ToString();
+            //                string _folderName = _folder + "\\" + _file.Replace("down/", "");
+            //                string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
+            //                using (WebClient client = new WebClient())
+            //                {
+            //                    client.DownloadFile(_url, _folderName);
+            //                }
+            //                ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
+            //            }
+            //            else
+            //            {
+            //                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            //            }
+            //        }
+            //        catch (Exception ex)
+            //        {
+            //            ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            //        }
+            //    }
+            //}
         }
 
         private void BtnReport_ItemClick(object sender, ItemClickEventArgs e)
@@ -438,6 +360,11 @@
             if (btnQueryClick != null) btnQueryClick(this, e);
         }
 
+        /// <summary>
+        /// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (MsgHelper.AskQuestion("纭畾瑕佽鍙栨秷鍚�?"))
@@ -452,14 +379,24 @@
                 lst.Add(btnDesign.Name);
                 lst.Add(btnChk.Name);
                 lst.Add(btnFchk.Name);
-                lst.Add(btnJianYan.Name);
-                lst.Add(btnFjianYan.Name);
                 lst.Add(btnOut.Name);
                 lst.Add(btnIn.Name);
                 lst.Add(btnLog.Name);
                 lst.Add(btnPiZhun.Name);
+                lst.Add(btnFPiZhun.Name);
                 lst.Add(btnHelp.Name);
-                lst.Add(btnBoHui.Name);
+                lst.Add(btnLayout.Name);
+                lst.Add(btnFont.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);
@@ -467,7 +404,11 @@
         }
 
 
-
+        /// <summary>
+        /// 淇濆瓨鎴愬姛鍚庯紝杩樺師鎸夐挳鍙敤鎬�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void BtnSave_ItemClick(object sender, ItemClickEventArgs e)
         {
             if (btnSaveClick != null)
@@ -478,27 +419,34 @@
                     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);
-                    lst.Add(btnJianYan.Name);
-                    lst.Add(btnFjianYan.Name);
                     lst.Add(btnQuery.Name);
                     lst.Add(btnLog.Name);
-                    lst.Add(btnZhiLiangChk.Name);
-                    lst.Add(btnZhiLiangFchk.Name);
                     lst.Add(btnPiZhun.Name);
-                    lst.Add(btnBoHui.Name);
+                    lst.Add(btnFPiZhun.Name);
                     lst.Add(btnDesign.Name);
                     lst.Add(btnReport.Name);
                     lst.Add(btnKg.Name);
                     lst.Add(btnWg.Name);
                     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);
                 }
+
+
             }
         }
 
@@ -513,25 +461,28 @@
 
         private void BtnEdit_ItemClick(object sender, ItemClickEventArgs e)
         {
-            bool bl = _isCk();
+            bool bl = _isCk(1);
             if (bl) return;
             var lst = new List<string>();
             lst.Add(btnSave.Name);
             lst.Add(btnEsc.Name);
             lst.Add(btnHelp.Name);
+            lst.Add(btnLayout.Name);
+            lst.Add(btnFont.Name);
+            lst.Add(btnFont.Name);
+            lst.Add(btnLog.Name);
             _enabledBtn(lst);
             this.currentAction = "edit";
             if (btnEdtClick != null) btnEdtClick(this, e);
-           
         }
 
         private void BtnDel_ItemClick(object sender, ItemClickEventArgs e)
         {
-            bool bl = _isCk();
+            bool bl = _isCk(1);
             if (bl) return;
             if (btnDelClick != null) btnDelClick(this, e);
 
-           // btnEsc.Enabled = false;
+            // btnEsc.Enabled = false;
             this.currentAction = "";
         }
 
@@ -545,13 +496,15 @@
             lst.Add(btnSave.Name);
             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);
             Form parentForm = this.FindForm();
             if (parentForm != null)
             {
-                PictureBox specificControl =(PictureBox) parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
+                PictureBox specificControl = (PictureBox)parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
                 if (specificControl != null)
                 {
                     specificControl.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -573,8 +526,6 @@
         {
             if (btnWgClick != null) btnWgClick(this, e);
         }
-
-
 
         private void BtnbZhongTai_ItemClick(object sender, ItemClickEventArgs e)
         {
@@ -617,10 +568,28 @@
                 return;
             }
             Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtnJson.rtnMsg);
-
         }
 
-
+        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)
+            {
+                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = getGvList();
+                List<DevExpress.XtraLayout.LayoutControl> layList = getLayList();
+                List<DevExpress.XtraEditors.SplitContainerControl> spcList = getSpcList();
+                Gs.DevApp.UserControl.showLayOut DevFrm = new showLayOut(_formNamespace, gvList, layList, spcList);
+                DevFrm.ShowDialog();
+            }
+        }
+        private void BtnFont_ItemClick(object sender, ItemClickEventArgs e)
+        {
+            Gs.DevApp.UserControl.SelectFont DevFrm = new SelectFont();
+            DevFrm.ShowDialog();
+        }
         private void _enabledBtn(List<string> lstBtn)
         {
             foreach (BarItem item in barManager1.Items)
@@ -654,7 +623,6 @@
             var _obj = new
             {
                 userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
-                orgGuid = LoginInfoModel.CurrentUser.LoginOrgGuid,
                 formNamespace = _formNamespace
             };
             var strReturn = "";
@@ -665,6 +633,19 @@
                     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)
                 {
@@ -747,6 +728,8 @@
                 //榛樿鍚敤鐨勬寜閽�
                 _enabledList.Add(btnLoad.Name);
                 _enabledList.Add(btnHelp.Name);
+                _enabledList.Add(btnLayout.Name);
+                _enabledList.Add(btnFont.Name);
                 _enabledBtn(_enabledList);
             }
             catch (Exception ex)
@@ -789,7 +772,7 @@
             catch (Exception ex)
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                return true;
+                return false;
             }
             return false;
         }
@@ -865,6 +848,11 @@
         /// </summary>
         public event EventHandler btnPiZhunClick;
 
+        /// <summary>
+        ///    鎵瑰噯
+        /// </summary>
+        public event EventHandler btnFPiZhunClick;
+
 
         /// <summary>
         ///   鏃ュ織
@@ -892,6 +880,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>
         ///   椹冲洖
@@ -939,6 +950,21 @@
         /// </summary>
         public event EventHandler btnWgClick;
 
+        /// <summary>
+        /// 鐢熸垚棣栨
+        /// </summary>
+        public event EventHandler btnShouJianClick;
+
+        /// <summary>
+        /// 鍙戦�丱A
+        /// </summary>
+        public event EventHandler btnOaClick;
+
+
+        /// <summary>
+        ///    瀵煎嚭
+        /// </summary>
+        public event EventHandler btnOutClick;
 
         #endregion
 
@@ -980,8 +1006,219 @@
         /// 褰撳墠鐘舵��
         /// </summary>
         public string currentAction { get; set; }
+
+        public string defaultActions { get; set; }
         #endregion
 
 
+
+        /// <summary>
+        /// 鏌ユ壘gridView
+        /// </summary>
+        /// <returns></returns>
+        private List<DevExpress.XtraGrid.Views.Grid.GridView> getGvList()
+        {
+            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();
+            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);
+                }
+            }
+            return gvList;
+        }
+        /// <summary>
+        /// 鏌ユ壘LayoutControl
+        /// </summary>
+        /// <returns></returns>
+        private List<DevExpress.XtraLayout.LayoutControl> getLayList()
+        {
+            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)
+            {
+                layList.Add(lay2);
+            }
+            return layList;
+        }
+
+        /// <summary>
+        /// 鏌ユ壘SplitContainerControl
+        /// </summary>
+        /// <returns></returns>
+        private List<DevExpress.XtraEditors.SplitContainerControl> getSpcList()
+        {
+            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();
+            if (spc1 != null)
+            {
+                spcList.Add(spc1);
+            }
+            if (spc2 != null)
+            {
+                spcList.Add(spc2);
+            }
+            return spcList;
+        }
+
+        /// <summary>
+        /// 璇诲彇xml閰嶇疆锛岀洰鍓嶉厤缃甮cMain1,layoutMx1,鍔犳煡璇㈡潯浠�
+        /// </summary>
+        public void getXmlConfig()
+        {
+            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();
+            var _obj = new
+            {
+                formPath = _formNamespace,
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", "Fm/GetModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    JObject _job = JObject.Parse(strJson);
+                    foreach (var a in _job["rtnData"]["list"])
+                    {
+                        //string _id = a["controlId"].ToString();
+                        //string _controlType = a["controlType"].ToString();
+                        //string _controlXml = a["controlXml"].ToString();
+                        //string _splitterPosition = a["splitterPosition"].ToString();
+                        array.Add(a);
+                    }
+                    foreach (GridView gv in gvList)
+                    {
+                        JToken john = array.FirstOrDefault(t => t["controlId"].ToString().ToUpper() == gv.Name.ToString().Trim().ToUpper());
+                        if (john != null)
+                        {
+                            string controlId = john["controlId"].ToString();
+                            string controlXml = john["controlXml"].ToString();
+                            byte[] byteArray = Encoding.UTF8.GetBytes(controlXml);
+                            using (var stream = new MemoryStream(byteArray))
+                            {
+                                gv.RestoreLayoutFromStream(stream);
+                            }
+                        }
+                    }
+                    foreach (LayoutControl lay in layList)
+                    {
+                        JToken john = array.FirstOrDefault(t => t["controlId"].ToString().ToUpper() == lay.Name.ToString().Trim().ToUpper());
+                        if (john != null)
+                        {
+                            string controlId = john["controlId"].ToString();
+                            string controlXml = john["controlXml"].ToString();
+                            byte[] byteArray = Encoding.UTF8.GetBytes(controlXml);
+                            using (var stream = new MemoryStream(byteArray))
+                            {
+                                lay.RestoreLayoutFromStream(stream);
+                            }
+                        }
+                    }
+                    foreach (SplitContainerControl spt in spcList)
+                    {
+                        JToken john = array.FirstOrDefault(t => t["controlId"].ToString().ToUpper() == spt.Name.ToString().Trim().ToUpper());
+                        if (john != null)
+                        {
+                            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);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3