From 1210460a95ba58f219d38e545dcaf9e21383d18f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 19 十二月 2024 14:12:50 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 238 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 153 insertions(+), 85 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index c43e44e..f4c7c84 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -25,9 +25,7 @@
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;
@@ -44,7 +42,13 @@
btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
btnBoHui.ItemClick += BtnBoHui_ItemClick;
- btnPrint.ItemClick += BtnPrint_ItemClick;
+ btnJieAn.ItemClick += BtnJieAn_ItemClick;
+ btnFjieAn.ItemClick += BtnFjieAn_ItemClick;
+ btnTzbl.ItemClick += BtnTzbl_ItemClick;
+ btnKg.ItemClick += BtnKg_ItemClick;
+ btnZhongTai.ItemClick += BtnbZhongTai_ItemClick;
+ btnWg.ItemClick += BtnWg_ItemClick;
+ btnHelp.ItemClick += BtnHelp_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -52,8 +56,6 @@
lst.Add(item.Caption);
actions = lst;
}
-
-
/// <summary>
@@ -64,13 +66,6 @@
base.OnCreateControl();
if (Parent != null) getNamespace();
}
-
- private void BtnPrint_ItemClick(object sender, ItemClickEventArgs e)
- {
- if (btnPrintClick != null)
- btnPrintClick(this, e);
- }
-
private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e)
{
@@ -179,49 +174,34 @@
private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnFChkClick != null)
+ {
btnFChkClick(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());
+ return;
}
private void BtnChk_ItemClick(object sender, ItemClickEventArgs e)
{
if (btnChkClick != null)
+ {
btnChkClick(this, e);
+ }
+ return;
+ }
+ private void BtnFjieAn_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnFjieAnClick != null)
+ btnFjieAnClick(this, e);
else
return;
+ }
- if (string.IsNullOrEmpty(guidKey))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ private void BtnJieAn_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnJieAnClick != null)
+ btnJieAnClick(this, e);
+ else
return;
- }
-
- if (string.IsNullOrEmpty(chkParameter))
- {
- MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- return;
- }
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾瀹℃牳鍚楋紵"))
- return;
- _ckService(1.ToString());
}
@@ -235,7 +215,7 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- UserControl.ShowLogcs frm = new ShowLogcs();
+ UserControl.ShowLogcs frm = new ShowLogcs(this.guidKey);
frm.ShowDialog();
}
@@ -296,7 +276,7 @@
//_ckService(1.ToString());
}
- private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
+ private async void BtnIn_ItemClick(object sender, ItemClickEventArgs e)
{
if (string.IsNullOrEmpty(xlsInService))
{
@@ -382,18 +362,24 @@
private void BtnReport_ItemClick(object sender, ItemClickEventArgs e)
{
+ if (btnReportClick != null)
+ btnReportClick(this, e);
+ else
+ return;
+
+ if (rptParameter == "return false")
+ return;
if (string.IsNullOrEmpty(rptParameter))
{
MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
return;
}
-
var _bl = false;
_bl = _ckRptService();
if (_bl)
{
- var frm = new RptPreview(rptParameter);
- frm.Show();
+ var frm = new RptPreview(guidKey, rptParameter);
+ frm.ShowDialog();
return;
}
@@ -402,24 +388,27 @@
private void BtnDesign_ItemClick(object sender, ItemClickEventArgs e)
{
+ if (btnDesignClick != null)
+ btnDesignClick(this, e);
+ else
+ return;
+
if (string.IsNullOrEmpty(rptParameter))
{
MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
return;
}
-
var _bl = false;
_bl = _ckRptService();
//濡傛灉宸茬粡鏈夋ā鏉夸簡锛岀洿鎺ユ墦寮�璁剧疆妯℃澘
if (_bl)
{
- var frm = new EasyRptDesign(rptParameter);
- frm.Show();
+ var frm = new EasyRptDesign(guidKey, rptParameter);
+ frm.ShowDialog();
return;
}
-
//鍚﹀垯鍚戝璁捐妯℃澘
- var rptWizard = new ShowRptWizard(rptParameter);
+ var rptWizard = new ShowRptWizard(guidKey, rptParameter);
rptWizard.ShowDialog();
}
@@ -427,7 +416,7 @@
{
if (btnQueryClick != null) btnQueryClick(this, e);
}
-
+
private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e)
{
if (MsgHelper.AskQuestion("纭畾瑕佽鍙栨秷鍚�?"))
@@ -437,7 +426,6 @@
lst.Add(btnEdit.Name);
lst.Add(btnLoad.Name);
lst.Add(btnDel.Name);
- lst.Add(btnRole.Name);
lst.Add(btnQuery.Name);
lst.Add(btnReport.Name);
lst.Add(btnDesign.Name);
@@ -449,15 +437,14 @@
lst.Add(btnIn.Name);
lst.Add(btnLog.Name);
lst.Add(btnPiZhun.Name);
+ lst.Add(btnHelp.Name);
_enabledBtn(lst);
+ this.currentAction = "esc";
if (btnEscClick != null) btnEscClick(this, e);
}
}
- private void BtnKG_ItemClick(object sender, ItemClickEventArgs e)
- {
- if (btnKGClick != null) btnKGClick(this, e);
- }
+
private void BtnSave_ItemClick(object sender, ItemClickEventArgs e)
{
@@ -489,7 +476,9 @@
var lst = new List<string>();
lst.Add(btnSave.Name);
lst.Add(btnEsc.Name);
+ lst.Add(btnHelp.Name);
_enabledBtn(lst);
+ this.currentAction = "edit";
if (btnEdtClick != null) btnEdtClick(this, e);
}
@@ -507,7 +496,9 @@
var lst = new List<string>();
lst.Add(btnSave.Name);
lst.Add(btnEsc.Name);
+ lst.Add(btnHelp.Name);
_enabledBtn(lst);
+ this.currentAction = "add";
if (btnAddClick != null) btnAddClick(this, e);
}
@@ -519,6 +510,58 @@
//setBtn(lst);
if (btnRoleClick != null) btnRoleClick(this, e);
}
+
+ private void BtnWg_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnWgClick != null) btnWgClick(this, e);
+ }
+
+
+
+ private void BtnbZhongTai_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnZhongTaiClick != null) btnZhongTaiClick(this, e);
+ }
+
+ private void BtnKg_ItemClick(object sender, ItemClickEventArgs e)
+ {
+
+ if (btnKgClick != null) btnKgClick(this, e);
+ }
+
+ private void BtnTzbl_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnTzblClick != null) btnTzblClick(this, e);
+ }
+ private void BtnHelp_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ var _formNamespace = "";
+ Control parentControl = this;
+ while (parentControl.Parent != null)
+ {
+ if (parentControl.Parent is Form parentForm)
+ {
+ var formType = parentForm.GetType();
+ _formNamespace = formType.FullName;
+ break;
+ }
+ parentControl = parentControl.Parent;
+ }
+ string strReturn = UtilityHelper.HttpPost("",
+ "MenuAction/GetHelpFile",
+ JsonConvert.SerializeObject(_formNamespace));
+ var _rtnJson = UtilityHelper.ReturnToDynamic(strReturn);
+ if (_rtnJson.rtnCode > 0)
+ {
+ var urlPath = _rtnJson.rtnData.ToString();
+ Gs.DevApp.UserControl.ShowFile frm = new ShowFile(urlPath);
+ frm.ShowDialog();
+ return;
+ }
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtnJson.rtnMsg);
+
+ }
+
private void _enabledBtn(List<string> lstBtn)
{
@@ -547,7 +590,6 @@
_formNamespace = formType.FullName;
break;
}
-
parentControl = parentControl.Parent;
}
@@ -646,6 +688,7 @@
//榛樿鍚敤鐨勬寜閽�
_enabledList.Add(btnLoad.Name);
+ _enabledList.Add(btnHelp.Name);
_enabledBtn(_enabledList);
}
catch (Exception ex)
@@ -675,9 +718,11 @@
{
var _obj = new
{
- rptParameter
+ guid = guidKey,
+ rptParameter,
+ isDesign = 1
};
- var strJson = UtilityHelper.HttpPost("", "Report/GetTemplate",
+ var strJson = UtilityHelper.HttpPost("", "Report/GetRptData",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0) return true;
@@ -688,26 +733,9 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
return true;
}
-
return false;
}
-
- private void _ckService(string _ckValue)
- {
- var _obj = new
- {
- guid = guidKey,
- parameter = chkParameter,
- ckValue = _ckValue
- };
- var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData["outMsg"].ToString());
- if (_rtn.rtnCode > 0)
- {
- }
- }
+
#region 鍏叡浜嬩欢
@@ -741,10 +769,6 @@
/// </summary>
public event EventHandler btnEscClick;
- /// <summary>
- /// 寮�宸�
- /// </summary>
- public event EventHandler btnKGClick;
/// <summary>
/// 鏉冮檺
@@ -816,8 +840,48 @@
/// </summary>
public event EventHandler btnBoHuiClick;
+ /// <summary>
+ /// 璁剧疆鎶ヨ〃
+ /// </summary>
+ public event EventHandler btnDesignClick;
- public event EventHandler btnPrintClick;
+ /// <summary>
+ /// 鎶ヨ〃
+ /// </summary>
+ public event EventHandler btnReportClick;
+
+ /// <summary>
+ /// 缁撴
+ /// </summary>
+ public event EventHandler btnJieAnClick;
+
+ /// <summary>
+ /// 鍙嶇粨妗�
+ /// </summary>
+ public event EventHandler btnFjieAnClick;
+
+
+ /// <summary>
+ /// 寮�宸�
+ /// </summary>
+ public event EventHandler btnKgClick;
+
+ /// <summary>
+ /// 閫氱煡澶囨枡
+ /// </summary>
+ public event EventHandler btnTzblClick;
+
+ /// <summary>
+ /// 鐘舵��
+ /// </summary>
+ public event EventHandler btnZhongTaiClick;
+
+ /// <summary>
+ /// 鎵嬪姩瀹屽伐
+ /// </summary>
+ public event EventHandler btnWgClick;
+
+
#endregion
#region 鍏叡灞炴��
@@ -854,6 +918,10 @@
/// </summary>
public string chkParameter { get; set; }
+ /// <summary>
+ /// 褰撳墠鐘舵��
+ /// </summary>
+ public string currentAction { get; set; }
#endregion
--
Gitblit v1.9.3