From cefcc903f51610846fa313a3a35bca34e129c1fe Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 25 十月 2024 08:57:01 +0800
Subject: [PATCH] 代码清理以及格式化
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 580 ++++++++++++++++++++++++++++------------------------------
1 files changed, 280 insertions(+), 300 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 2356000..3e13490 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -1,219 +1,102 @@
-锘縰sing DevExpress.Pdf.Native.BouncyCastle.Asn1.X509;
-using DevExpress.Utils.DirectXPaint;
-using DevExpress.XtraBars;
-using DevExpress.XtraLayout.Customization;
-using DevExpress.XtraReports.Design;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
+锘縰sing System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
-using System.IO;
using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Security.Policy;
-using System.Threading.Tasks;
using System.Windows.Forms;
+using DevExpress.XtraBars;
+using DevExpress.XtraEditors;
+using Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.DevFrm.Sys;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
namespace Gs.DevApp.UserControl
{
- public partial class UcToolBarMenu : DevExpress.XtraEditors.XtraUserControl
+ public partial class UcToolBarMenu : XtraUserControl
{
- #region 鍏叡浜嬩欢
- /// <summary>
- /// 鏂板
- /// </summary>
- public event EventHandler btnAddClick;
-
- /// <summary>
- /// 鍒犻櫎
- /// </summary>
- public event EventHandler btnDelClick;
-
- /// <summary>
- /// 淇敼
- /// </summary>
- public event EventHandler btnEdtClick;
-
- /// <summary>
- /// 鍒锋柊
- /// </summary>
- public event EventHandler btnLoadClick;
-
- /// <summary>
- /// 淇濆瓨
- /// </summary>
- public event EventHandler btnSaveClick;
-
- /// <summary>
- /// 鍙栨秷
- /// </summary>
- public event EventHandler btnEscClick;
-
- /// <summary>
- /// 寮�宸�
- /// </summary>
- public event EventHandler btnKGClick;
-
- /// <summary>
- /// 鏉冮檺
- /// </summary>
- public event EventHandler btnRoleClick;
-
- /// <summary>
- /// 鏌ヨ
- /// </summary>
- public event EventHandler btnQueryClick;
-
- /// <summary>
- /// 瀹℃牳
- /// </summary>
- public event EventHandler btnChkClick;
-
- /// <summary>
- /// 鍙嶅鏍�
- /// </summary>
- public event EventHandler btnFChkClick;
-
-
- /// <summary>
- /// 妫�楠�
- /// </summary>
- public event EventHandler btnJianYanClick;
- /// <summary>
- /// 鍙嶆楠�
- /// </summary>
- public event EventHandler btnFjianYanClick;
-
- #endregion
-
- #region 鍏叡灞炴��
-
-
- public bool isSetBtn { get; set; }
-
- /// <summary>
- /// 鍏抽敭瀛楋紝涓�鑸槸涓婚敭
- /// </summary>
- public string guidKey { get; set; }
-
- /// <summary>
- /// 鎸夐挳鍚嶇О闆嗗悎
- /// </summary>
- public List<string> actions { get; }
-
- /// <summary>
- /// 鎶ヨ〃锛屽湪鏁版嵁搴撲腑瑕佸敮涓�,濡傦細瀛樺偍杩囩▼鍚峽鍏ュ弬1鍚峾鍏ュ弬鍊�,鍏ュ弬2鍚峾鍏ュ弬鍊紏
- /// </summary>
- public string rptParameter { get; set; }
-
- /// <summary>
- /// 瀵煎嚭锛岃鍥惧悕,濡傦細瑙嗗浘鍚峽鍏ュ弬1鍚峾鍏ュ弬鍊�,鍏ュ弬2鍚峾鍏ュ弬鍊紏
- /// </summary>
- public string xlsOutParameter { get; set; }
-
- /// <summary>
- /// 瀵煎叆
- /// </summary>
- public string xlsInService { get; set; }
-
- /// <summary>
- /// 瀹℃牳鍙傛暟,琛ㄥ悕,瀛楁鍚嶏紝濡傦細MES_HOLIDAY,check_date,check_status,check_by
- /// </summary>
- public string chkParameter { get; set; }
- #endregion
-
-
public UcToolBarMenu()
{
InitializeComponent();
- this.btnAdd.ItemClick += BtnAdd_ItemClick;
- this.btnDel.ItemClick += BtnDel_ItemClick;
- this.btnEdit.ItemClick += BtnEdit_ItemClick;
- this.btnLoad.ItemClick += BtnLoad_ItemClick;
- this.btnSave.ItemClick += BtnSave_ItemClick;
- this.btnKG.ItemClick += BtnKG_ItemClick;
- this.btnEsc.ItemClick += BtnEsc_ItemClick;
- this.btnRole.ItemClick += BtnRole_ItemClick;
- this.btnQuery.ItemClick += BtnQuery_ItemClick;
- this.btnReport.ItemClick += BtnReport_ItemClick;
- this.btnDesign.ItemClick += BtnDesign_ItemClick;
- this.btnOut.ItemClick += BtnOut_ItemClick;
- this.btnIn.ItemClick += BtnIn_ItemClick;
- this.btnChk.ItemClick += BtnChk_ItemClick;
- this.btnFchk.ItemClick += BtnFchk_ItemClick;
- this.btnJianYan.ItemClick += BtnJianYan_ItemClick;
- this.btnFjianYan.ItemClick += BtnFjianYan_ItemClick;
- List<string> lst = new List<string>();
+ btnAdd.ItemClick += BtnAdd_ItemClick;
+ btnDel.ItemClick += BtnDel_ItemClick;
+ btnEdit.ItemClick += BtnEdit_ItemClick;
+ btnLoad.ItemClick += BtnLoad_ItemClick;
+ btnSave.ItemClick += BtnSave_ItemClick;
+ btnKG.ItemClick += BtnKG_ItemClick;
+ btnEsc.ItemClick += BtnEsc_ItemClick;
+ btnRole.ItemClick += BtnRole_ItemClick;
+ btnQuery.ItemClick += BtnQuery_ItemClick;
+ btnReport.ItemClick += BtnReport_ItemClick;
+ btnDesign.ItemClick += BtnDesign_ItemClick;
+ btnOut.ItemClick += BtnOut_ItemClick;
+ btnIn.ItemClick += BtnIn_ItemClick;
+ btnChk.ItemClick += BtnChk_ItemClick;
+ btnFchk.ItemClick += BtnFchk_ItemClick;
+ btnJianYan.ItemClick += BtnJianYan_ItemClick;
+ btnFjianYan.ItemClick += BtnFjianYan_ItemClick;
+ var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
- {
if (item is BarLargeButtonItem largeButtonItem)
- {
if (!string.IsNullOrEmpty(item.Caption))
lst.Add(item.Caption);
- }
- }
- this.actions = lst;
+ actions = lst;
}
/// <summary>
- /// 鍒濆鍖栨寜閽姸鎬�
+ /// 鍒濆鍖栨寜閽姸鎬�
/// </summary>
protected override void OnCreateControl()
{
base.OnCreateControl();
- if (this.Parent != null)
- {
- getNamespace();
- }
+ if (Parent != null) getNamespace();
}
+
private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnFChkClick != null)
- {
btnFChkClick(this, e);
- }
else
return;
- if (string.IsNullOrEmpty(this.guidKey))
+ if (string.IsNullOrEmpty(guidKey))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- if (string.IsNullOrEmpty(this.chkParameter))
+
+ if (string.IsNullOrEmpty(chkParameter))
{
- ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
return;
}
+
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍙嶅鏍稿悧锛�"))
return;
_ckService(0.ToString());
}
+
private void BtnChk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnChkClick != null)
- {
btnChkClick(this, e);
- }
else
return;
- if (string.IsNullOrEmpty(this.guidKey))
+ if (string.IsNullOrEmpty(guidKey))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- if (string.IsNullOrEmpty(this.chkParameter))
+
+ if (string.IsNullOrEmpty(chkParameter))
{
- ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
return;
}
+
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾瀹℃牳鍚楋紵"))
return;
_ckService(1.ToString());
@@ -222,22 +105,22 @@
private void BtnFjianYan_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnFjianYanClick != null)
- {
btnFjianYanClick(this, e);
- }
else
return;
- if (string.IsNullOrEmpty(this.guidKey))
+ if (string.IsNullOrEmpty(guidKey))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- if (string.IsNullOrEmpty(this.chkParameter))
+
+ if (string.IsNullOrEmpty(chkParameter))
{
- ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
return;
}
+
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍙嶆楠屽悧锛�"))
return;
_ckService(0.ToString());
@@ -246,62 +129,68 @@
private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnJianYanClick != null)
- {
btnJianYanClick(this, e);
- }
else
return;
- if (string.IsNullOrEmpty(this.guidKey))
+ if (string.IsNullOrEmpty(guidKey))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- if (string.IsNullOrEmpty(this.chkParameter))
+
+ if (string.IsNullOrEmpty(chkParameter))
{
- ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
return;
}
+
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎻愪氦妫�楠屽悧锛�"))
return;
var _obj = new
{
- guid = this.guidKey,
- parameter = this.chkParameter
+ guid = guidKey,
+ parameter = chkParameter
};
_ckService(1.ToString());
}
private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
{
- if (string.IsNullOrEmpty(this.xlsInService))
+ if (string.IsNullOrEmpty(xlsInService))
{
- ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎叆鏈嶅姟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
+ MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎叆鏈嶅姟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
return;
}
- OpenFileDialog openFileDialog = new OpenFileDialog();
+
+ var openFileDialog = new OpenFileDialog();
//openFileDialog.InitialDirectory = "c:\\";
openFileDialog.Filter = "鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*";
openFileDialog.Title = "閫夋嫨鏂囦欢";
- DialogResult result = openFileDialog.ShowDialog();
+ var result = openFileDialog.ShowDialog();
if (result == DialogResult.OK)
{
- string WebApiUrl = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + "Upload/UploadFile";
- string strJson = await UtilityHelper.UploadFileAsync(openFileDialog.FileName);
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ 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 = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ strJson = UtilityHelper.HttpPost("",
+ "XlsInOut/" + xlsInService,
+ JsonConvert.SerializeObject(_obj));
+ _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
}
@@ -349,58 +238,60 @@
// }
//}
}
+
private void BtnReport_ItemClick(object sender, ItemClickEventArgs e)
{
- if (string.IsNullOrEmpty(this.rptParameter))
+ if (string.IsNullOrEmpty(rptParameter))
{
- ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
+ MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
return;
}
- bool _bl = false;
+
+ var _bl = false;
_bl = _ckRptService();
if (_bl)
{
- Gs.DevApp.DevFrm.Rpt.RptPreview frm = new Gs.DevApp.DevFrm.Rpt.RptPreview(this.rptParameter);
+ var frm = new RptPreview(rptParameter);
frm.Show();
return;
}
- ToolBox.MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
- return;
+
+ MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
}
+
private void BtnDesign_ItemClick(object sender, ItemClickEventArgs e)
{
- if (string.IsNullOrEmpty(this.rptParameter))
+ if (string.IsNullOrEmpty(rptParameter))
{
- ToolBox.MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
+ MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
return;
}
- bool _bl = false;
+
+ var _bl = false;
_bl = _ckRptService();
//濡傛灉宸茬粡鏈夋ā鏉夸簡锛岀洿鎺ユ墦寮�璁剧疆妯℃澘
if (_bl)
{
- Gs.DevApp.DevFrm.Sys.EasyRptDesign frm = new Gs.DevApp.DevFrm.Sys.EasyRptDesign(this.rptParameter);
+ var frm = new EasyRptDesign(rptParameter);
frm.Show();
return;
}
+
//鍚﹀垯鍚戝璁捐妯℃澘
- UserControl.ShowRptWizard rptWizard = new ShowRptWizard(this.rptParameter);
+ var rptWizard = new ShowRptWizard(rptParameter);
rptWizard.ShowDialog();
}
private void BtnQuery_ItemClick(object sender, ItemClickEventArgs e)
{
- if (btnQueryClick != null)
- {
- btnQueryClick(this, e);
- }
+ if (btnQueryClick != null) btnQueryClick(this, e);
}
private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e)
{
if (MsgHelper.AskQuestion("纭畾瑕佽鍙栨秷鍚�?"))
{
- List<string> lst = new List<string>();
+ var lst = new List<string>();
lst.Add(btnAdd.Name);
lst.Add(btnEdit.Name);
lst.Add(btnLoad.Name);
@@ -412,29 +303,23 @@
lst.Add(btnChk.Name);
lst.Add(btnFchk.Name);
_enabledBtn(lst);
- if (btnEscClick != null)
- {
- btnEscClick(this, e);
- }
+ if (btnEscClick != null) btnEscClick(this, e);
}
}
- private void BtnKG_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void BtnKG_ItemClick(object sender, ItemClickEventArgs e)
{
- if (btnKGClick != null)
- {
- btnKGClick(this, e);
- }
+ if (btnKGClick != null) btnKGClick(this, e);
}
- private void BtnSave_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void BtnSave_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnSaveClick != null)
{
btnSaveClick(this, e);
- if (isSetBtn == true)
+ if (isSetBtn)
{
- List<string> lst = new List<string>();
+ var lst = new List<string>();
lst.Add(btnAdd.Name);
lst.Add(btnEdit.Name);
lst.Add(btnEsc.Name);
@@ -443,54 +328,40 @@
}
}
- private void BtnLoad_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void BtnLoad_ItemClick(object sender, ItemClickEventArgs e)
{
-
if (btnLoadClick != null)
- {
//List<string> lst = new List<string>();
//lst.Add(btnRole.Name);
//setBtn(lst);
btnLoadClick(this, e);
- }
-
}
- private void BtnEdit_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void BtnEdit_ItemClick(object sender, ItemClickEventArgs e)
{
- List<string> lst = new List<string>();
+ var lst = new List<string>();
lst.Add(btnSave.Name);
lst.Add(btnEsc.Name);
_enabledBtn(lst);
- if (btnEdtClick != null)
- {
- btnEdtClick(this, e);
- }
+ if (btnEdtClick != null) btnEdtClick(this, e);
}
- private void BtnDel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void BtnDel_ItemClick(object sender, ItemClickEventArgs e)
{
- if (btnDelClick != null)
- {
- btnDelClick(this, e);
- }
+ if (btnDelClick != null) btnDelClick(this, e);
}
/// <summary>
- ///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void BtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
+ private void BtnAdd_ItemClick(object sender, ItemClickEventArgs e)
{
- List<string> lst = new List<string>();
+ var lst = new List<string>();
lst.Add(btnSave.Name);
lst.Add(btnEsc.Name);
_enabledBtn(lst);
- if (btnAddClick != null)
- {
- btnAddClick(this, e);
- }
+ if (btnAddClick != null) btnAddClick(this, e);
}
private void BtnRole_ItemClick(object sender, ItemClickEventArgs e)
@@ -499,15 +370,12 @@
//lst.Add(btnSave.Name);
//lst.Add(btnEsc.Name);
//setBtn(lst);
- if (btnRoleClick != null)
- {
- btnRoleClick(this, e);
- }
+ if (btnRoleClick != null) btnRoleClick(this, e);
}
+
private void _enabledBtn(List<string> lstBtn)
{
foreach (BarItem item in barManager1.Items)
- {
if (item is BarLargeButtonItem largeButtonItem)
{
if (lstBtn.Contains(item.Name))
@@ -515,74 +383,82 @@
else
largeButtonItem.Enabled = false;
}
- }
}
/// <summary>
- /// 鏍规嵁鍛藉悕绌洪棿鍜屾潈闄愶紝璇诲彇璇ョ獥浣撲笅闈㈢殑鎸夐挳闆嗗悎
+ /// 鏍规嵁鍛藉悕绌洪棿鍜屾潈闄愶紝璇诲彇璇ョ獥浣撲笅闈㈢殑鎸夐挳闆嗗悎
/// </summary>
private void getNamespace()
{
- string _formNamespace = "";
- System.Windows.Forms.Control parentControl = this;
+ var _formNamespace = "";
+ Control parentControl = this;
while (parentControl.Parent != null)
{
if (parentControl.Parent is Form parentForm)
{
- Type formType = parentForm.GetType();
+ var formType = parentForm.GetType();
_formNamespace = formType.FullName;
break;
}
+
parentControl = parentControl.Parent;
}
+
var _obj = new
{
userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
orgGuid = LoginInfoModel.CurrentUser.LoginOrgGuid,
- formNamespace = _formNamespace,
+ formNamespace = _formNamespace
};
- string strReturn = "";
+ var strReturn = "";
try
{
- strReturn = UtilityHelper.HttpPost("", "Role/GetListByUserOrgSpace", JsonConvert.SerializeObject(_obj));
- ReturnModel<DataTable> dd = UtilityHelper.ReturnToList(strReturn);
- DataTable dt = dd.rtnData;
- List<string> _enabledList = new List<string>();
+ strReturn = UtilityHelper.HttpPost("",
+ "Role/GetListByUserOrgSpace",
+ JsonConvert.SerializeObject(_obj));
+ var dd = UtilityHelper.ReturnToList(strReturn);
+ var dt = dd.rtnData;
+ var _enabledList = new List<string>();
foreach (BarItem item in barManager1.Items)
{
///鍏锋湁鑱斿姩鍏崇郴鐨勬寜閽�(澧炲姞)锛�
if (item.Caption == "澧炲姞")
{
- bool ld1 = dt.AsEnumerable().Any(row => row.Field<string>("name") == "澧炲姞"
- //|| row.Field<string>("name") == "淇敼"
- );
- if (ld1 == true)
+ var ld1 = dt.AsEnumerable().Any(
+ row => row.Field<string>("name") == "澧炲姞"
+ //|| row.Field<string>("name") == "淇敼"
+ );
+ if (ld1)
{
-
- btnEsc.Visibility = btnSave.Visibility = btnLoad.Visibility = BarItemVisibility.Always;
+ btnEsc.Visibility = btnSave.Visibility =
+ btnLoad.Visibility = BarItemVisibility.Always;
btnAdd.Visibility = BarItemVisibility.Always;
_enabledList.Add(item.Name);
continue;
}
}
+
///鍏锋湁鑱斿姩鍏崇郴鐨勬寜閽�(淇敼)锛�
if (item.Caption == "淇敼")
{
- bool ld1 = dt.AsEnumerable().Any(row => row.Field<string>("name") == "淇敼"
- );
- if (ld1 == true)
+ var ld1 = dt.AsEnumerable().Any(
+ row => row.Field<string>("name") == "淇敼"
+ );
+ if (ld1)
{
- btnEsc.Visibility = btnSave.Visibility = btnLoad.Visibility = BarItemVisibility.Always;
+ btnEsc.Visibility = btnSave.Visibility =
+ btnLoad.Visibility = BarItemVisibility.Always;
btnEdit.Visibility = BarItemVisibility.Always;
_enabledList.Add(item.Name);
continue;
}
}
+
///鍏锋湁鑱斿姩鍏崇郴鐨勬寜閽�(鏌ヨ)锛�
- bool ld2 = dt.AsEnumerable().Any(row => row.Field<string>("name") == "鏌ヨ"
+ var ld2 = dt.AsEnumerable().Any(
+ row => row.Field<string>("name") == "鏌ヨ"
);
- if (ld2 == true)
- {
+ if (ld2)
if (item.Caption == "鍒锋柊")
{
item.Visibility = BarItemVisibility.Always;
@@ -590,56 +466,59 @@
_enabledList.Add(item.Name);
continue;
}
- }
+
///鍏锋湁鑱斿姩鍏崇郴鐨勬寜閽�(鎻愪氦妫�楠�)锛�
if (item.Caption == "鎻愪氦妫�楠�")
{
- bool ld1 = dt.AsEnumerable().Any(row => row.Field<string>("name") == "鎻愪氦妫�楠�"
- );
- if (ld1 == true)
+ var ld1 = dt.AsEnumerable().Any(
+ row => row.Field<string>("name") == "鎻愪氦妫�楠�"
+ );
+ if (ld1)
{
- btnJianYan.Visibility = btnFjianYan.Visibility = btnLoad.Visibility = BarItemVisibility.Always;
+ btnJianYan.Visibility = btnFjianYan.Visibility =
+ btnLoad.Visibility = BarItemVisibility.Always;
btnJianYan.Visibility = BarItemVisibility.Always;
_enabledList.Add(item.Name);
continue;
}
}
+
//鎸夐挳鏄惁鍦ㄦ潈闄愯〃涓�
- bool exists = dt.AsEnumerable().Any(row => row.Field<string>("name") == item.Caption);
- if (exists == true)
+ var exists = dt.AsEnumerable().Any(row =>
+ row.Field<string>("name") == item.Caption);
+ if (exists)
{
item.Visibility = BarItemVisibility.Always;
//鍑嗗鍚敤
- string _btnName = _FindBarLargeButtonItemByCaption(item.Caption);
+ var _btnName =
+ _FindBarLargeButtonItemByCaption(item.Caption);
if (!string.IsNullOrEmpty(_btnName))
_enabledList.Add(_btnName);
}
}
+
//榛樿鍚敤鐨勬寜閽�
// _enabledList.Add(btnDesign.Name);
_enabledBtn(_enabledList);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
- /// 鏍规嵁鏂囧瓧锛屾煡鎵炬寜閽畁ame
+ /// 鏍规嵁鏂囧瓧锛屾煡鎵炬寜閽畁ame
/// </summary>
/// <param name="caption"></param>
/// <returns></returns>
private string _FindBarLargeButtonItemByCaption(string caption)
{
foreach (BarItem item in barManager1.Items)
- {
- if (item is BarLargeButtonItem largeButtonItem && largeButtonItem.Caption == caption)
- {
+ if (item is BarLargeButtonItem largeButtonItem &&
+ largeButtonItem.Caption == caption)
return largeButtonItem.Name;
- }
- }
return null;
}
@@ -649,21 +528,20 @@
{
var _obj = new
{
- rptParameter = this.rptParameter,
+ rptParameter
};
- string strJson = UtilityHelper.HttpPost("", "Report/GetTemplate", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- return true;
- }
+ var strJson = UtilityHelper.HttpPost("", "Report/GetTemplate",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0) return true;
return false;
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
return true;
}
+
return false;
}
@@ -671,21 +549,123 @@
{
var _obj = new
{
- guid = this.guidKey,
- parameter = this.chkParameter,
+ guid = guidKey,
+ parameter = chkParameter,
ckValue = _ckValue
};
- string strJson = UtilityHelper.HttpPost("", "General/GeneralCheck", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData["outMsg"].ToString());
+ var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData["outMsg"].ToString());
if (_rtn.rtnCode > 0)
{
-
- }
- else
- {
-
}
}
+
+ #region 鍏叡浜嬩欢
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ public event EventHandler btnAddClick;
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ public event EventHandler btnDelClick;
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ public event EventHandler btnEdtClick;
+
+ /// <summary>
+ /// 鍒锋柊
+ /// </summary>
+ public event EventHandler btnLoadClick;
+
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
+ public event EventHandler btnSaveClick;
+
+ /// <summary>
+ /// 鍙栨秷
+ /// </summary>
+ public event EventHandler btnEscClick;
+
+ /// <summary>
+ /// 寮�宸�
+ /// </summary>
+ public event EventHandler btnKGClick;
+
+ /// <summary>
+ /// 鏉冮檺
+ /// </summary>
+ public event EventHandler btnRoleClick;
+
+ /// <summary>
+ /// 鏌ヨ
+ /// </summary>
+ public event EventHandler btnQueryClick;
+
+ /// <summary>
+ /// 瀹℃牳
+ /// </summary>
+ public event EventHandler btnChkClick;
+
+ /// <summary>
+ /// 鍙嶅鏍�
+ /// </summary>
+ public event EventHandler btnFChkClick;
+
+
+ /// <summary>
+ /// 妫�楠�
+ /// </summary>
+ public event EventHandler btnJianYanClick;
+
+ /// <summary>
+ /// 鍙嶆楠�
+ /// </summary>
+ public event EventHandler btnFjianYanClick;
+
+ #endregion
+
+ #region 鍏叡灞炴��
+
+ public bool isSetBtn { get; set; }
+
+ /// <summary>
+ /// 鍏抽敭瀛楋紝涓�鑸槸涓婚敭
+ /// </summary>
+ public string guidKey { get; set; }
+
+ /// <summary>
+ /// 鎸夐挳鍚嶇О闆嗗悎
+ /// </summary>
+ public List<string> actions { get; }
+
+ /// <summary>
+ /// 鎶ヨ〃锛屽湪鏁版嵁搴撲腑瑕佸敮涓�,濡傦細瀛樺偍杩囩▼鍚峽鍏ュ弬1鍚峾鍏ュ弬鍊�,鍏ュ弬2鍚峾鍏ュ弬鍊紏
+ /// </summary>
+ public string rptParameter { get; set; }
+
+ /// <summary>
+ /// 瀵煎嚭锛岃鍥惧悕,濡傦細瑙嗗浘鍚峽鍏ュ弬1鍚峾鍏ュ弬鍊�,鍏ュ弬2鍚峾鍏ュ弬鍊紏
+ /// </summary>
+ public string xlsOutParameter { get; set; }
+
+ /// <summary>
+ /// 瀵煎叆
+ /// </summary>
+ public string xlsInService { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鍙傛暟,琛ㄥ悕,瀛楁鍚嶏紝濡傦細MES_HOLIDAY,check_date,check_status,check_by
+ /// </summary>
+ public string chkParameter { get; set; }
+
+ #endregion
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3