From cddeb04d1d702e5d9b3b6173f0f9304c6bdf1c47 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 22 三月 2025 15:54:35 +0800
Subject: [PATCH] 修改字体大小前

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs |   44 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index d2b3ada..65d36f0 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;
         }
@@ -714,6 +714,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)
                 {
@@ -839,7 +853,7 @@
             catch (Exception ex)
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                return true;
+                return false;
             }
             return false;
         }
@@ -1032,6 +1046,8 @@
         /// 褰撳墠鐘舵��
         /// </summary>
         public string currentAction { get; set; }
+
+        public string defaultActions { get; set; }
         #endregion
 
 
@@ -1123,6 +1139,9 @@
             return spcList;
         }
 
+        /// <summary>
+        /// 璇诲彇xml閰嶇疆锛岀洰鍓嶉厤缃甮cMain1,layoutMx1,鍔犳煡璇㈡潯浠�
+        /// </summary>
         public void getXmlConfig()
         {
             Form parentForm;
@@ -1209,6 +1228,27 @@
 
                         }
                     }
+                    //璁剧疆鏌ヨ鏉′欢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();
+                                var column = gv1.Columns.Cast<DevExpress.XtraGrid.Columns.GridColumn>()
+                                                .FirstOrDefault(c => c.Name == _gvColName);
+                                if (column != null)
+                                {
+                                    column.Tag = _sqlField;
+                                }
+                            }
+                        }
+                    }
+                    //璁剧疆鏌ヨ鏉′欢end
                 }
                 else
                     ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);

--
Gitblit v1.9.3