From 74202f2545445ed080b3bd2536474b9661990378 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 29 十月 2024 14:28:11 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/User/User.cs | 294 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 170 insertions(+), 124 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs
index ec5a2f2..48ca2c6 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -1,70 +1,65 @@
-锘縰sing DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Base;
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using Gs.DevApp.Models;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using System;
-using System.Data;
+锘縰sing System;
+using System.Collections.Generic;
using System.Drawing;
+using System.Text;
using System.Windows.Forms;
+using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.Controls;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
namespace Gs.DevApp.DevFrm.User
{
- public partial class User : DevExpress.XtraEditors.XtraForm
+ public partial class User : XtraForm
{
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
+
public User()
{
InitializeComponent();
- this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
- this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
- this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
- this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
- this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+ toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+ toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+ toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+ toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+ toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- pageBar1.PagerEvent += PageBar1_PagerEvent;
getPageList(1, UtilityHelper.GetPageSize());
- }
-
- 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());
+ 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)
{
- GridHitInfo info = gridView1.CalcHitInfo(e.Location);
- if (info.InRow)
- {
- 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);
- }
- }
- }
+ var rowGuid =
+ UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
+ if (!string.IsNullOrEmpty(rowGuid))
+ getModel(rowGuid, false, 999);
}
+
/// <summary>
- /// 鍒嗛〉浜嬩欢
+ /// 鍒嗛〉浜嬩欢
/// </summary>
/// <param name="curPage"></param>
/// <param name="pageSize"></param>
@@ -74,91 +69,124 @@
}
/// <summary>
- /// 鍙栨秷浜嬩欢
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ var frm = new ShowFilter(gridView1.Columns, _filterList);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ }
+
+ /// <summary>
+ /// 鏌ヨ鍥炶皟
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ {
+ _filterList = e.FilterList;
+ getPageList(1, pageBar1.RowsCount);
+ }
+
+ /// <summary>
+ /// 鍙栨秷浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
{
- UtilityHelper.ChangeTab(xtraTabControl1, 0);
+ UtilityHelper.JumpToTab(xtraTabControl1, 0);
}
/// <summary>
- /// 鍒犻櫎浜嬩欢
+ /// 鍒犻櫎浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <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_userName, gridView1);
+ if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + dr["userName"].ToString() + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
return;
- var _obj = new
- {
- guidList = dr["guid"].ToString(),//涓诲缓
- };
- string strJson = "";
+ var lst = new List<string>();
+ lst.Add(rowGuid);
+ var _obj = lst;
try
{
- strJson = UtilityHelper.HttpPost("", "User/DeleteModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ var strJson = UtilityHelper.HttpPost("", "User/DeleteModel",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- UtilityHelper.ChangeTab(xtraTabControl1, 0);
+ UtilityHelper.JumpToTab(xtraTabControl1, 0);
getPageList(1, UtilityHelper.GetPageSize());
}
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
- /// 鍒锋柊浜嬩欢
+ /// 鍒锋柊浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <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>
- /// 淇敼浜嬩欢
+ /// 淇敼浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <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_userName, gridView1);
+ if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- getModel(dr["guid"].ToString(), true, 1);
+
+ getModel(rowGuid, true, 1);
}
+
/// <summary>
- /// 鏂板浜嬩欢
+ /// 鏂板浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <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(panel1.Controls, true);
txt_password.Visible = lbPwd.Visible = true;
+ txt_account.Enabled = txt_password.Enabled = true;
}
+
/// <summary>
- /// 淇濆瓨浜嬩欢
+ /// 淇濆瓨浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -167,136 +195,154 @@
toolBarMenu1.isSetBtn = false;
if (string.IsNullOrEmpty(txt_account.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
+ MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
txt_account.Focus();
return;
}
+
if (string.IsNullOrEmpty(txt_password.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�");
+ MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�");
txt_password.Focus();
return;
}
+
if (string.IsNullOrEmpty(txt_userName.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("濮撳悕涓嶈兘涓虹┖锛�");
+ MsgHelper.Warning("濮撳悕涓嶈兘涓虹┖锛�");
txt_userName.Focus();
return;
}
- if (txt_isLocked.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("鐘舵�佷笉鑳戒负绌猴紒");
- txt_isLocked.Focus();
- return;
- }
+
var _obj = new
{
- guid = lbGuid.Text.Trim(),//涓诲缓
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
account = txt_account.Text.Trim(),
password = txt_password.Text.Trim(),
userName = txt_userName.Text.Trim(),
address = txt_address.Text.Trim(),
tel = txt_tel.Text.Trim(),
email = txt_email.Text.Trim(),
- isLocked = txt_isLocked.SelectedIndex,
- flagAdmin = 0,
- flagOnline = 0,
- loginCounter = 0,
- workerID = "",
+ isStatus = txt_isStatus.Checked,
remark = txt_remark.Text.Trim(),
- departGuid = "",
isSys = 0
};
try
{
- string strJson = UtilityHelper.HttpPost("", "User/EditModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ var strJson = UtilityHelper.HttpPost("", "User/EditModel",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnable(this.panel1.Controls, false);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
}
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
- ///
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage, int pageSize)
{
- Models.PageQueryModel pgq = new Models.PageQueryModel(curPage, pageSize, "createTime", "asc", "", "");
- string json = JsonConvert.SerializeObject(pgq);
+ 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",
+ "asc", "", _sbSqlWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
try
{
- string strReturn = UtilityHelper.HttpPost("", "User/GetListPage", json);
- ReturnModel<PageListModel> dd = UtilityHelper.GetTableByJson(strReturn);
- DataTable dt = dd.rtnData.list;
+ var strReturn =
+ UtilityHelper.HttpPost("", "User/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
gcMain.BindingContext = new BindingContext();
gcMain.DataSource = dt;
gcMain.ForceInitialize();
- int dddd = dd.rtnData.pages;//鎬婚〉
+ var dddd = dd.rtnData.pages; //鎬婚〉
pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RowsCount = pageSize;//姣忛〉鏄剧ず
+ pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
+ pageBar1.CurrentPage = curPage; //褰撳墠椤�
+ pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
pageBar1.setTxt();
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- UtilityHelper.ChangeTab(xtraTabControl1, tabIdx);
+
+ UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
- guid = strGuid,//涓诲缓
+ guid = strGuid //涓诲缓
};
try
{
- string strJson = UtilityHelper.HttpPost("", "User/GetModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.GetDataByJson(strJson);
+ var strJson = UtilityHelper.HttpPost("", "User/GetModel",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- dynamic dy = _rtn.rtnData;
+ var dy = _rtn.rtnData;
lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit);
- txt_account.Enabled = false;
- txt_password.Enabled = txt_password.Visible = lbPwd.Visible = tipPwd.Visible = false;
+ UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit);
+ txt_account.Enabled = txt_password.Enabled =
+ txt_password.Visible =
+ lbPwd.Visible = tipPwd.Visible = false;
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
- private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+
+ private void repositoryItemButtonEdit1_ButtonClick(object sender,
+ ButtonPressedEventArgs e)
{
if (e.Button.Index == 0)
{
- int rowhandle = gridView1.FocusedRowHandle;
- DataRow dr = gridView1.GetDataRow(rowhandle);
- string userGuid = dr["guid"].ToString();
- UserSelectRole frm = new UserSelectRole(userGuid);
+ var rowhandle = gridView1.FocusedRowHandle;
+ var dr = gridView1.GetDataRow(rowhandle);
+ var userGuid = dr["guid"].ToString();
+ var frm = new UserSelectRole(userGuid);
+ frm.ShowDialog();
+ }
+ }
+
+ private void repositoryItemButtonEdit2_ButtonClick(object sender,
+ ButtonPressedEventArgs e)
+ {
+ if (e.Button.Index == 0)
+ {
+ var rowhandle = gridView1.FocusedRowHandle;
+ var dr = gridView1.GetDataRow(rowhandle);
+ var userGuid = dr["guid"].ToString();
+ var frm = new UserSetPwd(userGuid);
frm.ShowDialog();
}
}
}
-}
-
+}
\ No newline at end of file
--
Gitblit v1.9.3