From 6c8e038aad394c1e91c8c046d3de25dc8e84ecbe Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期日, 01 九月 2024 09:31:27 +0800
Subject: [PATCH] 优化
---
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 85 ++++++++++++++++++++++++++++++++----------
1 files changed, 65 insertions(+), 20 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index c78fca3..c71d77b 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -19,8 +19,27 @@
public FrmMain()
{
InitializeComponent();
- this.Text = this.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
+ this.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
+ tab.CloseButtonClick += Tab_CloseButtonClick;
getTree();
+ tooLoading.Click += TooLoading_Click;
+ }
+
+ private void TooLoading_Click(object sender, EventArgs e)
+ {
+ int i = 100;
+ Gs.DevApp.UserControl.ShowDialogForm sdf = new Gs.DevApp.UserControl.ShowDialogForm("鎻愮ず", "", "璇疯�愬績绛夊�欙紝姝ｅ湪鎿嶄綔涓紒");
+ for (int j = 0; j < i; j++)
+ {
+ sdf.SetCaption("鎵ц杩涘害锛�" + (j) + "/" + i.ToString() + "锛�");
+ }
+ sdf.Close();
+ getTree();
+ }
+
+ private void Tab_CloseButtonClick(object sender, EventArgs e)
+ {
+ RemoveTabPage(tab, e);
}
private void getTree()
@@ -37,6 +56,7 @@
strJson = UtilityHelper.HttpPost("", "User/GetUserLoginInfo", JsonConvert.SerializeObject(_obj));
JObject _job = JObject.Parse(strJson);
string rtnCode = _job["rtnCode"].ToString();
+ this.acrd.Clear();
string rtnMsg = _job["rtnMsg"].ToString();
barMsg.Caption = rtnMsg;
JArray array = new JArray();
@@ -48,6 +68,7 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain));
DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
DataRow[] drGrp = dt.Select("upGuid is null");
+ int idx = 0;
foreach (DataRow _dy in drGrp)
{
AccordionControlElement _grp = this.acrd.AddGroup();
@@ -55,7 +76,7 @@
_grp.Name = _dy["guid"].ToString();
_grp.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
_grp.Text = _dy["name"].ToString();
- _grp.Tag = _dy["formPath"].ToString();
+ _grp.Tag = _dy["formPath"].ToString();//瀛樿矾寰勶紝绫诲悕
_grp.Click += _grp_Click;
DataRow[] drItem = dt.Select("upGuid='" + _dy["guid"].ToString() + "'");
foreach (DataRow _dy2 in drItem)
@@ -66,9 +87,20 @@
_itm.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
_itm.Text = _dy2["name"].ToString();
_itm.Appearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
- _itm.Tag = _dy2["formPath"].ToString();
+ _itm.Tag = _dy2["formPath"].ToString();//瀛樿矾寰勶紝绫诲悕
_itm.Click += _grp_Click;
_grp.Elements.Add(_itm);
+ //
+ if (idx == 0 && tab.TabPages.Count <= 0)
+ {
+ string tabPageName = _itm.Name + "_page";
+ string tabText = _itm.Text;//褰撳墠閫夐」鍗￠〉Text鏍囬
+ string newFormName = _itm.Tag.ToString();//瀛樿矾寰勶紝绫诲悕
+ Image imgIcon = _itm.Image;
+ AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon);
+ }
+ idx++;
+ //
};
}
}
@@ -83,8 +115,8 @@
AccordionControlElement _acd = (AccordionControlElement)sender;
if (_acd.Elements.Count > 0) return;
string tabPageName = _acd.Name + "_page";
- string tabText = _acd.Text;
- string newFormName = _acd.Tag.ToString();
+ string tabText = _acd.Text;//褰撳墠閫夐」鍗￠〉Text鏍囬
+ string newFormName = _acd.Tag.ToString();//瀛樿矾寰勶紝绫诲悕
Image imgIcon = _acd.Image;
AddTabpage(tab, tabPageName, tabText, newFormName, imgIcon);
}
@@ -95,7 +127,7 @@
/// <param name="tabControl">閫夐」鍗℃帶浠�</param>
/// <param name="tabPageName">褰撴湡閫夐」鍗￠〉name鍚嶇О</param>
/// <param name="tabText">褰撳墠閫夐」鍗￠〉Text鏍囬</param>
- /// <param name="newFormName">褰撳墠閫夐」鍗′腑鐨勬柊绐椾綋</param>
+ /// <param name="newFormName">褰撳墠閫夐」鍗′腑鐨勬柊绐椾綋璺緞锛岀被鍚�</param>
public void AddTabpage(XtraTabControl tabControl, string tabPageName, string tabText, string newFormName, Image imgIcon)
{
if (IsTabpageExsit(tabControl, tabPageName))
@@ -105,11 +137,13 @@
XtraTabPage newPage = new XtraTabPage();
newPage.Name = tabPageName;
newPage.Text = tabText;
- newPage.Tooltip = (tabText);
+ newPage.Tooltip = newPage.Name;
+ newPage.Appearance.Header.Font = (tab.Appearance.Font);
newPage.ImageOptions.Image = imgIcon;
- if (AddNewForm(newFormName) != null)
+ Form fm = AddNewForm(newFormName);
+ if (fm != null)
{
- newPage.Controls.Add(AddNewForm(newFormName));
+ newPage.Controls.Add(fm);
tabControl.TabPages.Add(newPage);
TabPageDic.Add(tabPageName, newPage);
tabControl.SelectedTabPage = newPage;
@@ -124,14 +158,17 @@
/// <param name="e"></param>
public void RemoveTabPage(XtraTabControl tabControl, EventArgs e)
{
+ if (TabPageDic.Count <= 1)
+ {
+ ToolBox.MsgHelper.Warning("璇疯嚦灏戜繚鐣欎竴涓姛鑳斤紒");
+ return;
+ }
DevExpress.XtraTab.ViewInfo.ClosePageButtonEventArgs args = (DevExpress.XtraTab.ViewInfo.ClosePageButtonEventArgs)e;
string name = args.Page.Tooltip;
- MessageBox.Show(name);
foreach (XtraTabPage item in tabControl.TabPages)
{
if (item.Name == name)
{
- MessageBox.Show(item.Name);
tabControl.TabPages.Remove(item);
item.Dispose();
TabPageDic.Remove(name);
@@ -165,18 +202,26 @@
/// <param name="form">绐椾綋鍚嶇О</param>
private Form AddNewForm(string formName)
{
- Form newForm = (Form)Assembly.GetExecutingAssembly().CreateInstance(formName);
- if (newForm == null)
+ try
+ {
+ Form newForm = (Form)Assembly.GetExecutingAssembly().CreateInstance(formName);
+ if (newForm == null)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒");
+ return null;
+ }
+ newForm.FormBorderStyle = FormBorderStyle.None;
+ newForm.TopLevel = false;
+ newForm.ControlBox = false;
+ newForm.Dock = DockStyle.Fill;
+ newForm.Visible = true;
+ return newForm;
+ }
+ catch (Exception)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒");
- return null;
}
- newForm.FormBorderStyle = FormBorderStyle.None;
- newForm.TopLevel = false;
- newForm.ControlBox = false;
- newForm.Dock = DockStyle.Fill;
- newForm.Visible = true;
- return newForm;
+ return null;
}
}
}
--
Gitblit v1.9.3