From dd7c9629d16d81bde03e42b3e9e984088f3e4d2c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 21 一月 2025 17:28:47 +0800
Subject: [PATCH] 细节

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

diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 7328a68..d6b0c51 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -67,17 +67,32 @@
             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 (_type == 1)
                 {
-                    if (specificControl.Tag.ToString() == "宸插鏍�")
+                    PictureBox specificControl = (PictureBox)parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
+                    if (specificControl != null)
                     {
-                        Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ュ崟鎹凡琚鏍革紝鏃犳硶杩涜鎿嶄綔锛�");
-                        return true;
+                        if (specificControl.Tag.ToString() == "宸插鏍�")
+                        {
+                            Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ュ崟鎹凡琚鏍革紝鏃犳硶杩涜鎿嶄綔锛�");
+                            return true;
+                        }
+                    }
+                }
+                if (_type == 0)
+                {
+                    PictureBox specificControl = (PictureBox)parentForm.Controls.Find("picCheckBox", true).FirstOrDefault();
+                    if (specificControl != null)
+                    {
+                        if (specificControl.Tag.ToString() == "鏈鏍�")
+                        {
+                            Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ュ崟鎹湭琚鏍革紝鏃犳硶杩涜鎿嶄綔锛�");
+                            return true;
+                        }
                     }
                 }
             }
@@ -190,6 +205,8 @@
 
         private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
         {
+            bool bl = _isCk(0);
+            if (bl) return;
             if (btnFChkClick != null)
             {
                 btnFChkClick(this, e);
@@ -199,7 +216,7 @@
 
         private void BtnChk_ItemClick(object sender, ItemClickEventArgs e)
         {
-            bool bl = _isCk();
+            bool bl = _isCk(1);
             if (bl) return;
             if (btnChkClick != null)
             {
@@ -268,7 +285,7 @@
 
         private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e)
         {
-            bool bl = _isCk();
+            bool bl = _isCk(1);
             if (bl) return;
             if (btnJianYanClick != null)
                 btnJianYanClick(this, e);
@@ -496,6 +513,7 @@
                     lst.Add(btnWg.Name);
                     lst.Add(btnZhongTai.Name);
                     lst.Add(btnHelp.Name);
+                    lst.Add(btnLoad.Name);
                     _enabledBtn(lst);
                 }
             }
@@ -512,7 +530,7 @@
 
         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);
@@ -526,9 +544,12 @@
 
         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;
+            this.currentAction = "";
         }
 
         /// <summary>
@@ -650,7 +671,6 @@
             var _obj = new
             {
                 userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
-                orgGuid = LoginInfoModel.CurrentUser.LoginOrgGuid,
                 formNamespace = _formNamespace
             };
             var strReturn = "";

--
Gitblit v1.9.3