From dd7c9629d16d81bde03e42b3e9e984088f3e4d2c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 21 一月 2025 17:28:47 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 124 +++++++++++++++++++++++++++++++++++------
1 files changed, 106 insertions(+), 18 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 96811fd..3e20974 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -5,7 +5,6 @@
using System.Data;
using System.Drawing;
using System.Reflection;
-using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraBars;
using DevExpress.XtraBars.FluentDesignSystem;
@@ -16,7 +15,6 @@
using Gs.DevApp.DevFrm.User;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -26,7 +24,7 @@
{
private static readonly Dictionary<string, XtraTabPage> TabPageDic =
new Dictionary<string, XtraTabPage>();
-
+ private string OldorgFids = "";
public FrmMain()
{
InitializeComponent();
@@ -38,6 +36,77 @@
FormClosing += FrmMain_FormClosing;
barEasy.ItemClick += BarEasy_ItemClick;
getTree();
+ tab.MouseDown += Tab_MouseDown;
+ tabCloseCurrent.Click += (s, e) =>
+ {
+ string name = tab.SelectedTabPage.Tooltip;
+ RemoveTabPage(tab, name);
+ };
+ tabCloseAll.Click += (s, e) =>
+ {
+ string _name = tab.SelectedTabPage.Tooltip;
+ int _tabCount = tab.TabPages.Count;
+ for (int i = _tabCount; i >= 0; i--)
+ {
+ try
+ {
+ string name = tab.TabPages[i].Tooltip;
+ if (name != _name)
+ {
+ RemoveTabPage(tab, name);
+ }
+ }
+ catch (Exception)
+ {
+ }
+ }
+ };
+ GetOrg();
+ barOrg.EditValueChanged += (s, e) =>
+ {
+ if (barOrg.EditValue == null)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佺殑缁勭粐锛�");
+ return;
+ }
+ string _val = barOrg.EditValue.ToString();
+ if (string.IsNullOrEmpty(_val))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佺殑缁勭粐锛�");
+ return;
+ }
+ if (OldorgFids == _val)
+ return;
+ var _obj = new
+ {
+ edtUserGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
+ userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
+ userOrgFids = _val,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "User/SetUserOrg",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ };
+ }
+
+ private void Tab_MouseDown(object sender, MouseEventArgs e)
+ {
+ if (e.Button == MouseButtons.Right)
+ {
+ tab.ContextMenuStrip = null;
+ //TreeListHitInfo hInfo = treeList1.CalcHitInfo(new Point(e.X, e.Y));
+ //TreeListNode node = hInfo.Node;
+ //treeList1.FocusedNode = node;
+ tab.ContextMenuStrip = cms1;
+ }
}
private void BarEasy_ItemClick(object sender, ItemClickEventArgs e)
@@ -105,23 +174,20 @@
{
getTree();
}
-
- private async void getTree()
+ private void getTree()
{
- UcLoading _loading = new UcLoading();
toolTime.Text = "鐧诲綍鏃堕棿" + LoginInfoModel.CurrentUser.LoginTime;
var _obj = new
{
userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
- orgGuid = LoginInfoModel.CurrentUser.LoginOrgGuid
};
try
{
- var strJson = await UtilityHelper.HttpPostAsync("",
+ var strJson = UtilityHelper.HttpPost("",
"User/GetUserLoginInfo", JsonConvert.SerializeObject(_obj));
+ DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("鎷煎懡鍔犺浇涓紝璇风◢鍚�......", "鍙嬫儏鎻愮ず");
var _job = JObject.Parse(strJson);
var rtnCode = _job["rtnCode"].ToString();
- _loading.Stop();
if (int.Parse(rtnCode) > 0)
{
acrd.Clear();
@@ -138,6 +204,7 @@
int gdx = 0, idx = 0;
foreach (var _dy in drGrp)
{
+ wdf.SetCaption("鍔犺浇杩涘害:" + _dy["name"].ToString());
var _grp = acrd.AddGroup();
_grp.ImageOptions.Image =
UtilityHelper.GetImgFromResource(
@@ -159,6 +226,7 @@
_itm.Name = _dy2["guid"].ToString();
_itm.Style = ElementStyle.Item;
_itm.Text = _dy2["name"].ToString();
+ wdf.SetCaption("鍔犺浇杩涘害:" + _dy2["name"].ToString());
_itm.Appearance.Normal.Font =
new Font("Tahoma", 10F);
_itm.Tag = _dy2["formPath"].ToString(); //瀛樿矾寰勶紝绫诲悕
@@ -183,13 +251,14 @@
{
MsgHelper.ShowError("鎻愮ず锛氬垵濮嬪寲澶辫触锛岃鑱旂郴绠＄悊鍛橈紒");
}
+ wdf.SetCaption("鍔犺浇杩涘害锛�90/100锛�");
+ wdf.Close();
}
catch (Exception ex)
{
- _loading.Stop();
+
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
-
}
/// <summary>
@@ -215,7 +284,9 @@
/// <param name="e"></param>
private void Tab_CloseButtonClick(object sender, EventArgs e)
{
- RemoveTabPage(tab, e);
+ var args = (ClosePageButtonEventArgs)e;
+ var name = args.Page.Tooltip;
+ RemoveTabPage(tab, name);
}
/// <summary>
@@ -251,16 +322,13 @@
/// <param name="tabControl"></param>
/// <param name="tabPageName"></param>
/// <param name="e"></param>
- public void RemoveTabPage(XtraTabControl tabControl, EventArgs e)
+ public void RemoveTabPage(XtraTabControl tabControl, string name)
{
if (TabPageDic.Count <= 1)
{
MsgHelper.Warning("璇疯嚦灏戜繚鐣欎竴涓姛鑳斤紒");
return;
}
-
- var args = (ClosePageButtonEventArgs)e;
- var name = args.Page.Tooltip;
foreach (XtraTabPage item in tabControl.TabPages)
if (item.Name == name)
{
@@ -305,7 +373,6 @@
MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒");
return null;
}
-
newForm.FormBorderStyle = FormBorderStyle.None;
newForm.TopLevel = false;
newForm.ControlBox = false;
@@ -320,7 +387,6 @@
return null;
}
-
private int _userOut()
{
var _obj = new
@@ -344,5 +410,27 @@
return -1;
}
}
+ private void GetOrg()
+ {
+ string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
+ var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, " and IS_STATUS=1");
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
+ var _rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = _rtn.rtnData.list;
+ repositoryItemCheckedComboBoxEdit1.DataSource = dt;
+ repositoryItemCheckedComboBoxEdit1.DisplayMember = "name";
+ repositoryItemCheckedComboBoxEdit1.ValueMember = "fid";
+ var _obj = UtilityHelper.ReturnToDynamic(strReturn);
+ barOrg.EditValue = _obj.rtnData.extendText;
+ OldorgFids = _obj.rtnData.extendText;
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3