SVN-Revision: r885
This commit is contained in:
wyf
2025-07-23 08:59:34 +00:00
parent 36299a8b3b
commit 9b6fbeecc6
8 changed files with 89 additions and 74 deletions
@@ -167,7 +167,7 @@ namespace Lskj.Main.Control
/// <summary>
/// 快捷窗口圆角
/// </summary>
private Dictionary<string, CornerLab> _quickPageHeaders = new Dictionary<string, CornerLab>();
private Dictionary<string, Lskj.Control.CircleButton> _quickPageHeaders = new Dictionary<string, Lskj.Control.CircleButton>();
/// <summary>
/// 默认模块(右上角)圆角
/// </summary>
@@ -651,6 +651,12 @@ namespace Lskj.Main.Control
/// </summary>
private void SetMenus()
{
FontFamily fontFamily = FontUtil.Fonts.Families.Where(n => n.Name.Equals("MiSans")).FirstOrDefault();
if (fontFamily != null)
{
collectTipsLab.Font = new Font(fontFamily, 10.5f, FontStyle.Regular);
allTipsLab.Font = new Font(fontFamily, 10.5f, FontStyle.Regular);
}
string[] menuFiles = null;
if (Directory.Exists(PubUtil.ModuleDefaultPath))
{
@@ -697,8 +703,16 @@ namespace Lskj.Main.Control
{
GroupControl baseGroupControl = new GroupControl();
baseGroupControl.TipsLabel.ForeColor = Color.DimGray;
if (fontFamily != null)
{
baseGroupControl.TipsLabel.Font = new Font(fontFamily, 10.5f, FontStyle.Regular);
}
GroupControl reportGroupControl = new GroupControl();
reportGroupControl.TipsLabel.ForeColor = Color.DimGray;
if (fontFamily != null)
{
baseGroupControl.TipsLabel.Font = new Font(fontFamily, 10.5f, FontStyle.Regular);
}
FlowLayoutPanel baseFlowPanel = new FlowLayoutPanel();
FlowLayoutPanel reportFlowPanel = new FlowLayoutPanel();
baseFlowPanel.Padding = new Padding(menuLeft, 0, 0, 0);
@@ -717,6 +731,12 @@ namespace Lskj.Main.Control
string hoverImg = PubUtil.MainMenuDefaultImage + dataRow["MouseOverImg1"] + "";
string[] menuTag = new string[] { dataRow["DllFileName"] + "", dataRow["PurviewId"] + "", dataRow["LMenuId"] + "", dataRow["UrlParams"] + "", dataRow["LSubSysId"] + "", dataRow["dllShowCaption"] + "" };
Menu_ItemNew menu = new Menu_ItemNew();
if (fontFamily != null)
{
menu.GetLabelTitle().Font = new Font(fontFamily, 9.75f, FontStyle.Bold);
menu.GetLabelTitleSub().Font = new Font(fontFamily, 8.5f, FontStyle.Regular);
}
menu.GetLabelTitle().ForeColor = Color.FromArgb(71, 73, 79);
menu.Margin = new Padding(0, 0, 20, 0);
menu.Name = groupMenuId;
menu.Size = new Size(menuWidth, menuHeight);
@@ -766,6 +786,12 @@ namespace Lskj.Main.Control
string hoverImg = PubUtil.MainMenuDefaultImage + dataRow["MouseOverImg1"] + "";
string[] menuTag = new string[] { dataRow["DllFileName"] + "", dataRow["PurviewId"] + "", dataRow["LMenuId"] + "", dataRow["UrlParams"] + "", dataRow["LSubSysId"] + "", dataRow["dllShowCaption"] + "" };
Menu_ItemNew menu = new Menu_ItemNew();
if (fontFamily != null)
{
menu.GetLabelTitle().Font = new Font(fontFamily, 9.75f, FontStyle.Bold);
menu.GetLabelTitleSub().Font = new Font(fontFamily, 8.5f, FontStyle.Regular);
}
menu.GetLabelTitle().ForeColor = Color.FromArgb(71, 73, 79);
menu.Margin = new Padding(0, 0, 20, 0);
menu.Name = groupMenuId;
menu.Size = new Size(menuWidth, menuHeight);
@@ -1050,7 +1076,12 @@ namespace Lskj.Main.Control
groupIndex = groupByDataRows.Where(n => !n.Key.Equals(99)).Count() > 0 ? groupByDataRows.Where(n => !n.Key.Equals(99)).Max(n => n.Key) + 1 : 1;
}
Menu_ItemNew menu = new Menu_ItemNew();
menu.GetLabelTitle().ForeColor = Color.FromArgb(88, 85, 85);
if (fontFamily != null)
{
menu.GetLabelTitle().Font = new Font(fontFamily, 9.75f, FontStyle.Bold);
menu.GetLabelTitleSub().Font = new Font(fontFamily, 8.5f, FontStyle.Regular);
}
menu.GetLabelTitle().ForeColor = Color.FromArgb(71, 73, 79);
menu.menuRow = dataRow.Table.Columns.Contains("menuRow") && !string.IsNullOrEmpty(dataRow["menuRow"] + "") ? Convert.ToInt32(dataRow["menuRow"] + "") : 1;
menu.menuGroup = groupIndex;
if ((menu.menuRow - minMenuRow + 1) > nowRowCount + 1)
@@ -1833,7 +1864,7 @@ namespace Lskj.Main.Control
{
string groupMenuId = items["LMenuId"] + "";
Menu_ItemNew menuItem = this._menuItemList.Cast<Menu_ItemNew>().FirstOrDefault(x => x.Name == groupMenuId);
CornerLab corLab = _quickPageHeaders[key];
Lskj.Control.CircleButton corLab = _quickPageHeaders[key];
corLab.Visible = true;
string number = items["amount"] + "";