From 2057778ce796422f1dab4ec011ca66eb1faf66cf Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 13 七月 2025 10:00:15 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 332 ++++++++++++++++++-------------------------------------
1 files changed, 110 insertions(+), 222 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index 023ad57..ec3ff79 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -1,15 +1,14 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Base;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Entity;
-using Gs.DevApp.Properties;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.User
{
@@ -17,7 +16,6 @@
{
private StringBuilder _actionLst = new StringBuilder();
private List<FilterEntity> _filterList = new List<FilterEntity>();
-
public Role()
{
InitializeComponent();
@@ -28,37 +26,26 @@
toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- //gridView1.FocusedRowChanged += GridView1_FocusedRowChanged;
- getPageList(1, UtilityHelper.GetPageSize());
+ this.toolBarMenu1.getXmlConfig();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }, lbGuid);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.IndicatorWidth = 50;
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- var str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- var f = new Font("寰蒋闆呴粦", 16);
- var r = new Rectangle(gridView1.GridControl.Width / 2 - 100,
- e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
- e.Graphics.DrawString(str, f, Brushes.Gray, r);
- };
}
-
- /// <summary>
- /// 鍙屽嚮浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- var rowGuid =
- UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
- if (!string.IsNullOrEmpty(rowGuid))
- getModel(rowGuid, false, 999);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ Task.Delay(100);
+ getPageList(1);
}
/// <summary>
@@ -68,7 +55,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
@@ -78,7 +65,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- var frm = new ShowFilter(gridView1.Columns, _filterList);
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -91,7 +81,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
/// <summary>
@@ -101,7 +91,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
/// <summary>
@@ -113,15 +103,13 @@
{
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_roleName, gridView1, 2);
+ lbGuid, txt_roleName, gridView1, "roleName");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName +
- "銆戯紝纭畾鍒犻櫎鍚楋紵\n璇ユ搷浣滃皢浼氭竻绌虹浉搴旂殑鐢ㄦ埛鏉冮檺"))
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵\n璇ユ搷浣滃皢浼氭竻绌虹浉搴旂殑鐢ㄦ埛鏉冮檺"))
return;
var lst = new List<string>();
lst.Add(rowGuid);
@@ -133,10 +121,12 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ { }
+ else
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+ getPageList(this.pageBar1.CurrentPage);
}
-
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
@@ -152,8 +142,20 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim());
+ else
+ {
+ //_filterList.Clear();
+ //if (gridView1.ActiveFilter.Count > 0)
+ //{
+ // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ // gridView1.ActiveFilter.Clear();
+ // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ //}
+ //getPageList(1);
+ getPageList(this.pageBar1.CurrentPage);
+ }
}
/// <summary>
@@ -163,16 +165,22 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_roleName, gridView1);
+ string rowGuid = "", rowName = "";
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_roleName, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
- getModel(rowGuid, true, 1);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid);
+ }
+ else
+ {
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
+ }
}
/// <summary>
@@ -182,9 +190,9 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
lbGuid.Text = "";
- UtilityHelper.CleanValueByControl(panel1.Controls, true);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
}
/// <summary>
@@ -208,7 +216,6 @@
txt_roleRemark.Focus();
return;
}
-
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
@@ -226,7 +233,9 @@
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
+ toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
}
catch (Exception ex)
@@ -236,88 +245,61 @@
}
/// <summary>
- /// 鏉冮檺璁剧疆浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- //private void ToolBarMenu1_btnRoleClick(object sender, EventArgs e)
- //{
- // string rowGuid, rowName;
- // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- // lbGuid, txt_roleName, gridView1);
- // if (string.IsNullOrEmpty(rowGuid))
- // {
- // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- // return;
- // }
-
- // if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾璁剧疆鏉冮檺鍚楋紵"))
- // return;
- // _actionLst = new StringBuilder();
- // TraverseTreeViewNodes(trv.Nodes);
- // var _obj = new
- // {
- // roleGuid = rowGuid,
- // actionLst = _actionLst.ToString()
- // };
- // try
- // {
- // var strJson = UtilityHelper.HttpPost("",
- // "Role/SetRoleMenuAction",
- // JsonConvert.SerializeObject(_obj));
- // var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- // MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
- // }
- // catch (Exception ex)
- // {
- // MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- // }
- //}
-
- /// <summary>
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage)
{
- var _sbSqlWhere = new StringBuilder();
- foreach (var itm in _filterList)
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
- var pgq = new PageQueryModel(curPage, pageSize, "CREATE_TIME",
- "desc", "", _sbSqlWhere.ToString());
+ gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "ROLE_NAME asc,CREATE_TIME ", "desc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
var strReturn =
UtilityHelper.HttpPost("", "Role/GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- var dddd = dd.rtnData.pages; //鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
- pageBar1.setTxt();
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain1.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
- private void getModel(string strGuid, bool isEdit, int tabIdx)
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
+ private void getModel(string strGuid)
{
+ bool isEdit = false;
+ if (toolBarMenu1.currentAction == "add") return;
+ if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
- UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
guid = strGuid //涓诲缓
@@ -332,7 +314,7 @@
{
var dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
}
else
{
@@ -344,104 +326,6 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
- //private void getTree(string roleGuid)
- //{
- // trv.Nodes.Clear();
- // var imageList = new ImageList();
- // imageList.Images.Add("icon0", Resources.publicfix_32x32);
- // imageList.Images.Add("icon1", Resources.addfooter_32x32);
- // imageList.Images.Add("icon2", Resources.listmultilevel_16x16);
- // imageList.Images.Add("icon3", Resources.addcalculatedfield_16x16);
- // trv.ImageList = imageList;
- // var _obj = new
- // {
- // roleGuid //涓诲缓
- // };
- // try
- // {
- // var strReturn = UtilityHelper.HttpPost("", "Role/GetListByRole",
- // JsonConvert.SerializeObject(_obj));
- // var dd = UtilityHelper.ReturnToTablePage(strReturn);
- // var dt = dd.rtnData.list;
- // var drGrp = dt.Select("upGuid='' or upGuid is null");
- // foreach (var _dy in drGrp)
- // {
- // var _orgGuid = _dy["guid"] + "&";
- // var node = new TreeNode(); //瀹氫箟缁撶偣
- // node.Text = _dy["name"].ToString(); //涓虹粨鐐硅祴鍊�
- // node.Name = _dy["guid"].ToString();
- // node.ImageIndex = 0;
- // node.Checked = _dy["isCk"].ToString() == "1" ? true : false;
- // var drItem = dt.Select("upGuid='" + _dy["guid"] +
- // "' and orgGuid='" + _dy["guid"] +
- // "'");
- // foreach (var _dy2 in drItem)
- // {
- // var node22 = new TreeNode(); //瀹氫箟缁撶偣
- // node22.Text = _dy2["name"].ToString(); //涓虹粨鐐硅祴鍊�
- // node22.Name = _orgGuid + _dy2["guid"];
- // node22.ImageIndex = 1;
- // node22.Checked = _dy2["isCk"].ToString() == "1"
- // ? true
- // : false;
- // var drItem33 = dt.Select("upGuid='" + _dy2["guid"] +
- // "' and orgGuid='" +
- // _dy["guid"] + "'");
- // foreach (var _dy3 in drItem33)
- // {
- // var node33 = new TreeNode(); //瀹氫箟缁撶偣
- // node33.Text = _dy3["name"].ToString(); //涓虹粨鐐硅祴鍊�
- // node33.Name = _orgGuid + _dy3["guid"];
- // node33.ImageIndex = 2;
- // node33.Checked = _dy3["isCk"].ToString() == "1"
- // ? true
- // : false;
- // var drItem44 = dt.Select("upGuid='" + _dy3["guid"] +
- // "' and orgGuid='" + _dy["guid"] + "'");
- // foreach (var _dy4 in drItem44)
- // {
- // var node44 = new TreeNode(); //瀹氫箟缁撶偣
- // node44.Text = _dy4["name"].ToString(); //涓虹粨鐐硅祴鍊�
- // node44.Name = _orgGuid + _dy4["guid"];
- // node44.ImageIndex = 3;
- // node44.Checked = _dy4["isCk"].ToString() == "1"
- // ? true
- // : false;
- // node33.Nodes.Add(node44);
- // }
-
- // node22.Nodes.Add(node33);
- // }
-
- // node22.Expand();
- // node.Nodes.Add(node22);
- // }
-
- // node.Expand();
- // trv.Nodes.Add(node);
- // }
- // }
- // catch (Exception ex)
- // {
- // MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- // }
- //}
-
- //private void Trv_AfterCheck(object sender, TreeViewEventArgs e)
- //{
- // try
- // {
- // trv.AfterCheck -= Trv_AfterCheck;
- // UtilityHelper.TreeViewCheck(e);
- // trv.AfterCheck += Trv_AfterCheck;
- // }
- // catch (Exception ex)
- // {
- // MsgHelper.ShowError(ex.Message);
- // }
- //}
-
// 閬嶅巻TreeView涓殑鎵�鏈夎妭鐐�
private void TraverseTreeViewNodes(TreeNodeCollection nodes)
{
@@ -453,15 +337,19 @@
if (node.Nodes.Count > 0) TraverseTreeViewNodes(node.Nodes);
}
}
-
+ /// <summary>
+ /// 寮瑰嚭閰嶇疆鏉冮檺
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
if (e.Button.Index == 0)
{
var rowhandle = gridView1.FocusedRowHandle;
var dr = gridView1.GetDataRow(rowhandle);
- var userGuid = dr["guid"].ToString();
- var frm = new RoleSelectAction(userGuid);
+ var roleGuid = dr["guid"].ToString();
+ var frm = new RoleSelectAction(roleGuid,"璁剧疆瑙掕壊鏉冮檺");
frm.ShowDialog();
}
}
--
Gitblit v1.9.3