From bd06bb837fa0c7edeeae56cb0fe4fb844f53fb2f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 23 十月 2024 16:42:34 +0800
Subject: [PATCH] 修改了报表设计器
---
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 174 ++++++++++++++++++++++++---------------------------------
1 files changed, 73 insertions(+), 101 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 774d757..25acef1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -1,10 +1,9 @@
锘縰sing DevExpress.XtraEditors.Controls;
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
+using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
@@ -21,11 +20,11 @@
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
- this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ this.toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ this.toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- pageBar1.PagerEvent += PageBar1_PagerEvent;
getPageList(1, UtilityHelper.GetPageSize());
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
getTree();
txt_docCode.EditValueChanged += Txt_docCode_EditValueChanged;
txxtItem1.EditValueChanged += TxxtItem1_EditValueChanged;
@@ -33,20 +32,8 @@
txxtItem3.EditValueChanged += TxxtItem1_EditValueChanged;
txxtItem4.EditValueChanged += TxxtItem1_EditValueChanged;
txt_noLength.ValueChanged += Txt_noLength_ValueChanged;
- txt_flagIncludeDocCode.CheckedChanged += Txt_flagIncludeDocCode_CheckedChanged;
- txt_flagSpilitNo.CheckedChanged += Txt_flagIncludeDocCode_CheckedChanged;
- }
-
- private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
- {
- //// 鑾峰彇GridView缁勪欢
- //GridView view = sender as GridView;
- //// 纭繚view涓嶄负null
- //if (view == null) return;
- //// 鑾峰彇搴旂敤鐨勭瓫閫夊櫒淇℃伅
- //string filter = view.ActiveFilterString;
- //MessageBox.Show(filter);
- //getPageList(1, UtilityHelper.GetPageSize());
+ txt_isIncludeDoc.CheckedChanged += Txt_flagIncludeDocCode_CheckedChanged;
+ txt_isSpilit.CheckedChanged += Txt_flagIncludeDocCode_CheckedChanged;
}
/// <summary>
/// 鍙屽嚮浜嬩欢
@@ -55,19 +42,12 @@
/// <param name="e"></param>
private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
{
- GridHitInfo info = gridView1.CalcHitInfo(e.Location);
- if (info.InRow)
+ string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
+ if (!string.IsNullOrEmpty(rowGuid))
{
- GridView view = info.View as GridView;
- if (view != null)
- {
- DataRow row = view.GetDataRow(info.RowHandle);
- if (row != null)
- {
- string rowGuid = (row["guid"].ToString());
- getModel(rowGuid, false, 999);
- }
- }
+ getModel(rowGuid, false, 999);
+ txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = false;
+
}
}
/// <summary>
@@ -80,27 +60,30 @@
getPageList(curPage, pageSize);
}
/// <summary>
- /// 鏌ヨ浜嬩欢
+ /// 鍙嶅鏍�
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
+ this.toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_docCode, gridView1);
+ this.toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
- /// 鏌ヨ鍥炶皟
+ /// 瀹℃牳浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
- string strWhere = e.Data;
- MessageBox.Show(strWhere);
+ this.toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_docCode, gridView1);
+ this.toolBarMenu1.guidKey = rowGuid;
}
-
/// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
@@ -108,7 +91,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
{
- UtilityHelper.ChangeTab(xtraTabControl1, 0);
+ UtilityHelper.JumpToTab(xtraTabControl1, 0);
}
/// <summary>
/// 鍒犻櫎浜嬩欢
@@ -117,26 +100,26 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
- DataRow dr = gridView1.GetFocusedDataRow();
- if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_docCode, gridView1);
+ if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + dr["docCode"].ToString() + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
return;
- var _obj = new
- {
- guidList = dr["guid"].ToString(),//涓诲缓
- };
- string strJson = "";
+
+ List<string> lst = new List<string>();
+ lst.Add(rowGuid);
+ var _obj = lst;
try
{
- strJson = UtilityHelper.HttpPost("", "DocNoRule/DeleteModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ string strJson = UtilityHelper.HttpPost("", "DocNoRule/DeleteModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- UtilityHelper.ChangeTab(xtraTabControl1, 0);
+ UtilityHelper.JumpToTab(xtraTabControl1, 0);
getPageList(1, UtilityHelper.GetPageSize());
}
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -153,7 +136,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.ChangeTab(xtraTabControl1, 0);
+ UtilityHelper.JumpToTab(xtraTabControl1, 0);
getPageList(1, UtilityHelper.GetPageSize());
}
/// <summary>
@@ -163,15 +146,15 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
- DataRow dr = gridView1.GetFocusedDataRow();
- if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_docCode, gridView1);
+ if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = false;
- getModel(dr["guid"].ToString(), true, 1);
- txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = true;
+ getModel(rowGuid, true, 1);
+ txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = panelControl1.Enabled = true;
}
/// <summary>
/// 鏂板浜嬩欢
@@ -180,11 +163,11 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
{
- UtilityHelper.ChangeTab(xtraTabControl1, 1);
+ UtilityHelper.JumpToTab(xtraTabControl1, 1);
lbGuid.Text = "";
- UtilityHelper.CleanValue(this.panel1.Controls, true);
+ UtilityHelper.CleanValueByControl(this.panel1.Controls, true);
txxtItem1.SelectedIndex = txxtItem2.SelectedIndex = txxtItem3.SelectedIndex = txxtItem4.SelectedIndex = 0;
-
+ txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = panelControl1.Enabled = true;
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -200,39 +183,38 @@
txt_docCode.Focus();
return;
}
- if (txt_ruleFormat.Text.Length <= 0)
+ if ((txxtItem1.SelectedIndex + txxtItem2.SelectedIndex + txxtItem3.SelectedIndex + txxtItem4.SelectedIndex) <= 0)
+ {
+ ToolBox.MsgHelper.Warning("璇疯嚦灏戦�夋嫨涓�涓弬鏁帮紒");
+ txxtItem1.Focus();
+ return;
+ }
+ if (txt_docFormat.Text.Length <= 0)
{
ToolBox.MsgHelper.Warning("璇峰厛閰嶇疆鍙傛暟锛�");
txt_docCode.Focus();
- return;
- }
- if (txt_resetZero.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨褰掗浂鏂瑰紡锛�");
- txt_resetZero.Focus();
return;
}
var _obj = new
{
guid = lbGuid.Text.Trim(),//涓诲缓
docCode = txt_docCode.EditValue.ToString(),
- ruleFormat = txt_ruleFormat.Text.ToString(),
- //currentValue = txt_currentValue.Text.ToString(),
+ docFormat = txt_docFormat.Text.ToString(),
noLength = txt_noLength.Value.ToString(),
- resetZero = txt_resetZero.SelectedIndex.ToString(),
- flagSpilitNo = txt_flagSpilitNo.Checked ? 1 : 2,
- flagIncludeDocCode = txt_flagIncludeDocCode.Checked ? 1 : 2,
+ resetZero = txt_resetZero.Checked,
+ isSpilit = txt_isSpilit.Checked,
+ isIncludeDoc = txt_isIncludeDoc.Checked,
};
try
{
string strJson = UtilityHelper.HttpPost("", "DocNoRule/EditModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnable(this.panel1.Controls, false);
+ UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
}
}
catch (Exception ex)
@@ -247,12 +229,12 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage, int pageSize)
{
- PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "docCode", "asc", "", "");
+ PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "doc_Code", "asc", "", "");
string json = JsonConvert.SerializeObject(pgq);
try
{
string strReturn = UtilityHelper.HttpPost("", "DocNoRule/GetListPage", json);
- ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
+ ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
DataTable dt = dd.rtnData.list;
gcMain.BindingContext = new BindingContext();
gcMain.DataSource = dt;
@@ -276,7 +258,7 @@
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
+ UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
guid = strGuid,//涓诲缓
@@ -284,15 +266,14 @@
try
{
string strJson = UtilityHelper.HttpPost("", "DocNoRule/GetModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
txt_docCode.EditValue = dy.docCode.ToString();
- txxtItem1.Enabled = txxtItem2.Enabled = txxtItem3.Enabled = txxtItem4.Enabled = false;
- string _rule = dy.ruleFormat.ToString();
+ string _rule = dy.docFormat.ToString();
string[] _ary = _rule.Split(new char[] { '<' }, StringSplitOptions.RemoveEmptyEntries);
if (_ary.Length > 0)
txxtItem1.Text = "<" + _ary[0];
@@ -314,10 +295,8 @@
private void getTree()
{
- // 鍒涘缓鏁版嵁琛�
DataTable dataTable = new DataTable();
dataTable.Columns.Add("docCode", typeof(string));
- // 娣诲姞鏁版嵁琛�
dataTable.Rows.Add("DH(鍒拌揣鍗�)");
dataTable.Rows.Add("QO(鎶ヤ环鍗�)");
dataTable.Rows.Add("PO(閲囪喘璁㈠崟)");
@@ -330,11 +309,10 @@
dataTable.Rows.Add("IV(閿�鍞彂绁�)");
dataTable.Rows.Add("IN(鍏ュ簱)");
dataTable.Rows.Add("PN(鐢熶骇搴�)");
- // 璁剧疆LookUpEdit鐨勬暟鎹簮
txt_docCode.Properties.DataSource = dataTable;
txt_docCode.Properties.DisplayMember = "docCode"; // 鏄剧ず鐨勫垪
txt_docCode.Properties.ValueMember = "docCode"; // 瀹為檯鍊肩殑鍒�
- txt_docCode.Properties.TextEditStyle = TextEditStyles.Standard;
+ txt_docCode.Properties.TextEditStyle = TextEditStyles.DisableTextEditor;
}
private void Txt_flagIncludeDocCode_CheckedChanged(object sender, EventArgs e)
@@ -353,31 +331,25 @@
}
private void DoPreviewCode()
{
- if (txt_docCode.Enabled == false
- || txxtItem1.Enabled==false
- || txxtItem2.Enabled == false
- || txxtItem3.Enabled == false
+ if (txt_docCode.Enabled == false
+ || txxtItem1.Enabled == false
+ || txxtItem2.Enabled == false
+ || txxtItem3.Enabled == false
|| txxtItem4.Enabled == false)
return;
var text = txxtItem1.Text + txxtItem2.Text + txxtItem3.Text + txxtItem4.Text;
- txt_ruleFormat.Text = text;
- if (txt_docCode.EditValue == null)
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨鍗曟嵁绫诲瀷");
- txt_docCode.Focus();
- return;
- }
- if (txt_ruleFormat.Text == "")
+ txt_docFormat.Text = text;
+ if (txt_docFormat.Text == "")
{
lblPreview.Text = "璇峰畾涔夎鍒�.";
}
else
{
// txtRuleFormat="<骞村勾>", "<骞村勾骞村勾>", "<鏈堟湀>", "<鏃ユ棩>" });
- var preview = txt_ruleFormat.Text;
+ var preview = txt_docFormat.Text;
var length = int.Parse(txt_noLength.Value.ToString());
var docCode = "";
- if (txt_flagIncludeDocCode.Checked)
+ if (txt_isIncludeDoc.Checked)
{
docCode = txt_docCode.EditValue.ToString();
}
@@ -387,7 +359,7 @@
preview = preview.Replace("<骞村勾>", "24");
preview = preview.Replace("<鏈堟湀>", "06");
preview = preview.Replace("<鏃ユ棩>", "18");
- preview = preview + (txt_flagSpilitNo.Checked ? "-" : "") + "8".PadLeft(length, '0');
+ preview = preview + (txt_isSpilit.Checked ? "-" : "") + "8".PadLeft(length, '0');
lblPreview.Text = "鐢熸垚缂栧彿锛�" + preview;
}
}
--
Gitblit v1.9.3